diff --git a/src/app/sprint-table/sprint-table.component.html b/src/app/sprint-table/sprint-table.component.html
index ad80d25..e824be9 100644
--- a/src/app/sprint-table/sprint-table.component.html
+++ b/src/app/sprint-table/sprint-table.component.html
@@ -11,29 +11,29 @@
         <th (click)="sortById()" class="sortable">
           <span>ID</span>
           <span *ngIf="sortBy === 'id'" class="pl-3">
-            <span *ngIf="sortDescending">▲</span>
-            <span *ngIf="sortDescending === false">▼</span>
+            <span *ngIf="sortDescending"><i class="fa fa-sort-up"></i></span>
+            <span *ngIf="sortDescending === false"><i class="fa fa-sort-down"></i></span>
           </span>
         </th>
         <th (click)="sortByTitle()" class="sortable">
           <span>Titel</span>
           <span *ngIf="sortBy === 'title'" class="pl-3">
-            <span *ngIf="sortDescending">▲</span>
-            <span *ngIf="sortDescending === false">▼</span>
+            <span *ngIf="sortDescending"><i class="fa fa-sort-up"></i></span>
+            <span *ngIf="sortDescending === false"><i class="fa fa-sort-down"></i></span>
           </span>
         </th>
         <th (click)="sortByStartDate()" class="sortable">
             <span>Start</span>
             <span *ngIf="sortBy === 'startDate'" class="pl-3">
-              <span *ngIf="sortDescending">▲</span>
-              <span *ngIf="sortDescending === false">▼</span>
+              <span *ngIf="sortDescending"><i class="fa fa-sort-up"></i></span>
+              <span *ngIf="sortDescending === false"><i class="fa fa-sort-down"></i></span>
             </span>
           </th>
           <th (click)="sortByEndDate()" class="endDate">
             <span>End</span>
             <span *ngIf="sortBy === 'endDate'" class="pl-3">
-              <span *ngIf="sortDescending">▲</span>
-              <span *ngIf="sortDescending === false">▼</span>
+              <span *ngIf="sortDescending"><i class="fa fa-sort-up"></i></span>
+              <span *ngIf="sortDescending === false"><i class="fa fa-sort-down"></i></span>
             </span>
           </th>
         <th></th>
@@ -47,8 +47,12 @@
         <td>{{sprint.startDate | date:'dd.MM.yyyy'}}</td>
         <td>{{sprint.endDate | date:'dd.MM.yyyy'}}</td>
         <td>
-          <button class="btn btn-secondary m-2" (click)="openSprintForm(sprint)">Bearbeiten</button>
-          <button class="btn btn-secondary m-2" (click)="deleteSprint(sprint)">Löschen</button>
+          <button type="button" rel="tooltip" (click)="openSprintForm(sprint)" class="btn btn-success btn-sm btn-icon">
+            <i class="fa fa-pencil-alt"></i>
+        </button>
+        <button type="button" rel="tooltip" (click)="deleteSprint(sprint)" class="btn btn-danger btn-sm btn-icon">
+            <i class="fa fa-trash"></i>
+        </button>
         </td>
       </tr>
       </tbody>
diff --git a/src/app/task-table/task-table.component.html b/src/app/task-table/task-table.component.html
index e0b4ae5..68019f9 100644
--- a/src/app/task-table/task-table.component.html
+++ b/src/app/task-table/task-table.component.html
@@ -20,56 +20,61 @@
                 <th (click)="sortById()" class="sortable">
                     <span>ID</span>
                     <span *ngIf="sortBy === 'id'" class="pl-3">
-                        <span *ngIf="sortDescending">▲</span>
-                        <span *ngIf="sortDescending === false">▼</span>
+                        <span *ngIf="sortDescending"><i class="fa fa-sort-up"></i></span>
+                        <span *ngIf="sortDescending === false"><i class="fa fa-sort-down"></i></span>
                     </span>
                 </th>
                 <th (click)="sortByTitle()" class="sortable">
                     <span>Titel</span>
                     <span *ngIf="sortBy === 'title'" class="pl-3">
-                        <span *ngIf="sortDescending">▲</span>
-                        <span *ngIf="sortDescending === false">▼</span>
+                        <span *ngIf="sortDescending"><i class="fa fa-sort-up"></i></span>
+                        <span *ngIf="sortDescending === false"><i class="fa fa-sort-down"></i></span>
                     </span>
                 </th>
                 <th (click)="sortByTasks()" class="sortable">
                     <span>Userstory</span>
                     <span *ngIf="sortBy === 'userstory'" class="pl-3">
-                        <span *ngIf="sortDescending">▲</span>
-                        <span *ngIf="sortDescending === false">▼</span>
+                        <span *ngIf="sortDescending"><i class="fa fa-sort-up"></i></span>
+                        <span *ngIf="sortDescending === false"><i class="fa fa-sort-down"></i></span>
                     </span>
                 </th>
                 <th (click)="sortByStatus()" class="sortable">
                     <span>Status</span>
                     <span *ngIf="sortBy === 'statusid'" class="pl-3">
-                        <span *ngIf="sortDescending">▲</span>
-                        <span *ngIf="sortDescending === false">▼</span>
+                        <span *ngIf="sortDescending"><i class="fa fa-sort-up"></i></span>
+                        <span *ngIf="sortDescending === false"><i class="fa fa-sort-down"></i></span>
                     </span>
                 </th>
-                <th (click)="sortByPrio()" class="sortable">
-                    <div ngbDropdown class="d-inline-block">
-                        <button class="btn btn-outline-primary" id="dropdownBasic1" ngbDropdownToggle>Priorität</button>
-                        <div ngbDropdownMenu aria-labelledby="dropdownBasic1">
-                            <li [ngValue]="null" selected="selected">All</li>
-                            <li *ngFor="let p of getAllPriorities()" [ngValue]="p">{{p}}</li>
+                <th class="sortable">
+                    <div class="d-inline-block">
+                        <div ngbDropdown class="d-inline-block">
+                            <span id="dropdownBasic1" ngbDropdownToggle>Priotität</span>
+                            <div ngbDropdownMenu aria-labelledby="dropdownBasic1">
+                                <option (click)="filterPriority=null">All</option>
+                                <option *ngFor="let p of getAllPriorities()" (click)="filterPriority=p">{{p}}</option>
+                            </div>
+                        </div>
+                        <div (click)="sortByPrio()">
+                            <i class="fa fa-sort"></i>
+                            <span *ngIf="sortBy === 'priority'" (click)="sortByPrio()" class="pl-3">
+                                <span *ngIf="sortDescending"><i class="fa fa-sort-up"></i></span>
+                                <span *ngIf="sortDescending === false"><i class="fa fa-sort-down"></i></span>
+                            </span>
                         </div>
                     </div>
-                    <span *ngIf="sortBy === 'priority'" (click)="sortByPrio()" class="pl-3">
-                        <span *ngIf="sortDescending">▲</span>
-                        <span *ngIf="sortDescending === false">▼</span>
-                    </span>
                 </th>
                 <th (click)="sortByAssigned()" class="sortable">
                     <span>Assigned To</span>
                     <span *ngIf="sortBy === 'assignedtoid'" class="pl-3">
-                        <span *ngIf="sortDescending">▲</span>
-                        <span *ngIf="sortDescending === false">▼</span>
+                        <span *ngIf="sortDescending"><i class="fa fa-sort-up"></i></span>
+                        <span *ngIf="sortDescending === false"><i class="fa fa-sort-down"></i></span>
                     </span>
                 </th>
                 <th (click)="sortByCategory()" class="sortable">
                     <span>Category</span>
                     <span *ngIf="sortBy === 'categoryid'" class="pl-3">
-                        <span *ngIf="sortDescending">▲</span>
-                        <span *ngIf="sortDescending === false">▼</span>
+                        <span *ngIf="sortDescending"><i class="fa fa-sort-up"></i></span>
+                        <span *ngIf="sortDescending === false"><i class="fa fa-sort-down"></i></span>
                     </span>
                 </th>
                 <th></th>
diff --git a/src/app/userstory-table/userstory-table.component.html b/src/app/userstory-table/userstory-table.component.html
index 502aa3f..d06db1c 100644
--- a/src/app/userstory-table/userstory-table.component.html
+++ b/src/app/userstory-table/userstory-table.component.html
@@ -11,29 +11,29 @@
       <th (click)="sortById()" class="sortable">
         <span>ID</span>
         <span *ngIf="sortBy === 'id'" class="pl-3">
-          <span *ngIf="sortDescending">▲</span>
-          <span *ngIf="sortDescending === false">▼</span>
+          <span *ngIf="sortDescending"><i class="fa fa-sort-up"></i></span>
+          <span *ngIf="sortDescending === false"><i class="fa fa-sort-down"></i></span>
         </span>
       </th>
       <th (click)="sortByTitle()" class="sortable">
         <span>Titel</span>
         <span *ngIf="sortBy === 'title'" class="pl-3">
-          <span *ngIf="sortDescending">▲</span>
-          <span *ngIf="sortDescending === false">▼</span>
+          <span *ngIf="sortDescending"><i class="fa fa-sort-up"></i></span>
+          <span *ngIf="sortDescending === false"><i class="fa fa-sort-down"></i></span>
         </span>
       </th>
       <th (click)="sortByTasks()" class="sortable">
         <span>Tasks</span>
         <span *ngIf="sortBy === 'tasks'" class="pl-3">
-          <span *ngIf="sortDescending">▲</span>
-          <span *ngIf="sortDescending === false">▼</span>
+          <span *ngIf="sortDescending"><i class="fa fa-sort-up"></i></span>
+          <span *ngIf="sortDescending === false"><i class="fa fa-sort-down"></i></span>
         </span>
       </th>
       <th (click)="sortByStatus()" class="sortable">
         <span>Status</span>
         <span *ngIf="sortBy === 'statusid'" class="pl-3">
-          <span *ngIf="sortDescending">▲</span>
-          <span *ngIf="sortDescending === false">▼</span>
+          <span *ngIf="sortDescending"><i class="fa fa-sort-up"></i></span>
+          <span *ngIf="sortDescending === false"><i class="fa fa-sort-down"></i></span>
         </span>
       </th>
       <th (click)="sortByPrio()" class="sortable">
@@ -45,15 +45,15 @@
           </select>
         </label>
         <span *ngIf="sortBy === 'priority'" class="pl-3">
-          <span *ngIf="sortDescending">▲</span>
-          <span *ngIf="sortDescending === false">▼</span>
+          <span *ngIf="sortDescending"><i class="fa fa-sort-up"></i></span>
+          <span *ngIf="sortDescending === false"><i class="fa fa-sort-down"></i></span>
         </span>
       </th>
       <th (click)="sortByCategory()" class="sortable">
         <span>Category</span>
         <span *ngIf="sortBy === 'categoryid'" class="pl-3">
-          <span *ngIf="sortDescending">▲</span>
-          <span *ngIf="sortDescending === false">▼</span>
+          <span *ngIf="sortDescending"><i class="fa fa-sort-up"></i></span>
+          <span *ngIf="sortDescending === false"><i class="fa fa-sort-down"></i></span>
         </span>
       </th>
       <th></th>
@@ -81,8 +81,12 @@
         </a>
       </td>
       <td>
-        <button class="btn btn-secondary m-2" (click)="openUserstoryForm(userstory)">Bearbeiten</button>
-        <button class="btn btn-secondary m-2" (click)="deleteUserstory(userstory)">Löschen</button>
+        <button type="button" rel="tooltip" (click)="openUserstoryForm(userstory)" class="btn btn-success btn-sm btn-icon">
+          <i class="fa fa-pencil-alt"></i>
+      </button>
+      <button type="button" rel="tooltip" (click)="deleteUserstory(userstory)" class="btn btn-danger btn-sm btn-icon">
+          <i class="fa fa-trash"></i>
+      </button>
       </td>
     </tr>
     </tbody>