diff --git a/src/theme.scss b/src/theme.scss
index a2d5157bd..6099d2d6b 100644
--- a/src/theme.scss
+++ b/src/theme.scss
@@ -311,10 +311,19 @@ textarea {
             padding-right: 5px;
         }
     }
+
+    .grid-item-dropdown {
+        width: 50px;
+        border: none;
+
+        &:hover {
+            background-color: rgba(255, 255, 255, 0.5);
+        }
+    }
 }
 
 .grid-item-content {
-    position: relative; // required to make action buttons positioned absolute within the element
+    display: block;
     background-color: white;
     box-shadow: 0px 2px 5px rgba(0, 0, 0, 0.1);
     border-radius: 2px;
@@ -333,51 +342,6 @@ textarea {
     font-family: $font-family-heading;
 }
 
-.grid-item-actions {
-    display: block;
-    position: absolute;
-    top: 30px;
-    right: 0;
-    opacity: 0;
-    background-color: transparent;
-    transition: opacity 250ms, right 250ms;
-
-    @media(max-width:767px) {
-        opacity: 1;
-        top: 0;
-        right: 20px;
-    }
-
-    a {
-        display: block;
-        text-align: center;
-        transition: transform 150ms ease-in;
-        margin: 10px 0;
-
-        @media(max-width:767px) {
-            margin: 40px 0;
-            transform: scale(1.8);
-        }
-
-        @media(min-width:768px) {
-            &:hover {
-                transform: scale(2);
-            }
-        }
-    }
-
-    .grid-items-action-tooltip {
-        margin-left: 10px;
-    }
-}
-
-@media(min-width:768px) {
-    .grid-item:hover .grid-item-actions {
-        opacity: 1;
-        right: 10px;
-    }
-}
-
 .app-update-badge {
     display: flex;
     justify-content: center;
@@ -397,7 +361,6 @@ textarea {
     &:hover {
         transform: scale(1.4);
     }
-
 }
 
 .app-postinstall-message {
diff --git a/src/views/apps.html b/src/views/apps.html
index 16b497984..d6b21c7ac 100644
--- a/src/views/apps.html
+++ b/src/views/apps.html
@@ -119,12 +119,24 @@
     <div class="animateMeOpacity ng-hide" ng-show="installedApps.length > 0">
       <div class="app-grid">
         <div class="grid-item" ng-repeat="app in installedApps | selectedGroupAccessFilter:selectedGroup | selectedStateFilter:selectedState | selectedTagFilter:selectedTags | selectedDomainFilter:selectedDomain | appSearchFilter:appSearch | orderBy:'fqdn'" ng-class="{ 'admin-action': app.manifest.configurePath && (app | applicationLink) }">
-          <a ng-href="{{ app | applicationLink }}" ng-click="user.isAtLeastAdmin && (((app | installError) === true || (app | installationActive) === true) && showAppConfigure(app, 'repair')) || ((app | appIsInstalledAndHealthy) && app.pendingPostInstallConfirmation && appPostInstallConfirm.show(app))" target="_blank" ng-class="{ 'hand': (app | appIsInstalledAndHealthy) || (app | installError)  || (app | installationActive)}">
-            <div class="highlight grid-item-content" uib-tooltip="{{ app.fqdn }}">
+          <div class="highlight grid-item-content" uib-tooltip="{{ app.fqdn }}">
+            <div class="dropdown" style="display: inline-block; float: right">
+              <button class="btn btn-lg btn-default grid-item-dropdown dropdown-toggle" type="button" data-toggle="dropdown">
+                <i class="fas fa-ellipsis-v"></i>
+              </button>
+              <ul class="dropdown-menu dropdown-menu-right">
+                <li><a ng-href="#/app/{{ app.id}}/display"><i class="fas fa-cogs fa-fw"></i> {{ 'apps.configActionTooltip' | tr }}</a></li>
+                <li role="separator" class="divider"></li>
+                <li><a ng-href="{{ '/logs.html?appId=' + app.id }}" target="_blank"><i class="fas fa-align-left fa-fw"></i> {{ 'apps.logsActionTooltip' | tr }}</a></li>
+                <li><a ng-href="" class="hand" ng-click="appInfo.show(app)"><i class="fas fa-info-circle fa-fw"></i> {{ 'apps.infoActionTooltip' | tr }}</a></li>
+                <li role="separator" class="divider" ng-show="app.manifest.configurePath && (app | applicationLink)"></li>
+                <li ng-show="app.manifest.configurePath && (app | applicationLink)"><a ng-href="{{ app | applicationLink }}{{ app.manifest.configurePath }}" target="_blank"><i class="fas fa-external-link-alt fa-fw"></i> {{ 'apps.adminPageActionTooltip' | tr }}</a></li>
+              </ul>
+            </div>
+            <a ng-href="{{ app | applicationLink }}" ng-click="user.isAtLeastAdmin && (((app | installError) === true || (app | installationActive) === true) && showAppConfigure(app, 'repair')) || ((app | appIsInstalledAndHealthy) && app.pendingPostInstallConfirmation && appPostInstallConfirm.show(app))" target="_blank" ng-class="{ 'hand': (app | appIsInstalledAndHealthy) || (app | installError)  || (app | installationActive)}">
               <div class="grid-item-top">
                 <div class="row">
                   <div class="col-xs-12 text-center" style="padding-left: 5px; padding-right: 5px;">
-                    <br/>
                     <img ng-src="{{ app.iconUrl || 'img/appicon_fallback.png' }}" fallback-icon="img/appicon_fallback.png" onerror="imageErrorHandler(this)" class="app-icon"/>
                   </div>
                 </div>
@@ -144,19 +156,12 @@
                 </div>
               </div>
 
-              <div class="grid-item-actions" ng-show="user.isAtLeastAdmin">
-                <a ng-href="#/app/{{ app.id}}/display" uib-tooltip="{{ 'apps.configActionTooltip' | tr }}" tooltip-placement="right" tooltip-class="grid-items-action-tooltip"><i class="fas fa-cogs"></i></a>
-                <a ng-href="{{ '/logs.html?appId=' + app.id }}" target="_blank" uib-tooltip="{{ 'apps.logsActionTooltip' | tr }}" tooltip-placement="right" tooltip-class="grid-items-action-tooltip"><i class="fas fa-align-left"></i></a>
-                <a ng-href="" class="hand" ng-click="appInfo.show(app)" uib-tooltip="{{ 'apps.infoActionTooltip' | tr }}" tooltip-placement="right" tooltip-class="grid-items-action-tooltip"><i class="fas fa-info-circle"></i></a>
-                <a ng-href="{{ app | applicationLink }}{{ app.manifest.configurePath }}" target="_blank" ng-show="app.manifest.configurePath && (app | applicationLink)" uib-tooltip="{{ 'apps.adminPageActionTooltip' | tr }}" tooltip-placement="right" tooltip-class="grid-items-action-tooltip"><i class="fas fa-external-link-alt"></i></a>
-              </div>
-
               <!-- we check the version here because the box updater does not know when an app gets updated -->
               <div class="app-update-badge" ng-click="showAppConfigure(app, 'updates')" ng-show="config.update[app.id].manifest.version && config.update[app.id].manifest.version !== app.manifest.version && (app | installSuccess)">
                 <i class="fa fa-arrow-up fa-inverse"></i>
               </div>
-            </div>
-          </a>
+            </a>
+          </div>
         </div>
       </div>
     </div>