diff --git a/public/theme/element-extra.css b/public/theme/element-extra.css
index b4c4564a6..a0f729ef8 100644
--- a/public/theme/element-extra.css
+++ b/public/theme/element-extra.css
@@ -92,8 +92,8 @@
 
 
 td .el-button.el-button--mini {
-  padding: 2px 4px;
-  line-height: 1.5;
+  padding: 3px 6px;
+  /*line-height: 1.5;*/
 
   .el-icon--right {
       margin-bottom: 2px;
diff --git a/src/components/DataActions/index.vue b/src/components/DataActions/index.vue
index 714e4d69f..3dfa3eed9 100644
--- a/src/components/DataActions/index.vue
+++ b/src/components/DataActions/index.vue
@@ -228,19 +228,18 @@ export default {
 // 主要是 Table 中的操作列
 .layout.table-actions {
   .el-button {
-    padding: 1px 5px;
     color: #fff;
   }
 
   ::v-deep .action-item.el-dropdown .el-button {
-    padding: 1px 5px;
+    padding: 3px 6px;
     background-color: #E8F7F4;
     color: #1ab394;
 
     &:focus {
       color: #fff;
       background-color: #83CBBA !important;
-  }
+    }
 
     &:hover {
       color: #fff;
diff --git a/src/components/Table/TableFormatters/ActionsFormatter.vue b/src/components/Table/TableFormatters/ActionsFormatter.vue
index 68ad23742..ac797333d 100644
--- a/src/components/Table/TableFormatters/ActionsFormatter.vue
+++ b/src/components/Table/TableFormatters/ActionsFormatter.vue
@@ -134,7 +134,7 @@ export default {
       },
       {
         name: 'clone',
-        title: this.$t('Clone'),
+        title: this.$t('Duplicate'),
         type: 'info',
         has: colActions.hasClone,
         can: colActions.canClone,
@@ -222,9 +222,11 @@ export default {
 </script>
 
 <style scoped>
-.table-actions >>> {
-  .el-icon-arrow-down {
-    display: none;
+.table-actions {
+  >>> {
+    .el-icon-arrow-down {
+      display: none;
+    }
   }
 }
 
diff --git a/src/components/Table/TagSearch/index.vue b/src/components/Table/TagSearch/index.vue
index 1101a5e62..9998e6b58 100644
--- a/src/components/Table/TagSearch/index.vue
+++ b/src/components/Table/TagSearch/index.vue
@@ -409,7 +409,7 @@ export default {
       height: 28px;
       max-width: 200px;
       border: none;
-      padding-left: 5px;
+      padding-left: 1px;
       font-size: 13px;
     }
   }
diff --git a/src/components/Tree/AutoDataZTree/index.vue b/src/components/Tree/AutoDataZTree/index.vue
index c8dc8db71..066ecba4a 100644
--- a/src/components/Tree/AutoDataZTree/index.vue
+++ b/src/components/Tree/AutoDataZTree/index.vue
@@ -324,8 +324,6 @@ export default {
 }
 
 .data-z-tree {
-  padding: 10px 5px 0 20px;
-
   >>> {
     .fa {
       width: 10px;
diff --git a/src/layout/components/GenericCreateUpdateForm/index.vue b/src/layout/components/GenericCreateUpdateForm/index.vue
index 13f35326d..66f72be24 100644
--- a/src/layout/components/GenericCreateUpdateForm/index.vue
+++ b/src/layout/components/GenericCreateUpdateForm/index.vue
@@ -337,7 +337,9 @@ export default {
         .then((res) => this.onPerformSuccess.bind(this)(res, this.method, this, addContinue))
         .catch((error) => this.onPerformError(error, this.method, this))
         .finally(() => {
-          this.isSubmitting = false
+          setTimeout(() => {
+            this.isSubmitting = false
+          }, 200)
         })
     },
     async getFormValue() {
diff --git a/src/layout/components/NavHeader/index.vue b/src/layout/components/NavHeader/index.vue
index ffe1126d4..4d252b1ba 100644
--- a/src/layout/components/NavHeader/index.vue
+++ b/src/layout/components/NavHeader/index.vue
@@ -168,6 +168,10 @@ export default {
         font-weight: 600;
         font-size: 15px;
 
+        ::v-deep .el-input__inner {
+          padding-left: 25px;
+        }
+
         ::v-deep .el-input.is-disabled > input {
           background: none;
         }
diff --git a/src/layout/components/Page/index.vue b/src/layout/components/Page/index.vue
index cc0b36607..ca6619f8b 100644
--- a/src/layout/components/Page/index.vue
+++ b/src/layout/components/Page/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="page">
-    <TagsView :show.sync="showHistory" />
+    <TagsView />
     <PageHeading v-if="iTitle || helpMessage" :help-msg="helpMessage" class="disabled-when-print">
       <el-button
         :disabled="gobackDisabled"
@@ -138,7 +138,7 @@ export default {
 
 .go-back {
   border: none;
-  padding: 4px;
+  padding: 6px;
 }
 
 .go-back >>> i {
diff --git a/src/router/console/accounts.js b/src/router/console/accounts.js
index 4bf4b0c55..3a20678b7 100644
--- a/src/router/console/accounts.js
+++ b/src/router/console/accounts.js
@@ -79,7 +79,7 @@ export default [
         name: 'AccountTemplateList',
         component: () => import('@/views/accounts/AccountTemplate/AccountTemplateList'),
         meta: {
-          menuTitle: i18n.t('AccountTemplate'),
+          menuTitle: i18n.t('MenuAccountTemplates'),
           title: i18n.t('AccountTemplateList'),
           permissions: ['accounts.view_accounttemplate']
         }
diff --git a/src/styles/index.scss b/src/styles/index.scss
index dbd7d4022..3d89c3d54 100644
--- a/src/styles/index.scss
+++ b/src/styles/index.scss
@@ -401,17 +401,6 @@ input[type=file] {
   color: var(--color-text-primary);
 }
 
-.el-alert {
-  &.el-alert--success.is-light {
-    color: var(--color-text-primary)
-  }
-
-  .el-alert__description,
-  .el-alert__title{
-    color: var(--color-text-primary) !important;
-  }
-}
-
 .el-form .el-form-item__content {
   font-size: 13px;
   line-height: 32px;
@@ -473,7 +462,7 @@ input[type=file] {
 }
 
 button .el-icon--right {
-  margin-left: 3px;
+  margin-left: 5px;
 }
 
 // 定义颜色变量
@@ -537,3 +526,11 @@ li.rmenu i.fa {
 .el-checkbox__inner {
   border-radius: 1px !important;
 }
+
+.el-button.el-button--primary {
+  border-color: var(--color-border);
+
+  &:hover {
+    border-color: var(--color-border);
+  }
+}
diff --git a/src/utils/theme/index.js b/src/utils/theme/index.js
index 3400bad54..1c44f993a 100644
--- a/src/utils/theme/index.js
+++ b/src/utils/theme/index.js
@@ -17,23 +17,24 @@ export function changeElementColor(themeColors) {
     `
     if (['primary', 'success', 'info', 'warning', 'danger'].includes(key)) {
       const blendColor = mix('ffffff', value.replace(/#/g, ''), 35)
+      const darken = mix('000000', value.replace(/#/g, ''), 10)
       colorsCssText = colorsCssText + `
         .el-button--${key}:focus {
-          background-color: ${value}!important;
-          border-color: ${value}!important;
+          background-color: ${darken}!important;
         }
         .el-button--${key}.is-disabled,
         .el-button--${key}.is-disabled:active,
-        .el-button--${key}.is-disabled:focus,
-        .el-button--${key}:hover{
+        .el-button--${key}.is-disabled:focus {
           background-color: ${blendColor}!important;
-          border-color: ${blendColor}!important;
+        }
+        .el-button--${key}:hover{
+          background-color: ${darken}!important;
         }
         .el-link.el-link--${key}{
           color: ${value}!important;
         }
         .el-link.el-link--${key}:hover {
-          color: ${blendColor}!important;
+          color: ${darken}!important;
         }
         .el-link.el-link--${key}.is-underline:hover:after,
         .el-link.el-link--${key}:after {
diff --git a/src/views/dashboard/Audit/CardSummary.vue b/src/views/dashboard/Audit/CardSummary.vue
index 19668ef0b..bb0f79136 100644
--- a/src/views/dashboard/Audit/CardSummary.vue
+++ b/src/views/dashboard/Audit/CardSummary.vue
@@ -1,10 +1,10 @@
 <template>
   <div>
     <el-row :gutter="16">
-      <el-col :lg="12" :sm="24" class="margin-top-16">
+      <el-col :lg="12" :sm="24" class="margin-top-10">
         <SummaryCountCard :config="logConfig" :items="LogItems" />
       </el-col>
-      <el-col :lg="12" :sm="24" class="margin-top-16">
+      <el-col :lg="12" :sm="24" class="margin-top-10">
         <SummaryCountCard :config="sessionConfig" :items="sessionItems" />
       </el-col>
     </el-row>
@@ -124,7 +124,7 @@ export default {
 </script>
 
 <style scoped>
-.margin-top-16 {
-  margin-top: 16px;
+.margin-top-10 {
+  margin-top: 10px;
 }
 </style>
diff --git a/src/views/dashboard/Audit/DataSummary.vue b/src/views/dashboard/Audit/DataSummary.vue
index 795c6c813..e01ce4235 100644
--- a/src/views/dashboard/Audit/DataSummary.vue
+++ b/src/views/dashboard/Audit/DataSummary.vue
@@ -1,6 +1,6 @@
 <template>
   <el-row :gutter="16">
-    <el-col :lg="12" :sm="12" class="margin-top-16">
+    <el-col :lg="12" :sm="12" class="margin-top-10">
       <DataCard :config="logConfig">
         <div class="custom">
           <span>{{ logConfig.total }}</span>
@@ -10,7 +10,7 @@
         </div>
       </DataCard>
     </el-col>
-    <el-col :lg="12" :sm="12" class="margin-top-16">
+    <el-col :lg="12" :sm="12" class="margin-top-10">
       <DataCard :config="assetConfig">
         <div class="custom">
           <span>{{ assetConfig.total }}</span>
@@ -26,6 +26,7 @@
 <script>
 import DataCard from '../components/DataCard.vue'
 import Decimal from 'decimal.js'
+
 export default {
   components: {
     DataCard
@@ -118,7 +119,7 @@ export default {
   display: inline-block;
 }
 
-.margin-top-16 {
-  margin-top: 16px;
+.margin-top-10 {
+  margin-top: 10px;
 }
 </style>
diff --git a/src/views/dashboard/Audit/RightSummary.vue b/src/views/dashboard/Audit/RightSummary.vue
index 17f396b55..943ccfeb9 100644
--- a/src/views/dashboard/Audit/RightSummary.vue
+++ b/src/views/dashboard/Audit/RightSummary.vue
@@ -6,7 +6,7 @@
       </div>
       <LineChart v-bind="chartConfig" />
     </div>
-    <SummaryCountCard :config="chartTitleConfig" :items="summaryItems" class="margin-top-16" />
+    <SummaryCountCard :config="chartTitleConfig" :items="summaryItems" class="margin-top-10" />
   </div>
 </template>
 
@@ -109,8 +109,8 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.margin-top-16 {
-  margin-top: 16px;
+.margin-top-10 {
+  margin-top: 10px;
 }
 
 .box {
diff --git a/src/views/dashboard/components/SwitchDate.vue b/src/views/dashboard/components/SwitchDate.vue
index ec35b7fa8..d35c115dd 100644
--- a/src/views/dashboard/components/SwitchDate.vue
+++ b/src/views/dashboard/components/SwitchDate.vue
@@ -57,11 +57,11 @@ export default {
 
 <style lang="scss" scoped>
 .switch {
-  padding: 4px;
+  font-weight: 400;
 
   ::v-deep .el-radio-button {
     .el-radio-button__inner {
-      border: 1px solid var(--color-border);
+      border-right: 1px solid var(--color-border);
       color: var(--color-text-primary);
       background: #ffffff;
       border-radius: 0;
diff --git a/src/views/users/Role/RoleDetail/RoleInfo.vue b/src/views/users/Role/RoleDetail/RoleInfo.vue
index a2c381bad..220b6f55d 100644
--- a/src/views/users/Role/RoleDetail/RoleInfo.vue
+++ b/src/views/users/Role/RoleDetail/RoleInfo.vue
@@ -1,9 +1,9 @@
 <template>
   <el-row :gutter="20">
-    <el-col :md="12" :sm="24">
+    <el-col :md="14" :sm="24">
       <AutoDetailCard :fields="detailFields" :object="object" :url="url" />
     </el-col>
-    <el-col :md="12" :sm="24">
+    <el-col :md="10" :sm="24">
       <IBox :title="$tc('Permissions')">
         <div style="height: 10%">
           <el-button