diff --git a/src/components/Apps/ChatAi/components/ChitChat/ChatMessage.vue b/src/components/Apps/ChatAi/components/ChitChat/ChatMessage.vue
index 08c3364ef..35d2837b4 100644
--- a/src/components/Apps/ChatAi/components/ChitChat/ChatMessage.vue
+++ b/src/components/Apps/ChatAi/components/ChitChat/ChatMessage.vue
@@ -22,7 +22,6 @@
           <el-tooltip
             v-if="isSystemError && isLoading"
             :content="$tc('Reconnect')"
-            effect="dark"
             placement="top"
           >
             <svg-icon icon-class="refresh" @click="onRefresh" />
diff --git a/src/components/Form/DataForm/components/el-form-renderer/components/render-form-item.vue b/src/components/Form/DataForm/components/el-form-renderer/components/render-form-item.vue
index 7e74a485f..da96abb22 100755
--- a/src/components/Form/DataForm/components/el-form-renderer/components/render-form-item.vue
+++ b/src/components/Form/DataForm/components/el-form-renderer/components/render-form-item.vue
@@ -8,7 +8,7 @@
     v-bind="data.attrs"
   >
     <template v-if="data.label" #label>
-      <el-tooltip v-if="data.helpTip" effect="light" placement="top" popper-class="help-tips">
+      <el-tooltip v-if="data.helpTip" effect="dark" placement="top" popper-class="help-tips">
         <div slot="content" v-html="data.helpTip" />
         <i class="el-icon-warning-outline help-tip-icon" />
       </el-tooltip>
diff --git a/src/layout/components/NavHeader/Organization.vue b/src/layout/components/NavHeader/Organization.vue
index 18d80f769..708223856 100644
--- a/src/layout/components/NavHeader/Organization.vue
+++ b/src/layout/components/NavHeader/Organization.vue
@@ -164,6 +164,7 @@ $height: 28px;
   line-height: $height;
   background: transparent;
   color: #FFF;
+  font-size: 13px;
 
   & >>> .el-input__prefix {
     left: 0;
diff --git a/src/layout/components/Page/index.vue b/src/layout/components/Page/index.vue
index 380c2ce48..62cf2a71e 100644
--- a/src/layout/components/Page/index.vue
+++ b/src/layout/components/Page/index.vue
@@ -5,7 +5,7 @@
       <slot name="title">
         <span style="padding-left: 10px">
           {{ iTitle }}
-          <el-tooltip v-if="helpTip" effect="light" placement="right" popper-class="help-tips">
+          <el-tooltip v-if="helpTip" effect="dark" placement="top" popper-class="help-tips">
             <div slot="content" class="page-help-content" v-html="helpTip" />
             <span>
               <el-button class="help-msg-btn">
@@ -98,7 +98,7 @@ export default {
   }
 
   .page-content {
-    height: calc(100% - 50px);
+    height: calc(100% - 90px);
     overflow-x: hidden;
     overflow-y: auto;
   }
diff --git a/src/layout/components/TabPage/index.vue b/src/layout/components/TabPage/index.vue
index 58357e500..2f23a9dae 100644
--- a/src/layout/components/TabPage/index.vue
+++ b/src/layout/components/TabPage/index.vue
@@ -23,7 +23,7 @@
               <i v-if="item.icon" :class="item.icon" class="fa pre-icon " />
               {{ toSentenceCase(item.title) }}
               <slot :tab="item.name" name="badge" />
-              <el-tooltip v-if="item.helpTip" effect="light" placement="bottom" popper-class="help-tips">
+              <el-tooltip v-if="item.helpTip" effect="dark" placement="bottom" popper-class="help-tips">
                 <div slot="content" class="page-help-content" v-html="item.helpTip" />
                 <span>
                   <el-button class="help-msg-btn">
diff --git a/src/router/console/accounts.js b/src/router/console/accounts.js
index bd4d8fafd..85ed94ce6 100644
--- a/src/router/console/accounts.js
+++ b/src/router/console/accounts.js
@@ -80,7 +80,7 @@ export default [
         name: 'AccountTemplateList',
         component: () => import('@/views/accounts/AccountTemplate/AccountTemplateList'),
         meta: {
-          menuTitle: i18n.t('Templates'),
+          menuTitle: i18n.t('AccountTemplates'),
           title: i18n.t('AccountTemplateList'),
           permissions: ['accounts.view_accounttemplate']
         }
diff --git a/src/styles/default-theme.scss b/src/styles/default-theme.scss
index 4c699fcc9..28298b950 100644
--- a/src/styles/default-theme.scss
+++ b/src/styles/default-theme.scss
@@ -5,6 +5,10 @@
   --color-warning: #f8ac59;
   --color-danger: #ed5565;
   --color-link: #1c84c6;
+  --color-text: #1F2329;
+  --color-text-2: #646a73;
+  --color-text-3: #8f959e;
+  --color-text-4: #bbbfc4;
   --banner-bg: #148f76;
   --submenu-bg: #ffffff;
   --menu-bg: #ffffff;
diff --git a/src/styles/index.scss b/src/styles/index.scss
index 40a74d04b..ea8b61ef2 100644
--- a/src/styles/index.scss
+++ b/src/styles/index.scss
@@ -93,10 +93,6 @@ div:focus {
   padding: 20px;
 }
 
-.el-tooltip__popper.is-light {
-  background-color: #ebeef5 !important;
-}
-
 .el-tooltip__popper.is-light.help-tips div span {
   padding: 50px;
 }
@@ -181,9 +177,9 @@ input[type=file] {
   table-layout: fixed !important;
 }
 
-
-.el-tooltip__popper.is-dark {
-  max-width: 60% !important;
+.el-tooltip__popper {
+  max-width: 500px !important;
+  line-height: 1.5;
 }
 
 .view-switcher {
@@ -453,7 +449,7 @@ $tooltip-arrow-color: #c2d1e1;
 
   i {
     color: var(--color-info);
-    opacity: 1;
+    opacity: 0.9;
   }
 }
 
@@ -461,6 +457,7 @@ $tooltip-arrow-color: #c2d1e1;
   padding: 8px;
   font-weight: 500;
   font-size: 13px;
+  line-height: 1.5;
 }
 
 .help-tips {
diff --git a/src/styles/menu.scss b/src/styles/menu.scss
index 5b34f36df..45aa67424 100644
--- a/src/styles/menu.scss
+++ b/src/styles/menu.scss
@@ -82,8 +82,8 @@
   }
 
   .el-menu-item, .el-submenu__title {
-    height: 48px;
-    line-height: 48px;
+    height: 42px;
+    line-height: 42px;
     font-weight: 400;
     font-size: 13px;
   }
@@ -121,6 +121,6 @@
   }
 
   .nest-menu:last-child {
-    padding-bottom: 10px;
+    padding-bottom: 12px;
   }
 }