diff --git a/src/views/activity.html b/src/views/activity.html
index b2fbb5f21..73079ae0e 100644
--- a/src/views/activity.html
+++ b/src/views/activity.html
@@ -16,8 +16,8 @@
       </select> -->
     </div>
     <div class="pagination pull-right">
-      <button class="btn btn-default btn-outline" ng-click="showPrevPage()" ng-disabled="busy || currentPage <= 1"><i class="fa fa-angle-double-left"></i> prev</button>
       <button class="btn btn-default btn-outline" ng-click="refresh()"><i class="fas fa-sync-alt" ng-class="{ 'fa-spin': busyRefresh }"></i></button>
+      <button class="btn btn-default btn-outline" ng-click="showPrevPage()" ng-disabled="busy || currentPage <= 1"><i class="fa fa-angle-double-left"></i> prev</button>
       <button class="btn btn-default btn-outline" ng-click="showNextPage()" ng-disabled="busy || pageItems.value > eventLogs.length">next <i class="fa fa-angle-double-right"></i></button>
     </div>
   </div>
diff --git a/src/views/app.html b/src/views/app.html
index 6f3619f3d..1a56e0810 100644
--- a/src/views/app.html
+++ b/src/views/app.html
@@ -1000,17 +1000,7 @@
             <span ng-show="!app.appStoreId" class="text-danger pull-right">Updates are not available for custom apps</span>
           </div>
           <div class="col-md-12" ng-show="config.update.apps[app.id].manifest.version && config.update.apps[app.id].manifest.version !== app.manifest.version && app.installationState !== 'pending_update'">
-            <button class="btn pull-right btn-success" ng-click="updates.askUpdate()" ng-hide="app.taskId || app.error || app.runState === 'stopped'">Update Available</button>
-
-            <!-- active apptask -->
-            <span class="text-danger pull-right" ng-show="app.taskId">The available update can only be applied after the current active task has finished.</span>
-
-            <!-- app in error state -->
-            <span class="text-danger pull-right" ng-show="app.error">The app cannot be updated if in error state.</span>
-
-            <!-- app not running -->
-            <span class="text-danger" ng-show="app.runState === 'stopped'">App is not running. First start the app, then apply the update.</span>
-            <button class="btn btn-primary pull-right" ng-show="app.runState === 'stopped'" ng-click="console.toggleRunState()">Start App</button>
+            <button type="button" class="btn btn-primary pull-right" ng-click="updates.askUpdate()" ng-disabled="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' }}">Update Available</button>
           </div>
         </div>
         <hr/>