diff --git a/src/theme.scss b/src/theme.scss
index 9aa6d420b..605ed03ce 100644
--- a/src/theme.scss
+++ b/src/theme.scss
@@ -470,6 +470,28 @@ multiselect {
             text-decoration: none;
         }
     }
+
+    .app-header-container {
+        display: flex;
+        flex-direction: row;
+        margin-bottom: 10px;
+        justify-content: space-between;
+
+        h1 {
+            margin-right: 10px;
+            line-height: 0.7;
+            font-size: 30px;
+        }
+
+        div {
+            text-align: right;
+            padding-top: 10px;
+
+            a {
+                margin-top: 10px;
+            }
+        }
+    }
 }
 
 .task-indicator {
diff --git a/src/views/app.html b/src/views/app.html
index 879f584f6..cd0ff4533 100644
--- a/src/views/app.html
+++ b/src/views/app.html
@@ -201,20 +201,22 @@
       <img ng-src="{{ app.iconUrl || 'img/appicon_fallback.png' }}" fallback-icon="img/appicon_fallback.png" onerror="imageErrorHandler(this)" class="app-icon"/>
     </div>
     <div class="col-md-8">
-      <h1 style="line-height: 0.7;">
-        {{ app.label || app.fqdn }}
-        <a class="btn btn-sm btn-outline btn-primary pull-right" 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>
-        <a class="btn btn-sm btn-outline btn-primary pull-right" ng-href="{{ app.manifest.documentationUrl }}" target="_blank">Documentation</a>
-        <br/>
-        <span class="text-small">
-          {{ app | installationStateLabel:user }}
-        </span>
-      </h1>
+      <div class="app-header-container">
+        <h1>
+          {{ app.label || app.fqdn }}
+          <br/>
+          <span class="text-small">
+            {{ app | installationStateLabel:user }}
+          </span>
+        </h1>
+        <div>
+          <a class="btn btn-sm btn-outline btn-primary" ng-href="{{ app.manifest.documentationUrl }}" target="_blank">Documentation</a>
+          <a class="btn btn-sm btn-outline btn-primary" 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>
   </div>
 
-  <br/>
-
   <div class="row">
     <div class="col-md-2">
       <div class="app-configure-links">