diff --git a/FrontEnd/src/app/flashcards/flashcards-add-csv/flashcards-add-csv.component.css b/FrontEnd/src/app/flashcards/flashcards-add-csv/flashcards-add-csv.component.css
index f8e46bb..9899c5d 100644
--- a/FrontEnd/src/app/flashcards/flashcards-add-csv/flashcards-add-csv.component.css
+++ b/FrontEnd/src/app/flashcards/flashcards-add-csv/flashcards-add-csv.component.css
@@ -6,10 +6,15 @@ margin-top: 1rem;
     text-align: left;
 
 }
+.button{
+    font-size: large;
+    padding-left: 30px;
+    padding-right: 30px;
+  }
 
 .container {
     background-color: #181616;
-    padding: 30px; 
+    padding: 30px;
     margin-top: 2rem;
     margin-bottom: 2rem;
     text-align: center;
@@ -38,7 +43,7 @@ margin-top: 1rem;
 
 .content{
     background-color: #181616;
-    padding: 30px; 
+    padding: 30px;
     margin-top: 2rem;
     margin-bottom: 2rem;
     text-align: center;
@@ -52,4 +57,4 @@ ag-grid-angular{
 
 .buttons-container > div{
     margin: 10px;
-}
\ No newline at end of file
+}
diff --git a/FrontEnd/src/app/flashcards/flashcards-add-csv/flashcards-add-csv.component.html b/FrontEnd/src/app/flashcards/flashcards-add-csv/flashcards-add-csv.component.html
index 20361ca..30df933 100644
--- a/FrontEnd/src/app/flashcards/flashcards-add-csv/flashcards-add-csv.component.html
+++ b/FrontEnd/src/app/flashcards/flashcards-add-csv/flashcards-add-csv.component.html
@@ -1,8 +1,8 @@
 <div class="wrapper">
     <div class="content">
         <div class="buttons-container">
-            <button class="btn btn-study-cave" routerLink="/flashcards/sets"><i class="fas fa-arrow-left"></i> WRÓĆ DO LISTY</button>
-            <button class="btn btn-study-cave" routerLink="/flashcards/add/table"><i class="fas fa-table"></i> DODAJ ZA POMOCĄ TABELI</button>
+            <button class="button" routerLink="/flashcards/sets"><i class="fas fa-arrow-left"></i> WRÓĆ DO LISTY</button>
+            <button class="button" routerLink="/flashcards/add/table"><i class="fas fa-table"></i> DODAJ ZA POMOCĄ TABELI</button>
         </div>
 </div>
   <div class="wrapper-add">
@@ -45,9 +45,9 @@
         <br />
         <input type="checkbox" name="{{ permission }}" class="form-control" [checked]="permission" (change)="changePermission()"/><b>Udostępnij publicznie</b>
         </div><br />
-        <button class="btn btn-study-cave" [disabled]="!selectedFiles" (click)="upload()"><i class="fas fa-check-circle"></i> Dodaj fiszki!</button>
+        <button class="button" style="font-size: x-large;" [disabled]="!selectedFiles" (click)="upload()"><i class="fas fa-check-circle"></i> Dodaj fiszki!</button>
         <br /><br />
-        <button class="btn btn-study-cave" routerLink="/flashcards/sets/"><i class="fas fa-arrow-left"></i> Powrót</button>
+        <button class="button" routerLink="/flashcards/sets/"><i class="fas fa-arrow-left"></i> Powrót</button>
     </div>
   </div>
 </div>
diff --git a/FrontEnd/src/app/flashcards/flashcards-add-table/flashcards-add-table.component.css b/FrontEnd/src/app/flashcards/flashcards-add-table/flashcards-add-table.component.css
index 8507619..96ad491 100644
--- a/FrontEnd/src/app/flashcards/flashcards-add-table/flashcards-add-table.component.css
+++ b/FrontEnd/src/app/flashcards/flashcards-add-table/flashcards-add-table.component.css
@@ -7,9 +7,19 @@ table, th, td, tr {
     background-color: transparent;
 }
 
+.button{
+  font-size: large;
+  padding-left: 30px;
+  padding-right: 30px;
+  margin-bottom: 10px;
+  outline: none;
+}
+
+
+
 .container {
     background-color: #181616;
-    padding: 30px; 
+    padding: 30px;
     margin-top: 2rem;
     margin-bottom: 2rem;
     text-align: center;
@@ -32,7 +42,7 @@ table, th, td, tr {
 
 .content{
     background-color: #181616;
-    padding: 30px; 
+    padding: 30px;
     margin-top: 2rem;
     margin-bottom: 2rem;
     text-align: center;
@@ -46,4 +56,4 @@ ag-grid-angular{
 
 .buttons-container > div{
     margin: 10px;
-}
\ No newline at end of file
+}
diff --git a/FrontEnd/src/app/flashcards/flashcards-add-table/flashcards-add-table.component.html b/FrontEnd/src/app/flashcards/flashcards-add-table/flashcards-add-table.component.html
index 1eae5dc..cdda2d0 100644
--- a/FrontEnd/src/app/flashcards/flashcards-add-table/flashcards-add-table.component.html
+++ b/FrontEnd/src/app/flashcards/flashcards-add-table/flashcards-add-table.component.html
@@ -1,8 +1,8 @@
 <div class="wrapper">
     <div class="content">
         <div class="buttons-container">
-            <button class="btn btn-study-cave" routerLink="/flashcards/sets"><i class="fas fa-arrow-left"></i> WRÓĆ DO LISTY</button>
-            <button class="btn btn-study-cave" routerLink="/flashcards/add/csv"><i class="fas fa-file-csv"></i> DODAJ ZA POMOCĄ CSV</button>
+            <button class="button" routerLink="/flashcards/sets"><i class="fas fa-arrow-left"></i> WRÓĆ DO LISTY</button>
+            <button class="button" routerLink="/flashcards/add/csv"><i class="fas fa-file-csv"></i> DODAJ ZA POMOCĄ CSV</button>
         </div>
 </div>
   <div class="wrapper-add">
@@ -37,7 +37,7 @@
                   <input [(ngModel)]="field.right_side" class="form-control" type="text" name="{{field.right_side}}" />
                 </td>
                 <td>
-                  <button class="btn btn-study-cave"  type="button" (click)="deleteFieldValue(i)"><i class="fas fa-trash-alt"></i> Usuń fiszkę</button>
+                  <button class="button"  type="button" (click)="deleteFieldValue(i)"><i class="fas fa-trash-alt"></i> Usuń fiszkę</button>
                 </td>
               </tr>
               <tr>
@@ -48,7 +48,7 @@
                   <input class="form-control" type="text" id="newAttributeRight" [(ngModel)]="newAttribute.right_side" name="newAttributeRight" />
                 </td>
                 <td>
-                  <button class="btn btn-study-cave" type="button" (click)="addFieldValue()"><i class="fas fa-plus"></i> Dodaj fiszkę</button>
+                  <button class="button" type="button" (click)="addFieldValue()"><i class="fas fa-plus"></i> Dodaj fiszkę</button>
                 </td>
               </tr>
             </tbody>
@@ -60,9 +60,9 @@
             <b>Udostępnij publicznie</b>
         </div>
         <br /><br />
-        <button class="btn btn-study-cave" type="submit"><i class="fas fa-check-circle"></i> Dodaj fiszki!</button>
-        <button class="btn btn-study-cave" routerLink="/flashcards/sets/"><i class="fas fa-arrow-left"></i> Powrót</button>
+        <button class="button" style="font-size: x-large;" type="submit"><i class="fas fa-check-circle"></i> Dodaj fiszki!</button><br />
+        <button class="button" routerLink="/flashcards/sets/"><i class="fas fa-arrow-left"></i> Powrót</button>
       </form>
     </div>
   </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/FrontEnd/src/app/flashcards/flashcards-add/flashcards-add.component.css b/FrontEnd/src/app/flashcards/flashcards-add/flashcards-add.component.css
index a57c9dd..f2ace5a 100644
--- a/FrontEnd/src/app/flashcards/flashcards-add/flashcards-add.component.css
+++ b/FrontEnd/src/app/flashcards/flashcards-add/flashcards-add.component.css
@@ -19,7 +19,7 @@
 
 .content{
     background-color: #181616;
-    padding: 30px; 
+    padding: 30px;
     margin-top: 2rem;
     margin-bottom: 2rem;
     text-align: center;
@@ -33,4 +33,11 @@ ag-grid-angular{
 
 .buttons-container > div{
     margin: 10px;
-}
\ No newline at end of file
+}
+
+.button{
+  font-size: large;
+  padding-left: 30px;
+  padding-right: 30px;
+  margin-bottom: 10px;
+}
diff --git a/FrontEnd/src/app/flashcards/flashcards-add/flashcards-add.component.html b/FrontEnd/src/app/flashcards/flashcards-add/flashcards-add.component.html
index 0d9ede8..a34df8c 100644
--- a/FrontEnd/src/app/flashcards/flashcards-add/flashcards-add.component.html
+++ b/FrontEnd/src/app/flashcards/flashcards-add/flashcards-add.component.html
@@ -1,9 +1,9 @@
 <div class="wrapper">
     <div class="content">
             <div class="buttons-container">
-                <button class="btn btn-study-cave" routerLink="/flashcards/sets"><i class="fas fa-arrow-left"></i> WRÓĆ DO LISTY</button>
-                <button class="btn btn-study-cave" routerLink="/flashcards/add/table"><i class="fas fa-table"></i> DODAJ ZA POMOCĄ TABELI</button>
-                <button class="btn btn-study-cave" routerLink="/flashcards/add/csv"><i class="fas fa-file-csv"></i> DODAJ ZA POMOCĄ CSV</button>
+                <button class="button" routerLink="/flashcards/sets"><i class="fas fa-arrow-left"></i> WRÓĆ DO LISTY</button>
+                <button class="button" routerLink="/flashcards/add/table"><i class="fas fa-table"></i> DODAJ ZA POMOCĄ TABELI</button>
+                <button class="button" routerLink="/flashcards/add/csv"><i class="fas fa-file-csv"></i> DODAJ ZA POMOCĄ CSV</button>
             </div>
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/FrontEnd/src/app/flashcards/flashcards-edit-table/flashcards-edit-table.component.css b/FrontEnd/src/app/flashcards/flashcards-edit-table/flashcards-edit-table.component.css
index 8507619..13de380 100644
--- a/FrontEnd/src/app/flashcards/flashcards-edit-table/flashcards-edit-table.component.css
+++ b/FrontEnd/src/app/flashcards/flashcards-edit-table/flashcards-edit-table.component.css
@@ -9,12 +9,19 @@ table, th, td, tr {
 
 .container {
     background-color: #181616;
-    padding: 30px; 
+    padding: 30px;
     margin-top: 2rem;
     margin-bottom: 2rem;
     text-align: center;
 }
 
+.button{
+  font-size: large;
+  padding-left: 30px;
+  padding-right: 30px;
+  margin-bottom: 10px;
+}
+
 .wrapper-add {
     width: 100%;
     display: flex;
@@ -32,7 +39,7 @@ table, th, td, tr {
 
 .content{
     background-color: #181616;
-    padding: 30px; 
+    padding: 30px;
     margin-top: 2rem;
     margin-bottom: 2rem;
     text-align: center;
@@ -46,4 +53,4 @@ ag-grid-angular{
 
 .buttons-container > div{
     margin: 10px;
-}
\ No newline at end of file
+}
diff --git a/FrontEnd/src/app/flashcards/flashcards-edit-table/flashcards-edit-table.component.html b/FrontEnd/src/app/flashcards/flashcards-edit-table/flashcards-edit-table.component.html
index 4e4346c..4e97ae8 100644
--- a/FrontEnd/src/app/flashcards/flashcards-edit-table/flashcards-edit-table.component.html
+++ b/FrontEnd/src/app/flashcards/flashcards-edit-table/flashcards-edit-table.component.html
@@ -1,7 +1,7 @@
 <div class="wrapper">
     <div class="content">
         <div class="buttons-container">
-                <button class="btn btn-study-cave" (click)="returnToSet()"><i class="fas fa-arrow-left"></i> WRÓĆ DO ZESTAWU</button>
+                <button class="button" (click)="returnToSet()"><i class="fas fa-arrow-left"></i> WRÓĆ DO ZESTAWU</button>
         </div>
 </div>
   <div class="wrapper-add">
@@ -45,7 +45,7 @@
                   <input [(ngModel)]="field.right_side" class="form-control" type="text" name="{{field.right_side}}" />
                 </td>
                 <td>
-                  <button class="btn btn-study-cave"  type="button" (click)="deleteFieldValue(i)"><i class="fas fa-trash-alt"></i> Usuń fiszkę</button>
+                  <button class="button"  type="button" (click)="deleteFieldValue(i)"><i class="fas fa-trash-alt"></i> Usuń fiszkę</button>
                 </td>
               </tr>
               <tr>
@@ -56,7 +56,7 @@
                     <input class="form-control" type="text" id="newAttributeRight" [(ngModel)]="newAttribute['right_side']" name="newAttributeRight" />
                 </td>
                 <td>
-                  <button class="btn btn-study-cave" type="button" (click)="addFieldValue()"><i class="fas fa-file-csv"></i> Dodaj fiszkę</button>
+                  <button class="button" type="button" (click)="addFieldValue()"><i class="fas fa-file-csv"></i> Dodaj fiszkę</button>
                 </td>
               </tr>
             </tbody>
@@ -64,10 +64,10 @@
         </label>
         <br />
         <div>
-          <button class="btn btn-study-cave" type="submit"><i class="fas fa-check-circle"></i> Edytuj fiszki!</button>
-          <button class="btn btn-study-cave" [routerLink]="['/flashcards/sets', ident]"><i class="fas fa-arrow-left"></i> Powrót</button>
+          <button class="button" style="font-size: x-large;" type="submit"><i class="fas fa-check-circle"></i> Edytuj fiszki!</button><br />
+          <button class="button" [routerLink]="['/flashcards/sets', ident]"><i class="fas fa-arrow-left"></i> Powrót</button>
         </div>
       </form>
     </div>
   </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/FrontEnd/src/app/flashcards/flashcards-filling-in-test/flashcards-filling-in-test.component.css b/FrontEnd/src/app/flashcards/flashcards-filling-in-test/flashcards-filling-in-test.component.css
index f5d8eae..dcc4148 100644
--- a/FrontEnd/src/app/flashcards/flashcards-filling-in-test/flashcards-filling-in-test.component.css
+++ b/FrontEnd/src/app/flashcards/flashcards-filling-in-test/flashcards-filling-in-test.component.css
@@ -1,8 +1,8 @@
 #container-small {
     background-color: #181616;
-    padding: 30px; 
+    padding: 30px;
     width: 32%;
-    height: 400px; 
+    height: 400px;
     box-sizing: border-box;
     position: relative;
     text-align: center;
@@ -15,9 +15,16 @@
     margin-top: 2rem;
 }
 
+.button{
+  font-size: large;
+  padding-left: 30px;
+  padding-right: 30px;
+  margin-bottom: 10px;
+}
+
 #container-large {
     background-color: #181616;
-    padding: 30px; 
+    padding: 30px;
     width: 62%;
     min-height: 400px;
     text-align: center;
@@ -40,4 +47,4 @@
         width: 90%;
         margin-bottom: 2.5rem;
     }
-}
\ No newline at end of file
+}
diff --git a/FrontEnd/src/app/flashcards/flashcards-filling-in-test/flashcards-filling-in-test.component.html b/FrontEnd/src/app/flashcards/flashcards-filling-in-test/flashcards-filling-in-test.component.html
index a480f7f..13d92d8 100644
--- a/FrontEnd/src/app/flashcards/flashcards-filling-in-test/flashcards-filling-in-test.component.html
+++ b/FrontEnd/src/app/flashcards/flashcards-filling-in-test/flashcards-filling-in-test.component.html
@@ -27,7 +27,7 @@
 <div id="container-large">
     <div *ngIf="started">
     <div *ngIf="this.filled >= 1 && !finish">
-    
+
       Poprzednia odpowiedź:<br />
       {{flashcards[index-1].content}} {{allAnswers[index-1].answer}}
     </div>
@@ -35,7 +35,7 @@
       Podaj odpowiedź:<br />
       {{flashcards[index].content}}
       <input appAutofocus [(ngModel)]="answer" class="mr-2" placeholder="odpowiedź" (keyup.enter)="verifyAnswer()" >
-      <button class="btn btn-study-cave" (click)="verifyAnswer()"><i class="fas fa-check-circle"></i> Sprawdź</button>
+      <button class="button" style="min-width: 200px;" (click)="verifyAnswer()"><i class="fas fa-check-circle"></i> Sprawdź</button>
     </div>
     <div *ngIf="this.is_correct === true && !finish">ODPOWIEDŹ POPRAWNA</div>
     <div *ngIf="this.is_correct === false && !finish">ODPOWIEDŹ NIEPOPRAWNA</div>
@@ -50,10 +50,10 @@
     <app-test-results [result]="good" [maxPts]="length_test"></app-test-results>
   </div>
   <div *ngIf="!finish">
-    <button class="btn btn-study-cave" *ngIf="!started" (click)="start()"><i class="far fa-play-circle"></i> Rozpocznij test</button>
+    <button class="button" *ngIf="!started" (click)="start()"><i class="far fa-play-circle"></i> Rozpocznij test</button>
   </div>
-  <button class="btn btn-study-cave" *ngIf="finish" routerLink="/flashcards/sets/{{ id }}"><i class="far fa-stop-circle"></i> Zakończ test</button>
-  <button class="btn btn-study-cave" *ngIf="started && !finish && !not_last"(click)="finished()"><i class="fas fa-arrow-left"></i> Przejdź do wyniku</button>
+  <button class="button" *ngIf="finish" routerLink="/flashcards/sets/{{ id }}"><i class="far fa-stop-circle"></i> Zakończ test</button>
+  <button class="button" *ngIf="started && !finish && !not_last"(click)="finished()"><i class="fas fa-arrow-left"></i> Przejdź do wyniku</button>
   <br />
-  <button class="btn btn-study-cave" routerLink="/flashcards/sets/{{ id }}"><i class="fas fa-arrow-left"></i> Wróć do zestawu</button>
+  <button class="button" routerLink="/flashcards/sets/{{ id }}"><i class="fas fa-arrow-left"></i> Wróć do zestawu</button>
 </div>
diff --git a/FrontEnd/src/app/flashcards/flashcards-memory-test/flashcards-memory-test.component.css b/FrontEnd/src/app/flashcards/flashcards-memory-test/flashcards-memory-test.component.css
index f5d8eae..dcc4148 100644
--- a/FrontEnd/src/app/flashcards/flashcards-memory-test/flashcards-memory-test.component.css
+++ b/FrontEnd/src/app/flashcards/flashcards-memory-test/flashcards-memory-test.component.css
@@ -1,8 +1,8 @@
 #container-small {
     background-color: #181616;
-    padding: 30px; 
+    padding: 30px;
     width: 32%;
-    height: 400px; 
+    height: 400px;
     box-sizing: border-box;
     position: relative;
     text-align: center;
@@ -15,9 +15,16 @@
     margin-top: 2rem;
 }
 
+.button{
+  font-size: large;
+  padding-left: 30px;
+  padding-right: 30px;
+  margin-bottom: 10px;
+}
+
 #container-large {
     background-color: #181616;
-    padding: 30px; 
+    padding: 30px;
     width: 62%;
     min-height: 400px;
     text-align: center;
@@ -40,4 +47,4 @@
         width: 90%;
         margin-bottom: 2.5rem;
     }
-}
\ No newline at end of file
+}
diff --git a/FrontEnd/src/app/flashcards/flashcards-memory-test/flashcards-memory-test.component.html b/FrontEnd/src/app/flashcards/flashcards-memory-test/flashcards-memory-test.component.html
index ebdfc27..fe97f57 100644
--- a/FrontEnd/src/app/flashcards/flashcards-memory-test/flashcards-memory-test.component.html
+++ b/FrontEnd/src/app/flashcards/flashcards-memory-test/flashcards-memory-test.component.html
@@ -38,12 +38,12 @@
       </div>
       <br />
       <div *ngIf="!finish">
-        <button class="btn btn-study-cave" *ngIf="!started" (click)="start()"><i class="far fa-play-circle"></i> Rozpocznij test</button>
-        <button class="btn btn-study-cave" *ngIf="checked && not_last" (click)="increment()"><i class="fas fa-arrow-right"></i>Przejdź dalej</button>
-        <button class="btn btn-study-cave" *ngIf="checked && !not_last" (click)="increment()"><i class="far fa-stop-circle"></i> Zakończ test</button>
+        <button class="button" *ngIf="!started" (click)="start()"><i class="far fa-play-circle"></i> Rozpocznij test</button>
+        <button class="button" *ngIf="checked && not_last" (click)="increment()"><i class="fas fa-arrow-right"></i>Przejdź dalej</button>
+        <button class="button" *ngIf="checked && !not_last" (click)="increment()"><i class="far fa-stop-circle"></i> Zakończ test</button>
       </div>
       <br />
-      <button class="btn btn-study-cave" routerLink="/flashcards/sets/{{ id }}"><i class="fas fa-arrow-left"></i> Wróć do zestawu</button>
+      <button class="button" routerLink="/flashcards/sets/{{ id }}"><i class="fas fa-arrow-left"></i> Wróć do zestawu</button>
     </div>
-  </div>  
+  </div>
 </div>
diff --git a/FrontEnd/src/app/flashcards/flashcards-pairs-test-set/flashcards-pairs-test-set.component.css b/FrontEnd/src/app/flashcards/flashcards-pairs-test-set/flashcards-pairs-test-set.component.css
index 50130c9..ca8b842 100644
--- a/FrontEnd/src/app/flashcards/flashcards-pairs-test-set/flashcards-pairs-test-set.component.css
+++ b/FrontEnd/src/app/flashcards/flashcards-pairs-test-set/flashcards-pairs-test-set.component.css
@@ -1,8 +1,8 @@
 #container-small {
     background-color: #181616;
-    padding: 30px; 
+    padding: 30px;
     width: 25%;
-    height: 400px; 
+    height: 400px;
     margin: 25px;
     float:left;
     box-sizing: border-box;
@@ -12,17 +12,25 @@
 .content{
     position:fixed;
     width:100%;
-    box-sizing: border-box;  
+    box-sizing: border-box;
     max-width: 100%;
 }
+
+.button{
+  font-size: large;
+  padding-left: 30px;
+  padding-right: 30px;
+  margin-bottom: 10px;
+}
+
 #container-large {
     background-color: #181616;
-    padding: 30px; 
+    padding: 30px;
     width: 65%;
-    height: 400px; 
+    height: 400px;
     margin: 25px;
     float: right;
-    box-sizing: border-box;    
+    box-sizing: border-box;
     position: relative;
     text-align: center;
 }
@@ -91,4 +99,4 @@
 
 .wrong{
     background-color: red;
-}
\ No newline at end of file
+}
diff --git a/FrontEnd/src/app/flashcards/flashcards-pairs-test-set/flashcards-pairs-test-set.component.html b/FrontEnd/src/app/flashcards/flashcards-pairs-test-set/flashcards-pairs-test-set.component.html
index 60e160e..ab3d61e 100644
--- a/FrontEnd/src/app/flashcards/flashcards-pairs-test-set/flashcards-pairs-test-set.component.html
+++ b/FrontEnd/src/app/flashcards/flashcards-pairs-test-set/flashcards-pairs-test-set.component.html
@@ -27,5 +27,5 @@
 
   </div>
   <br />
-  <button *ngIf="!verify" class="btn btn-study-cave" (click)="nextQuestion()"><i class="fas fa-check-circle"></i> Sprawdź</button>
-</div>
\ No newline at end of file
+  <button *ngIf="!verify" class="button" style="min-width: 200px;" (click)="nextQuestion()"><i class="fas fa-check-circle"></i> Sprawdź</button>
+</div>
diff --git a/FrontEnd/src/app/flashcards/flashcards-pairs-test/flashcards-pairs-test.component.css b/FrontEnd/src/app/flashcards/flashcards-pairs-test/flashcards-pairs-test.component.css
index 48eaf62..fd096b7 100644
--- a/FrontEnd/src/app/flashcards/flashcards-pairs-test/flashcards-pairs-test.component.css
+++ b/FrontEnd/src/app/flashcards/flashcards-pairs-test/flashcards-pairs-test.component.css
@@ -1,8 +1,8 @@
 #container-small {
     background-color: #181616;
-    padding: 30px; 
+    padding: 30px;
     width: 32%;
-    height: 400px; 
+    height: 400px;
     box-sizing: border-box;
     position: relative;
     text-align: center;
@@ -15,9 +15,16 @@
     margin-top: 2rem;
 }
 
+.button{
+  font-size: large;
+  padding-left: 30px;
+  padding-right: 30px;
+  margin-bottom: 10px;
+}
+
 #container-large {
     background-color: #181616;
-    padding: 30px; 
+    padding: 30px;
     width: 62%;
     min-height: 400px;
     text-align: center;
@@ -48,4 +55,4 @@
         height: 350px;
     }
 
-}
\ No newline at end of file
+}
diff --git a/FrontEnd/src/app/flashcards/flashcards-pairs-test/flashcards-pairs-test.component.html b/FrontEnd/src/app/flashcards/flashcards-pairs-test/flashcards-pairs-test.component.html
index 554bd88..3bfd7b5 100644
--- a/FrontEnd/src/app/flashcards/flashcards-pairs-test/flashcards-pairs-test.component.html
+++ b/FrontEnd/src/app/flashcards/flashcards-pairs-test/flashcards-pairs-test.component.html
@@ -45,11 +45,11 @@
   </div>
   <br />
   <div *ngIf="!finish">
-    <button class="btn btn-study-cave" *ngIf="!started" (click)="start()"><i class="far fa-play-circle"></i> Rozpocznij test</button>
-    <button class="btn btn-study-cave" *ngIf="checked && not_last" (click)="increment()"><i class="far fa-play-circle"></i> Przejdź dalej</button>
-    <button class="btn btn-study-cave" *ngIf="checked && !not_last" (click)="increment()"><i class="far fa-stop-circle"></i> Zakończ test</button>
+    <button class="button" *ngIf="!started" (click)="start()"><i class="far fa-play-circle"></i> Rozpocznij test</button>
+    <button class="button" *ngIf="checked && not_last" (click)="increment()"><i class="far fa-play-circle"></i> Przejdź dalej</button>
+    <button class="button" *ngIf="checked && !not_last" (click)="increment()"><i class="far fa-stop-circle"></i> Zakończ test</button>
   </div>
   <br />
-  <button class="btn btn-study-cave" routerLink="/flashcards/sets/{{ id }}"><i class="fas fa-arrow-left"></i> Wróć do zestawu</button>
+  <button class="button" routerLink="/flashcards/sets/{{ id }}"><i class="fas fa-arrow-left"></i> Wróć do zestawu</button>
 </div>
 </div>
diff --git a/FrontEnd/src/app/flashcards/flashcards-set-detail/flashcards-set-detail.component.css b/FrontEnd/src/app/flashcards/flashcards-set-detail/flashcards-set-detail.component.css
index a93a165..158f7a3 100644
--- a/FrontEnd/src/app/flashcards/flashcards-set-detail/flashcards-set-detail.component.css
+++ b/FrontEnd/src/app/flashcards/flashcards-set-detail/flashcards-set-detail.component.css
@@ -12,9 +12,16 @@
     margin-bottom: 5px;
 }
 
+.button{
+  font-size: large;
+  padding-left: 30px;
+  padding-right: 30px;
+  margin-bottom: 10px;
+}
+
 .content{
     background-color: #181616;
-    padding: 30px; 
+    padding: 30px;
     margin-top: 2rem;
     margin-bottom: 2rem;
     text-align: center;
diff --git a/FrontEnd/src/app/flashcards/flashcards-set-detail/flashcards-set-detail.component.html b/FrontEnd/src/app/flashcards/flashcards-set-detail/flashcards-set-detail.component.html
index b5af84a..a9f5642 100644
--- a/FrontEnd/src/app/flashcards/flashcards-set-detail/flashcards-set-detail.component.html
+++ b/FrontEnd/src/app/flashcards/flashcards-set-detail/flashcards-set-detail.component.html
@@ -1,12 +1,12 @@
 <div class="wrapper">
     <div class="content">
         <div class="button-container">
-            <button class="btn btn-study-cave" (click)="goBack()"><i class="fas fa-arrow-left"></i> POWRÓT</button>
-            <button class="btn btn-study-cave" (click)="showTestTypeMenu()"><i class="fas fa-pencil-ruler"></i> GENERUJ TESTY</button>
-            <button *ngIf="owned && set && set.permission !== 'GROUP'" class="btn btn-study-cave" (click)="navigateToEditMode()"><i class="fas fa-edit"></i> EDYTUJ FISZKI</button>
-            <button *ngIf="owned && set && set.permission !== 'GROUP'" class="btn btn-study-cave" (click)="showPopup()"><i class="fas fa-trash-alt"></i> USUŃ FISZKI</button>
+            <button class="button" (click)="goBack()"><i class="fas fa-arrow-left"></i> POWRÓT</button>
+            <button class="button" (click)="showTestTypeMenu()"><i class="fas fa-pencil-ruler"></i> GENERUJ TESTY</button>
+            <button *ngIf="owned && set && set.permission !== 'GROUP'" class="button" (click)="navigateToEditMode()"><i class="fas fa-edit"></i> EDYTUJ FISZKI</button>
+            <button *ngIf="owned && set && set.permission !== 'GROUP'" class="button" (click)="showPopup()"><i class="fas fa-trash-alt"></i> USUŃ FISZKI</button>
             <div *ngIf="user && owned && set && set.permission !== 'GROUP'">
-                <button class="btn btn-study-cave" (click)="changePermission()"><i class="fas fa-unlock"></i> ZMIEŃ UPRAWNIENIA</button>
+                <button class="button" (click)="changePermission()"><i class="fas fa-unlock"></i> ZMIEŃ UPRAWNIENIA</button>
             </div>
         </div>
 
@@ -38,8 +38,8 @@
     <p-dialog header="Potwierdź" [(visible)]="display">
         Czy chcesz usunąć fiszkę?
         <p-footer>
-            <button type="button" pButton icon="pi pi-check" (click)="deleteSet()" label="TAK"></button>
-            <button type="button" pButton icon="pi pi-close" (click)="display=false" label="NIE" class="ui-button-secondary"></button>
+            <button type="button" class="button" pButton icon="pi pi-check" (click)="deleteSet()" label="TAK"></button>
+            <button type="button" class="button" pButton icon="pi pi-close" (click)="display=false" label="NIE" class="ui-button-secondary"></button>
         </p-footer>
     </p-dialog>
-</div>
\ No newline at end of file
+</div>
diff --git a/FrontEnd/src/app/flashcards/flashcards-sets-list/flashcards-sets-list.component.css b/FrontEnd/src/app/flashcards/flashcards-sets-list/flashcards-sets-list.component.css
index f4a5593..d11b4f2 100644
--- a/FrontEnd/src/app/flashcards/flashcards-sets-list/flashcards-sets-list.component.css
+++ b/FrontEnd/src/app/flashcards/flashcards-sets-list/flashcards-sets-list.component.css
@@ -10,6 +10,34 @@
     cursor: pointer;
 }
 
+
+
+label
+{
+  clip-path: polygon(0% 50%, 15% 0%, 85% 0%, 100% 50%, 85% 100%, 15% 100%);
+  background-color: #000080;
+  width: 300px;
+  text-align: center;
+  border: 3px solid #000080;
+  border-bottom: #000080;
+  color: white;
+  cursor: pointer;
+  margin-top:10px;
+  font-size: x-large;
+}
+
+label:hover
+{
+  background-color: orange;
+  border-color: orange;
+}
+
+.radio-answer:checked + label
+{
+  background-color: orange;
+  border-color: orange;
+}
+
 .wrapper{
     width: 100%;
     padding: 30px;
@@ -17,6 +45,13 @@
     margin-bottom: 40px;
 }
 
+.button{
+  font-size: large;
+  padding-left: 30px;
+  padding-right: 30px;
+  margin-bottom: 10px;
+}
+
 @media screen and (max-width: 800px) {
     .mobile{
         display: none;
@@ -29,7 +64,7 @@
 
 .content{
     background-color: #181616;
-    padding: 30px; 
+    padding: 30px;
     margin-top: 2rem;
     margin-bottom: 2rem;
     text-align: center;
@@ -43,4 +78,10 @@ ag-grid-angular{
 
 .buttons-container > div{
     margin: 10px;
-}
\ No newline at end of file
+}
+
+.radio-answer
+{
+  display: none;
+}
+
diff --git a/FrontEnd/src/app/flashcards/flashcards-sets-list/flashcards-sets-list.component.html b/FrontEnd/src/app/flashcards/flashcards-sets-list/flashcards-sets-list.component.html
index 6710519..5fe237f 100644
--- a/FrontEnd/src/app/flashcards/flashcards-sets-list/flashcards-sets-list.component.html
+++ b/FrontEnd/src/app/flashcards/flashcards-sets-list/flashcards-sets-list.component.html
@@ -6,30 +6,30 @@
     <br />
     <div class="buttons-container">
         <div *ngIf="logged">
-          <button class="btn btn-study-cave" (click)="toFlashcardsMaker()"><i class="fas fa-plus"></i> Dodaj fiszki</button>
+          <button class="button" (click)="toFlashcardsMaker()"><i class="fas fa-plus"></i> Dodaj fiszki</button>
         </div>
         <div *ngIf="logged" class="btn-group btn-group-toggle" data-toggle="buttons">
-          <label class="btn btn-study-cave active" (click)="ShowPublic()">
-            <input type="radio" name="options" id="option1" autocomplete="off" checked><i class="fas fa-globe"></i> Publiczne
+          <label class="button active" (click)="ShowPublic()">
+            <input type="radio" class="radio-answer" name="options" id="option1" autocomplete="off" checked><i class="fas fa-globe"></i> Publiczne
           </label>
-          <label class="btn btn-study-cave" (click)="ShowPrivate()">
-            <input type="radio" name="options" id="option2" autocomplete="off"><i class="fas fa-user-secret"></i> Prywatne
+          <label class="button" (click)="ShowPrivate()">
+            <input type="radio" class="radio-answer" name="options" id="option2" autocomplete="off"><i class="fas fa-user-secret"></i> Prywatne
           </label>
         </div>
       </div>
       <br />
     <ag-grid-angular style="width: 100%; height: 475px;" class="ag-theme-dark" [rowData]="sets" [columnDefs]="columnDefs" [enableSorting]="true"
     [enableFilter]="true" (gridReady)="onGridReady($event)" (gridSizeChanged)="onGridSizeChanged($event)" [gridOptions]="gridOptions"
-    [pagination]="true" [paginationAutoPageSize]="true" (rowClicked)="onRowClicked($event)" [localeText]="localeText" 
+    [pagination]="true" [paginationAutoPageSize]="true" (rowClicked)="onRowClicked($event)" [localeText]="localeText"
     (gridColumnsChanged)="onGidColumnsChanged($event)">
   </ag-grid-angular>
   <p-dialog header="Potwierdź" [(visible)]="display">
       Czy chcesz usunąć fiszkę?
       <p-footer>
-          <button type="button" pButton icon="pi pi-check" (click)="deleteSet()" label="TAK"></button>
-          <button type="button" pButton icon="pi pi-close" (click)="display=false" label="NIE" class="ui-button-secondary"></button>
+          <button type="button" class="button" pButton icon="pi pi-check" (click)="deleteSet()" label="TAK"></button>
+          <button type="button" class="button" pButton icon="pi pi-close" (click)="display=false" label="NIE" class="ui-button-secondary"></button>
       </p-footer>
     </p-dialog>
 
   </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/FrontEnd/src/app/flashcards/flashcards-test-type-menu/flashcards-test-type-menu.component.css b/FrontEnd/src/app/flashcards/flashcards-test-type-menu/flashcards-test-type-menu.component.css
index ebd4ed4..0e85a02 100644
--- a/FrontEnd/src/app/flashcards/flashcards-test-type-menu/flashcards-test-type-menu.component.css
+++ b/FrontEnd/src/app/flashcards/flashcards-test-type-menu/flashcards-test-type-menu.component.css
@@ -1,4 +1,12 @@
 div{
     margin-top: 5px;
     margin-bottom: 5px;
-}
\ No newline at end of file
+}
+
+.button{
+  font-size: large;
+  padding-left: 30px;
+  padding-right: 30px;
+  margin-bottom: 10px;
+  min-width: 200px;
+}
diff --git a/FrontEnd/src/app/flashcards/flashcards-test-type-menu/flashcards-test-type-menu.component.html b/FrontEnd/src/app/flashcards/flashcards-test-type-menu/flashcards-test-type-menu.component.html
index e01d94e..69efe46 100644
--- a/FrontEnd/src/app/flashcards/flashcards-test-type-menu/flashcards-test-type-menu.component.html
+++ b/FrontEnd/src/app/flashcards/flashcards-test-type-menu/flashcards-test-type-menu.component.html
@@ -1,7 +1,7 @@
 <div>
-  <button class="btn btn-study-cave" (click)="goToTestGenFill()">Uzupełnij</button>
-  <button class="btn btn-study-cave" (click)="goToTestGen()">Pary</button>
-  <button class="btn btn-study-cave" (click)="goToTestGenTyperace()">Na czas</button>
-  <button class="btn btn-study-cave" (click)="goToTestGenMemory()">Memory</button>
-  <button class="btn btn-study-cave" (click)="cancelMenu()"><i class="fas fa-times"></i> Anuluj</button>
-</div>
\ No newline at end of file
+  <button class="button" (click)="goToTestGenFill()">Uzupełnij</button>
+  <button class="button" (click)="goToTestGen()">Pary</button>
+  <button class="button" (click)="goToTestGenTyperace()">Na czas</button>
+  <button class="button" (click)="goToTestGenMemory()">Memory</button><br />
+  <button class="button" (click)="cancelMenu()"><i class="fas fa-times"></i> Anuluj</button>
+</div>
diff --git a/FrontEnd/src/app/flashcards/flashcards-typerace-test/flashcards-typerace-test.component.css b/FrontEnd/src/app/flashcards/flashcards-typerace-test/flashcards-typerace-test.component.css
index e1f5971..402a422 100644
--- a/FrontEnd/src/app/flashcards/flashcards-typerace-test/flashcards-typerace-test.component.css
+++ b/FrontEnd/src/app/flashcards/flashcards-typerace-test/flashcards-typerace-test.component.css
@@ -1,7 +1,7 @@
 #container-small {
     background-color: #181616;
-    padding: 30px; 
-    width: 32%; 
+    padding: 30px;
+    width: 32%;
     min-height: 400px;
     box-sizing: border-box;
     position: relative;
@@ -15,9 +15,16 @@
     margin-top: 2rem;
 }
 
+.button{
+  font-size: large;
+  padding-left: 30px;
+  padding-right: 30px;
+  margin-bottom: 10px;
+}
+
 #container-large {
     background-color: #181616;
-    padding: 30px; 
+    padding: 30px;
     width: 62%;
     min-height: 400px;
     text-align: center;
@@ -40,4 +47,4 @@
         width: 90%;
         margin-bottom: 2.5rem;
     }
-}
\ No newline at end of file
+}
diff --git a/FrontEnd/src/app/flashcards/flashcards-typerace-test/flashcards-typerace-test.component.html b/FrontEnd/src/app/flashcards/flashcards-typerace-test/flashcards-typerace-test.component.html
index 0d0cb41..c55ca81 100644
--- a/FrontEnd/src/app/flashcards/flashcards-typerace-test/flashcards-typerace-test.component.html
+++ b/FrontEnd/src/app/flashcards/flashcards-typerace-test/flashcards-typerace-test.component.html
@@ -32,13 +32,13 @@
     <div *ngIf="started">
     <div *ngIf="this.filled >= 1 && !finish">
       Poprzednia odpowiedź:<br />
-      {{flashcards[index-1].content}} {{stoptimes[index-1].m}} m {{stoptimes[index-1].s}} s {{stoptimes[index-1].ms}} ms 
+      {{flashcards[index-1].content}} {{stoptimes[index-1].m}} m {{stoptimes[index-1].s}} s {{stoptimes[index-1].ms}} ms
     </div>
     <div *ngIf="this.filled < this.length_test && !finish">
       Podaj odpowiedź:<br />
       {{flashcards[index].content}}
       <input appAutofocus [(ngModel)]="answer" class="mr-2" placeholder="odpowiedź" (keyup.enter)="verifyAnswer()" >
-      <button class="btn btn-study-cave" (click)="verifyAnswer()" ><i class="fas fa-check-circle"></i> Sprawdź</button>
+      <button class="button" style="min-width: 200px;" (click)="verifyAnswer()" ><i class="fas fa-check-circle"></i> Sprawdź</button>
     </div>
     <div *ngIf="this.is_correct === true && !finish">ODPOWIEDŹ POPRAWNA</div>
     <div *ngIf="this.is_correct === false && !finish">ODPOWIEDŹ NIEPOPRAWNA</div>
@@ -52,11 +52,11 @@
     <app-test-results [result]="good" [maxPts]="length_test" [minutes]="finalminute" [seconds]="finalsecond" [milliseconds]="finalmillisecond" [timer]="true"></app-test-results>
   </div>
   <div *ngIf="!finish">
-    <button class="btn btn-study-cave" *ngIf="!started" (click)="start()"><i class="far fa-play-circle"></i> Rozpocznij test</button>
+    <button class="button" *ngIf="!started" (click)="start()"><i class="far fa-play-circle"></i> Rozpocznij test</button>
   </div>
-  <button class="btn btn-study-cave" *ngIf="finish" routerLink="/flashcards/sets/{{ id }}"><i class="far fa-stop-circle"></i> Zakończ test</button>
-  <button class="btn btn-study-cave" *ngIf="started && !finish && !not_last"(click)="finished()"><i class="far fa-stop-circle"></i> Przejdź do wyniku</button>
+  <button class="button" *ngIf="finish" routerLink="/flashcards/sets/{{ id }}"><i class="far fa-stop-circle"></i> Zakończ test</button>
+  <button class="button" *ngIf="started && !finish && !not_last"(click)="finished()"><i class="far fa-stop-circle"></i> Przejdź do wyniku</button>
   <br />
-  <button class="btn btn-study-cave" routerLink="/flashcards/sets/{{ id }}"><i class="fas fa-arrow-left"></i> Wróć do zestawu</button>
+  <button class="button" routerLink="/flashcards/sets/{{ id }}"><i class="fas fa-arrow-left"></i> Wróć do zestawu</button>
 </div>
 </div>
diff --git a/FrontEnd/src/app/flashcards/flashcards/flashcards.component.css b/FrontEnd/src/app/flashcards/flashcards/flashcards.component.css
index 01530aa..8ff3ab8 100644
--- a/FrontEnd/src/app/flashcards/flashcards/flashcards.component.css
+++ b/FrontEnd/src/app/flashcards/flashcards/flashcards.component.css
@@ -1,3 +1,6 @@
-.btn{
-    margin-bottom: 5px;
-}
\ No newline at end of file
+.button{
+  font-size: large;
+  min-width: 200px;
+}
+
+
diff --git a/FrontEnd/src/app/flashcards/flashcards/flashcards.component.html b/FrontEnd/src/app/flashcards/flashcards/flashcards.component.html
index 3c5b93d..1814118 100644
--- a/FrontEnd/src/app/flashcards/flashcards/flashcards.component.html
+++ b/FrontEnd/src/app/flashcards/flashcards/flashcards.component.html
@@ -1,4 +1,4 @@
 <div>
-    <button class="btn btn-study-cave" routerLink="/flashcards/sets"><i class="fas fa-scroll"></i> FISZKI</button>
-    <button class="btn btn-study-cave" routerLink="/materials/list"><i class="fas fa-book-open"></i> MATERIAŁY</button>
+    <button class="button" routerLink="/flashcards/sets"><i class="fas fa-scroll"></i> FISZKI</button>
+    <button class="button" routerLink="/materials/list"><i class="fas fa-book-open"></i> MATERIAŁY</button>
 </div>
diff --git a/FrontEnd/src/styles.css b/FrontEnd/src/styles.css
index 02a8ba3..d5c0dfb 100644
--- a/FrontEnd/src/styles.css
+++ b/FrontEnd/src/styles.css
@@ -157,6 +157,7 @@ a:hover{
   border-bottom: #000080;
   color: white;
   font-size: x-large;
+  outline: none;
 }
 
 .button:hover