diff --git a/src/theme.scss b/src/theme.scss
index bbae04a90..2c813a7ce 100644
--- a/src/theme.scss
+++ b/src/theme.scss
@@ -486,6 +486,15 @@ multiselect {
             margin-right: 10px;
             line-height: 0.7;
             font-size: 30px;
+
+            a {
+                color: black;
+
+                &:hover {
+                    text-decoration: none;
+                    color: $brand-primary;
+                }
+            }
         }
 
         div {
diff --git a/src/views/app.html b/src/views/app.html
index 28dd6c926..51e8552bc 100644
--- a/src/views/app.html
+++ b/src/views/app.html
@@ -267,7 +267,7 @@
     <div class="col-md-8">
       <div class="app-header-container">
         <h1>
-          {{ app.label || app.fqdn }}
+          <a ng-href="{{ app | applicationLink }}" target="_blank">{{ app.label || app.fqdn }} <sup ng-show="app | appIsInstalledAndHealthy"><i class="fas fa-external-link-alt" style="font-size: 12px;"></i></sup></a>
           <br/>
           <span class="text-small">{{ app | installationStateLabel:user }}</span>
         </h1>
@@ -278,13 +278,12 @@
               <span class="caret"></span>
             </button>
             <ul class="dropdown-menu dropdown-menu-right">
-              <li ng-class="{ 'disabled': !app.manifest.postInstallMessage }"><a href="" ng-click="showPostInstall()"><i class="fas fa-star-of-life fa-fw"></i> First Time Setup</a></li>
-              <li><a ng-href="{{ app.manifest.documentationUrl }}" target="_blank"><i class="fas fa-book fa-fw"></i> Documentation</a></li>
+              <li ng-class="{ 'disabled': !app.manifest.postInstallMessage }"><a href="" ng-click="showPostInstall()">First Time Setup</a></li>
+              <li><a ng-href="{{ app.manifest.documentationUrl }}" target="_blank">Documentation</a></li>
               <li role="separator" class="divider"></li>
-              <li><a ng-href="{{ app.manifest.website }}" target="_blank"><i class="fas fa-external-link-alt fa-fw"></i> Project Website</a></li>
+              <li><a ng-href="{{ app.manifest.website }}" target="_blank">Project Website</a></li>
             </ul>
           </div>
-          <a class="btn btn-sm btn-outline btn-primary" style="margin-top: 10px;" ng-href="{{ app | applicationLink }}" target="_blank" ng-disabled="!(app | appIsInstalledAndHealthy)" ng-click="user.admin && ((app | installError) === true && setView('debug')) || ((app | appIsInstalledAndHealthy) && app.pendingPostInstallConfirmation && postInstallConfirm.show())"><i class="fas fa-external-link-alt"></i> Open App</a>
         </div>
       </div>
     </div>