diff --git a/src/translation/en.json b/src/translation/en.json
index f6711eca3..d9c851d71 100644
--- a/src/translation/en.json
+++ b/src/translation/en.json
@@ -1524,7 +1524,7 @@
                 "disableAction": "Disable Automatic Updates",
                 "enableAction": "Enable Automatic Updates"
             },
-            "noUpdates": "on latest version"
+            "noUpdates": "No new updates available"
         },
         "backups": {
             "backups": {
diff --git a/src/views/app.html b/src/views/app.html
index 09d037012..b2fa8f8e5 100644
--- a/src/views/app.html
+++ b/src/views/app.html
@@ -1341,8 +1341,10 @@
         <br/>
 
         <div class="row" ng-show="app.appStoreId">
-          <div class="col-md-12 text-right">
-            <span style="padding-right: 10px" ng-show="!updates.busyCheck && !(config.update[app.id].manifest.version && config.update[app.id].manifest.version !== app.manifest.version)">{{ 'app.updates.noUpdates' | tr }}</span>
+          <div class="col-md-6" style="line-height: 34px;">
+            <span class="text-success" ng-show="!updates.busyCheck && !(config.update[app.id].manifest.version && config.update[app.id].manifest.version !== app.manifest.version)">{{ 'app.updates.noUpdates' | tr }}</span>
+          </div>
+          <div class="col-md-6 text-right">
             <button type="button" class="btn" ng-class="config.update[app.id].unstable ? 'btn-danger' : 'btn-success'" ng-click="updates.askUpdate()" ng-hide="!(config.update[app.id].manifest.version && config.update[app.id].manifest.version !== app.manifest.version && app.installationState !== 'pending_update') || app.taskId || app.error || app.runState === 'stopped'" tooltip-enable="app.error || app.taskId || app.runState === 'stopped'" uib-tooltip="{{ app.error ? 'App is in error state' : 'App is not running' }}">{{ 'app.updateDialog.updateAction' | tr }}</button>
             <button class="btn btn-default btn-outline" ng-click="updates.check()" ng-disabled="updates.busyCheck"><i class="fas fa-sync-alt fa-spin" ng-show="updates.busyCheck"></i><i class="fas fa-sync-alt" ng-hide="updates.busyCheck"></i> {{ 'settings.updates.checkForUpdatesAction' | tr }}</button>
           </div>
@@ -1360,8 +1362,12 @@
           <div class="col-md-12">
             <label class="control-label">{{ 'app.updates.auto.title' | tr }}</label>
             <p>{{ 'app.updates.auto.description' | tr }}</p>
-            <p class="text-success" ng-show="app.enableAutomaticUpdate">{{ 'app.updates.auto.enabled' | tr }}</p>
-            <p class="text-danger" ng-hide="app.enableAutomaticUpdate">{{ 'app.updates.auto.disabled' | tr }}</p>
+          </div>
+          <div class="col-md-6" style="line-height: 34px;">
+            <span class="text-success" ng-show="app.enableAutomaticUpdate">{{ 'app.updates.auto.enabled' | tr }}</span>
+            <span class="text-danger" ng-hide="app.enableAutomaticUpdate">{{ 'app.updates.auto.disabled' | tr }}</span>
+          </div>
+          <div class="col-md-6">
             <button class="btn btn-primary pull-right" uib-tooltip="{{ app.appStoreId ? '' : 'Not available for custom apps' }}" ng-class="{ 'btn-danger': app.enableAutomaticUpdate }" ng-click="updates.toggleAutomaticUpdates()" ng-disabled="updates.busyAutomaticUpdates || !app.appStoreId"><i class="fa fa-circle-notch fa-spin" ng-show="updates.busyAutomaticUpdates"></i> {{ app.enableAutomaticUpdate ? ('app.updates.auto.disableAction' | tr) : ('app.updates.auto.enableAction' | tr) }} </button>
           </div>
         </div>