diff --git a/src/theme.scss b/src/theme.scss
index 6a50b8f8c..a58b6f7ab 100644
--- a/src/theme.scss
+++ b/src/theme.scss
@@ -168,6 +168,19 @@ html, body {
     padding: 0;
 }
 
+.filter-bar {
+    position: absolute;
+    right: 14px;
+    margin-top: 5px;
+    padding: 5px;
+    padding-top: 0;
+    background-color: #fff;
+    background-clip: padding-box;
+    border: 1px solid rgba(0,0,0,.15);
+    border-radius: 2px;
+    box-shadow: 0 6px 12px rgba(0,0,0,.175);
+}
+
 .offline-banner {
     position: fixed;
     z-index: 30000;
diff --git a/src/views/apps.html b/src/views/apps.html
index 16e6cd19f..d21fa2cf5 100644
--- a/src/views/apps.html
+++ b/src/views/apps.html
@@ -199,7 +199,7 @@
             <div class="input-group">
               <input type="text" class="form-control" style="width: 300px" ng-show="installedApps.length > 8" placeholder="{{ 'apps.searchPlaceholder' | tr }}" id="appSearch" ng-model="appSearch"/>
               <span class="input-group-btn">
-                <button class="btn btn-default" type="button" ng-class="{ 'active': showFilter }" ng-click="showFilter = !showFilter">{{ showFilter ? 'Less' : 'More' }} Filter</button>
+                <button class="btn btn-default" type="button" ng-class="{ 'active': showFilter }" ng-click="showFilter = !showFilter"><i class="fas fa-filter"></i></button>
               </span>
             </div>
             <div class="btn-group">
@@ -212,7 +212,7 @@
             </div>
           </form>
         </div>
-        <div ng-show="showFilter" class="pull-right">
+        <div ng-show="showFilter" class="filter-bar">
           <form class="form-inline">
             <multiselect ng-model="selectedGroup" ng-show="user.isAtLeastAdmin && installedApps.length > 1 && groups.length > 1" ms-header="{{ selectedGroup.name }}" options="group.name for group in groups" data-multiple="false" filter-after-rows="5" scroll-after-rows="10"></multiselect>
             <multiselect ng-model="selectedState" ng-show="user.isAtLeastAdmin && installedApps.length > 1" ms-header="{{ 'apps.stateFilterHeader' | tr }}" ms-selected="{{ selectedState }}" options="state.label for state in states" data-multiple="false"></multiselect>