diff --git a/app/src/main/java/com/topjohnwu/magisk/MainActivity.java b/app/src/main/java/com/topjohnwu/magisk/MainActivity.java
index 4c1da9d80..98af3ca30 100644
--- a/app/src/main/java/com/topjohnwu/magisk/MainActivity.java
+++ b/app/src/main/java/com/topjohnwu/magisk/MainActivity.java
@@ -81,6 +81,7 @@ public class MainActivity extends Activity
 
         navigationView.setNavigationItemSelectedListener(this);
         getApplicationContext().reloadMainActivity.register(this);
+        getApplicationContext().updateCheckDone.register(this);
 
     }
 
@@ -105,6 +106,7 @@ public class MainActivity extends Activity
     @Override
     protected void onDestroy() {
         getApplicationContext().reloadMainActivity.unRegister(this);
+        getApplicationContext().updateCheckDone.unRegister(this);
         super.onDestroy();
     }
 
@@ -126,7 +128,11 @@ public class MainActivity extends Activity
 
     @Override
     public void onTrigger(CallbackEvent<Void> event) {
-        recreate();
+        if (event == getApplicationContext().reloadMainActivity) {
+            recreate();
+        } else if (event == getApplicationContext().updateCheckDone) {
+            checkHideSection();
+        }
     }
 
     private void checkHideSection() {
diff --git a/app/src/main/java/com/topjohnwu/magisk/SettingsActivity.java b/app/src/main/java/com/topjohnwu/magisk/SettingsActivity.java
index 2fa2230cf..542c482ce 100644
--- a/app/src/main/java/com/topjohnwu/magisk/SettingsActivity.java
+++ b/app/src/main/java/com/topjohnwu/magisk/SettingsActivity.java
@@ -89,10 +89,6 @@ public class SettingsActivity extends Activity {
             prefs = PreferenceManager.getDefaultSharedPreferences(getActivity());
             prefScreen = getPreferenceScreen();
 
-            SwitchPreference busybox = (SwitchPreference) findPreference("busybox");
-            SwitchPreference magiskHide = (SwitchPreference) findPreference("magiskhide");
-            SwitchPreference hosts = (SwitchPreference) findPreference("hosts");
-
             PreferenceCategory magiskCategory = (PreferenceCategory) findPreference("magisk");
             PreferenceCategory suCategory = (PreferenceCategory) findPreference("superuser");
 
@@ -118,11 +114,6 @@ public class SettingsActivity extends Activity {
                 if (getApplication().magiskVersion < 11) {
                     prefScreen.removePreference(magiskCategory);
                 }
-                if (getApplication().disabled) {
-                    busybox.setEnabled(false);
-                    magiskHide.setEnabled(false);
-                    hosts.setEnabled(false);
-                }
             }
         }
 
diff --git a/app/src/main/java/com/topjohnwu/magisk/SplashActivity.java b/app/src/main/java/com/topjohnwu/magisk/SplashActivity.java
index b83e1e062..bf7117bf3 100644
--- a/app/src/main/java/com/topjohnwu/magisk/SplashActivity.java
+++ b/app/src/main/java/com/topjohnwu/magisk/SplashActivity.java
@@ -44,8 +44,8 @@ public class SplashActivity extends Activity{
 
         // Now fire all async tasks
         new GetBootBlocks(this).exec();
-        if (magiskManager.magiskHide && !magiskManager.disabled &&
-                magiskManager.magiskVersion > 11 && !magiskManager.magiskHideStarted) {
+        if (magiskManager.magiskHide && magiskManager.magiskVersion > 11 &&
+                !magiskManager.magiskHideStarted) {
             new MagiskHide().enable();
         }
         new LoadModules(this) {
diff --git a/app/src/main/java/com/topjohnwu/magisk/StatusFragment.java b/app/src/main/java/com/topjohnwu/magisk/StatusFragment.java
index ffc63ee7e..d74ba9e66 100644
--- a/app/src/main/java/com/topjohnwu/magisk/StatusFragment.java
+++ b/app/src/main/java/com/topjohnwu/magisk/StatusFragment.java
@@ -65,7 +65,9 @@ public class StatusFragment extends Fragment implements CallbackEvent.Listener<V
 
     @OnClick(R.id.magisk_status_container)
     public void gotoInstall() {
-        ((MainActivity) getActivity()).navigate(R.id.install);
+        if (getApplication().remoteMagiskVersion > 0) {
+            ((MainActivity) getActivity()).navigate(R.id.install);
+        }
     }
 
     private int defaultColor;
@@ -159,7 +161,7 @@ public class StatusFragment extends Fragment implements CallbackEvent.Listener<V
         if (getApplication().magiskVersion < 0) {
             magiskVersionText.setText(R.string.magisk_version_error);
         } else if (getApplication().disabled) {
-            magiskVersionText.setText(getString(R.string.magisk_version_disable, getApplication().magiskVersionString));
+            magiskVersionText.setText(getString(R.string.magisk_version_core_only, getApplication().magiskVersionString));
         } else {
             magiskVersionText.setText(getString(R.string.magisk_version, getApplication().magiskVersionString));
         }
@@ -212,9 +214,6 @@ public class StatusFragment extends Fragment implements CallbackEvent.Listener<V
         if (getApplication().magiskVersion < 0) {
             color = colorBad;
             image = R.drawable.ic_cancel;
-        } else if (getApplication().disabled) {
-            color = colorNeutral;
-            image = R.drawable.ic_cancel;
         }
 
         magiskStatusContainer.setBackgroundColor(color);
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 844e5e09e..7f96a8357 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -14,7 +14,6 @@
 
     <!--Status Fragment-->
     <string name="magisk_version">Nainstalován Magisk v%1$s</string>
-    <string name="magisk_version_disable">Magisk v%1$s deaktivován</string>
     <string name="magisk_version_error">Magisk není nainstalován</string>
 
     <string name="checking_for_updates">Kontrola aktualizací…</string>
@@ -133,8 +132,6 @@
     <string name="settings_clear_cache_title">Smazat Uchovanou Mezipaměť</string>
     <string name="settings_clear_cache_summary">Smaže informace online použití v Mezipaměti, donutí aplikaci obnovit informace online</string>
 
-    <string name="settings_disable_title">Zakázat Magisk</string>
-    <string name="settings_disable_summary">Všechno kromě rootu (MagiskSU) bude deaktivováno</string>
     <string name="settings_magiskhide_summary">Skryje root (MagiskSU) před různými aplikacemi</string>
     <string name="settings_busybox_title">Povolit BusyBox</string>
     <string name="settings_busybox_summary">Nasadí vestavěný Magisk busybox do xbin</string>
@@ -193,5 +190,6 @@
     <string name="pid">PID:\u0020</string>
     <string name="target_uid">Cílové UID:\u0020</string>
     <string name="command">Příkaz:\u0020</string>
+    <string name="settings_core_only_summary"></string>
 
 </resources>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 16360bcc6..687388bcb 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -17,7 +17,6 @@
 
     <!--Status Fragment-->
     <string name="magisk_version">Magisk %1$s ist installiert</string>
-    <string name="magisk_version_disable">Magisk %1$s ist deaktiviert</string>
     <string name="magisk_version_error">Magisk ist nicht installiert</string>
 
     <string name="checking_for_updates">Suche nach Updates…</string>
@@ -136,8 +135,6 @@
     <string name="settings_clear_cache_title">Repo-Cache löschen</string>
     <string name="settings_clear_cache_summary">Löscht die zwischengespeicherten Informationen der Online-Repos. Erzwingt eine Aktualisierung</string>
 
-    <string name="settings_disable_title">Magisk deaktivieren</string>
-    <string name="settings_disable_summary">Deaktiviert alles außer den root-Zugang (MagiskSU)</string>
     <string name="settings_magiskhide_summary">Versteckt Magisk vor diversen Entdeckungsmethoden</string>
     <string name="settings_busybox_title">BusyBox aktivieren</string>
     <string name="settings_busybox_summary">Magisk\'s integriertes BusyBox nach xbin mounten</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 0d641e1a2..6a812edde 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -14,7 +14,6 @@
 
     <!--Magisk Fragment-->
     <string name="magisk_version">Instalado Magisk v%1$s</string>
-    <string name="magisk_version_disable">Magisk v%1$s está deshabilitado</string>
     <string name="magisk_version_error">Magisk no está instalado</string>
 
     <string name="checking_for_updates">Comprobando actualizaciones…</string>
@@ -126,8 +125,6 @@
     <string name="settings_clear_cache_title">Limpiar caché del repositorio</string>
     <string name="settings_clear_cache_summary">Limpiar la información en caché para los repositorios en línea, fuerza a la aplicación a actualizar en línea</string>
 
-    <string name="settings_disable_title">Deshabilitar Magisk</string>
-    <string name="settings_disable_summary">Todo será desactivado excepto el root (MagiskSU)</string>
     <string name="settings_magiskhide_summary">Ocultar Magisk de varias detecciones</string>
     <string name="settings_busybox_title">Habilitar BusyBox</string>
     <string name="settings_busybox_summary">Montar el busybox interno de Magisk en xbin</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 3a2df6fc2..c5d5c1c1d 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -16,7 +16,6 @@
     
     <string name="magisk_version">Versione Magisk: v%1$s</string>
     <string name="magisk_version_error">Hai installato Magisk?</string>
-    <string name="magisk_version_disable">Magisk v%1$s disabilitato</string>
     <string name="checking_for_updates">Controlla aggiornamenti…</string>
     <string name="magisk_update_available">Magisk v%1$.1f update!</string>
     <string name="cannot_check_updates">Impossibile controllare aggiornamenti</string>
@@ -135,8 +134,6 @@
     <string name="settings_clear_cache_title">Pulisci Cache Repo</string>
     <string name="settings_clear_cache_summary">Clear the cached information for online repos, forces the app to refresh online</string>
 
-    <string name="settings_disable_title">Disabilita Magisk</string>
-    <string name="settings_disable_summary">Tutto sarà disattivato tranne il Root (MagiskSU)</string>
     <string name="settings_magiskhide_summary">Hide Magisk from various detections</string>
     <string name="settings_busybox_title">Abilita BusyBox</string>
     <string name="settings_busybox_summary">Bind mount Magisk\'s built-in busybox to xbin</string>
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index ee1d4d7db..318dab4ec 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -14,7 +14,6 @@
 
     <!--Status Fragment-->
     <string name="magisk_version">Magisk v%1$s 설치됨</string>
-    <string name="magisk_version_disable">Magisk v%1$s 비활성화됨</string>
     <string name="magisk_version_error">Magisk가 설치되지 않음</string>
 
     <string name="checking_for_updates">업데이트 확인 중…</string>
@@ -124,8 +123,6 @@
     <string name="settings_clear_cache_title">저장소 캐시 비우기</string>
     <string name="settings_clear_cache_summary">온라인 저장소에 대해 캐시된 정보를 지우고, 온라인에서 정보를 강제로 새로 고칩니다.</string>
 
-    <string name="settings_disable_title">Magisk 비활성화</string>
-    <string name="settings_disable_summary">루팅(MagiskSU)을 제외한 모든 것이 비활성화됩니다.</string>
     <string name="settings_magiskhide_summary">다양한 감지로부터 Magisk를 숨깁니다.</string>
     <string name="settings_busybox_title">BusyBox 사용</string>
     <string name="settings_busybox_summary">xbin 디렉터리에 Magisk의 빌트인 busybox를 바인드합니다.</string>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index dfa5cada7..20c77f66e 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -17,7 +17,6 @@
 
     <!--Status Fragment-->
     <string name="magisk_version">Zainstalowany Magisk v%1$s</string>
-    <string name="magisk_version_disable">Magisk v%1$s wyłaczony</string>
     <string name="magisk_version_error">Magisk nie jest zainstalowany</string>
 
     <string name="checking_for_updates">Sprawdzanie aktualizacji…</string>
@@ -136,8 +135,6 @@
     <string name="settings_clear_cache_title">Wyczyść Pamięć Repozytorium</string>
     <string name="settings_clear_cache_summary">Wymusza na aplikacji odświeżenie online repozytorium</string>
 
-    <string name="settings_disable_title">Wyłącz Magisk</string>
-    <string name="settings_disable_summary">Wszystko zostanie wyłączone za wyjątkiem roota (MagiskSU)</string>
     <string name="settings_magiskhide_summary">Włącz Hide Magisk dla wykrytych aplikacji</string>
     <string name="settings_busybox_title">Włącz BusyBox</string>
     <string name="settings_busybox_summary">Zmień montowanie Magisk z wbudowanego busybox do xbin</string>
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index df8b71f56..8a4af75ec 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -180,8 +180,6 @@
     <string name="pid">PID:\u0020</string>
     <string name="target_uid">Alvo UID:\u0020</string>
     <string name="command">Comando:\u0020</string>
-	<string name="settings_disable_title">Desativar Magic Mount</string>
-    <string name="settings_disable_summary">Desativa Magic Mount, Isso impedirá que todos os módulos funcionem</string>
-	
-	
+
+
 </resources>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 870a54a97..f57523bf1 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -12,7 +12,6 @@
 
     <!--Status Fragment-->
     <string name="magisk_version">Установлен Magisk v%1$s</string>
-    <string name="magisk_version_disable">Magisk v%1$s выключен</string>
     <string name="magisk_version_error">Magisk не установлен</string>
 
     <string name="checking_for_updates">Проверка обновлений…</string>
@@ -119,8 +118,6 @@
     <string name="settings_clear_cache_title">Очистить кэш репозиториев</string>
     <string name="settings_clear_cache_summary">Удалить сохранённую информацию о сетевых репозиториях, чтобы приложение обновило информацию из сети</string>
 
-    <string name="settings_disable_title">Отключить Magisk</string>
-    <string name="settings_disable_summary">Будет выключено все, кроме рута (MagiskSU)</string>
     <string name="settings_magiskhide_summary">Скрыть Magisk от различных проверок</string>
     <string name="settings_busybox_title">Включить BusyBox</string>
     <string name="settings_busybox_summary">Примонтировать встроенный busybox из Magisk в xbin</string>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 9690fcba5..6f9711649 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -12,8 +12,7 @@
 
     <!--Status Fragment-->
     <string name="magisk_version">Magisk v%1$s yüklü</string>
-    <string name="magisk_version_disable">Magisk v%1$s devre dışı</string>
-    <string name="magisk_version_error">Magisk yüklü değil</string>
+     <string name="magisk_version_error">Magisk yüklü değil</string>
 
     <string name="checking_for_updates">Güncelleştirmeler denetleniyor…</string>
     <string name="magisk_update_available">Magisk v%1$.1f mevcut!</string>
@@ -131,9 +130,7 @@
     <string name="settings_clear_cache_title">Repo Önbelleğini Temizle</string>
     <string name="settings_clear_cache_summary">Çevrimiçi repolar için önbellek bilgilerini temizle, uygulamayı çevrimiçi yenilemeye zorla</string>
 
-    <string name="settings_disable_title">"Magisk'i devre dışı bırak"</string>
-    <string name="settings_disable_summary">Root (MagiskSU) dışında her şey devre dışı bırakılır</string>
-    <string name="settings_magiskhide_summary">"Magisk'i çeşitli algılamalardan gizle"</string>
+     <string name="settings_magiskhide_summary">"Magisk'i çeşitli algılamalardan gizle"</string>
     <string name="settings_busybox_title">"BusyBox'ı etkinleştir"</string>
     <string name="settings_busybox_summary">"Magisk'in dahili busybox'ını xbin'e bağla"</string>
     <string name="settings_hosts_title">Sistemsiz host</string>
diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml
index ff1961451..4f6c254af 100644
--- a/app/src/main/res/values-vi/strings.xml
+++ b/app/src/main/res/values-vi/strings.xml
@@ -1,12 +1,9 @@
 <resources>
     <!--Universal-->
-    <string name="app_name" translatable="false">Magisk Manager</string>
-    <string name="magisk" translatable="false">Magisk</string>
 
     <!--Welcome Activity-->
     <string name="navigation_drawer_open">Mở thanh điều hướng</string>
     <string name="navigation_drawer_close">Đóng thanh điều hướng</string>
-    <string name="magiskhide" translatable="false">Magisk Hide</string>
     <string name="modules">Mô-đun</string>
     <string name="downloads">Tải xuống</string>
     <string name="superuser">Superuser</string>
@@ -17,7 +14,6 @@
 
     <!--Status Fragment-->
     <string name="magisk_version">Đã cài Magisk v%1$s</string>
-    <string name="magisk_version_disable">Magisk v%1$s disabled</string>
     <string name="magisk_version_error">Magisk chưa được cài đặt</string>
 
     <string name="checking_for_updates">Đang kiểm tra cập nhật…</string>
@@ -136,8 +132,6 @@
     <string name="settings_clear_cache_title">Xoá bộ đệm kho</string>
     <string name="settings_clear_cache_summary">Xoá thông tin truy cập nhật về các kho mô-đun, buộc ứng dụng làm mới trực tuyến</string>
 
-    <string name="settings_disable_title">Vô hiệu Magisk</string>
-    <string name="settings_disable_summary">Vô hiệu tất cả trừ root (MagiskSU)</string>
     <string name="settings_magiskhide_summary">Ẩn Magisk khỏi nhiều phương thức phát hiện</string>
     <string name="settings_busybox_title">Dùng BusyBox</string>
     <string name="settings_busybox_summary">Gắn kết busy có sẵn của Magisk tới xbin</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 31b518ba6..ad4d87879 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -14,7 +14,7 @@
 
     <!--Status Fragment-->
     <string name="magisk_version">已安装 Magisk v%1$s</string>
-    <string name="magisk_version_disable">已禁用 Magisk v%1$s</string>
+    <string name="magisk_version_core_only">已安装 Magisk v%1$s (仅核心功能)</string>
     <string name="magisk_version_error">未安装 Magisk</string>
 
     <string name="checking_for_updates">正在检查更新…</string>
@@ -128,8 +128,7 @@
     <string name="settings_clear_cache_title">清除资源库缓存</string>
     <string name="settings_clear_cache_summary">清除已缓存的在线资源库信息，强制刷新在线数据</string>
 
-    <string name="settings_disable_title">禁用 Magisk</string>
-    <string name="settings_disable_summary">除 ROOT (MagiskSU) 以外，其他都将被禁用</string>
+    <string name="settings_core_only_summary">仅启用核心功能，所有模组将不会被载入。MagiskSU丶MagiskHide丶systemless hosts丶和 busybox 仍会持续运作</string>
     <string name="settings_magiskhide_summary">隐藏 Magisk 使其不被多种方法检测到</string>
     <string name="settings_busybox_title">启用 BusyBox</string>
     <string name="settings_busybox_summary">将 Magisk 内置的 Busybox 挂载到 xbin</string>
@@ -188,5 +187,6 @@
     <string name="pid">PID:\u0020</string>
     <string name="target_uid">目标 UID:\u0020</string>
     <string name="command">命令:\u0020</string>
+    <string name="settings_core_only_title">Magisk 核心功能模式</string>
 
 </resources>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index e9a019c45..bc92c8ab7 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -14,7 +14,6 @@
 
     <!--Status Fragment-->
     <string name="magisk_version">已安裝 Magisk v%1$s</string>
-    <string name="magisk_version_disable">已禁用 Magisk v%1$s</string>
     <string name="magisk_version_error">未安裝 Magisk</string>
 
     <string name="checking_for_updates">正在檢查更新…</string>
@@ -120,8 +119,7 @@
     <string name="settings_clear_cache_title">清除資源庫快取</string>
     <string name="settings_clear_cache_summary">清除已暫存的在線資源庫快取，強制刷新在線數據</string>
 
-    <string name="settings_disable_title">禁用 Magisk</string>
-    <string name="settings_disable_summary">除 ROOT (MagiskSU) 以外，其他都將被禁用</string>
+    <string name="settings_core_only_title">Magisk 核心功能模式</string>
     <string name="settings_magiskhide_summary">隱藏 Magisk 使其不被多種方法檢測到</string>
     <string name="settings_busybox_title">啟用 BusyBox</string>
     <string name="settings_busybox_summary">將 Magisk 內置的 Busybox 掛載到 xbin</string>
@@ -193,5 +191,7 @@
     <string name="cannot_auto_detect">(無法自動偵測)</string>
     <string name="settings_notification_summary">有更新的時候顯示通知</string>
     <string name="settings_notification_title">更新通知</string>
+    <string name="magisk_version_core_only">已安裝 Magisk v%1$s (僅核心功能)</string>
+    <string name="settings_core_only_summary">僅啟用核心功能，所有模組將不會被載入。MagiskSU、MagiskHide、systemless hosts、和 busybox 仍會持續運作</string>
 
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index d306c2bd2..539c3482c 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -17,7 +17,7 @@
 
     <!--Status Fragment-->
     <string name="magisk_version">Installed Magisk v%1$s</string>
-    <string name="magisk_version_disable">Magisk v%1$s disabled</string>
+    <string name="magisk_version_core_only">Installed Magisk v%1$s (Core Only Mode)</string>
     <string name="magisk_version_error">Magisk not installed</string>
 
     <string name="checking_for_updates">Checking for updates…</string>
@@ -136,8 +136,8 @@
     <string name="settings_clear_cache_title">Clear Repo Cache</string>
     <string name="settings_clear_cache_summary">Clear the cached information for online repos, forces the app to refresh online</string>
 
-    <string name="settings_disable_title">Disable Magisk</string>
-    <string name="settings_disable_summary">Everything will be disabled except root (MagiskSU)</string>
+    <string name="settings_core_only_title">Magisk Core Only Mode</string>
+    <string name="settings_core_only_summary">Enable only core features, all modules will not be loaded. MagiskSU, MagiskHide, systemless hosts, and busybox will still be enabled</string>
     <string name="settings_magiskhide_summary">Hide Magisk from various detections</string>
     <string name="settings_busybox_title">Enable BusyBox</string>
     <string name="settings_busybox_summary">Bind mount Magisk\'s built-in busybox to xbin</string>
diff --git a/app/src/main/res/xml/app_settings.xml b/app/src/main/res/xml/app_settings.xml
index 9774ba8f9..c83eecdb0 100644
--- a/app/src/main/res/xml/app_settings.xml
+++ b/app/src/main/res/xml/app_settings.xml
@@ -10,7 +10,7 @@
             android:summary="@string/settings_dark_theme_summary"
             android:key="dark_theme" />
 
-        <CheckBoxPreference
+        <SwitchPreference
             android:title="@string/settings_notification_title"
             android:summary="@string/settings_notification_summary"
             android:key="notification" />
@@ -28,8 +28,8 @@
 
         <CheckBoxPreference
             android:key="disable"
-            android:title="@string/settings_disable_title"
-            android:summary="@string/settings_disable_summary" />
+            android:title="@string/settings_core_only_title"
+            android:summary="@string/settings_core_only_summary" />
 
         <SwitchPreference
             android:key="busybox"