diff --git a/assets/translations/strings_en.i18n.json b/assets/translations/strings_en.i18n.json
index 444c0c7e..67830b27 100644
--- a/assets/translations/strings_en.i18n.json
+++ b/assets/translations/strings_en.i18n.json
@@ -160,8 +160,8 @@
             },
             "enableAnalytics": "Enable Analytics",
             "enableAnalyticsMsg": "Give permission to collect analytics and send crash reports to improve the app",
-            "autoStart": "Start on Boot",
-            "silentStart": "Silent Start",
+            "autoStart": "Start At Login",
+            "silentStart": "Start Minimized",
             "openWorkingDir": "Open Working Directory",
             "ignoreBatteryOptimizations": "Disable Battery Optimization",
             "ignoreBatteryOptimizationsMsg": "Remove restrictions for optimal VPN performance",
@@ -171,7 +171,8 @@
             "sectionTitle": "Advanced",
             "debugMode": "Debug Mode",
             "debugModeMsg": "Restart the app for applying this change",
-            "memoryLimit": "Memory Limit"
+            "memoryLimit": "Memory Limit",
+            "memoryLimitMsg": "Enable if you're experiencing out of memory errors or frequent app crash"
         },
         "network": {
             "perAppProxyPageTitle": "Per-app Proxy",
diff --git a/assets/translations/strings_es.i18n.json b/assets/translations/strings_es.i18n.json
index 40f20643..e98c82ef 100644
--- a/assets/translations/strings_es.i18n.json
+++ b/assets/translations/strings_es.i18n.json
@@ -165,7 +165,8 @@
             "debugModeMsg": "Reinicie la aplicación para aplicar este cambio.",
             "sectionTitle": "Avanzado",
             "debugMode": "Modo de depuración",
-            "memoryLimit": "Limite de memoria"
+            "memoryLimit": "Limite de memoria",
+            "memoryLimitMsg": "Habilítelo si experimenta errores de falta de memoria o fallas frecuentes de la aplicación"
         },
         "network": {
             "perAppProxyModes": {
diff --git a/assets/translations/strings_fa.i18n.json b/assets/translations/strings_fa.i18n.json
index 131ae880..1b630a5d 100644
--- a/assets/translations/strings_fa.i18n.json
+++ b/assets/translations/strings_fa.i18n.json
@@ -171,7 +171,8 @@
             "sectionTitle": "پیشرفته",
             "debugMode": "دیباگ مود",
             "debugModeMsg": "برای اعمال این تغییر اپ را ری‌استارت کنید",
-            "memoryLimit": "محدودیت مموری"
+            "memoryLimit": "محدودیت مموری",
+            "memoryLimitMsg": "اگر با خطاهای کمبود حافظه یا خرابی مکرر برنامه مواجه شدید، فعال کنید"
         },
         "network": {
             "perAppProxyPageTitle": "پراکسی برنامه‌ها",
diff --git a/assets/translations/strings_ru.i18n.json b/assets/translations/strings_ru.i18n.json
index 1a0aafcf..ccfedde7 100644
--- a/assets/translations/strings_ru.i18n.json
+++ b/assets/translations/strings_ru.i18n.json
@@ -171,7 +171,8 @@
             "sectionTitle": "Расширенные",
             "debugMode": "Режим отладки",
             "debugModeMsg": "Чтобы применить изменения, перезапустите приложение.",
-            "memoryLimit": "Ограничение памяти"
+            "memoryLimit": "Ограничение памяти",
+            "memoryLimitMsg": "Включите, если у вас возникают ошибки нехватки памяти или частые сбои приложения."
         },
         "network": {
             "perAppProxyPageTitle": "Раздельное проксирование",
diff --git a/assets/translations/strings_tr.i18n.json b/assets/translations/strings_tr.i18n.json
index 263f5ca5..20f06aed 100644
--- a/assets/translations/strings_tr.i18n.json
+++ b/assets/translations/strings_tr.i18n.json
@@ -171,7 +171,8 @@
             "sectionTitle": "Gelişmiş",
             "debugMode": "Hata ayıklama modu",
             "debugModeMsg": "Bu değişikliği uygulamak için uygulamayı yeniden başlatın",
-            "memoryLimit": "Bellek Sınırı"
+            "memoryLimit": "Bellek Sınırı",
+            "memoryLimitMsg": "Yetersiz bellek hataları veya sık sık uygulama çökmesi yaşıyorsanız etkinleştirin"
         },
         "network": {
             "perAppProxyPageTitle": "Uygulama başına Proxy",
diff --git a/assets/translations/strings_zh-CN.i18n.json b/assets/translations/strings_zh-CN.i18n.json
index 03eaf498..0fc56fe2 100644
--- a/assets/translations/strings_zh-CN.i18n.json
+++ b/assets/translations/strings_zh-CN.i18n.json
@@ -171,7 +171,8 @@
             "sectionTitle": "高级选项",
             "debugMode": "调试模式",
             "debugModeMsg": "重新启动应用程序以应用此更改",
-            "memoryLimit": "内存限制"
+            "memoryLimit": "内存限制",
+            "memoryLimitMsg": "如果您遇到内存不足错误或频繁应用程序崩溃，请启用"
         },
         "network": {
             "perAppProxyPageTitle": "分应用代理",
diff --git a/lib/features/settings/widgets/advanced_setting_tiles.dart b/lib/features/settings/widgets/advanced_setting_tiles.dart
index a88a918a..75ed4bc4 100644
--- a/lib/features/settings/widgets/advanced_setting_tiles.dart
+++ b/lib/features/settings/widgets/advanced_setting_tiles.dart
@@ -63,6 +63,15 @@ class AdvancedSettingTiles extends HookConsumerWidget {
             },
           ),
         ],
+        SwitchListTile(
+          title: Text(t.settings.advanced.memoryLimit),
+          subtitle: Text(t.settings.advanced.memoryLimitMsg),
+          value: !disableMemoryLimit,
+          secondary: const Icon(Icons.memory),
+          onChanged: (value) async {
+            await ref.read(disableMemoryLimitProvider.notifier).update(!value);
+          },
+        ),
         SwitchListTile(
           title: Text(t.settings.advanced.debugMode),
           value: debug,
@@ -90,13 +99,6 @@ class AdvancedSettingTiles extends HookConsumerWidget {
             await ref.read(debugModeNotifierProvider.notifier).update(value);
           },
         ),
-        SwitchListTile(
-          title: Text(t.settings.advanced.memoryLimit),
-          value: !disableMemoryLimit,
-          onChanged: (value) async {
-            await ref.read(disableMemoryLimitProvider.notifier).update(!value);
-          },
-        ),
       ],
     );
   }
diff --git a/lib/features/settings/widgets/general_setting_tiles.dart b/lib/features/settings/widgets/general_setting_tiles.dart
index 282cfe18..29fd1ab6 100644
--- a/lib/features/settings/widgets/general_setting_tiles.dart
+++ b/lib/features/settings/widgets/general_setting_tiles.dart
@@ -22,7 +22,6 @@ class GeneralSettingTiles extends HookConsumerWidget {
     return Column(
       children: [
         const LocalePrefTile(),
-        const EnableAnalyticsPrefTile(),
         ListTile(
           title: Text(t.settings.general.themeMode),
           subtitle: Text(themeMode.present(t)),
@@ -53,6 +52,7 @@ class GeneralSettingTiles extends HookConsumerWidget {
             }
           },
         ),
+        const EnableAnalyticsPrefTile(),
         if (Platform.isAndroid)
           SwitchListTile(
             title: Text(t.settings.general.dynamicNotification),