diff --git a/src/app/task-table/task-table.component.html b/src/app/task-table/task-table.component.html
index 68019f9..5483525 100644
--- a/src/app/task-table/task-table.component.html
+++ b/src/app/task-table/task-table.component.html
@@ -54,13 +54,11 @@
                                 <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>
+                        <span (click)="sortByPrio()">
+                                <span *ngIf="sortBy != 'priority'"><i class="fa fa-sort fa-lg"></i></span>
+                                <span *ngIf="sortDescending && sortBy === 'priority'"><i class="fa fa-sort-up fa-lg"></i></span>
+                                <span *ngIf="sortDescending === false && sortBy === 'priority'"><i class="fa fa-sort-down fa-lg"></i></span>
+                        </span>
                     </div>
                 </th>
                 <th (click)="sortByAssigned()" class="sortable">
@@ -72,9 +70,10 @@
                 </th>
                 <th (click)="sortByCategory()" class="sortable">
                     <span>Category</span>
-                    <span *ngIf="sortBy === 'categoryid'" 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>
+                        <span *ngIf="sortBy != 'categoryid'"><i class="fa fa-sort fa-lg"></i></span>
+                        <span *ngIf="sortDescending && sortBy === 'categoryid'"><i class="fa fa-sort-up fa-lg"></i></span>
+                        <span *ngIf="sortDescending === false && sortBy === 'categoryid'"><i class="fa fa-sort-down fa-lg"></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 d06db1c..26d24a6 100644
--- a/src/app/userstory-table/userstory-table.component.html
+++ b/src/app/userstory-table/userstory-table.component.html
@@ -36,25 +36,29 @@
           <span *ngIf="sortDescending === false"><i class="fa fa-sort-down"></i></span>
         </span>
       </th>
-      <th (click)="sortByPrio()" class="sortable">
-        <span>Priorität</span>
-        <label class="pl-3" (click)="$event.stopPropagation()">
-          <select [(ngModel)]="filterPriority">
-            <option [ngValue]="null" selected></option>
-            <option *ngFor="let p of getAllPriorities()" [ngValue]="p">{{p}}</option>
-          </select>
-        </label>
-        <span *ngIf="sortBy === 'priority'" 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>
+      <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>
+          <span (click)="sortByPrio()">
+                  <span *ngIf="sortBy != 'priority'"><i class="fa fa-sort fa-lg"></i></span>
+                  <span *ngIf="sortDescending && sortBy === 'priority'"><i class="fa fa-sort-up fa-lg"></i></span>
+                  <span *ngIf="sortDescending === false && sortBy === 'priority'"><i class="fa fa-sort-down fa-lg"></i></span>
+          </span>
+      </div>
       </th>
       <th (click)="sortByCategory()" class="sortable">
         <span>Category</span>
-        <span *ngIf="sortBy === 'categoryid'" 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>
+        <span>
+          <span *ngIf="sortBy != 'categoryid'"><i class="fa fa-sort fa-lg"></i></span>
+          <span *ngIf="sortDescending && sortBy === 'categoryid'"><i class="fa fa-sort-up fa-lg"></i></span>
+          <span *ngIf="sortDescending === false && sortBy === 'categoryid'"><i class="fa fa-sort-down fa-lg"></i></span>
+      </span>
       </th>
       <th></th>
     </tr>