diff --git a/src/js/terminal.js b/src/js/terminal.js
index 3b722d233..a4e6e4f47 100644
--- a/src/js/terminal.js
+++ b/src/js/terminal.js
@@ -152,50 +152,6 @@ app.controller('TerminalController', ['$scope', '$timeout', '$location', 'Client
         });
     };
 
-    $scope.pauseApp = function () {
-        $('#pauseAppModal').modal('show');
-    };
-
-    $scope.pauseAppBegin = function () {
-        $scope.appBusy = true;
-
-        function waitUntilInPauseState() {
-            refreshApp($scope.selected.value, function (error, result) {
-                if (error) return console.error('Failed to get app status.', error);
-
-                if (result.installationState === 'installed') $scope.appBusy = false;
-                else setTimeout(waitUntilInPauseState, 2000);
-            });
-        }
-
-        Client.debugApp($scope.selected.value, true, function (error) {
-            if (error) return console.error(error);
-
-            $('#pauseAppModal').modal('hide');
-
-            waitUntilInPauseState();
-        });
-    };
-
-    $scope.pauseAppDone = function () {
-        $scope.appBusy = true;
-
-        function waitUntilInNormalState() {
-            refreshApp($scope.selected.value, function (error, result) {
-                if (error) return console.error('Failed to get app status.', error);
-
-                if (result.installationState === 'installed') $scope.appBusy = false;
-                else setTimeout(waitUntilInNormalState, 2000);
-            });
-        }
-
-        Client.debugApp($scope.selected.value, false, function (error) {
-            if (error) return console.error(error);
-
-            waitUntilInNormalState();
-        });
-    };
-
     function createTerminalSocket() {
         try {
             // websocket cannot use relative urls
diff --git a/src/terminal.html b/src/terminal.html
index 6728d5a0c..0dc3fc56c 100644
--- a/src/terminal.html
+++ b/src/terminal.html
@@ -101,25 +101,6 @@
         </div>
     </div>
 
-    <!-- Modal pause info -->
-    <div class="modal fade" id="pauseAppModal" tabindex="-1" role="dialog">
-        <div class="modal-dialog">
-            <div class="modal-content">
-                <div class="modal-header">
-                    <h4 class="modal-title">Pause app {{ selected.name }} ?</h4>
-                </div>
-                <div class="modal-body">
-                    <p>The app will start in a paused state and can be used to fix broken plugins or database content.</p>
-                    <p class="text-danger text-bold">The app will not be reachable in paused mode.</p>
-                </div>
-                <div class="modal-footer">
-                    <button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
-                    <button type="button" class="btn btn-danger" ng-click="pauseAppBegin()">Pause</button>
-                </div>
-            </div>
-        </div>
-    </div>
-
     <div class="animateMe ng-hide layout-root terminal-view" ng-show="initialized">
 
         <div class="terminal-controls">
@@ -148,8 +129,6 @@
                 <button class="btn btn-primary" ng-click="uploadFile()" ng-show="selected.type === 'app' && !uploadProgress.busy" ng-disabled="appBusy"><i class="fa fa-upload"></i> Upload to /tmp</button>
                 <button class="btn btn-primary" ng-click="uploadProgress.show()" ng-show="uploadProgress.busy" ng-disabled="appBusy"><i class="fa fa-circle-notch fa-spin"></i> Uploading...</button>
                 <button class="btn btn-primary" ng-click="downloadFile.show()" ng-show="selected.type === 'app'" ng-disabled="appBusy"><i class="fa fa-download"></i> Download</button>
-                <button class="btn btn-primary" ng-click="pauseApp()" ng-show="selected.type === 'app' && !selectedAppInfo.debugMode" ng-disabled="appBusy"><i class="fa fa-pause"></i> Pause</button>
-                <button class="btn btn-danger" ng-click="pauseAppDone()" ng-show="selectedAppInfo.debugMode" ng-disabled="appBusy"><i class="fa fa-play"></i> Resume</button>
             </div>
         </div>
 
diff --git a/src/views/app.html b/src/views/app.html
index 57957b549..96571cfc0 100644
--- a/src/views/app.html
+++ b/src/views/app.html
@@ -757,15 +757,22 @@
       <div class="card" ng-show="view === 'repair'">
         <div class="row">
           <div class="col-md-12">
-            <label class="control-label">Repair</label>
-            <p>Use the repair button to retry failed operations or if the app is down.</p>
-
-            <p>If the app is not starting up because of a broken plugin or misconfiguration, use the <a ng-href="{{ '/terminal.html?id=' + app.id }}" target="_blank">Terminal</a>
-              and click 'Pause' to edit the app's filesystem.</p>
-
+            <label class="control-label">Crash Recovery</label>
+            <p>If the app is constantly restarting because of a broken plugin or misconfiguration, place the app in recovery mode.
+              Use the following <a target="_blank" ng-href="{{ config.webServerOrigin }}/documentation/troubleshooting/#unresponsive-apps">instructions</a>
+              to get the app running again.
+            </p>
+            <button class="btn btn-danger pull-right" ng-click="repair.pauseAppBegin()" ng-show="!app.debugMode" ng-disabled="repair.pauseBusy || app.error">Enable Recovery Mode</button>
+            <button class="btn btn-success pull-right" ng-click="repair.pauseAppDone()" ng-show="app.debugMode" ng-disabled="repair.pauseBusy || app.error">Disable Recovery Mode</button>
+          </div>
+        </div>
+        <hr/>
+        <div class="row">
+          <div class="col-md-12">
+            <label class="control-label">Error Recovery</label>
+            <p>If a task (configuration, update, restore, backup) resulted in the app ending up in an error state, you can retry the operation.</p>
             <p ng-show="app.error">An error occurred during the <b>{{ app.error.installationState | taskName }}</b> operation: <span class="text-danger"><b>{{ app.error.reason + ': ' + app.error.message }}</b></span></p>
-            <!--<p ng-show="app.error" class="text-info"><b>{{ app.error | errorSuggestion }}</b></p>-->
-            <button class="btn btn-success pull-right" ng-click="repair.confirm()" ng-disabled="app.taskId">Repair</button>
+            <button class="btn btn-success pull-right" ng-click="repair.confirm()" ng-disabled="app.taskId">Retry {{ app.error.installationState | taskName }}</button>
 
             <button class="btn btn-danger pull-right" ng-click="repair.stopAppTask(app.taskId)" ng-show="app.taskId">Cancel Current Task</button>
           </div>
diff --git a/src/views/app.js b/src/views/app.js
index 33aadd9ae..e8cf0c690 100644
--- a/src/views/app.js
+++ b/src/views/app.js
@@ -917,6 +917,41 @@ angular.module('Application').controller('AppController', ['$scope', '$location'
                 if (error && error.statusCode !== 409) Client.error(error);
             });
         },
+
+        pauseBusy: false,
+
+        pauseAppBegin: function () {
+            $scope.repair.pauseBusy = true;
+
+            Client.debugApp($scope.app.id, true, function (error) {
+                if (error) return console.error(error);
+
+                refreshApp($scope.app.id, function () {
+                    waitForAppTask(function (error) {
+                        if (error) return Client.error(error);
+
+                        $scope.repair.pauseBusy = false;
+                    });
+                });
+            });
+        },
+
+        pauseAppDone: function () {
+            $scope.repair.pauseBusy = true;
+
+            Client.debugApp($scope.app.id, false, function (error) {
+                if (error) return console.error(error);
+
+                refreshApp($scope.app.id, function () {
+                    waitForAppTask(function (error) {
+                        if (error) return Client.error(error);
+
+                        $scope.repair.pauseBusy = false;
+                    });
+                });
+            });
+        }
+
     };
 
     $scope.postInstallConfirm = {