diff --git a/src/theme.scss b/src/theme.scss
index 486ba6ac1..7b531b1d4 100644
--- a/src/theme.scss
+++ b/src/theme.scss
@@ -702,6 +702,53 @@ multiselect {
     }
 }
 
+.appstore-toolbar {
+    position: fixed;
+    z-index: 1000;
+    width: 100%;
+    padding: 10px;
+    width: 100%;
+    background: $body-bg;
+
+    .appstore-toolbar-content {
+        display: flex;
+        margin: auto;
+        max-width: 1200px;
+
+        > input {
+            margin: 0 10px;
+        }
+
+        > button, > .dropdown {
+            border-radius: 0;
+            display: inline-block;
+        }
+
+        @media(max-width:768px) {
+            flex-wrap: wrap;
+
+            > input {
+                margin: 10px;
+            }
+
+            > button, > .dropdown {
+                display: none;
+            }
+        }
+    }
+}
+
+.appstore-grid {
+    margin: auto;
+    margin-top: 50px;
+    width: 100%;
+    max-width: 1200px;
+
+    @media(max-width:768px) {
+        margin-top: 50px;
+    }
+}
+
 .appstore-item {
     padding: 10px;
     width: 300px;
diff --git a/src/views/appstore.html b/src/views/appstore.html
index c147016ff..cfa0de7d9 100644
--- a/src/views/appstore.html
+++ b/src/views/appstore.html
@@ -270,66 +270,56 @@
 
 <!-- give more vertical spacing so the login form does not appear clipped -->
 <div ng-show="ready && !validSubscription">
-    <br/>
-    <br/>
+  <br/>
+  <br/>
 </div>
 
-<div ng-show="ready && validSubscription" class="ng-cloak" id="appstoreGrid">
-    <div class="col-md-2">
-        <br/>
-        <div>
-            <form ng-submit="search()">
-                <div class="input-group">
-                    <input type="text" id="appstoreSearch" class="form-control" style="height: 40px" placeholder="Search" ng-model="searchString" ng-change="search()" autofocus>
-                </div>
-            </form>
-        </div>
-        <br/>
-        <a href="" class="appstore-category-link" ng-click="showCategory($event);" ng-class="{'category-active': category === 'featured' }" category="featured">Popular</a>
-        <a href="" class="appstore-category-link" ng-click="showCategory($event);" ng-class="{'category-active': category === 'new' }" category="new">New Apps</a>
-        <a href="" class="appstore-category-link" ng-click="showCategory($event);" ng-class="{'category-active': category === 'recent' }" category="recent">Recently Updated</a>
-        <a href="" class="appstore-category-link" ng-click="showCategory($event);" ng-class="{'category-active': category === '' }" category="">All</a>
-        <br/>
-        <a href="" class="appstore-category-link" ng-click="showCategory($event);" ng-class="{'category-active': category === 'analytics' }" category="analytics"><i class="fa fa-chart-line"></i> Analytics</a>
-        <a href="" class="appstore-category-link" ng-click="showCategory($event);" ng-class="{'category-active': category === 'blog' }" category="blog"><i class="fa fa-font"></i> Blog</a>
-        <a href="" class="appstore-category-link" ng-click="showCategory($event);" ng-class="{'category-active': category === 'chat' }" category="chat"><i class="fa fa-comments"></i> Chat</a>
-        <a href="" class="appstore-category-link" ng-click="showCategory($event);" ng-class="{'category-active': category === 'git' }" category="git"><i class="fa fa-code-branch"></i> Code Hosting</a>
-        <a href="" class="appstore-category-link" ng-click="showCategory($event);" ng-class="{'category-active': category === 'CRM' }" category="crm"><i class="fab fa-connectdevelop"></i> CRM</a>
-        <a href="" class="appstore-category-link" ng-click="showCategory($event);" ng-class="{'category-active': category === 'document' }" category="document"><i class="fa fa-file-word"></i> Documents</a>
-        <a href="" class="appstore-category-link" ng-click="showCategory($event);" ng-class="{'category-active': category === 'email' }" category="email"><i class="fa fa-envelope"></i> Email</a>
-        <a href="" class="appstore-category-link" ng-click="showCategory($event);" ng-class="{'category-active': category === 'sync' }" category="sync"><i class="fa fa-sync-alt"></i> File Sync</a>
-        <a href="" class="appstore-category-link" ng-click="showCategory($event);" ng-class="{'category-active': category === 'finance' }" category="finance"><i class="fa fa-hand-holding-usd"></i> Finance</a>
-        <a href="" class="appstore-category-link" ng-click="showCategory($event);" ng-class="{'category-active': category === 'forum' }" category="forum"><i class="fa fa-users"></i> Forum</a>
-        <a href="" class="appstore-category-link" ng-click="showCategory($event);" ng-class="{'category-active': category === 'gallery' }" category="gallery"><i class="fa fa-images"></i> Gallery</a>
-        <a href="" class="appstore-category-link" ng-click="showCategory($event);" ng-class="{'category-active': category === 'game' }" category="game"><i class="fa fa-gamepad"></i> Games</a>
-        <a href="" class="appstore-category-link" ng-click="showCategory($event);" ng-class="{'category-active': category === 'notes' }" category="notes"><i class="fa fa-sticky-note"></i> Notes</a>
-        <a href="" class="appstore-category-link" ng-click="showCategory($event);" ng-class="{'category-active': category === 'project' }" category="project"><i class="fas fa-project-diagram"></i> Project Management</a>
-        <a href="" class="appstore-category-link" ng-click="showCategory($event);" ng-class="{'category-active': category === 'vpn' }" category="vpn"><i class="fa fa-user-secret"></i> VPN</a>
-        <a href="" class="appstore-category-link" ng-click="showCategory($event);" ng-class="{'category-active': category === 'hosting' }" category="hosting"><i class="fa fa-server"></i> Web Hosting</a>
-        <a href="" class="appstore-category-link" ng-click="showCategory($event);" ng-class="{'category-active': category === 'wiki' }" category="wiki"><i class="fab fa-wikipedia-w"></i> Wiki</a>
-        <br/>
-        <br/>
-        <a href="https://forum.cloudron.io/category/5/app-requests" target="_blank">Missing an app? Let us know.</a>
+<div ng-show="ready && validSubscription" class="ng-cloak appstore-toolbar">
+  <div class="appstore-toolbar-content">
+    <button class="btn" type="button" ng-click="showCategory('');">All</button>
+    <button class="btn" type="button" ng-click="showCategory('new');">New Apps</button>
+    <button class="btn" type="button" ng-click="showCategory('recent');">Recently Updated</button>
+    <div class="dropdown">
+      <button class="btn dropdown-toggle" type="button" data-toggle="dropdown">
+        Categories
+        <span class="caret"></span>
+      </button>
+      <ul class="dropdown-menu">
+        <li ng-repeat="category in categories"><a href="" ng-click="showCategory(category.id);"><i class="{{ category.icon }}"></i> {{ category.label }}</a></li>
+      </ul>
     </div>
-    <div class="col-md-10" ng-show="apps.length">
-        <div class="row-no-margin">
-            <div class="col-sm-1 appstore-item" ng-repeat="app in apps | orderBy:'installCount':true">
-                <div class="appstore-item-content highlight" ng-click="gotoApp(app)" ng-class="{ 'appstore-item-content-testing': app.releaseState === 'unstable' }">
-                    <span class="badge badge-danger appstore-item-badge-testing" ng-show="app.releaseState === 'unstable'">Unstable</span>
-                    <div class="appstore-item-content-icon col-same-height">
-                        <img ng-src="{{app.iconUrl}}" onerror="this.onerror=null;this.src='img/appicon_fallback.png'" class="app-icon"/>
-                    </div>
-                    <div class="appstore-item-content-description col-same-height">
-                        <h4 class="appstore-item-content-title">{{ app.manifest.title }}</h4>
-                        <div class="appstore-item-content-tagline text-muted">{{ app.manifest.tagline }}</div>
-                        <!-- <div class="appstore-item-rating"><i class="fa fa-star"></i><i class="fa fa-star"></i><i class="fa fa-star"></i><i class="fa fa-star-half-o"></i><i class="fa fa-star-o"></i></div> -->
-                    </div>
-                </div>
+    <input type="text" id="appstoreSearch" class="form-control" placeholder="Search for alternatives to products like Github, Dropbox, Slack, Trello, ..." ng-model="searchString" ng-change="search()" autofocus>
+  </div>
+</div>
+
+<div ng-show="ready && validSubscription" class="ng-cloak appstore-grid" id="appstoreGrid">
+  <div class="row">
+    <div class="col-md-12" ng-hide="apps.length">
+      <br/>
+      <br/>
+      <a href="https://forum.cloudron.io/category/5/app-requests" target="_blank">Missing an app? Let us know.</a>
+    </div>
+    <div class="col-md-12" ng-show="apps.length">
+      <h3>{{ categoryLabel(category) }}</h3>
+      <div class="row-no-margin">
+        <div class="col-sm-1 appstore-item" ng-repeat="app in apps | orderBy:'installCount':true">
+          <div class="appstore-item-content highlight" ng-click="gotoApp(app)" ng-class="{ 'appstore-item-content-testing': app.releaseState === 'unstable' }">
+            <span class="badge badge-danger appstore-item-badge-testing" ng-show="app.releaseState === 'unstable'">Unstable</span>
+            <div class="appstore-item-content-icon col-same-height">
+              <img ng-src="{{app.iconUrl}}" onerror="this.onerror=null;this.src='img/appicon_fallback.png'" class="app-icon"/>
             </div>
+            <div class="appstore-item-content-description col-same-height">
+              <h4 class="appstore-item-content-title">{{ app.manifest.title }}</h4>
+              <div class="appstore-item-content-tagline text-muted">{{ app.manifest.tagline }}</div>
+              <!-- <div class="appstore-item-rating"><i class="fa fa-star"></i><i class="fa fa-star"></i><i class="fa fa-star"></i><i class="fa fa-star-half-o"></i><i class="fa fa-star-o"></i></div> -->
+            </div>
+          </div>
         </div>
+      </div>
     </div>
     <div class="col-md-10 animateMeOpacity loading-banner" ng-show="!apps.length">
-        <h3 class="text-muted">No apps found.</h3>
-        <a href="https://forum.cloudron.io/category/5/app-requests" target="_blank"><h3>Request an app or vote for one in our forum.</h3></a>
+      <h3 class="text-muted">No apps found.</h3>
+      <a href="https://forum.cloudron.io/category/5/app-requests" target="_blank"><h3>Request an app or vote for one in our forum.</h3></a>
     </div>
+  </div>
 </div>
diff --git a/src/views/appstore.js b/src/views/appstore.js
index b5c3fb9d4..df1ea31dc 100644
--- a/src/views/appstore.js
+++ b/src/views/appstore.js
@@ -39,6 +39,36 @@ angular.module('Application').controller('AppStoreController', ['$scope', '$loca
         $('.modal').modal('hide');
     };
 
+    $scope.categories = [
+        { id: 'analytics', icon: 'fa fa-chart-line', label: 'Analytics'},
+        { id: 'blog', icon: 'fa fa-font', label: 'Blog'},
+        { id: 'chat', icon: 'fa fa-comments', label: 'Chat'},
+        { id: 'git', icon: 'fa fa-code-branch', label: 'Code Hosting'},
+        { id: 'crm', icon: 'fab fa-connectdevelop', label: 'CRM'},
+        { id: 'document', icon: 'fa fa-file-word', label: 'Documents'},
+        { id: 'email', icon: 'fa fa-envelope', label: 'Email'},
+        { id: 'sync', icon: 'fa fa-sync-alt', label: 'File Sync'},
+        { id: 'finance', icon: 'fa fa-hand-holding-usd', label: 'Finance'},
+        { id: 'forum', icon: 'fa fa-users', label: 'Forum'},
+        { id: 'gallery', icon: 'fa fa-images', label: 'Gallery'},
+        { id: 'game', icon: 'fa fa-gamepad', label: 'Games'},
+        { id: 'notes', icon: 'fa fa-sticky-note', label: 'Notes'},
+        { id: 'project', icon: 'fas fa-project-diagram', label: 'Project Management'},
+        { id: 'vpn', icon: 'fa fa-user-secret', label: 'VPN'},
+        { id: 'hosting', icon: 'fa fa-server', label: 'Web Hosting'},
+        { id: 'wiki', icon: 'fab fa-wikipedia-w', label: 'Wiki'},
+    ];
+
+    $scope.categoryLabel = function (category) {
+        if (category === 'new') return 'New Apps';
+        if (category === 'recent') return 'Recently Updated';
+
+        var tmp = $scope.categories.find(function (c) { return c.id === category; });
+        if (tmp) return tmp.label;
+
+        return '';
+    };
+
     $scope.appInstall = {
         busy: false,
         state: 'appInfo',
@@ -338,8 +368,8 @@ angular.module('Application').controller('AppStoreController', ['$scope', '$loca
         Client.getAppstoreApps(function (error) {
             if (error) return callback(error);
 
-            // start with featured apps listing. this also sets $scope.apps accordingly
-            $scope.showCategory(null, 'featured');
+            // start with all apps listing. this also sets $scope.apps accordingly
+            $scope.showCategory('');
 
             // do this in background
             fetchUsers();
@@ -385,7 +415,7 @@ angular.module('Application').controller('AppStoreController', ['$scope', '$loca
     };
 
     function filterForNewApps(apps) {
-        var minApps = apps.length < 5 ? apps.length : 5; // prevent endless loop
+        var minApps = apps.length < 10 ? apps.length : 10; // prevent endless loop
         var tmp = [];
         var i = 0;
 
@@ -398,7 +428,7 @@ angular.module('Application').controller('AppStoreController', ['$scope', '$loca
     }
 
     function filterForRecentlyUpdatedApps(apps) {
-        var minApps = apps.length < 5 ? apps.length : 5; // prevent endless loop
+        var minApps = apps.length < 10 ? apps.length : 10; // prevent endless loop
         var tmp = [];
         var i = 0;
 
@@ -410,14 +440,13 @@ angular.module('Application').controller('AppStoreController', ['$scope', '$loca
         return tmp;
     }
 
-    $scope.showCategory = function (event, category) {
-        if (!event) $scope.category = category;
-        else $scope.category = event.target.getAttribute('category');
+    $scope.showCategory = function (category) {
+        $scope.category = category;
 
         $scope.cachedCategory = $scope.category;
 
         Client.getAppstoreAppsFast(function (error, apps) {
-            if (error) return $timeout($scope.showCategory.bind(null, event), 1000);
+            if (error) return $timeout($scope.showCategory.bind(null, category), 1000);
 
             if (!$scope.category) {
                 $scope.apps = apps;