diff --git a/web/html/login.html b/web/html/login.html
index f3572785..2dafe52d 100644
--- a/web/html/login.html
+++ b/web/html/login.html
@@ -435,14 +435,6 @@
     }
   }
 
-  .ant-menu-item .anticon {
-    margin-right: 4px;
-  }
-
-  .ant-menu-inline .ant-menu-item {
-    padding: 0 16px !important;
-  }
-
   .setting-section {
     position: absolute;
     top: 0;
@@ -478,14 +470,15 @@
         <div class="setting-section">
           <a-popover :overlay-class-name="themeSwitcher.currentTheme" title='{{ i18n "menu.settings" }}' placement="bottomRight" trigger="click">
             <template slot="content">
-              <a-space direction="vertical">
+              <a-space direction="vertical" :size="10">
+                <a-theme-switch-login></a-theme-switch-login>
+                <span>{{ i18n "pages.settings.language" }}</span>
                 <a-select ref="selectLang" :style="{ width: '100%' }" v-model="lang" @change="LanguageManager.setLanguage(lang)" :dropdown-class-name="themeSwitcher.currentTheme">
                   <a-select-option :value="l.value" label="English" v-for="l in LanguageManager.supportedLanguages">
                     <span role="img" aria-label="l.name" v-text="l.icon"></span>
                     &nbsp;&nbsp;<span v-text="l.name"></span>
                   </a-select-option>
                 </a-select>
-                <a-theme-switch-login></a-theme-switch-login>
               </a-space>
             </template>
             <a-button shape="circle" icon="setting"></a-button>
diff --git a/web/html/xui/component/aThemeSwitch.html b/web/html/xui/component/aThemeSwitch.html
index b17b6159..2f76cd1b 100644
--- a/web/html/xui/component/aThemeSwitch.html
+++ b/web/html/xui/component/aThemeSwitch.html
@@ -24,12 +24,12 @@
 
 {{define "component/themeSwitchTemplateLogin"}}
 <template>
-  <a-space direction="vertical" :style="{ width: '100%' }">
-    <a-space direction="horizontal">
+  <a-space direction="vertical" :size="10" :style="{ width: '100%' }">
+    <a-space direction="horizontal" size="small">
       <a-switch size="small" :default-checked="themeSwitcher.isDarkTheme" @change="themeSwitcher.toggleTheme()"></a-switch>
       <span>{{ i18n "menu.dark" }}</span>
     </a-space>
-    <a-space v-if="themeSwitcher.isDarkTheme" direction="horizontal">
+    <a-space v-if="themeSwitcher.isDarkTheme" direction="horizontal" size="small">
       <a-checkbox :checked="themeSwitcher.isUltra" @click="themeSwitcher.toggleUltra()"></a-checkbox>
       <span>{{ i18n "menu.ultraDark" }}</span>
     </a-space>