diff --git a/webadmin/src/theme.scss b/webadmin/src/theme.scss
index 60bad14b6..ed6d4a091 100644
--- a/webadmin/src/theme.scss
+++ b/webadmin/src/theme.scss
@@ -288,6 +288,24 @@ h1, h2, h3 {
     overflow-y: auto;
 }
 
+.app-info-title {
+    display: inline-block;
+    margin: 5px 10px;
+}
+
+.app-info-meta {
+    margin-left: 10px;
+    color: $text-muted;
+}
+
+.app-info-icon {
+    float: left;
+    min-height: 64px;
+    max-height: 64px;
+    min-width: 64px;
+    max-width: 100%;
+}
+
 // ----------------------------
 // Appstore view
 // ----------------------------
@@ -1166,4 +1184,4 @@ footer {
     left: 0;
     width: 100%;
     height: 100%;
-}
\ No newline at end of file
+}
diff --git a/webadmin/src/views/apps.html b/webadmin/src/views/apps.html
index 9e2514c93..749d74263 100644
--- a/webadmin/src/views/apps.html
+++ b/webadmin/src/views/apps.html
@@ -3,8 +3,8 @@
     <div class="modal-dialog">
         <div class="modal-content">
             <div class="modal-header">
-                <h4 class="modal-title" ng-show="(appConfigure.app | installError)">Repair</h4>
-                <h4 class="modal-title" ng-hide="(appConfigure.app | installError)">Configure</h4>
+                <h4 class="modal-title" ng-show="(appConfigure.app | installError)">Repair {{ appConfigure.app.fqdn }}</h4>
+                <h4 class="modal-title" ng-hide="(appConfigure.app | installError)">Configure {{ appConfigure.app.fqdn }}</h4>
             </div>
             <div class="modal-body">
                 <fieldset>
@@ -224,16 +224,22 @@
     </div>
 </div>
 
-<!-- Modal post install message app -->
-<div class="modal fade" id="appPostInstallModal" tabindex="-1" role="dialog">
+<!-- Modal information of app -->
+<div class="modal fade" id="appInfoModal" tabindex="-1" role="dialog">
     <div class="modal-dialog">
         <div class="modal-content">
             <div class="modal-header">
-                <h4 class="modal-title">Installation notes for {{ appPostInstall.app.manifest.title }}</h4>
+                <img ng-src="{{appInfo.app.iconUrl}}" onerror="this.onerror=null;this.src='img/appicon_fallback.png'" class="app-info-icon"/>
+                <h5 class="app-info-title">{{ appInfo.app.manifest.title }}</h5>
+                <br/>
+                <span class="app-info-meta">Package version <a ng-href="/#/appstore/{{appInfo.app.manifest.id}}?version={{appInfo.app.manifest.version}}">{{ appInfo.app.manifest.version }}</a> </span>
             </div>
             <div class="modal-body">
-                <div class="app-postinstall-message">
-                    <div ng-bind-html="appPostInstall.message | postInstallMessage:appPostInstall.app | markdown2html"></div>
+                <div class="app-postinstall-message" ng-hide="appInfo.app.manifest && appInfo.app.manifest.postInstallMessage">
+                    This package has no special usage information.
+                </div>
+                <div class="app-postinstall-message" ng-show="appInfo.app.manifest && appInfo.app.manifest.postInstallMessage">
+                    <div ng-bind-html="appInfo.message | postInstallMessage:appInfo.app | markdown2html"></div>
                 </div>
             </div>
             <div class="modal-footer">
@@ -419,8 +425,8 @@
                             <a href="" ng-click="showConfigure(app)" title="Repair App"><i class="fa fa-wrench scale"></i></a>
                         </div>
 
-                        <div ng-show="hasPostInstallMessage(app)">
-                            <a href="" ng-click="showPostInstall(app)" title="Information"><i class="fa fa-info-circle scale"></i></a>
+                        <div>
+                            <a href="" ng-click="showInformation(app)" title="Information"><i class="fa fa-info-circle scale"></i></a>
                         </div>
                     </div>
 
diff --git a/webadmin/src/views/apps.js b/webadmin/src/views/apps.js
index de4a2d717..00fca473b 100644
--- a/webadmin/src/views/apps.js
+++ b/webadmin/src/views/apps.js
@@ -116,7 +116,7 @@ angular.module('Application').controller('AppsController', ['$scope', '$location
         }
     };
 
-    $scope.appPostInstall = {
+    $scope.appInfo = {
         app: {},
         message: ''
     };
@@ -139,7 +139,7 @@ angular.module('Application').controller('AppsController', ['$scope', '$location
         $('#appConfigureModal').modal('hide');
         $('#appRestoreModal').modal('hide');
         $('#appUpdateModal').modal('hide');
-        $('#appPostInstallModal').modal('hide');
+        $('#appInfoModal').modal('hide');
         $('#appUninstallModal').modal('hide');
 
         // reset configure dialog
@@ -349,13 +349,13 @@ angular.module('Application').controller('AppsController', ['$scope', '$location
         });
     };
 
-    $scope.showPostInstall = function (app) {
+    $scope.showInformation = function (app) {
         $scope.reset();
 
-        $scope.appPostInstall.app = app;
-        $scope.appPostInstall.message = app.manifest.postInstallMessage;
+        $scope.appInfo.app = app;
+        $scope.appInfo.message = app.manifest.postInstallMessage;
 
-        $('#appPostInstallModal').modal('show');
+        $('#appInfoModal').modal('show');
 
         return false; // prevent propagation and default
     };
@@ -443,10 +443,6 @@ angular.module('Application').controller('AppsController', ['$scope', '$location
         window.history.back();
     };
 
-    $scope.hasPostInstallMessage = function (app) {
-        return app.manifest && app.manifest.postInstallMessage;
-    };
-
     function fetchUsers() {
         Client.getUsers(function (error, users) {
             if (error) {