diff --git a/desktop/renderer/index.html b/desktop/renderer/index.html
index 45e4e11..3e6ae96 100644
--- a/desktop/renderer/index.html
+++ b/desktop/renderer/index.html
@@ -13,7 +13,7 @@
       href="https://fonts.googleapis.com/css2?family=DM+Sans:ital,opsz,wght@0,9..40,400;0,9..40,500;0,9..40,600;0,9..40,700&family=Noto+Sans+SC:wght@400;500;600;700&display=swap"
       rel="stylesheet"
     />
-    <title>MicroClawDesktop</title>
+    <title>MicroClaw</title>
   </head>
   <body>
     <div id="app"></div>
diff --git a/desktop/renderer/src/components/SidePanel.vue b/desktop/renderer/src/components/SidePanel.vue
index c5fb22b..2286346 100644
--- a/desktop/renderer/src/components/SidePanel.vue
+++ b/desktop/renderer/src/components/SidePanel.vue
@@ -65,28 +65,6 @@
         </div>
       </div>
 
-      <!-- Phone -->
-      <button
-        class="sp-menu-item"
-        :class="{ active: route.path === '/phone' }"
-        @click="router.push('/phone')"
-      >
-        <svg
-          width="16"
-          height="16"
-          viewBox="0 0 24 24"
-          fill="none"
-          stroke="currentColor"
-          stroke-width="1.8"
-          stroke-linecap="round"
-          stroke-linejoin="round"
-        >
-          <rect x="5" y="2" width="14" height="20" rx="2" />
-          <line x1="12" y1="18" x2="12.01" y2="18" />
-        </svg>
-        <span>{{ t("sidebar.phone") }}</span>
-      </button>
-
       <!-- Usage -->
       <button class="sp-menu-item" :class="{ active: route.path === '/usage' }" @click="openUsage">
         <svg
diff --git a/desktop/renderer/src/i18n/en-US.ts b/desktop/renderer/src/i18n/en-US.ts
index a699b86..f96228c 100644
--- a/desktop/renderer/src/i18n/en-US.ts
+++ b/desktop/renderer/src/i18n/en-US.ts
@@ -155,7 +155,7 @@ export default {
   "plugins.back": "Back",
   "plugins.title": "Plugin Manager",
   "plugins.desc": "Manage installed OpenClaw plugins",
-  "plugins.weixinName": "WeChat Plugin",
+  "plugins.weixinName": "WeChat",
   "plugins.weixinDesc":
     "Connect to WeChat messaging channel, enabling AI assistant to process WeChat messages",
   "plugins.channelLogin": "Channel Login",
@@ -194,6 +194,7 @@ export default {
   "settings.back": "Back",
   "settings.title": "Settings",
   "settings.general": "General",
+  "settings.application": "Application",
   "settings.language": "Language",
   "settings.autoStart": "Launch at Startup",
   "settings.startMinimized": "Start Minimized to Tray",
@@ -232,9 +233,8 @@ export default {
   "settings.notInstalled": "Not Installed",
   "settings.noManagedSkills": "No managed skills",
   "settings.noCustomSkills": "No custom skills",
-  "settings.workspace": "Workspace",
-  "settings.dataDir": "Data Directory",
-  "settings.gatewayPort": "Gateway Port",
+  "settings.connectionStatus": "Connection Status",
+  "settings.status": "Status",
   "settings.privacy": "Data & Privacy",
   "settings.privacyProtection": "Privacy Protection",
   "settings.privacyProtectionDesc":
@@ -347,13 +347,14 @@ export default {
   "settings.menu.usage": "Usage",
   "settings.menu.models": "Models",
   "settings.menu.skills": "Skills",
-  "settings.menu.workspace": "Workspace",
+  "settings.menu.gateway": "Gateway",
+  "settings.menu.channels": "Channels",
   "settings.menu.privacy": "Privacy",
   "settings.menu.security": "Security",
   "settings.menu.about": "About",
   // Models & API
   "settings.modelsAndApi": "Models & API",
-  "settings.reconnect": "Reconnect",
+  "settings.restart": "Restart",
   "settings.customModels": "Custom Models",
   "settings.addCustomModel": "Add Custom Model",
   "settings.currentSelection": "Current Selection",
@@ -380,22 +381,19 @@ export default {
   "settings.cancel": "Cancel",
   "settings.add": "Add",
   "settings.editCustomModel": "Edit Custom Model",
-  "settings.gatewayUrl": "Gateway URL",
   "settings.connected": "Connected",
-  "settings.resetConnection": "Reset Connection",
   "settings.port": "Port",
   "settings.portDesc":
     "Gateway will restart automatically after changing the port. If the default port is occupied, the system will try adjacent ports.",
-  "settings.webSearch": "Web Search",
+  "settings.webSearch": "Web search provider",
   "settings.braveSearchApiKey": "Brave Search API Key",
   "settings.reasoningOffDesc": "Reasoning off",
   "settings.reasoningDesc": "Reasoning {level}",
   "settings.modelNameRequired": "Model name is required",
   "settings.baseUrlRequired": "Base URL is required",
   "settings.modelNameExists": "A model with this name already exists",
-  "settings.gatewayReconnecting": "Gateway reconnecting...",
-  "settings.reconnectFailed": "Reconnect failed: {error}",
-  "settings.connectionReset": "Connection reset",
+  "settings.gatewayRestarting": "Gateway restarting...",
+  "settings.restartFailed": "Restart failed: {error}",
   "settings.invalidPort": "Invalid port number",
   "settings.portUpdated": "Port updated, gateway restarting...",
   "settings.portUpdateFailed": "Failed: {error}",
diff --git a/desktop/renderer/src/i18n/zh-CN.ts b/desktop/renderer/src/i18n/zh-CN.ts
index 0df1806..f620e82 100644
--- a/desktop/renderer/src/i18n/zh-CN.ts
+++ b/desktop/renderer/src/i18n/zh-CN.ts
@@ -148,7 +148,7 @@ export default {
   "plugins.back": "返回",
   "plugins.title": "插件管理",
   "plugins.desc": "管理已安装的 OpenClaw 插件",
-  "plugins.weixinName": "微信插件",
+  "plugins.weixinName": "微信",
   "plugins.weixinDesc": "接入微信消息频道，让 AI 助手处理微信消息",
   "plugins.channelLogin": "频道登录",
   "plugins.channelLoginDesc": "扫描二维码登录微信，登录后 AI 助手可以接收和处理微信消息。",
@@ -182,6 +182,7 @@ export default {
   "settings.back": "返回",
   "settings.title": "设置",
   "settings.general": "通用",
+  "settings.application": "应用",
   "settings.language": "语言",
   "settings.autoStart": "开机自启",
   "settings.startMinimized": "启动时最小化到托盘",
@@ -220,9 +221,8 @@ export default {
   "settings.notInstalled": "未安装",
   "settings.noManagedSkills": "暂无托管技能",
   "settings.noCustomSkills": "暂无自定义技能",
-  "settings.workspace": "工作区",
-  "settings.dataDir": "数据目录",
-  "settings.gatewayPort": "网关端口",
+  "settings.connectionStatus": "连接状态",
+  "settings.status": "状态",
   "settings.privacy": "数据与隐私",
   "settings.privacyProtection": "隐私防护",
   "settings.privacyProtectionDesc": "控制 MicroClaw 在将数据发送给 AI 模型前如何处理你的敏感信息。",
@@ -329,13 +329,14 @@ export default {
   "settings.menu.usage": "用量",
   "settings.menu.models": "模型",
   "settings.menu.skills": "技能",
-  "settings.menu.workspace": "工作区",
+  "settings.menu.gateway": "网关",
+  "settings.menu.channels": "频道",
   "settings.menu.privacy": "隐私",
   "settings.menu.security": "安全",
   "settings.menu.about": "关于",
   // Models & API
   "settings.modelsAndApi": "模型与 API",
-  "settings.reconnect": "重新连接",
+  "settings.restart": "重启",
   "settings.customModels": "自定义模型",
   "settings.addCustomModel": "添加自定义模型",
   "settings.currentSelection": "当前选中",
@@ -362,21 +363,18 @@ export default {
   "settings.cancel": "取消",
   "settings.add": "添加",
   "settings.editCustomModel": "编辑自定义模型",
-  "settings.gatewayUrl": "网关地址",
   "settings.connected": "已连接",
-  "settings.resetConnection": "重置连接",
   "settings.port": "端口",
   "settings.portDesc": "更改端口后网关将自动重启。如果默认端口被占用，系统将尝试使用相邻端口。",
-  "settings.webSearch": "联网搜索",
+  "settings.webSearch": "联网搜索提供商",
   "settings.braveSearchApiKey": "Brave 搜索 API Key",
   "settings.reasoningOffDesc": "推理关闭",
   "settings.reasoningDesc": "推理 {level}",
   "settings.modelNameRequired": "请填写模型名称",
   "settings.baseUrlRequired": "请填写 Base URL",
   "settings.modelNameExists": "已存在同名模型",
-  "settings.gatewayReconnecting": "正在重新连接网关…",
-  "settings.reconnectFailed": "重新连接失败: {error}",
-  "settings.connectionReset": "连接已重置",
+  "settings.gatewayRestarting": "正在重启网关…",
+  "settings.restartFailed": "重启失败: {error}",
   "settings.invalidPort": "端口号无效",
   "settings.portUpdated": "端口已更新，网关正在重启…",
   "settings.portUpdateFailed": "操作失败: {error}",
diff --git a/desktop/renderer/src/router.ts b/desktop/renderer/src/router.ts
index 35405f1..0a06299 100644
--- a/desktop/renderer/src/router.ts
+++ b/desktop/renderer/src/router.ts
@@ -38,8 +38,7 @@ const router = createRouter({
     },
     {
       path: "/phone",
-      name: "phone",
-      component: () => import("@/views/ChannelsView.vue"),
+      redirect: "/settings/channels",
     },
   ],
 });
diff --git a/desktop/renderer/src/views/ChannelsView.vue b/desktop/renderer/src/views/ChannelsView.vue
index fc99006..2ee91a4 100644
--- a/desktop/renderer/src/views/ChannelsView.vue
+++ b/desktop/renderer/src/views/ChannelsView.vue
@@ -1,8 +1,7 @@
 <template>
-  <div class="channels-view">
+  <div class="channels-view" :class="{ embedded }">
     <div class="view-header">
-      <h2>{{ t("channels.title") }}</h2>
-      <p class="view-desc">{{ t("channels.desc") }}</p>
+      <h2 :class="{ 'settings-group-title': embedded }">{{ t("channels.title") }}</h2>
     </div>
 
     <!-- WeChat Plugin Card -->
@@ -13,7 +12,6 @@
         </div>
         <div class="plugin-info">
           <div class="plugin-name">{{ t("plugins.weixinName") }}</div>
-          <div class="plugin-desc">{{ t("plugins.weixinDesc") }}</div>
         </div>
         <div class="plugin-toggle">
           <el-switch v-model="weixinEnabled" :loading="toggling" @change="handleToggleEnabled" />
@@ -90,6 +88,7 @@
         </div>
       </div>
     </div>
+    <p class="view-desc">{{ t("plugins.weixinDesc") }}</p>
 
     <!-- Other channels -->
     <div v-if="channelStore.channels.length" class="channel-grid">
@@ -118,6 +117,10 @@ import { t } from "@/i18n";
 import weixinIcon from "@/assets/wechat.png";
 import QRCode from "qrcode";
 
+withDefaults(defineProps<{ embedded?: boolean }>(), {
+  embedded: false,
+});
+
 const router = useRouter();
 const channelStore = useChannelStore();
 const chatStore = useChatStore();
@@ -415,6 +418,14 @@ function goToWeixinChat() {
   overflow-y: auto;
   padding: 24px 32px;
   max-width: 720px;
+  font-family: inherit;
+}
+
+.channels-view.embedded {
+  height: auto;
+  overflow: visible;
+  padding: 0;
+  max-width: none;
 }
 
 .view-header {
@@ -426,15 +437,26 @@ function goToWeixinChat() {
   font-weight: 600;
 }
 
-.view-desc {
+.view-header h2.settings-group-title {
+  margin: 0;
+  padding-left: 4px;
+  font-size: 11px;
+  font-weight: 600;
   color: var(--text-secondary);
-  font-size: 13px;
-  margin-top: 4px;
+  text-transform: uppercase;
+  letter-spacing: 0.07em;
+}
+
+.view-desc {
+  color: var(--text-muted);
+  font-size: 12px;
+  margin: -14px 0 20px;
+  padding: 6px 4px 0;
 }
 
 /* Plugin card */
 .plugin-card {
-  background: var(--bg-secondary);
+  background: var(--bg-grouped);
   border: 1px solid var(--border);
   border-radius: 12px;
   overflow: hidden;
@@ -472,15 +494,9 @@ function goToWeixinChat() {
 }
 
 .plugin-name {
-  font-size: 16px;
-  font-weight: 600;
-  color: var(--text-primary);
-}
-
-.plugin-desc {
   font-size: 13px;
-  color: var(--text-secondary);
-  margin-top: 2px;
+  font-weight: 400;
+  color: var(--text-primary);
 }
 
 .plugin-toggle {
@@ -502,15 +518,16 @@ function goToWeixinChat() {
 }
 
 .plugin-section-title {
-  font-size: 14px;
-  font-weight: 600;
+  font-size: 13px;
+  font-weight: 400;
   color: var(--text-primary);
   margin-bottom: 4px;
 }
 
 .plugin-section-desc {
-  font-size: 13px;
-  color: var(--text-secondary);
+  font-size: 12px;
+  font-weight: 400;
+  color: var(--text-muted);
   margin-bottom: 14px;
 }
 
@@ -636,7 +653,7 @@ function goToWeixinChat() {
   align-items: center;
   gap: 16px;
   padding: 16px;
-  background: var(--bg-secondary);
+  background: var(--bg-grouped);
   border: 1px solid var(--border);
   border-radius: 8px;
   transition: border-color 0.15s;
@@ -662,15 +679,23 @@ function goToWeixinChat() {
 }
 
 .channel-name {
-  font-weight: 500;
+  font-size: 13px;
+  font-weight: 400;
+  color: var(--text-primary);
 }
 
 .channel-type {
-  font-size: 12px;
-  color: var(--text-muted);
+  font-size: 13px;
+  font-weight: 400;
+  color: var(--text-secondary);
   margin-top: 2px;
 }
 
+.channels-view :deep(.el-button),
+.channels-view :deep(.el-switch) {
+  font-family: inherit;
+}
+
 .channel-status {
   font-size: 12px;
   padding: 4px 10px;
diff --git a/desktop/renderer/src/views/SettingsView.vue b/desktop/renderer/src/views/SettingsView.vue
index d357e2c..e3a487b 100644
--- a/desktop/renderer/src/views/SettingsView.vue
+++ b/desktop/renderer/src/views/SettingsView.vue
@@ -23,7 +23,7 @@
     <div class="settings-content">
       <!-- General -->
       <div v-if="activeSection === 'general'" class="section">
-        <div class="section-label">{{ t("settings.general") }}</div>
+        <div class="section-label">{{ t("settings.application") }}</div>
         <div class="card-group">
           <div class="card-row">
             <span class="row-label">{{ t("settings.language") }}</span>
@@ -41,13 +41,10 @@
             <el-switch v-model="settings.startMinimized" />
           </div>
         </div>
-      </div>
 
-      <!-- Theme -->
-      <div v-if="activeSection === 'theme'" class="section">
-        <div class="section-label">{{ t("settings.theme") }}</div>
+        <div class="sub-label">{{ t("settings.theme") }}</div>
         <div class="card-group">
-          <div class="card-row">
+          <div class="card-row no-border">
             <span class="row-label">{{ t("settings.themeMode") }}</span>
             <el-radio-group v-model="settings.themeMode" size="small">
               <el-radio value="light">{{ t("settings.themeLight") }}</el-radio>
@@ -176,15 +173,8 @@
         <div class="section-footer">{{ t("settings.usageFooter") }}</div>
       </div>
 
-      <!-- Models & API -->
+      <!-- Models -->
       <div v-if="activeSection === 'models'" class="section">
-        <div class="section-header">
-          <div class="section-header-title">{{ t("settings.modelsAndApi") }}</div>
-          <el-button size="small" @click="reconnectGateway">{{
-            t("settings.reconnect")
-          }}</el-button>
-        </div>
-
         <!-- Custom Models -->
         <div class="sub-label-row">
           <span class="sub-label" style="margin-bottom: 0">{{ t("settings.customModels") }}</span>
@@ -349,63 +339,12 @@
           </template>
         </el-dialog>
 
-        <!-- Gateway URL -->
-        <div class="sub-label-row" style="margin-top: 40px">
-          <div style="display: flex; align-items: center; gap: 8px">
-            <span class="sub-label" style="margin-top: 0; margin-bottom: 0">{{
-              t("settings.gatewayUrl")
-            }}</span>
-            <span class="badge" :class="gateway.status === 'running' ? 'badge-green' : 'badge-red'">
-              {{ gateway.status === "running" ? t("settings.connected") : gateway.status }}
-            </span>
-          </div>
-          <div style="display: flex; gap: 8px">
-            <el-button size="small" @click="reconnectGateway">{{
-              t("settings.reconnect")
-            }}</el-button>
-            <el-button size="small" type="danger" @click="resetConnection">{{
-              t("settings.resetConnection")
-            }}</el-button>
-          </div>
-        </div>
-
-        <!-- Port -->
-        <div class="card-group" style="margin-top: 14px">
-          <div class="card-row no-border port-row">
-            <div class="port-info">
-              <div class="port-title">{{ t("settings.port") }}</div>
-              <div class="port-desc">{{ t("settings.portDesc") }}</div>
-            </div>
-            <div class="port-input-group">
-              <span class="port-prefix">ws://127.0.0.1 :</span>
-              <el-input
-                v-model="gatewayPort"
-                size="small"
-                style="width: 80px"
-                @change="saveGatewayPort"
-              />
-            </div>
-          </div>
-        </div>
-
         <!-- Web Search (Brave) -->
         <div class="sub-label" style="margin-top: 40px">{{ t("settings.webSearch") }}</div>
         <div class="card-group">
           <div class="card-row no-border port-row">
             <div class="port-info">
               <div class="port-title">{{ t("settings.braveSearchApiKey") }}</div>
-              <div class="port-desc">
-                <template v-for="(part, i) in t('settings.braveDesc').split('{link}')" :key="i">
-                  <span v-if="i > 0"
-                    ><a
-                      href="#"
-                      @click.prevent="openExternal('https://brave.com/search/api/')"
-                      style="color: var(--accent)"
-                      >brave.com/search/api</a
-                    ></span
-                  >{{ part }}
-                </template>
-              </div>
             </div>
             <div style="display: flex; gap: 8px; align-items: center; flex-shrink: 0">
               <el-input
@@ -426,22 +365,19 @@
             </div>
           </div>
         </div>
-
-        <!-- Gateway Logs -->
-        <div class="sub-label-row" style="margin-top: 24px">
-          <span class="sub-label" style="margin-bottom: 0">{{ t("settings.gatewayLog") }}</span>
-          <el-button size="small" @click="gateway.logs = []">{{ t("settings.clear") }}</el-button>
-        </div>
-        <div class="gateway-log-box">
-          <div v-if="gateway.logs.length === 0" class="gateway-log-empty">
-            {{ t("settings.noLogs") }}
-          </div>
-          <div v-else class="gateway-log-content" ref="logBoxRef">
-            <div v-for="(line, i) in gateway.logs" :key="i" class="gateway-log-line">
-              {{ line }}
-            </div>
-          </div>
+        <div class="section-footer">
+          <template v-for="(part, i) in t('settings.braveDesc').split('{link}')" :key="i">
+            <span v-if="i > 0"
+              ><a
+                href="#"
+                @click.prevent="openExternal('https://brave.com/search/api/')"
+                style="color: var(--accent)"
+                >brave.com/search/api</a
+              ></span
+            >{{ part }}
+          </template>
         </div>
+
       </div>
 
       <!-- Skills -->
@@ -466,7 +402,7 @@
         </div>
 
         <!-- Windows Built-in -->
-        <div v-if="windowsSkills.length" class="sub-label" style="font-size: 12px; margin-top: 4px">
+        <div v-if="windowsSkills.length" class="sub-label" style="margin-top: 4px">
           {{ t("settings.windowsAdapt") }} ({{ windowsSkills.length }})
         </div>
         <div v-if="windowsSkills.length" class="card-group">
@@ -479,13 +415,6 @@
             <div class="skill-info">
               <div style="display: flex; align-items: center; gap: 6px; flex-wrap: wrap">
                 <span class="row-label">{{ skill.name }}</span>
-                <span
-                  v-for="p in skill.platform"
-                  :key="p"
-                  class="badge platform-tag"
-                  :class="'platform-' + p"
-                  >{{ platformLabel(p) }}</span
-                >
               </div>
               <span class="skill-desc">{{ skill.description }}</span>
             </div>
@@ -497,7 +426,7 @@
         </div>
 
         <!-- Other Platform Built-in -->
-        <div v-if="otherPlatformSkills.length" class="sub-label" style="font-size: 12px">
+        <div v-if="otherPlatformSkills.length" class="sub-label">
           {{ t("settings.otherPlatforms") }} ({{ otherPlatformSkills.length }})
         </div>
         <div v-if="otherPlatformSkills.length" class="card-group">
@@ -510,13 +439,6 @@
             <div class="skill-info">
               <div style="display: flex; align-items: center; gap: 6px; flex-wrap: wrap">
                 <span class="row-label">{{ skill.name }}</span>
-                <span
-                  v-for="p in skill.platform"
-                  :key="p"
-                  class="badge platform-tag"
-                  :class="'platform-' + p"
-                  >{{ platformLabel(p) }}</span
-                >
               </div>
               <span class="skill-desc">{{ skill.description }}</span>
             </div>
@@ -556,7 +478,7 @@
         <div
           v-if="windowsManagedSkills.length"
           class="sub-label"
-          style="font-size: 12px; margin-top: 4px"
+          style="margin-top: 4px"
         >
           {{ t("settings.windowsAdapt") }} ({{ windowsManagedSkills.length }})
         </div>
@@ -570,13 +492,6 @@
             <div class="skill-info">
               <div style="display: flex; align-items: center; gap: 6px; flex-wrap: wrap">
                 <span class="row-label">{{ skill.name }}</span>
-                <span
-                  v-for="p in skill.platform"
-                  :key="p"
-                  class="badge platform-tag"
-                  :class="'platform-' + p"
-                  >{{ platformLabel(p) }}</span
-                >
                 <span v-if="!skill.installed" class="badge badge-gray">{{
                   t("settings.notInstalled")
                 }}</span>
@@ -592,7 +507,7 @@
         </div>
 
         <!-- Other Platform Managed -->
-        <div v-if="otherPlatformManagedSkills.length" class="sub-label" style="font-size: 12px">
+        <div v-if="otherPlatformManagedSkills.length" class="sub-label">
           {{ t("settings.otherPlatforms") }} ({{ otherPlatformManagedSkills.length }})
         </div>
         <div v-if="otherPlatformManagedSkills.length" class="card-group">
@@ -605,13 +520,6 @@
             <div class="skill-info">
               <div style="display: flex; align-items: center; gap: 6px; flex-wrap: wrap">
                 <span class="row-label">{{ skill.name }}</span>
-                <span
-                  v-for="p in skill.platform"
-                  :key="p"
-                  class="badge platform-tag"
-                  :class="'platform-' + p"
-                  >{{ platformLabel(p) }}</span
-                >
                 <span v-if="!skill.installed" class="badge badge-gray">{{
                   t("settings.notInstalled")
                 }}</span>
@@ -655,21 +563,62 @@
         </div>
       </div>
 
-      <!-- Workspace -->
-      <div v-if="activeSection === 'workspace'" class="section">
-        <div class="section-label">{{ t("settings.workspace") }}</div>
+      <!-- Gateway -->
+      <div v-if="activeSection === 'gateway'" class="section">
+        <div class="section-label">{{ t("settings.connectionStatus") }}</div>
         <div class="card-group">
-          <div class="card-row">
-            <span class="row-label">{{ t("settings.dataDir") }}</span>
-            <span class="row-value">{{ stateDir }}</span>
+          <div class="card-row no-border">
+            <span class="row-label">{{ t("settings.status") }}</span>
+            <div style="display: flex; align-items: center; gap: 8px">
+              <span
+                class="badge"
+                :class="gateway.status === 'running' ? 'badge-green' : 'badge-red'"
+              >
+                {{ gateway.status === "running" ? t("settings.connected") : gateway.status }}
+              </span>
+              <el-button size="small" @click="restartGateway">{{
+                t("settings.restart")
+              }}</el-button>
+            </div>
           </div>
+        </div>
+
+        <div class="sub-label">{{ t("settings.port") }}</div>
+        <div class="card-group">
           <div class="card-row no-border">
-            <span class="row-label">{{ t("settings.gatewayPort") }}</span>
-            <span class="row-value">{{ gateway.port }}</span>
+            <span class="row-label">{{ t("settings.port") }}</span>
+            <div class="port-input-group">
+              <span class="port-prefix">ws://127.0.0.1 :</span>
+              <el-input
+                v-model="gatewayPort"
+                size="small"
+                style="width: 80px"
+                @change="saveGatewayPort"
+              />
+            </div>
+          </div>
+        </div>
+        <div class="section-footer">{{ t("settings.portDesc") }}</div>
+
+        <div class="sub-label-row">
+          <span class="sub-label" style="margin: 0">{{ t("settings.gatewayLog") }}</span>
+          <el-button size="small" @click="gateway.logs = []">{{ t("settings.clear") }}</el-button>
+        </div>
+        <div class="gateway-log-box">
+          <div v-if="gateway.logs.length === 0" class="gateway-log-empty">
+            {{ t("settings.noLogs") }}
+          </div>
+          <div v-else class="gateway-log-content" ref="logBoxRef">
+            <div v-for="(line, i) in gateway.logs" :key="i" class="gateway-log-line">
+              {{ line }}
+            </div>
           </div>
         </div>
       </div>
 
+      <!-- Channels -->
+      <ChannelsView v-if="activeSection === 'channels'" embedded />
+
       <!-- Security / Sandbox -->
       <div v-if="activeSection === 'security'" class="section">
         <div class="section-label">{{ t("settings.security") }}</div>
@@ -693,15 +642,7 @@
           <!-- Sandbox capabilities (network) -->
           <div class="card-group" style="margin-top: 12px">
             <div class="card-row">
-              <div>
-                <span class="row-label">{{ t("settings.cap.internetClient") }}</span>
-                <div
-                  class="row-hint"
-                  style="font-size: 12px; color: var(--text-muted); margin-top: 2px"
-                >
-                  {{ t("settings.sandboxCapsHint") }}
-                </div>
-              </div>
+              <span class="row-label">{{ t("settings.cap.internetClient") }}</span>
               <div style="display: flex; align-items: center; gap: 10px">
                 <span v-if="capsRestarting" class="restart-hint">{{
                   t("settings.sandboxCapsRestarting")
@@ -714,6 +655,7 @@
               </div>
             </div>
           </div>
+          <div class="section-footer">{{ t("settings.sandboxCapsHint") }}</div>
 
           <!-- External apps whitelist -->
           <div class="card-group" style="margin-top: 12px">
@@ -728,12 +670,6 @@
               >
                 <span class="row-label" style="margin: 0">{{ t("settings.externalApps") }}</span>
               </div>
-              <div
-                class="row-hint"
-                style="margin-bottom: 8px; font-size: 12px; color: var(--text-muted)"
-              >
-                {{ t("settings.externalAppsHint") }}
-              </div>
               <div class="external-apps-list">
                 <div v-for="(app, idx) in externalApps" :key="idx" class="app-tag">
                   <span>{{ app }}</span>
@@ -751,6 +687,7 @@
               </div>
             </div>
           </div>
+          <div class="section-footer">{{ t("settings.externalAppsHint") }}</div>
 
           <!-- Sandbox directory permissions -->
           <div class="card-group" style="margin-top: 12px">
@@ -770,13 +707,6 @@
                   >{{ t("settings.sandboxDirs") }}</span
                 >
               </div>
-              <div
-                class="row-hint"
-                style="margin-bottom: 8px; font-size: 12px; color: var(--text-muted)"
-              >
-                {{ t("settings.sandboxDirsHint") }}
-              </div>
-
               <!-- Read-Write directories -->
               <div class="dir-section">
                 <div
@@ -969,6 +899,7 @@
               </div>
             </div>
           </div>
+          <div class="section-footer">{{ t("settings.sandboxDirsHint") }}</div>
         </div>
         <!-- .sandbox-disabled wrapper -->
       </div>
@@ -977,7 +908,6 @@
       <div v-if="activeSection === 'privacy'" class="section">
         <!-- Privacy Protection Level -->
         <div class="section-label">{{ t("settings.privacyProtection") }}</div>
-        <div class="privacy-desc">{{ t("settings.privacyProtectionDesc") }}</div>
         <div class="privacy-levels">
           <div
             class="privacy-card"
@@ -1026,10 +956,10 @@
             </ul>
           </div>
         </div>
+        <div class="section-footer">{{ t("settings.privacyProtectionDesc") }}</div>
 
         <!-- PII Detection -->
         <div class="sub-label" style="margin-top: 36px">{{ t("settings.piiDetection") }}</div>
-        <div class="privacy-desc">{{ t("settings.piiDetectionDesc") }}</div>
         <div class="card-group">
           <div class="card-row">
             <span class="row-label">{{ t("settings.piiPhone") }}</span>
@@ -1055,10 +985,10 @@
             <el-switch v-model="piiToggles.apiKey" :disabled="settings.privacyLevel === 'basic'" />
           </div>
         </div>
+        <div class="section-footer">{{ t("settings.piiDetectionDesc") }}</div>
 
         <!-- Sensitive File Guard -->
         <div class="sub-label" style="margin-top: 32px">{{ t("settings.sensitiveFiles") }}</div>
-        <div class="privacy-desc">{{ t("settings.sensitiveFilesDesc") }}</div>
         <div class="card-group">
           <div class="card-row no-border">
             <span
@@ -1075,10 +1005,10 @@
             </span>
           </div>
         </div>
+        <div class="section-footer">{{ t("settings.sensitiveFilesDesc") }}</div>
 
         <!-- File Access Audit -->
         <div class="sub-label" style="margin-top: 32px">{{ t("settings.fileAccessAudit") }}</div>
-        <div class="privacy-desc">{{ t("settings.fileAccessAuditDesc") }}</div>
         <div class="card-group">
           <div class="card-row no-border">
             <span class="row-label">{{ t("settings.fileAccessAudit") }}</span>
@@ -1088,6 +1018,7 @@
             />
           </div>
         </div>
+        <div class="section-footer">{{ t("settings.fileAccessAuditDesc") }}</div>
 
         <!-- Chat History (existing) -->
         <div class="sub-label" style="margin-top: 32px">{{ t("settings.chatHistory") }}</div>
@@ -1106,7 +1037,7 @@
         <div class="section-label">{{ t("settings.about") }}</div>
         <div class="about-card">
           <img class="about-icon" :src="microclawLogo" alt="MicroClaw" />
-          <div class="about-name">MicroClawDesktop</div>
+          <div class="about-name">{{ t("app.name") }}</div>
           <div class="about-version">{{ t("settings.version") }}</div>
           <el-button
             type="primary"
@@ -1141,7 +1072,7 @@
         <div class="card-group" style="margin-top: 16px">
           <div class="card-row no-border">
             <span class="row-label">{{ t("settings.copyright") }}</span>
-            <span class="row-value">© 2026 MicroClawDesktop</span>
+            <span class="row-value">© 2026 {{ t("app.name") }}</span>
           </div>
         </div>
       </div>
@@ -1155,6 +1086,7 @@ import { useRoute } from "vue-router";
 import { useGatewayStore } from "@/stores/gateway";
 import { useChatStore } from "@/stores/chat";
 import { ElMessage, ElMessageBox } from "element-plus";
+import ChannelsView from "@/views/ChannelsView.vue";
 import microclawLogo from "../../../assets/microclaw.png";
 import { t, setLocale } from "@/i18n";
 import type { Locale } from "@/i18n";
@@ -1177,7 +1109,6 @@ watch(
 );
 
 const activeSection = ref("general");
-const stateDir = ref("");
 const updateChecking = ref(false);
 const updateResult = ref<UpdateCheckResult | null>(null);
 
@@ -1208,19 +1139,26 @@ const updateStatusDetail = computed(() => {
 
 const VALID_SECTIONS = [
   "general",
-  "theme",
   "usage",
   "models",
   "skills",
-  "workspace",
+  "gateway",
+  "channels",
   "security",
   "privacy",
   "about",
 ];
 
+function normalizeSection(section: unknown) {
+  if (section === "theme") return "general";
+  if (section === "workspace") return "gateway";
+  return typeof section === "string" && VALID_SECTIONS.includes(section) ? section : null;
+}
+
 // Initialise activeSection from the route param (e.g. /settings/models)
-if (typeof route.params.section === "string" && VALID_SECTIONS.includes(route.params.section)) {
-  activeSection.value = route.params.section;
+const initialSection = normalizeSection(route.params.section);
+if (initialSection) {
+  activeSection.value = initialSection;
 }
 
 // React to route-param changes while this view is mounted (e.g. user clicks
@@ -1228,8 +1166,9 @@ if (typeof route.params.section === "string" && VALID_SECTIONS.includes(route.pa
 watch(
   () => route.params.section,
   (section) => {
-    if (typeof section === "string" && VALID_SECTIONS.includes(section)) {
-      activeSection.value = section;
+    const normalizedSection = normalizeSection(section);
+    if (normalizedSection) {
+      activeSection.value = normalizedSection;
     }
   },
 );
@@ -1629,11 +1568,6 @@ const otherPlatformManagedSkills = computed(() =>
 );
 const managedEnabledCount = computed(() => managedSkills.value.filter((s) => s.enabled).length);
 
-function platformLabel(p: string): string {
-  const labels: Record<string, string> = { windows: "Windows", macos: "macOS", linux: "Linux" };
-  return labels[p] ?? p;
-}
-
 async function toggleSkill(skillId: string, enabled: boolean) {
   const skill = builtinSkills.value.find((s) => s.id === skillId);
   if (skill) skill.enabled = enabled;
@@ -1728,12 +1662,12 @@ async function loadUsage() {
 }
 
 const svg = {
-  general: `<svg viewBox="0 0 20 20" fill="none" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"><circle cx="10" cy="10" r="2.5"/><path d="M10 2v2M10 16v2M2 10h2M16 10h2M4.22 4.22l1.42 1.42M14.36 14.36l1.42 1.42M4.22 15.78l1.42-1.42M14.36 5.64l1.42-1.42"/></svg>`,
-  theme: `<svg viewBox="0 0 20 20" fill="none" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"><circle cx="10" cy="10" r="7"/><path d="M10 3a7 7 0 0 1 0 14V3z" fill="currentColor" stroke="none"/></svg>`,
+  general: `<svg viewBox="0 0 20 20" fill="none" stroke="currentColor" stroke-width="1.5" stroke-linecap="round"><path d="M3 5h3M10 5h7M3 10h7M14 10h3M3 15h2M9 15h8"/><circle cx="8" cy="5" r="2"/><circle cx="12" cy="10" r="2"/><circle cx="7" cy="15" r="2"/></svg>`,
   usage: `<svg viewBox="0 0 20 20" fill="none" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"><rect x="3" y="12" width="3" height="5" rx="1"/><rect x="8.5" y="8" width="3" height="9" rx="1"/><rect x="14" y="4" width="3" height="13" rx="1"/></svg>`,
-  models: `<svg viewBox="0 0 20 20" fill="none" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"><circle cx="10" cy="7" r="3"/><path d="M4 17c0-3.314 2.686-5 6-5s6 1.686 6 5"/><circle cx="15" cy="5" r="1.5"/><circle cx="5" cy="5" r="1.5"/></svg>`,
+  models: `<svg viewBox="0 0 20 20" fill="none" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"><rect x="5.5" y="5.5" width="9" height="9" rx="2"/><path d="M8 3v2.5M12 3v2.5M8 14.5V17M12 14.5V17M3 8h2.5M3 12h2.5M14.5 8H17M14.5 12H17"/><path d="m10 7 .7 2.3L13 10l-2.3.7L10 13l-.7-2.3L7 10l2.3-.7L10 7z"/></svg>`,
   skills: `<svg viewBox="0 0 20 20" fill="none" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"><path d="M14.5 2.5a2 2 0 0 1 2.83 2.83l-9.9 9.9-3.54.71.71-3.54 9.9-9.9z"/></svg>`,
-  workspace: `<svg viewBox="0 0 20 20" fill="none" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"><path d="M3 6l7-3 7 3v10l-7 3-7-3V6z"/><path d="M10 3v14M3 6l7 4 7-4"/></svg>`,
+  gateway: `<svg viewBox="0 0 20 20" fill="none" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"><rect x="3" y="3" width="14" height="6" rx="1.5"/><rect x="3" y="11" width="14" height="6" rx="1.5"/><circle cx="6" cy="6" r=".75" fill="currentColor" stroke="none"/><circle cx="6" cy="14" r=".75" fill="currentColor" stroke="none"/><path d="M9 6h5M9 14h5"/></svg>`,
+  channels: `<svg viewBox="0 0 20 20" fill="none" stroke="currentColor" stroke-width="1.5" stroke-linecap="round"><circle cx="10" cy="10" r="1.5" fill="currentColor" stroke="none"/><path d="M6.8 6.8a4.5 4.5 0 0 0 0 6.4M13.2 6.8a4.5 4.5 0 0 1 0 6.4M4.4 4.4a8 8 0 0 0 0 11.2M15.6 4.4a8 8 0 0 1 0 11.2"/></svg>`,
   security: `<svg viewBox="0 0 20 20" fill="none" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"><path d="M10 2l6 3v5c0 4-2.5 6.5-6 8-3.5-1.5-6-4-6-8V5l6-3z"/><path d="M7.5 10l2 2 3.5-4"/></svg>`,
   privacy: `<svg viewBox="0 0 20 20" fill="none" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"><rect x="4" y="9" width="12" height="9" rx="2"/><path d="M7 9V6a3 3 0 0 1 6 0v3"/><circle cx="10" cy="14" r="1" fill="currentColor" stroke="none"/></svg>`,
   about: `<svg viewBox="0 0 20 20" fill="none" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"><circle cx="10" cy="10" r="7"/><path d="M10 9v5"/><circle cx="10" cy="6.5" r="0.75" fill="currentColor" stroke="none"/></svg>`,
@@ -1741,11 +1675,11 @@ const svg = {
 
 const menuItems = computed(() => [
   { id: "general", label: t("settings.menu.general"), color: "#636366", svg: svg.general },
-  { id: "theme", label: t("settings.menu.theme"), color: "#636366", svg: svg.theme },
   { id: "usage", label: t("settings.menu.usage"), color: "#636366", svg: svg.usage },
   { id: "models", label: t("settings.menu.models"), color: "#636366", svg: svg.models },
   { id: "skills", label: t("settings.menu.skills"), color: "#636366", svg: svg.skills },
-  { id: "workspace", label: t("settings.menu.workspace"), color: "#636366", svg: svg.workspace },
+  { id: "gateway", label: t("settings.menu.gateway"), color: "#636366", svg: svg.gateway },
+  { id: "channels", label: t("settings.menu.channels"), color: "#636366", svg: svg.channels },
   { id: "security", label: t("settings.menu.security"), color: "#636366", svg: svg.security },
   { id: "privacy", label: t("settings.menu.privacy"), color: "#636366", svg: svg.privacy },
   { id: "about", label: t("settings.menu.about"), color: "#636366", svg: svg.about },
@@ -1834,8 +1768,6 @@ watch(activeSection, (v) => {
 });
 
 onMounted(async () => {
-  stateDir.value = await window.openclaw.config.getStateDir();
-
   // Load persisted app settings
   const saved = await window.openclaw.settings.get();
   if (saved) {
@@ -2235,26 +2167,12 @@ function openUpdateDownload() {
   }
 }
 
-async function reconnectGateway() {
+async function restartGateway() {
   try {
     await window.openclaw.gateway.restart();
-    ElMessage.success(t("settings.gatewayReconnecting"));
+    ElMessage.success(t("settings.gatewayRestarting"));
   } catch (err: any) {
-    ElMessage.error(t("settings.reconnectFailed", { error: err.message }));
-  }
-}
-
-async function resetConnection() {
-  try {
-    await ElMessageBox.confirm(
-      "This will reset the gateway connection. Continue?",
-      "Reset Connection",
-      { type: "warning" },
-    );
-    await window.openclaw.gateway.restart();
-    ElMessage.success(t("settings.connectionReset"));
-  } catch {
-    // Cancelled
+    ElMessage.error(t("settings.restartFailed", { error: err.message }));
   }
 }
 
@@ -2295,6 +2213,7 @@ async function clearChatHistory() {
   flex: 1;
   min-height: 0;
   background: var(--bg-primary);
+  font-family: inherit;
 }
 
 /* ── Left sidebar ── */
@@ -2364,8 +2283,10 @@ async function clearChatHistory() {
 }
 
 .menu-icon :deep(svg) {
+  display: block;
   width: 16px;
   height: 16px;
+  flex: 0 0 16px;
 }
 
 .menu-label {
@@ -2380,12 +2301,17 @@ async function clearChatHistory() {
   container-type: inline-size;
 }
 
-.section-label {
+.section-label,
+.section-header-title,
+.sub-label {
   font-size: 11px;
   font-weight: 600;
   color: var(--text-secondary);
   text-transform: uppercase;
   letter-spacing: 0.07em;
+}
+
+.section-label {
   margin-bottom: 8px;
   padding-left: 4px;
 }
@@ -2444,7 +2370,8 @@ async function clearChatHistory() {
 }
 
 .row-label {
-  font-size: 13.5px;
+  font-size: 13px;
+  font-weight: 400;
   color: var(--text-primary);
   flex-shrink: 1;
   min-width: 0;
@@ -2452,6 +2379,7 @@ async function clearChatHistory() {
 
 .row-value {
   font-size: 13px;
+  font-weight: 400;
   color: var(--text-secondary);
   text-align: right;
   overflow: hidden;
@@ -2469,12 +2397,14 @@ async function clearChatHistory() {
 
 .placeholder-text {
   font-size: 13px;
+  font-weight: 400;
   color: var(--text-secondary);
   text-align: center;
 }
 
 .section-footer {
   font-size: 12px;
+  font-weight: 400;
   color: var(--text-muted);
   padding: 6px 4px 0;
 }
@@ -2569,18 +2499,13 @@ async function clearChatHistory() {
 }
 
 .section-header-title {
-  font-size: 22px;
-  font-weight: 700;
-  color: var(--text-primary);
-  letter-spacing: -0.02em;
+  padding-left: 4px;
 }
 
 .sub-label {
-  font-size: 13px;
-  font-weight: 600;
-  color: var(--text-primary);
   margin-bottom: 10px;
   margin-top: 32px;
+  padding-left: 4px;
 }
 
 .sub-label-row {
@@ -2591,6 +2516,10 @@ async function clearChatHistory() {
   margin-bottom: 10px;
 }
 
+.section > .sub-label-row:first-child {
+  margin-top: 0;
+}
+
 .badge {
   display: inline-flex;
   align-items: center;
@@ -2648,16 +2577,9 @@ async function clearChatHistory() {
 }
 
 .port-title {
-  font-size: 14px;
-  font-weight: 600;
+  font-size: 13px;
+  font-weight: 400;
   color: var(--text-primary);
-  margin-bottom: 4px;
-}
-
-.port-desc {
-  font-size: 12.5px;
-  color: var(--text-secondary);
-  line-height: 1.5;
 }
 
 .port-input-group {
@@ -2718,7 +2640,16 @@ async function clearChatHistory() {
 .port-input-group :deep(.el-input__inner) {
   font-size: 13px;
   text-align: center;
-  font-weight: 600;
+  font-weight: 400;
+}
+
+.settings-view :deep(.el-input__inner),
+.settings-view :deep(.el-select__selected-item),
+.settings-view :deep(.el-radio__label),
+.settings-view :deep(.el-button) {
+  font-family: inherit;
+  font-size: 13px;
+  font-weight: 400;
 }
 
 .test-result {
@@ -2765,29 +2696,6 @@ async function clearChatHistory() {
   border: 1px solid rgba(255, 149, 0, 0.25);
 }
 
-.platform-tag {
-  font-size: 11px;
-  padding: 1px 8px;
-}
-
-.platform-windows {
-  background: var(--accent-subtle);
-  color: var(--accent);
-  border: 1px solid var(--accent-light);
-}
-
-.platform-macos {
-  background: var(--accent-subtle);
-  color: var(--accent);
-  border: 1px solid var(--accent-light);
-}
-
-.platform-linux {
-  background: rgba(255, 149, 0, 0.1);
-  color: #ff9500;
-  border: 1px solid rgba(255, 149, 0, 0.22);
-}
-
 .badge-gray {
   background: rgba(142, 142, 147, 0.12);
   color: #8e8e93;
@@ -2857,8 +2765,9 @@ async function clearChatHistory() {
   border: 1px solid var(--border);
   border-radius: 6px;
   padding: 4px 8px;
-  font-size: 12.5px;
-  color: var(--text-primary);
+  font-size: 13px;
+  font-weight: 400;
+  color: var(--text-secondary);
 }
 .app-tag .tag-remove {
   background: none;
@@ -2879,7 +2788,9 @@ async function clearChatHistory() {
   background: none;
   border: none;
   outline: none;
-  font-size: 12.5px;
+  font-family: inherit;
+  font-size: 13px;
+  font-weight: 400;
   width: 80px;
   color: var(--text-primary);
 }
@@ -2902,8 +2813,8 @@ async function clearChatHistory() {
   margin-top: 4px;
 }
 .dir-section-label {
-  font-size: 12.5px;
-  font-weight: 600;
+  font-size: 13px;
+  font-weight: 400;
   color: var(--text-primary);
 }
 .dir-add-btn {
@@ -2932,7 +2843,8 @@ async function clearChatHistory() {
 }
 .cap-label {
   font-size: 13px;
-  color: var(--text-secondary);
+  font-weight: 400;
+  color: var(--text-primary);
 }
 .sandbox-disabled {
   opacity: 0.45;
@@ -2952,7 +2864,8 @@ async function clearChatHistory() {
   border: 1px solid var(--border);
   border-radius: 6px;
   margin-bottom: 4px;
-  font-size: 12.5px;
+  font-size: 13px;
+  font-weight: 400;
   background: var(--bg-tertiary);
 }
 .dir-path {
@@ -3027,13 +2940,6 @@ async function clearChatHistory() {
 }
 
 /* ── Privacy Protection ── */
-.privacy-desc {
-  font-size: 13px;
-  color: var(--text-secondary);
-  margin-bottom: 16px;
-  line-height: 1.5;
-}
-
 .privacy-levels {
   display: grid;
   grid-template-columns: repeat(3, 1fr);
@@ -3072,8 +2978,8 @@ async function clearChatHistory() {
 }
 
 .privacy-card-title {
-  font-size: 14px;
-  font-weight: 600;
+  font-size: 13px;
+  font-weight: 400;
   color: var(--text-primary);
 }
 
@@ -3094,8 +3000,9 @@ async function clearChatHistory() {
 }
 
 .privacy-card-list li {
-  font-size: 12.5px;
-  color: var(--text-secondary);
+  font-size: 12px;
+  font-weight: 400;
+  color: var(--text-muted);
   line-height: 1.6;
   padding-left: 12px;
   position: relative;
diff --git a/desktop/src/i18n/index.test.ts b/desktop/src/i18n/index.test.ts
new file mode 100644
index 0000000..72acd48
--- /dev/null
+++ b/desktop/src/i18n/index.test.ts
@@ -0,0 +1,18 @@
+import { describe, expect, it } from "vitest";
+import { resolveSupportedLocale } from ".";
+
+describe("resolveSupportedLocale", () => {
+  it.each(["zh", "zh-CN", "zh-TW", "zh-HK", "ZH-cn"])(
+    "maps %s to Simplified Chinese",
+    (locale) => {
+      expect(resolveSupportedLocale(locale)).toBe("zh-CN");
+    },
+  );
+
+  it.each(["en-US", "en-GB", "fr-FR", "ja-JP", ""])(
+    "maps unsupported locale %s to English",
+    (locale) => {
+      expect(resolveSupportedLocale(locale)).toBe("en-US");
+    },
+  );
+});
\ No newline at end of file
diff --git a/desktop/src/i18n/index.ts b/desktop/src/i18n/index.ts
index 2ad0747..b7b59b9 100644
--- a/desktop/src/i18n/index.ts
+++ b/desktop/src/i18n/index.ts
@@ -7,11 +7,17 @@
 import zhCN from "./zh-CN";
 import enUS from "./en-US";
 
+export type SupportedLocale = "zh-CN" | "en-US";
+
 const messages: Record<string, Record<string, string>> = {
   "zh-CN": zhCN,
   "en-US": enUS,
 };
 
+export function resolveSupportedLocale(osLocale: string): SupportedLocale {
+  return osLocale.toLowerCase().startsWith("zh") ? "zh-CN" : "en-US";
+}
+
 export function t(lang: string, key: string): string {
   return messages[lang]?.[key] ?? messages["en-US"]?.[key] ?? key;
 }
diff --git a/desktop/src/main.ts b/desktop/src/main.ts
index 3ba410e..1074be0 100644
--- a/desktop/src/main.ts
+++ b/desktop/src/main.ts
@@ -15,7 +15,7 @@ import {
 import { ToolSandbox } from "./tool-sandbox";
 import { shieldIfNeeded, unshieldIfNeeded } from "./sensitive-shield";
 import { StudioBackendManager } from "./studio-backend-manager";
-import { t as mainT } from "./i18n";
+import { resolveSupportedLocale, t as mainT } from "./i18n";
 import { checkForUpdates } from "./update-checker";
 import {
   getOpenClawStateDir,
@@ -108,7 +108,7 @@ const store = new Store<{ windowBounds: Electron.Rectangle | null }>({
 });
 
 const settingsStore = new Store<{
-  language: string;
+  language?: string;
   autoStart: boolean;
   startMinimized: boolean;
   themeMode: string;
@@ -130,7 +130,6 @@ const settingsStore = new Store<{
 }>({
   name: "settings",
   defaults: {
-    language: "en-US",
     autoStart: false,
     startMinimized: false,
     themeMode: "light",
@@ -1557,7 +1556,7 @@ function sendWeixinNotification(
 /** Notify the remote WeChat user that a permission dialog is waiting on the desktop. */
 function notifyRemotePermissionNeeded(): void {
   if (!lastInputFromRemote || !cachedRemoteSource) return;
-  const lang = settingsStore.get("language");
+  const lang = settingsStore.get("language") ?? "en-US";
   sendWeixinNotification(cachedRemoteSource, mainT(lang, "perm.remoteNotify"));
 }
 
@@ -4193,7 +4192,7 @@ function registerIpcHandlers(): void {
                 // Nudge the model to retry — user granted permission but the original
                 // command already failed, so the model doesn't know to try again.
                 if (activeChatSession && gwClient?.connected) {
-                  const lang = settingsStore.get("language");
+                  const lang = settingsStore.get("language") ?? "en-US";
                   const accessLabel = mainT(lang, isRW ? "perm.accessRW" : "perm.accessRO");
                   const retryMsg = mainT(lang, "perm.retryNudge")
                     .replace("{dir}", dirToAdd)
@@ -4305,6 +4304,10 @@ if (!gotLock) {
 }
 
 app.whenReady().then(async () => {
+  if (!settingsStore.has("language")) {
+    settingsStore.set("language", resolveSupportedLocale(app.getLocale()));
+  }
+
   registerIpcHandlers();
 
   // Sync auto-start with OS
diff --git a/desktop/src/tray.ts b/desktop/src/tray.ts
index c93f3fb..451e61b 100644
--- a/desktop/src/tray.ts
+++ b/desktop/src/tray.ts
@@ -19,7 +19,7 @@ export function createTray(callbacks: {
   const icon = nativeImage.createFromPath(iconPath);
 
   tray = new Tray(icon.isEmpty() ? nativeImage.createEmpty() : icon);
-  tray.setToolTip("MicroClawDesktop");
+  tray.setToolTip("MicroClaw");
   quitCallback = callbacks.onQuit;
 
   updateTrayMenu("stopped", callbacks);
