diff --git a/src/theme.scss b/src/theme.scss
index a5f0885cc..9d48a5170 100644
--- a/src/theme.scss
+++ b/src/theme.scss
@@ -323,7 +323,7 @@ textarea {
 .grid-item-actions {
     display: block;
     position: absolute;
-    top: 60px;
+    top: 30px;
     right: -10px;
     opacity: 0;
     background-color: transparent;
@@ -339,8 +339,10 @@ textarea {
         display: block;
         text-align: center;
         transition: transform 150ms ease-in;
+        margin: 10px 0;
 
         @media(max-width:767px) {
+            margin: 40px 0;
             transform: scale(1.8);
         }
 
diff --git a/src/views/apps.html b/src/views/apps.html
index 37d39ecfb..a3af48700 100644
--- a/src/views/apps.html
+++ b/src/views/apps.html
@@ -30,6 +30,35 @@
   </div>
 </div>
 
+<!-- Modal app info -->
+<div class="modal fade" id="appInfoModal" tabindex="-1" role="dialog">
+  <div class="modal-dialog">
+    <div class="modal-content">
+      <div class="modal-header">
+        <img ng-src="{{appInfo.app.iconUrl}}" onerror="this.onerror=null;this.src='img/appicon_fallback.png'" class="app-info-icon" style="padding-right: 10px;"/>
+        <h4 style="margin-top: 0;">
+          {{ appInfo.app.manifest.title }}
+          <br/>
+          <span class="text-small text-muted">Package <a ng-href="/#/appstore/{{appInfo.app.manifest.id}}?version={{appInfo.app.manifest.version}}">v{{ appInfo.app.manifest.version }}</a></span>
+          <br/>
+          <span class="text-small text-muted" ng-show="appInfo.app.upstreamVersion">App v{{ appInfo.app.upstreamVersion }}</a></span>
+        </h5>
+      </div>
+      <div class="modal-body">
+        <p ng-show="appInfo.app.manifest.documentationUrl">Please see the <a target="_blank" ng-href="{{appInfo.app.manifest.documentationUrl}}">documentation</a> for helpful information and common topics for this app.</p>
+        <p>If you need further help, refer to the <a target="_blank" ng-href="{{ appInfo.app.manifest.forumUrl || 'https://forum.cloudron.io' }}">forum section</a>.</p>
+        <p>The logs can be viewed and downloaded <a ng-href="{{ '/logs.html?appId=' + app.id }}" target="_blank">here</a>.</p>
+
+        <h4 ng-show="appInfo.app.manifest.postInstallMessage" style="padding-top: 20px;">First Time Setup</h4>
+        <div ng-bind-html="appInfo.app.manifest.postInstallMessage | postInstallMessage:appInfo.app | markdown2html"></div>
+      </div>
+      <div class="modal-footer">
+        <button type="button" class="btn btn-primary" data-dismiss="modal">Close</button>
+      </div>
+    </div>
+  </div>
+</div>
+
 <script>
     function imageErrorHandler(elem) {
         'use strict';
@@ -104,6 +133,7 @@
               </div>
 
               <div class="grid-item-actions" ng-show="user.isAtLeastAdmin">
+                <a ng-href="" class="hand" ng-click="appInfo.show(app)"><i class="fas fa-info-circle"></i></a>
                 <a ng-href="#/app/{{ app.id}}/display"><i class="fas fa-cogs"></i></a>
               </div>
 
diff --git a/src/views/apps.js b/src/views/apps.js
index d9445af8c..eea85ec50 100644
--- a/src/views/apps.js
+++ b/src/views/apps.js
@@ -54,6 +54,20 @@ angular.module('Application').controller('AppsController', ['$scope', '$timeout'
         }
     };
 
+    $scope.appInfo = {
+        app: {},
+        message: '',
+
+        show: function (app) {
+            $scope.appInfo.app = app;
+            $scope.appInfo.message = app.manifest.postInstallMessage;
+
+            $('#appInfoModal').modal('show');
+
+            return false; // prevent propagation and default
+        }
+    };
+
     $scope.showAppConfigure = function (app, view) {
         $location.path('/app/' + app.id + '/' + view);
     };