diff --git a/dashboard/public/translation/da.json b/dashboard/public/translation/da.json
index c00e23b81..e2b47bcba 100644
--- a/dashboard/public/translation/da.json
+++ b/dashboard/public/translation/da.json
@@ -1549,9 +1549,7 @@
             "recovery": {
                 "description": "Hvis appen ikke reagerer, skal du prøve at genstarte appen. Hvis appen konstant genstarter på grund af et defekt plugin eller en forkert konfiguration, skal du sætte appen i genoprettelsestilstand for at få adgang til konsollen.\nBrug følgende <a href=\"{{ docsLink }}\" target=\"_blank\">instruktioner</a> for at få appen til at køre igen.",
                 "title": "Genopretning efter nedbrud",
-                "restartAction": "Genstart appen",
-                "enableRecoveryModeAction": "Aktiver genoprettelsestilstand",
-                "disableRecoveryModeAction": "Deaktivere genoprettelsestilstand"
+                "restartAction": "Genstart appen"
             },
             "taskError": {
                 "title": "Opgavefejl",
diff --git a/dashboard/public/translation/de.json b/dashboard/public/translation/de.json
index 6f70f591a..08916045e 100644
--- a/dashboard/public/translation/de.json
+++ b/dashboard/public/translation/de.json
@@ -1615,10 +1615,8 @@
         "repair": {
             "recovery": {
                 "title": "Wiederherstellung nach einem Absturz",
-                "enableRecoveryModeAction": "Wiederherstellungsmodus aktivieren",
                 "description": "Wenn die Anwendung nicht antwortet, bitte einen Neustart versuchen. Wenn die Anwendung aufgrund eines defekten Plugins oder einer Fehlkonfiguration ständig neu gestartet wird, die Anwendung in den Wiederherstellungsmodus bringen, um auf die Konsole zuzugreifen.\nFolgende <a href=\"{{ docsLink }}\" target=\"_blank\">Hinweise</a> befolgen, um die Anwendung wieder zum Laufen zu bringen.",
-                "restartAction": "Neustarten",
-                "disableRecoveryModeAction": "Wiederherstellungsmodus deaktivieren"
+                "restartAction": "Neustarten"
             },
             "taskError": {
                 "description": "Wenn ein Konfigurations-, Aktualisierungs-, Wiederherstellungs- oder Sicherungsauftrag zu einem Fehler geführt hat, Auftrag erneut versuchen.",
diff --git a/dashboard/public/translation/en.json b/dashboard/public/translation/en.json
index a6cdbf323..d2facf3a8 100644
--- a/dashboard/public/translation/en.json
+++ b/dashboard/public/translation/en.json
@@ -1710,18 +1710,22 @@
         },
         "repair": {
             "recovery": {
-                "title": "Crash Recovery",
-                "description": "If the app is not responding, try restarting the app. If the app is constantly restarting because of a broken plugin or misconfiguration, place the app in recovery mode in order to access the console.\nUse the following <a href=\"{{ docsLink }}\" target=\"_blank\">instructions</a> to get the app running again.",
+                "title": "Recovery Mode",
+                "description": "To fix broken plugins or misconfiguration, place the app in  <a href=\"{{ docsLink }}\" target=\"_blank\">Recovery Mode</a>.",
                 "restartAction": "Restart",
-                "enableRecoveryModeAction": "Enable Recovery Mode",
-                "disableRecoveryModeAction": "Disable Recovery Mode"
+                "disableAction": "Disable Recovery Mode",
+                "enableAction": "Enable Recovery Mode"
             },
             "taskError": {
                 "title": "Task Error",
                 "description": "If an installation, configuration, update, restore or backup action resulted in an error, you can retry the task.",
-                "retryAction": "Retry {{ task }} task"
+                "retryAction": "Retry {{ task }} Task"
             },
-            "appIsBusyTooltip": "App is busy"
+            "appIsBusyTooltip": "App is busy",
+            "restart": {
+                "title": "Restart",
+                "description": "If the app is not responding, try restarting the app."
+            }
         },
         "uninstall": {
             "startStop": {
diff --git a/dashboard/public/translation/es.json b/dashboard/public/translation/es.json
index cee60c0b7..b4ca57d40 100644
--- a/dashboard/public/translation/es.json
+++ b/dashboard/public/translation/es.json
@@ -1334,8 +1334,6 @@
             "recovery": {
                 "title": "Recuperación en caso de accidente",
                 "restartAction": "Reiniciar",
-                "enableRecoveryModeAction": "Habilitar Modo de Recuperación",
-                "disableRecoveryModeAction": "Deshabilitar Modo de Recuperación",
                 "description": "Si la aplicación no responde, intenta reiniciarla. Si la aplicación se reinicia constantemente debido a un complemento roto o una configuración incorrecta, coloca la aplicación en modo de recuperación para acceder a la consola.\nUtiliza las siguientes <a href=\"{{ docsLink }}\" target=\"_blank\"> instrucciones </a> para volver a ejecutar la aplicación."
             },
             "taskError": {
diff --git a/dashboard/public/translation/fr.json b/dashboard/public/translation/fr.json
index aa88e9398..65b4894fe 100644
--- a/dashboard/public/translation/fr.json
+++ b/dashboard/public/translation/fr.json
@@ -1001,8 +1001,6 @@
         "repair": {
             "recovery": {
                 "description": "Si l'application ne répond pas, essayez de redémarrer l'application. Si l'application redémarre sans arrêt à cause d'un plugin défectueux ou d'une anomalie de paramétrage, mettez l'application en mode récupération pour avoir accès à la console. \nSuivez les <a href=\"{{ docsLink }}\" target=\"_blank\">instructions suivantes</a> pour faire fonctionner l'application à nouveau.",
-                "disableRecoveryModeAction": "Désactiver le mode récupération",
-                "enableRecoveryModeAction": "Activer le mode récupération",
                 "restartAction": "Redémarrer l'application",
                 "title": "Récupération après un crash"
             },
diff --git a/dashboard/public/translation/it.json b/dashboard/public/translation/it.json
index b83e9f0b8..7794c0050 100644
--- a/dashboard/public/translation/it.json
+++ b/dashboard/public/translation/it.json
@@ -275,8 +275,6 @@
                 "title": "Errore dell'attività"
             },
             "recovery": {
-                "disableRecoveryModeAction": "Disabilita modalità ripristino",
-                "enableRecoveryModeAction": "Abilita modalità ripristino",
                 "restartAction": "Riavvia App",
                 "description": "Se l'app non risponde, prova a riavviare l'app. Se l'app si riavvia continuamente a causa di un plug-in danneggiato o di una configurazione errata, posiziona l'app in modalità di ripristino per accedere alla console.\nUtilizza le seguenti <a href=\"{{ docsLink }}\" target=\"_blank\">istruzioni</a> per riavviare l'app.",
                 "title": "Recupero Crash"
diff --git a/dashboard/public/translation/nl.json b/dashboard/public/translation/nl.json
index db17921c7..e597bd819 100644
--- a/dashboard/public/translation/nl.json
+++ b/dashboard/public/translation/nl.json
@@ -1131,8 +1131,6 @@
         "repair": {
             "recovery": {
                 "title": "Crash herstel",
-                "enableRecoveryModeAction": "Herstelmodus inschakelen",
-                "disableRecoveryModeAction": "Herstelmodus uitschakelen",
                 "restartAction": "Herstarten",
                 "description": "Indien de app niet reageert, probeer dan een herstart van de app. Indien de app continue herstart vanwege een defecte plug-in of verkeerde configuratie, plaats de app dan in herstel-modus voor toegang tot de Terminal.\nVolg deze <a href=\"{{ docsLink }}\" target=\"_blank\">instructies</a> om de app weer werkend te krijgen.."
             },
diff --git a/dashboard/public/translation/ru.json b/dashboard/public/translation/ru.json
index d2883ea54..172367dde 100644
--- a/dashboard/public/translation/ru.json
+++ b/dashboard/public/translation/ru.json
@@ -779,9 +779,7 @@
             "recovery": {
                 "title": "Восстановление работы приложения",
                 "description": "Если приложение не отвечает, попробуйте перезагрузить его. Если же приложение циклично перезапускается из-за ошибок в настройке или сломанного плагина, включите режим восстановления для дальнейшей работы в консоли.\nСоветуем ознакомиться с <a href=\"{{ docsLink }}\" target=\"_blank\">инструкцией</a> для восстановления работы приложения.",
-                "restartAction": "Запустить повторно",
-                "enableRecoveryModeAction": "Включить режим восстановления",
-                "disableRecoveryModeAction": "Выключить режим восстановления"
+                "restartAction": "Запустить повторно"
             },
             "taskError": {
                 "title": "Ошибка задачи",
diff --git a/dashboard/public/translation/vi.json b/dashboard/public/translation/vi.json
index d93915b42..3878e41e5 100644
--- a/dashboard/public/translation/vi.json
+++ b/dashboard/public/translation/vi.json
@@ -1537,8 +1537,6 @@
             "appIsBusyTooltip": "App đang bận",
             "recovery": {
                 "description": "Nếu app không có phản hồi, hãy thử khởi động lại app. Nếu app bị tự khởi động lại liên tục vì một plugin hay cấu hình hỏng, hãy bật app vào chế độ phục hồi để truy cập vào màn hình console. \nDùng những <a href=\"{{ docsLink }}\" target=\"_blank\">hướng dẫn sau đây</a> để khởi chạy app trở lại.",
-                "disableRecoveryModeAction": "Tắt chế độ phục hồi",
-                "enableRecoveryModeAction": "Bật chế độ phục hồi",
                 "title": "Khôi phục khi app bị sụp",
                 "restartAction": "Khởi động lại"
             },
diff --git a/dashboard/public/translation/zh_Hans.json b/dashboard/public/translation/zh_Hans.json
index 5f350a919..0e162e0a9 100644
--- a/dashboard/public/translation/zh_Hans.json
+++ b/dashboard/public/translation/zh_Hans.json
@@ -1409,9 +1409,7 @@
                 "retryAction": "重试 {{ task }} 任务"
             },
             "recovery": {
-                "enableRecoveryModeAction": "启用恢复模式",
                 "description": "如果应用无法响应，请先尝试重启应用。如果应用由于插件或者配置错误，在重启后仍然无法响应，请使用恢复模式来启动。\n请尝试下列<a href=\"{{ docsLink }}\" target=\"_blank\">步骤</a>来恢复该应用。",
-                "disableRecoveryModeAction": "停用恢复模式",
                 "title": "崩溃恢复",
                 "restartAction": "重启应用"
             },
diff --git a/dashboard/src/components/app/Repair.vue b/dashboard/src/components/app/Repair.vue
index 3ed99006b..898e26b40 100644
--- a/dashboard/src/components/app/Repair.vue
+++ b/dashboard/src/components/app/Repair.vue
@@ -1,7 +1,7 @@
 <script setup>
 
 import { ref, onMounted } from 'vue';
-import { Button, Switch } from '@cloudron/pankow';
+import { Button } from '@cloudron/pankow';
 import { taskNameFromInstallationState } from '../../utils.js';
 import { ISTATES } from '../../constants.js';
 import AppsModel from '../../models/AppsModel.js';
@@ -11,10 +11,10 @@ const props = defineProps([ 'app' ]);
 const appsModel = AppsModel.create();
 const busyRepair = ref(false);
 const busyRestart = ref(false);
-const debugMode = ref(false);
 const debugModeBusy = ref(false);
 
-async function onDebugMode(newValue) {
+async function onToggleDebugMode() {
+  const newValue = !props.app.debugMode;
   debugModeBusy.value = true;
 
   const data = newValue ? {
@@ -25,7 +25,6 @@ async function onDebugMode(newValue) {
   const [error] = await appsModel.configure(props.app.id, 'debug_mode', { debugMode: data });
   if (error) {
     debugModeBusy.value = false;
-    debugMode.value = !newValue;
     return console.error(error);
   }
 
@@ -56,28 +55,39 @@ async function onRestart() {
 }
 
 onMounted(() => {
-  debugMode.value = !!props.app.debugMode;
 });
 
 </script>
 
 <template>
   <div>
-    <label>{{ $t('app.repair.recovery.title') }}</label>
-    <div v-html="$t('app.repair.recovery.description', { docsLink: 'https://docs.cloudron.io/troubleshooting/#unresponsive-app' })"></div>
-    <br/>
-
-    <div style="display: flex; justify-content: space-between;">
-      <Switch v-model="debugMode" @change="onDebugMode" :disabled="debugModeBusy || (app.error && app.error.details.installationState !== ISTATES.PENDING_DEBUG) || app.taskId" label="Recovery Mode"/>
+    <div>
+      <label>{{ $t('app.repair.restart.title') }}</label>
+      <div>{{ $t('app.repair.restart.description') }}</div>
+      <br/>
+      <div v-if="app.error">An error occurred during the <b>{{ taskNameFromInstallationState(app.error.details.installationState) }}</b> operation: <span class="text-danger"><b>{{ app.error.reason + ': ' + app.error.message }}</b></span></div>
       <Button @click="onRestart()" :disabled="busyRestart || app.taskId || !!app.error" :loading="busyRestart || app.installationState === 'pending_restart'">{{ $t('app.repair.recovery.restartAction') }}</Button>
     </div>
+    <hr style="margin-top: 20px"/>
+
+    <div>
+      <label>{{ $t('app.repair.recovery.title') }}</label>
+      <div v-html="$t('app.repair.recovery.description', { docsLink: 'https://docs.cloudron.io/apps/#recovery-mode' })"></div>
+      <br/>
+      <Button @click="onToggleDebugMode" :disabled="debugModeBusy || (app.error && app.error.details.installationState !== ISTATES.PENDING_DEBUG) || app.taskId">
+        <span v-if="app.debugMode">{{ $t('app.repair.recovery.disableAction') }}</span>
+        <span v-else>{{ $t('app.repair.recovery.enableAction') }}</span>
+      </Button>
+    </div>
 
     <hr style="margin-top: 20px"/>
 
-    <label>{{ $t('app.repair.taskError.title') }}</label>
-    <div>{{ $t('app.repair.taskError.description') }}</div>
-    <br/>
-    <div v-if="app.error">An error occurred during the <b>{{ taskNameFromInstallationState(app.error.details.installationState) }}</b> operation: <span class="text-danger"><b>{{ app.error.reason + ': ' + app.error.message }}</b></span></div>
-    <Button @click="onRepair()" :disabled="busyRepair || app.taskId || !app.error" :loading="busyRepair">{{ $t('app.repair.taskError.retryAction', { task: app.error ? taskNameFromInstallationState(app.error.details.installationState) : '' }) }}</Button>
+    <div>
+      <label>{{ $t('app.repair.taskError.title') }}</label>
+      <div>{{ $t('app.repair.taskError.description') }}</div>
+      <br/>
+      <div v-if="app.error">An error occurred during the <b>{{ taskNameFromInstallationState(app.error.details.installationState) }}</b> operation: <span class="text-danger"><b>{{ app.error.reason + ': ' + app.error.message }}</b></span></div>
+      <Button @click="onRepair()" :disabled="busyRepair || app.taskId || !app.error" :loading="busyRepair">{{ $t('app.repair.taskError.retryAction', { task: app.error ? taskNameFromInstallationState(app.error.details.installationState) : '' }) }}</Button>
+    </div>
   </div>
 </template>
diff --git a/dashboard/src/components/app/Updates.vue b/dashboard/src/components/app/Updates.vue
index 85308b341..a850db895 100644
--- a/dashboard/src/components/app/Updates.vue
+++ b/dashboard/src/components/app/Updates.vue
@@ -2,7 +2,7 @@
 
 import { ref, onMounted, useTemplateRef } from 'vue';
 import { marked } from 'marked';
-import { Button, Switch, Dialog, Checkbox, FormGroup } from '@cloudron/pankow';
+import { Button, Switch, Dialog, Checkbox } from '@cloudron/pankow';
 import { ISTATES } from '../../constants.js';
 import SettingsItem from '../SettingsItem.vue';
 import AppsModel from '../../models/AppsModel.js';