diff --git a/mobile/src/main/res/values-zh-rCN/strings.xml b/mobile/src/main/res/values-zh-rCN/strings.xml
index 30c9daf0..3bc4e63a 100644
--- a/mobile/src/main/res/values-zh-rCN/strings.xml
+++ b/mobile/src/main/res/values-zh-rCN/strings.xml
@@ -56,7 +56,8 @@
     <string name="connected_state_valid">%s (已连上)</string>
     <string name="connected_state_failed">%s (已断开)</string>
 
-    <string name="settings_service">服务</string>
+    <string name="settings_upstream">上游</string>
+    <string name="settings_downstream">下游</string>
     <string name="settings_service_masquerade">IP 掩蔽</string>
     <string name="settings_service_masquerade_summary">建议使用广告拦截器与 socksfier 等虚拟 VPN 应用时禁用此选项。</string>
     <string name="settings_service_repeater_oc">Wi\u2011Fi 运行频段 (不稳定)</string>
diff --git a/mobile/src/main/res/values/strings.xml b/mobile/src/main/res/values/strings.xml
index 0f114396..7551ed88 100644
--- a/mobile/src/main/res/values/strings.xml
+++ b/mobile/src/main/res/values/strings.xml
@@ -59,7 +59,8 @@
     <string name="connected_state_valid">%s (reachable)</string>
     <string name="connected_state_failed">%s (lost)</string>
 
-    <string name="settings_service">Service</string>
+    <string name="settings_upstream">Upstream</string>
+    <string name="settings_downstream">Downstream</string>
     <string name="settings_service_masquerade">IP Masquerade</string>
     <string name="settings_service_masquerade_summary">Recommended to disable this option for dummy VPNs like
         ad-blockers and socksifiers.</string>
diff --git a/mobile/src/main/res/xml/pref_settings.xml b/mobile/src/main/res/xml/pref_settings.xml
index 3158c0c7..5ff57e92 100644
--- a/mobile/src/main/res/xml/pref_settings.xml
+++ b/mobile/src/main/res/xml/pref_settings.xml
@@ -1,18 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+    <Preference
+        android:key="service.clean"
+        android:icon="@drawable/ic_action_settings_backup_restore"
+        android:title="@string/settings_service_clean"
+        android:summary="@string/settings_service_clean_summary"/>
     <PreferenceCategory
-        android:title="@string/settings_service">
-        <Preference
-            android:key="service.clean"
-            android:icon="@drawable/ic_action_settings_backup_restore"
-            android:title="@string/settings_service_clean"
-            android:summary="@string/settings_service_clean_summary"/>
+        android:title="@string/settings_upstream">
+        <be.mygod.vpnhotspot.preference.AlwaysAutoCompleteEditTextPreference
+            android:key="service.upstream"
+            android:icon="@drawable/ic_action_settings_ethernet"
+            android:title="@string/settings_service_upstream"
+            android:summary="@string/settings_service_upstream_auto"
+            android:hint="@string/settings_service_upstream_auto"
+            android:singleLine="true"/>
         <SwitchPreference
             android:key="service.masquerade"
             android:icon="@drawable/ic_social_people"
             android:title="@string/settings_service_masquerade"
             android:summary="@string/settings_service_masquerade_summary"
             android:defaultValue="true"/>
+    </PreferenceCategory>
+    <PreferenceCategory
+        android:title="@string/settings_downstream">
         <SwitchPreference
             android:key="service.repeater.strict"
             android:icon="@drawable/ic_action_pan_tool"
@@ -29,17 +39,6 @@
             android:title="@string/settings_service_dns"
             android:singleLine="true"
             android:defaultValue="8.8.8.8"/>
-        <SwitchPreference
-            android:key="service.repeater.startOnBoot"
-            android:icon="@drawable/ic_action_autorenew"
-            android:title="@string/settings_service_repeater_start_on_boot"/>
-        <be.mygod.vpnhotspot.preference.AlwaysAutoCompleteEditTextPreference
-            android:key="service.upstream"
-            android:icon="@drawable/ic_action_settings_ethernet"
-            android:title="@string/settings_service_upstream"
-            android:summary="@string/settings_service_upstream_auto"
-            android:hint="@string/settings_service_upstream_auto"
-            android:singleLine="true"/>
         <SwitchPreference
             android:key="service.dhcpWorkaround"
             android:icon="@drawable/ic_action_build"
@@ -48,6 +47,10 @@
     </PreferenceCategory>
     <PreferenceCategory
         android:title="@string/settings_misc">
+        <SwitchPreference
+            android:key="service.repeater.startOnBoot"
+            android:icon="@drawable/ic_action_autorenew"
+            android:title="@string/settings_service_repeater_start_on_boot"/>
         <Preference
             android:key="misc.logcat"
             android:icon="@drawable/ic_action_bug_report"