diff --git a/packages/canvas/DesignCanvas/src/DesignCanvas.vue b/packages/canvas/DesignCanvas/src/DesignCanvas.vue
index 2633d88ce..3dc1b2a27 100644
--- a/packages/canvas/DesignCanvas/src/DesignCanvas.vue
+++ b/packages/canvas/DesignCanvas/src/DesignCanvas.vue
@@ -121,7 +121,6 @@ export default {
         useModal().confirm({
           title: '提示',
           message: renderMsg,
-          status: 'info',
           exec: callback,
           cancel: callback,
           hide: () => {
diff --git a/packages/common/component/BlockDeployDialog.vue b/packages/common/component/BlockDeployDialog.vue
index 27b4dcaab..f9f965b36 100644
--- a/packages/common/component/BlockDeployDialog.vue
+++ b/packages/common/component/BlockDeployDialog.vue
@@ -10,7 +10,7 @@
     <tiny-form
       ref="deployBlockRef"
       label-position="left"
-      label-width="100px"
+      label-width="84px"
       label-align
       :model="formState"
       :rules="formRules"
@@ -24,7 +24,7 @@
       <tiny-form-item label="保存设置" prop="needToSave" class="form-item-save">
         <tiny-checkbox v-model="formState.needToSave">发布成功后保存最新数据</tiny-checkbox>
       </tiny-form-item>
-      <tiny-form-item label="schema比对">
+      <tiny-form-item label="schema比对" class="schema-compare">
         <tiny-button class="compare-button" type="text" @click="changeCompare"> 查看本次发布的改动点 </tiny-button>
         <tiny-popover
           placement="top"
@@ -34,7 +34,7 @@
           content="区块本地schema和线上新版本schema进行比对"
         >
           <template #reference>
-            <icon-help-circle></icon-help-circle>
+            <svg-icon name="plugin-icon-plugin-help"></svg-icon>
           </template>
         </tiny-popover>
       </tiny-form-item>
@@ -71,7 +71,6 @@
 
 <script>
 import { reactive, ref, watch } from 'vue'
-import { iconHelpCircle } from '@opentiny/vue-icon'
 import {
   Checkbox as TinyCheckbox,
   Input as TinyInput,
@@ -88,7 +87,6 @@ import VueMonaco from './VueMonaco.vue'
 export default {
   components: {
     TinyCheckbox,
-    IconHelpCircle: iconHelpCircle(),
     TinyButton,
     TinyDialogBox,
     TinyForm,
@@ -254,7 +252,15 @@ export default {
     line-height: 0;
   }
 }
+.schema-compare {
+  .tiny-button.tiny-button {
+    padding-left: 0;
+    padding-right: 4px;
+    font-size: 12px;
+  }
+}
 .compare-button {
+  font-size: 12px;
   padding-left: 0;
   padding-right: 8px;
   line-height: 28px;
diff --git a/packages/common/component/LifeCycles.vue b/packages/common/component/LifeCycles.vue
index 3560f5014..371d44508 100644
--- a/packages/common/component/LifeCycles.vue
+++ b/packages/common/component/LifeCycles.vue
@@ -2,7 +2,7 @@
   <div class="life-cycle">
     <tiny-popover v-model="state.showPopover" placement="bottom-end" trigger="hover" popperClass="option-popper">
       <template #reference>
-        <tiny-button class="life-cycle-btn"><icon-plus class="icon-plus"></icon-plus>添加页面生命周期 </tiny-button>
+        <tiny-button class="life-cycle-btn"><svg-icon name="add"></svg-icon>添加页面生命周期 </tiny-button>
       </template>
       <div class="popover-list">
         <ul>
@@ -72,7 +72,7 @@ import { Button, DialogBox, Popover, Search } from '@opentiny/vue'
 import { useModal, usePage, useNotify, useCanvas } from '@opentiny/tiny-engine-meta-register'
 import { getMergeMeta } from '@opentiny/tiny-engine-meta-register'
 import MetaListItems from './MetaListItems.vue'
-import { iconYes, iconPlus } from '@opentiny/vue-icon'
+import { iconYes } from '@opentiny/vue-icon'
 import VueMonaco from './VueMonaco.vue'
 import { initCompletion } from '../js/completion'
 import { initLinter, lint } from '../js/linter'
@@ -87,8 +87,7 @@ export default {
     MonacoEditor: VueMonaco,
     SvgButton,
     MetaListItems,
-    IconYes: iconYes(),
-    IconPlus: iconPlus()
+    IconYes: iconYes()
   },
 
   props: {
diff --git a/packages/common/component/PluginBlockList.vue b/packages/common/component/PluginBlockList.vue
index 401bef27d..61b357e10 100644
--- a/packages/common/component/PluginBlockList.vue
+++ b/packages/common/component/PluginBlockList.vue
@@ -1,6 +1,6 @@
 <template>
-  <div v-if="blockStyle === BlockStyles.Mini" class="header">
-    <div class="col-checkbox" v-if="showCheckbox">
+  <div v-if="blockStyle === BlockStyles.Mini && showCheckbox" class="header">
+    <div class="col-checkbox">
       <select-all :allItems="data" :selected="checked" :hidden-label="true" @select-all="handleSelectAll"></select-all>
     </div>
     <div class="col-name">区块名称</div>
@@ -18,7 +18,7 @@
     @mouseleave="state.hover = false"
   >
     <li v-if="showAddButton" class="block-item block-plus" @click="$emit('add')">
-      <span class="block-plus-icon"><icon-plus></icon-plus></span>
+      <span class="block-plus-icon"><svg-icon name="add"></svg-icon></span>
       <div class="item-text">添加区块</div>
     </li>
     <li
@@ -47,13 +47,6 @@
           <div v-if="blockStyle === BlockStyles.List" class="item-description">{{ item.description }}</div>
         </div>
 
-        <div v-if="blockStyle === BlockStyles.Mini" class="cell cell-time">
-          <span>{{ format(item.created_at, 'yyyy/MM/dd hh:mm:ss') }}</span>
-        </div>
-        <div v-if="blockStyle === BlockStyles.Mini" class="cell cell-created-by">
-          <span>{{ users.find((user) => user.id === item.createdBy)?.name || item.id }}</span>
-        </div>
-
         <div v-if="item.isShowProgress" class="progress-bar">
           <tiny-progress
             :text-inside="true"
@@ -68,20 +61,16 @@
         <div v-if="isBlockManage" class="block-detail">
           <div class="setting-menu" @mouseover.stop="handleSettingMouseOver" @mouseleave="handleBlockItemLeave">
             <ul class="list">
-              <tiny-tooltip content="编辑" placement="top">
-                <li class="list-item" @mousedown.stop.left="editBlock({ event: $event, item, index })">
-                  <svg-button class="list-item-svg" name="to-edit"> </svg-button>
-                </li>
-              </tiny-tooltip>
-              <tiny-tooltip content="设置" placement="top">
-                <li
-                  class="list-item"
-                  @mouseover.stop="iconSettingMove"
-                  @mousedown.stop.prevent="iconClick({ event: $event, item, index })"
-                >
-                  <svg-button class="list-item-svg" name="text-source-setting"> </svg-button>
-                </li>
-              </tiny-tooltip>
+              <li class="list-item" @mousedown.stop.left="editBlock({ event: $event, item, index })">
+                <svg-button class="list-item-svg" name="to-edit"> </svg-button>
+              </li>
+              <li
+                class="list-item"
+                @mouseover.stop="iconSettingMove"
+                @mousedown.stop.prevent="iconClick({ event: $event, item, index })"
+              >
+                <svg-button class="list-item-svg" name="text-source-setting"> </svg-button>
+              </li>
             </ul>
           </div>
         </div>
@@ -140,7 +129,6 @@
 <script>
 import { computed, watch, inject, reactive } from 'vue'
 import { format } from '@opentiny/vue-renderless/common/date'
-import { iconPlus } from '@opentiny/vue-icon'
 import { Progress, Tooltip } from '@opentiny/vue'
 import PluginBlockItemImg from './PluginBlockItemImg.vue'
 import SearchEmpty from './SearchEmpty.vue'
@@ -159,7 +147,6 @@ const defaultImg =
 export default {
   components: {
     TinyProgress: Progress,
-    IconPlus: iconPlus(),
     TinyTooltip: Tooltip,
     PluginBlockItemImg,
     SvgButton,
@@ -503,16 +490,17 @@ export default {
 
     .publish-flag {
       position: absolute;
-      left: 2px;
-      top: 2px;
+      left: 4px;
+      top: 4px;
       text-align: center;
       display: block;
-      color: var(--ti-lowcode-common-secondary-text-color);
+      color: var(--te-common-text-primary);
       font-size: 12px;
-      background-color: var(--ti-lowcode-component-block-list-item-tag-bg);
-      padding: 2px;
-      border-radius: 4px 0 4px 0;
+      background-color: var(--te-common-bg-prompt);
+      padding: 2px 4px;
+      border-radius: 2px;
       transform: scale(0.9);
+      min-width: 45px;
     }
 
     &.block-item-small-list {
@@ -525,7 +513,7 @@ export default {
         margin-left: 8px;
       }
       .item-text {
-        width: calc(35% - 62px);
+        width: 50%;
       }
       .publish-flag {
         position: static;
@@ -545,6 +533,9 @@ export default {
           }
         }
       }
+      &:hover {
+        background-color: var(--te-common-bg-container);
+      }
     }
     &:nth-child(even) {
       border-right: 0;
@@ -602,7 +593,7 @@ export default {
       .item-text {
         font-size: 12px;
       }
-      .tiny-svg {
+      .svg-icon {
         font-size: 24px;
         color: var(--ti-lowcode-component-svg-button-color);
       }
diff --git a/packages/design-core/assets/plugin-icon-js.svg b/packages/design-core/assets/plugin-icon-js.svg
index 568ff176f..400f0f649 100644
--- a/packages/design-core/assets/plugin-icon-js.svg
+++ b/packages/design-core/assets/plugin-icon-js.svg
@@ -1,8 +1,24 @@
-<svg width="18.000000" height="18.000000" viewBox="0 0 18 18" fill="none" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-	<desc>
-			Created with Pixso.
-	</desc>
-	<defs/>
-	<rect id="矩形 66" width="18.000000" height="18.000000" fill="#C4C4C4" fill-opacity="0"/>
-	<path id="JS" d="M10.11 14.56Q11.09 14.83 12.15 14.83Q13.38 14.83 14.34 14.43C14.98 14.16 15.47 13.78 15.82 13.3C16.17 12.81 16.35 12.25 16.35 11.61Q16.35 10.76 15.94 10.2Q15.87 10.1 15.79 10.01C15.42 9.61 14.95 9.31 14.39 9.11C13.83 8.91 13.05 8.69 12.07 8.45C11.16 8.23 10.49 7.98 10.05 7.7C9.62 7.41 9.4 6.98 9.4 6.41Q9.4 5.81 9.67 5.37Q9.84 5.07 10.14 4.85C10.64 4.47 11.34 4.29 12.23 4.29Q13.19 4.29 13.87 4.55Q14.55 4.8 15.35 5.45C15.54 5.57 15.7 5.63 15.82 5.63Q15.87 5.63 15.91 5.62Q16.03 5.58 16.12 5.46Q16.17 5.4 16.2 5.32Q16.25 5.21 16.25 5.07Q16.25 4.99 16.24 4.93Q16.19 4.7 15.99 4.5C15.55 4.07 15 3.74 14.35 3.5C13.69 3.27 12.99 3.16 12.23 3.16Q11.02 3.16 10.07 3.57Q9.25 3.92 8.75 4.54Q8.67 4.63 8.6 4.73Q8.42 4.99 8.3 5.27Q8.07 5.81 8.07 6.46Q8.07 7.4 8.52 8.02Q8.56 8.06 8.6 8.11Q8.64 8.16 8.68 8.21Q9.19 8.77 9.97 9.08C10.54 9.31 11.27 9.53 12.15 9.73C12.81 9.88 13.34 10.03 13.72 10.17C14.11 10.31 14.43 10.49 14.67 10.73C14.9 10.96 15.02 11.26 15.02 11.64Q15.02 12.22 14.76 12.65Q14.58 12.95 14.27 13.17C13.78 13.52 13.07 13.7 12.14 13.7Q11.11 13.7 10.2 13.37Q9.41 13.08 8.7 12.53C8.54 12.41 8.39 12.35 8.25 12.35C8.13 12.35 8.03 12.41 7.94 12.52Q7.89 12.59 7.86 12.66Q7.81 12.78 7.81 12.92Q7.81 13.1 7.88 13.24Q7.94 13.38 8.06 13.49Q8.72 14.1 9.83 14.47Q9.97 14.52 10.11 14.56ZM1.85 14.67C1.99 14.77 2.2 14.81 2.47 14.78L2.95 14.75Q4.28 14.68 4.96 13.97Q4.99 13.95 5.01 13.92Q5.69 13.17 5.69 11.67L5.69 3.88Q5.69 3.63 5.57 3.46Q5.55 3.42 5.51 3.39C5.39 3.26 5.23 3.2 5.03 3.2Q4.87 3.2 4.74 3.26Q4.64 3.31 4.55 3.39C4.43 3.51 4.36 3.68 4.36 3.88L4.36 11.66Q4.36 12.68 3.95 13.14C3.68 13.45 3.27 13.62 2.72 13.65L2.24 13.68C1.84 13.69 1.64 13.88 1.64 14.23C1.64 14.43 1.71 14.58 1.85 14.67Z" fill="#191919" fill-opacity="1.000000" fill-rule="evenodd"/>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 26.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 132 132" style="enable-background:new 0 0 132 132;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:none;}
+	.st1{fill-rule:evenodd;clip-rule:evenodd;fill:currentColor}
+</style>
+<rect id="size" class="st0" width="132" height="132"/>
+<path id="JS" class="st1" d="M72.1,108.2c4.8,1.3,9.8,2,15,2c6,0,11.4-1,16.1-2.9c4.7-2,8.3-4.8,10.9-8.3c2.6-3.6,3.9-7.7,3.9-12.4
+	c0-4.2-1-7.6-3-10.3c-0.3-0.5-0.7-1-1.1-1.4c-2.7-2.9-6.2-5.1-10.3-6.6c-4.1-1.5-9.8-3.1-17-4.8C79.9,61.9,75,60.1,71.8,58
+	c-3.3-2.2-4.9-5.4-4.9-9.6c0-2.9,0.7-5.5,2-7.6c0.8-1.5,2-2.7,3.4-3.8c3.7-2.8,8.8-4.1,15.3-4.1c4.7,0,8.7,0.6,12,1.9
+	c3.3,1.2,6.9,3.4,10.9,6.6c1.4,0.9,2.6,1.3,3.4,1.3c0.2,0,0.5,0,0.7-0.1c0.6-0.2,1.1-0.6,1.5-1.2c0.2-0.3,0.4-0.6,0.6-1
+	c0.2-0.5,0.4-1.1,0.4-1.8c0-0.4,0-0.7-0.1-1c-0.2-1.1-0.9-2.2-1.8-3.2c-3.2-3.2-7.3-5.6-12-7.3c-4.8-1.7-10-2.5-15.5-2.5
+	c-5.9,0-11.2,1-15.8,3c-4,1.7-7.2,4.1-9.7,7.1c-0.4,0.4-0.8,0.9-1.1,1.4c-0.9,1.3-1.6,2.6-2.2,4c-1.1,2.6-1.7,5.5-1.7,8.7
+	c0,4.6,1.1,8.4,3.3,11.4c0.2,0.2,0.4,0.4,0.6,0.7c0.2,0.2,0.4,0.5,0.6,0.7c2.5,2.7,5.6,4.9,9.5,6.4c4.2,1.7,9.5,3.3,16,4.8
+	C92,73.9,95.9,75,98.7,76c2.9,1,5.2,2.3,7,4.1c1.7,1.7,2.6,3.9,2.6,6.7c0,2.8-0.6,5.3-1.9,7.4c-0.9,1.5-2.1,2.7-3.6,3.8
+	c-3.6,2.6-8.8,3.9-15.6,3.9c-5,0-9.8-0.8-14.2-2.4c-3.9-1.4-7.5-3.5-11-6.2c-1.2-0.9-2.3-1.3-3.3-1.3c-0.9,0-1.6,0.4-2.3,1.2
+	c-0.2,0.3-0.4,0.7-0.6,1c-0.2,0.6-0.4,1.2-0.4,1.9c0,0.9,0.2,1.7,0.5,2.3c0.3,0.7,0.7,1.3,1.3,1.8c3.2,3,7.6,5.4,13,7.2
+	C70.7,107.8,71.4,108,72.1,108.2z M11.5,109c1,0.7,2.6,1,4.5,0.8l3.5-0.2c6.5-0.3,11.4-2.2,14.7-5.7c0.1-0.1,0.3-0.2,0.4-0.4
+	c3.3-3.7,5-9.2,5-16.5V29.9c0-1.2-0.3-2.2-0.9-3.1c-0.1-0.2-0.2-0.4-0.4-0.5c-0.9-1-2.1-1.4-3.5-1.4c-0.8,0-1.5,0.1-2.1,0.4
+	c-0.5,0.2-1,0.6-1.4,1c-0.9,0.9-1.4,2.1-1.4,3.6V87c0,5-1,8.6-3,10.9s-5,3.5-9,3.7l-3.5,0.2c-2.9,0.1-4.4,1.5-4.4,4
+	C10,107.3,10.5,108.4,11.5,109z"/>
 </svg>
diff --git a/packages/layout/src/DesignPlugins.vue b/packages/layout/src/DesignPlugins.vue
index da6240dd6..27b7c9ee6 100644
--- a/packages/layout/src/DesignPlugins.vue
+++ b/packages/layout/src/DesignPlugins.vue
@@ -227,6 +227,9 @@ export default {
     :deep(.tiny-tabs__nav.is-show-active-bar) .tiny-tabs__item {
       margin-right: 0;
     }
+    :deep(.tiny-tabs.tiny-tabs .tiny-tabs__header .tiny-tabs__nav-wrap-not-separator::after) {
+      background-color: transparent;
+    }
   }
 }
 
@@ -303,6 +306,13 @@ export default {
       svg {
         font-size: 18px;
       }
+      .public-icon {
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        width: 26px;
+        height: 26px;
+      }
     }
   }
 }
diff --git a/packages/layout/src/DesignSettings.vue b/packages/layout/src/DesignSettings.vue
index 8ad765762..c79bcaeda 100644
--- a/packages/layout/src/DesignSettings.vue
+++ b/packages/layout/src/DesignSettings.vue
@@ -105,7 +105,7 @@ export default {
       }
 
       .tiny-tabs__item__title {
-        padding-bottom: 2px;
+        padding-bottom: 6px;
       }
     }
 
diff --git a/packages/plugins/block/src/BlockGroupArrange.vue b/packages/plugins/block/src/BlockGroupArrange.vue
index f2ac355dc..a4c38be01 100644
--- a/packages/plugins/block/src/BlockGroupArrange.vue
+++ b/packages/plugins/block/src/BlockGroupArrange.vue
@@ -47,26 +47,24 @@ export default {
 
 <style lang="less" scoped>
 .footer-toolbar {
+  border-radius: 4px;
+  background-color: var(--te-common-bg-container);
   .icon-wrap {
-    width: 20px;
-    height: 20px;
-    color: var(--ti-lowcode-text-color);
+    width: 24px;
+    height: 24px;
+    color: var(--te-common-text-weaken);
     font-size: 16px;
-    border-radius: 2px;
     cursor: pointer;
     display: inline-flex;
     justify-content: center;
     align-items: center;
     transition: 0.3s;
-    &:hover {
-      color: var(--ti-lowcode-common-primary-color);
-    }
     &.active {
-      color: var(--ti-lowcode-common-primary-color);
+      border: 1px solid var(--te-common-border-active);
+      color: var(--te-common-text-primary);
+      border-radius: 4px;
+      background-color: var(--te-common-bg-default);
     }
   }
-  .icon-wrap + .icon-wrap {
-    margin-left: 8px;
-  }
 }
 </style>
diff --git a/packages/plugins/block/src/BlockSetting.vue b/packages/plugins/block/src/BlockSetting.vue
index ae060a0e1..22072c2f7 100644
--- a/packages/plugins/block/src/BlockSetting.vue
+++ b/packages/plugins/block/src/BlockSetting.vue
@@ -186,10 +186,9 @@ export default {
 
     const deleteBlock = () => {
       const title = '删除区块'
-      const status = 'custom'
       const message = '您确认删除该区块吗?'
 
-      confirm({ title, status, message, exec: removeBlock })
+      confirm({ title, message, exec: removeBlock })
     }
 
     const updateBlock = () => {
@@ -209,12 +208,10 @@ export default {
           }
         }
         const title = '保存区块'
-        const status = 'custom'
         const message = '您确认修改并保存该区块吗?'
 
         confirm({
           title,
-          status,
           message,
           exec: async () => {
             const currentId = useBlock().getCurrentBlock()?.id
diff --git a/packages/plugins/block/src/CategoryEdit.vue b/packages/plugins/block/src/CategoryEdit.vue
index 1e39b7e11..ae4bb06ee 100644
--- a/packages/plugins/block/src/CategoryEdit.vue
+++ b/packages/plugins/block/src/CategoryEdit.vue
@@ -12,7 +12,7 @@
       show-message
       :model="formData"
       :rules="rules"
-      label-width="80px"
+      label-width="64px"
       :label-align="true"
       label-position="left"
       validate-type="text"
diff --git a/packages/plugins/block/src/Main.vue b/packages/plugins/block/src/Main.vue
index 43085bebb..316f8d285 100644
--- a/packages/plugins/block/src/Main.vue
+++ b/packages/plugins/block/src/Main.vue
@@ -489,9 +489,23 @@ export default {
   right: 0;
   padding: 10px 16px;
   background-color: var(--ti-lowcode-component-search-bg);
+  box-shadow: 0 -2px 12px 0 var(--te-base-box-shadow-rgba-2);
   color: var(--ti-lowcode-component-block-list-item-color);
   display: flex;
   justify-content: space-between;
+  :deep(.tiny-dropdown) {
+    color: var(--te-common-text-primary);
+    .tiny-dropdown__trigger:not(.tiny-dropdown__caret-button):not(.is-disabled):hover {
+      color: var(--te-common-text-primary);
+    }
+    .tiny-dropdown__suffix-inner {
+      color: var(--te-common-icon-secondary);
+      height: 10px;
+    }
+  }
+  :deep(.tiny-dropdown-menu) {
+    padding: var(--te-common-vertical-form-label-spacing) 0;
+  }
   .footer-layout {
     font-size: 12px;
     color: var(--ti-lowcode-component-block-list-item-color);
@@ -512,6 +526,17 @@ export default {
   height: 24px;
   line-height: 24px;
 }
+:deep(.tiny-dropdown-item) {
+  &:not(.is-disabled):active,
+  &:not(.is-disabled):hover,
+  &:focus {
+    background-color: var(--te-common-bg-container);
+    color: var(--te-common-text-primary);
+  }
+}
+:deep(.tiny-dropdown-menu.tiny-popper[x-placement^='top']) {
+  padding: var(--te-common-vertical-form-label-spacing) 0;
+}
 </style>
 
 <style lang="less">
@@ -552,4 +577,7 @@ export default {
     margin-top: 22px;
   }
 }
+.tiny-dropdown-menu.tiny-dropdown-menu {
+  padding: var(--te-common-vertical-form-label-spacing) 0;
+}
 </style>
diff --git a/packages/plugins/block/src/SaveNewBlock.vue b/packages/plugins/block/src/SaveNewBlock.vue
index 28fdb0476..8e26de1b6 100644
--- a/packages/plugins/block/src/SaveNewBlock.vue
+++ b/packages/plugins/block/src/SaveNewBlock.vue
@@ -13,7 +13,7 @@
         :model="formData"
         :rules="rules"
         ref="formRef"
-        label-width="120px"
+        label-width="64px"
         :label-align="true"
         label-position="left"
         validate-type="text"
@@ -24,7 +24,7 @@
         <tiny-form-item label="区块ID" prop="label">
           <TinyInput v-model="formData.label" placeholder="请输入区块ID"></TinyInput>
         </tiny-form-item>
-        <tiny-form-item label="请选择区块分类" prop="group">
+        <tiny-form-item label="区块分类" prop="group">
           <tiny-select v-model="formData.group" :options="categoryList" placeholder="请选择" @change="changeCategory">
           </tiny-select>
         </tiny-form-item>
diff --git a/packages/plugins/bridge/src/BridgeSetting.vue b/packages/plugins/bridge/src/BridgeSetting.vue
index c747286a8..47b799801 100644
--- a/packages/plugins/bridge/src/BridgeSetting.vue
+++ b/packages/plugins/bridge/src/BridgeSetting.vue
@@ -364,11 +364,11 @@ export default {
 }
 
 .code-preview {
-  font-size: 14px;
+  font-size: 12px;
   line-height: 20px;
-  color: var(--ti-lowcode-birdge-code-preview-color);
-  background-color: var(--ti-lowcode-birdge-code-preview-bg-color);
-  border-radius: 6px;
+  background: var(--te-common-bg-container);
+  color: var(--te-common-text-weaken);
+  border-radius: 4px;
 
   & .pre-title {
     font-family: Microsoft YaHei;
diff --git a/packages/plugins/datasource/src/DataSourceField.vue b/packages/plugins/datasource/src/DataSourceField.vue
index 88e5227b4..719f76392 100644
--- a/packages/plugins/datasource/src/DataSourceField.vue
+++ b/packages/plugins/datasource/src/DataSourceField.vue
@@ -3,7 +3,7 @@
     <span class="title">
       <span class="title">数据源字段</span>
       <div class="btn">
-        <tiny-button @click="openNewFieldForm">添加字段</tiny-button>
+        <tiny-button @click="openNewFieldForm"><svg-icon name="add"></svg-icon>添加字段</tiny-button>
         <tiny-button @click="$emit('openRemotePanel')">{{ editable ? '修改远程配置' : '获取远程字段' }}</tiny-button>
       </div>
     </span>
diff --git a/packages/plugins/datasource/src/DataSourceRecordList.vue b/packages/plugins/datasource/src/DataSourceRecordList.vue
index d23a72c8d..ef8e8f56d 100644
--- a/packages/plugins/datasource/src/DataSourceRecordList.vue
+++ b/packages/plugins/datasource/src/DataSourceRecordList.vue
@@ -12,7 +12,7 @@
     <template #content>
       <div class="actions">
         <tiny-button plain :disabled="!allowCreate" @click.stop="insertNewData"
-          ><icon-plus class="btn-icon"></icon-plus>新增静态数据</tiny-button
+          ><svg-icon name="add" class="btn-icon"></svg-icon>新增静态数据</tiny-button
         >
         <tiny-button plain :disabled="state.isBatchDeleteDisable" @click.stop="batchDelete"
           ><svg-icon class="btn-icon" name="delete"></svg-icon>删除</tiny-button
@@ -81,7 +81,7 @@
 import { reactive, ref, watchEffect, watch, computed } from 'vue'
 import { camelize, capitalize } from '@vue/shared'
 import { Grid, Pager, Input, Numeric, DatePicker, Switch, Slider, Link, Button } from '@opentiny/vue'
-import { iconPlus, iconUpload } from '@opentiny/vue-icon'
+import { iconUpload } from '@opentiny/vue-icon'
 import { PluginSetting } from '@opentiny/tiny-engine-common'
 import { utils } from '@opentiny/tiny-engine-utils'
 import { useModal, useLayout, useNotify, useCanvas } from '@opentiny/tiny-engine-meta-register'
@@ -108,7 +108,6 @@ export default {
     DataSourceRecordUpload,
     TinyLink: Link,
     TinyButton: Button,
-    IconPlus: iconPlus(),
     IconUpload: iconUpload()
   },
   props: {
@@ -595,19 +594,6 @@ export default {
       font-size: 14px;
     }
   }
-  :deep(.tiny-button--default) {
-    height: 24px;
-    line-height: 24px;
-    display: flex;
-    align-items: center;
-    border: 1px solid var(--ti-lowcode-i18n-button-border-color);
-    border-radius: 4px;
-  }
-  .btn-icon {
-    margin-right: 6px;
-    color: var(--ti-lowcode-datasource-tip-color);
-    font-size: 12px;
-  }
   .download {
     margin: 0 12px;
     text-decoration: underline;
diff --git a/packages/plugins/datasource/src/DataSourceRemoteAutoload.vue b/packages/plugins/datasource/src/DataSourceRemoteAutoload.vue
index d1f8fa1fd..628b22f6f 100644
--- a/packages/plugins/datasource/src/DataSourceRemoteAutoload.vue
+++ b/packages/plugins/datasource/src/DataSourceRemoteAutoload.vue
@@ -40,7 +40,7 @@ export default {
 .request-load {
   display: flex;
   margin-bottom: 15px;
-  margin-top: -10px;
+  margin-top: 10px;
 
   .use-service {
     color: var(--ti-lowcode-datasource-color);
diff --git a/packages/plugins/datasource/src/Main.vue b/packages/plugins/datasource/src/Main.vue
index 1c5565927..2f4771218 100644
--- a/packages/plugins/datasource/src/Main.vue
+++ b/packages/plugins/datasource/src/Main.vue
@@ -16,7 +16,9 @@
       ></svg-button>
     </template>
     <template #content>
-      <tiny-button class="add-data-source" @click="openDataSourceFormPanel()"> 添加数据源 </tiny-button>
+      <tiny-button class="add-data-source" @click="openDataSourceFormPanel()">
+        <svg-icon name="add"></svg-icon>添加数据源
+      </tiny-button>
       <data-source-list @edit="openDataSourceFormPanel"></data-source-list>
     </template>
   </plugin-panel>
@@ -150,17 +152,8 @@ export default {
   margin-right: 6px !important;
   color: var(--ti-lowcode-datasource-btn-click-color);
 }
-:deep(button.tiny-button.tiny-button--default) {
-  border-color: var(--ti-lowcode-datasource-border-color);
-}
 .add-data-source {
   margin: 0 12px 12px 12px;
-  color: var(--ti-lowcode-datasource-color);
-
-  &:hover {
-    color: var(--ti-lowcode-meta-codeEditor-hover-color);
-    border-color: var(--ti-lowcode-meta-codeEditor-border-hover-color);
-  }
 }
 :deep(.help-box) {
   position: absolute;
diff --git a/packages/plugins/help/src/HelpIcon.vue b/packages/plugins/help/src/HelpIcon.vue
index 14bb9ef37..bf396e08b 100644
--- a/packages/plugins/help/src/HelpIcon.vue
+++ b/packages/plugins/help/src/HelpIcon.vue
@@ -9,7 +9,7 @@
       id="help-icon-popover"
     >
       <template #reference>
-        <div title="帮助">
+        <div title="帮助" class="help-plugin-reference">
           <svg-icon name="plugin-icon-plugin-help"></svg-icon>
         </div>
       </template>
@@ -264,6 +264,9 @@ export default {
   margin-left: 20px;
   cursor: pointer;
 }
+.help-plugin-reference {
+  display: flex;
+}
 </style>
 
 <!-- tiny-guide在body元素上，所以不使用scoped -->
diff --git a/packages/plugins/i18n/src/Main.vue b/packages/plugins/i18n/src/Main.vue
index e41bd7d10..40772c8a3 100644
--- a/packages/plugins/i18n/src/Main.vue
+++ b/packages/plugins/i18n/src/Main.vue
@@ -18,7 +18,9 @@
         </tiny-input>
       </div>
       <div class="btn-box">
-        <tiny-button @click="openEditor($event, {})"><icon-plus class="btn-icon"></icon-plus>添加词条</tiny-button>
+        <tiny-button @click="openEditor($event, {})">
+          <svg-icon name="add" class="btn-icon"></svg-icon>添加词条
+        </tiny-button>
         <tiny-button class="middle-btn" @click="batchDelete" :disabled="!selectedRowLength"
           ><svg-icon class="btn-icon" name="delete"></svg-icon>删除</tiny-button
         >
@@ -124,7 +126,7 @@
 import { computed, ref, watchEffect, reactive, onMounted, nextTick, resolveComponent } from 'vue'
 import useClipboard from 'vue-clipboard3'
 import { Grid, GridColumn, Input, Popover, Button, FileUpload, Loading, Tooltip, Select } from '@opentiny/vue'
-import { iconLoadingShadow, iconPlus, iconUpload } from '@opentiny/vue-icon'
+import { iconLoadingShadow, iconUpload } from '@opentiny/vue-icon'
 import { PluginPanel, SearchEmpty } from '@opentiny/tiny-engine-common'
 import { useTranslate, useModal, useHelp, getMetaApi, META_SERVICE } from '@opentiny/tiny-engine-meta-register'
 import { getMergeMeta } from '@opentiny/tiny-engine-meta-register'
@@ -143,7 +145,6 @@ export default {
     TinySelect: Select,
     TinyFileUpload: FileUpload,
     SearchEmpty,
-    IconPlus: iconPlus(),
     IconUpload: iconUpload()
   },
   setup() {
@@ -281,7 +282,6 @@ export default {
       confirm({
         title: '批量删除',
         message: `您确定删除 ${i18nData.length} 条数据吗？`,
-        status: 'warning',
         exec: () => {
           const keys = i18nData.map(({ key }) => key)
           useTranslate().removeI18n(keys)
@@ -432,6 +432,9 @@ export default {
 </script>
 
 <style lang="less" scoped>
+.plugin-panel-i18n {
+  box-shadow: 6px 0px 3px 0px rgba(0, 0, 0, 0.05);
+}
 .stripe-tiny-grid {
   word-wrap: break-word;
   #empty-loading-box {
@@ -468,6 +471,14 @@ export default {
   .tiny-select {
     width: 210px;
   }
+  :deep(.tiny-input) {
+    .tiny-input__prefix {
+      line-height: 1;
+    }
+    &.tiny-input-prefix .tiny-input__inner {
+      padding: 0 8px 0 26px;
+    }
+  }
 }
 
 .btn-box {
@@ -478,23 +489,13 @@ export default {
   display: flex;
   align-items: center;
   .btn-icon {
-    margin-right: 6px;
-    color: var(--ti-lowcode-i18n-icon-color);
+    font-size: 16px;
+    color: var(--te-common-icon-secondary);
+    margin-right: 4px;
   }
   .middle-btn {
     margin-left: 0;
   }
-  :deep(.tiny-file-upload) {
-    margin-right: 8px;
-  }
-  :deep(.tiny-button--default) {
-    height: 24px;
-    line-height: 24px;
-    display: flex;
-    align-items: center;
-    border: 1px solid var(--ti-lowcode-i18n-button-border-color);
-    border-radius: 4px;
-  }
   span {
     padding-left: 12px;
   }
@@ -510,7 +511,7 @@ export default {
   }
   .download-btn {
     cursor: pointer;
-    text-decoration: underline;
+    text-decoration: none;
     display: inline-block;
     font-size: 12px;
     text-align: left;
@@ -522,6 +523,9 @@ export default {
     .tiny-button.tiny-button--text {
       color: var(--ti-lowcode-base-text-color);
     }
+    &:hover {
+      text-decoration: underline;
+    }
   }
 }
 
@@ -531,6 +535,12 @@ export default {
   padding: 12px;
   border-top: 1px solid var(--ti-lowcode-i18n-border-color);
   overflow-y: scroll;
+  &::-webkit-scrollbar-thumb {
+    background-color: var(--te-common-border-default);
+  }
+  &::-webkit-scrollbar-thumb:hover {
+    background-color: var(--te-common-border-hover);
+  }
 
   .operation-column {
     display: flex;
@@ -574,6 +584,7 @@ export default {
     display: flex;
     justify-content: space-between;
     :deep(.icon) {
+      color: var(--te-common-icon-secondary);
       svg {
         font-size: 16px;
       }
diff --git a/packages/plugins/materials/src/meta/block/src/BlockDetail.vue b/packages/plugins/materials/src/meta/block/src/BlockDetail.vue
index fb4f5863c..0e211e27b 100644
--- a/packages/plugins/materials/src/meta/block/src/BlockDetail.vue
+++ b/packages/plugins/materials/src/meta/block/src/BlockDetail.vue
@@ -71,7 +71,6 @@ export default {
     const deleteBlock = (blockId) => {
       const groupId = selectedGroup.value.groupId
       const title = '删除区块'
-      const status = 'custom'
       const messageRender = {
         render: () => <span>{'您确定要删除该区块吗?'}</span>
       }
diff --git a/packages/plugins/materials/src/meta/block/src/BlockList.vue b/packages/plugins/materials/src/meta/block/src/BlockList.vue
index 1cd41f5aa..d93cc7920 100644
--- a/packages/plugins/materials/src/meta/block/src/BlockList.vue
+++ b/packages/plugins/materials/src/meta/block/src/BlockList.vue
@@ -168,8 +168,7 @@ export default {
       const groupId = id || selectedGroup.value.groupId
       const groupName = name || selectedGroup.value.groupName
 
-      const title = `删除区块${label}`
-      const status = 'error'
+      const title = `移除区块${label}`
       const messageRender = {
         render: () => (
           <span>
@@ -192,10 +191,10 @@ export default {
             })
           })
           .catch((error) => {
-            message({ message: `删除区块失败: ${error.message || error}`, status: 'error' })
+            message({ message: `移除区块失败: ${error.message || error}`, status: 'error' })
           })
       }
-      confirm({ title, status, message: messageRender, exec })
+      confirm({ title, message: messageRender, exec })
     }
 
     const checkAll = (items) => {
diff --git a/packages/plugins/materials/src/meta/block/src/BlockVersionSelect.vue b/packages/plugins/materials/src/meta/block/src/BlockVersionSelect.vue
index 9d23d755a..00d8dfb37 100644
--- a/packages/plugins/materials/src/meta/block/src/BlockVersionSelect.vue
+++ b/packages/plugins/materials/src/meta/block/src/BlockVersionSelect.vue
@@ -67,7 +67,7 @@ export default {
           state.backupList = data.histories?.reverse?.() || []
         })
         .catch((error) => {
-          message({ message: `获取区块版本失败: ${error.message || error}`, status: 'error' })
+          message({ message: `获取区块版本失败: ${error.message || error}`, title: '区块版本获取失败' })
         })
     }
 
@@ -97,8 +97,8 @@ export default {
               })
               .catch((error) => {
                 message({
-                  message: `${selectedBlock.value.label}区块切换版本失败：${error.message || error}`,
-                  status: 'error'
+                  title: '切换区块版本失败',
+                  message: `${selectedBlock.value.label}区块切换版本失败：${error.message || error}`
                 })
               })
           }
diff --git a/packages/plugins/materials/src/meta/component/src/Main.vue b/packages/plugins/materials/src/meta/component/src/Main.vue
index 9a5e2a2c1..c45ea3c31 100644
--- a/packages/plugins/materials/src/meta/component/src/Main.vue
+++ b/packages/plugins/materials/src/meta/component/src/Main.vue
@@ -136,13 +136,18 @@ export default {
     padding: 12px;
   }
 
+  :deep(.tiny-collapse-item__content) {
+    padding: 0 var(--te-common-vertical-form-label-spacing) 4px;
+  }
+
   .component-group {
     display: grid;
     width: 100%;
     color: var(--ti-lowcode-materials-component-list-color);
 
     .component-item {
-      padding: 12px 0;
+      padding: var(--te-common-vertical-form-label-spacing) 0 var(--te-common-vertical-form-label-spacing);
+      margin-bottom: var(--te-common-vertical-form-label-spacing);
       text-align: center;
       user-select: none;
       cursor: move;
diff --git a/packages/plugins/materials/src/meta/layout/src/Main.vue b/packages/plugins/materials/src/meta/layout/src/Main.vue
index f2534ad74..35692b1ba 100644
--- a/packages/plugins/materials/src/meta/layout/src/Main.vue
+++ b/packages/plugins/materials/src/meta/layout/src/Main.vue
@@ -108,6 +108,16 @@ export default {
   }
 }
 
+:deep(.tiny-tabs__item:first-child) {
+  border-top-left-radius: var(--te-base-border-radius-1);
+  border-bottom-left-radius: var(--te-base-border-radius-1);
+}
+
+:deep(.tiny-tabs__item:last-child) {
+  border-top-right-radius: var(--te-base-border-radius-1);
+  border-bottom-right-radius: var(--te-base-border-radius-1);
+}
+
 .tiny-collapse {
   flex: 1;
   overflow-y: scroll;
diff --git a/packages/plugins/page/src/PageTree.vue b/packages/plugins/page/src/PageTree.vue
index 6ac076279..94466026b 100644
--- a/packages/plugins/page/src/PageTree.vue
+++ b/packages/plugins/page/src/PageTree.vue
@@ -247,8 +247,7 @@ export default {
         const username = node.data.occupier?.username || ''
 
         useModal().message({
-          message: `您点击的页面被${username}锁定，暂时无法编辑，请联系解锁`,
-          status: 'info'
+          message: `您点击的页面被${username}锁定，暂时无法编辑，请联系解锁`
         })
 
         return
diff --git a/packages/plugins/schema/src/Main.vue b/packages/plugins/schema/src/Main.vue
index aa9df3f78..2302ae16f 100644
--- a/packages/plugins/schema/src/Main.vue
+++ b/packages/plugins/schema/src/Main.vue
@@ -141,20 +141,22 @@ export default {
 
 <style lang="less" scoped>
 #source-code {
-  width: 45vw;
+  width: 50vw;
   height: calc(100% - var(--base-top-panel-height));
-  padding: 12px;
+  padding: 12px 0;
   position: fixed;
   top: var(--base-top-panel-height);
   left: 41px;
   background: var(--ti-lowcode-common-component-bg);
-  box-shadow: 2px 2px 6px rgb(0 0 0 / 60%);
+  box-shadow: 6px 0px 3px 0px rgba(0, 0, 0, 0.05);
   z-index: 1000;
   .source-code-header {
     display: flex;
     justify-content: space-between;
-    border-bottom: 1px solid var(--ti-lowcode-toolbar-border-color);
+    align-items: center;
+    border-bottom: 1px solid var(--te-common-border-divider);
     margin-bottom: 12px;
+    padding: 0 12px 12px;
   }
   .title {
     color: var(--ti-lowcode-plugin-panel-title-color);
@@ -164,7 +166,6 @@ export default {
     display: flex;
     justify-content: flex-end;
     align-items: center;
-    margin-bottom: 10px;
     .icon-wrap {
       .tiny-button {
         width: 40px;
@@ -194,6 +195,7 @@ export default {
     height: calc(100% - 42px);
     border: 1px solid var(--ti-lowcode-base-gray-101);
     border-radius: 4px;
+    margin: 0 12px;
   }
   .code-edit-content {
     height: 100%;
diff --git a/packages/plugins/script/src/Main.vue b/packages/plugins/script/src/Main.vue
index a4d1251cd..ae7b3fda9 100644
--- a/packages/plugins/script/src/Main.vue
+++ b/packages/plugins/script/src/Main.vue
@@ -113,11 +113,11 @@ export default {
     display: flex;
     justify-content: space-between;
     align-items: center;
-    border-bottom: 1px solid var(--ti-lowcode-plugin-js-head-border-bottom-color);
-    padding: 10px 0;
+    border-bottom: 1px solid var(--te-common-border-divider);
+    padding: 12px 0;
 
     .head-left {
-      padding-left: 15px;
+      padding-left: 12px;
       display: flex;
       align-items: center;
       .title {
@@ -137,7 +137,7 @@ export default {
     }
 
     .head-right {
-      margin-right: 20px;
+      margin-right: 12px;
       display: flex;
       align-items: center;
 
@@ -145,7 +145,7 @@ export default {
         width: 40px;
         padding: 0;
         min-width: 40px;
-        margin-right: 2px;
+        margin-right: 12px;
         height: 24px;
         line-height: 24px;
         .dots {
@@ -158,11 +158,14 @@ export default {
           right: 40px;
         }
       }
+      .icon-wrap {
+        width: auto;
+      }
     }
   }
 
   .code-edit-content {
-    padding: 12px 20px;
+    padding: 12px;
     height: calc(100% - 54px);
 
     & > div {
diff --git a/packages/plugins/state/src/CreateVariable.vue b/packages/plugins/state/src/CreateVariable.vue
index 846ac3144..be4bcaa05 100644
--- a/packages/plugins/state/src/CreateVariable.vue
+++ b/packages/plugins/state/src/CreateVariable.vue
@@ -53,13 +53,13 @@
             <template #fullscreenFooter>
               <div class="fullscreen-footer-content">
                 <div class="tips">
-                  <pre><code>{{ getterExample }}</code></pre>
+                  <pre>{{ getterExample }}</pre>
                 </div>
               </div>
             </template>
           </monaco-editor>
           <div class="tips">
-            <pre><code>{{ getterExample }}</code></pre>
+            <pre>{{ getterExample }}</pre>
           </div>
         </tiny-form-item>
       </tiny-collapse-item>
@@ -72,13 +72,13 @@
             <template #fullscreenFooter>
               <div class="fullscreen-footer-content">
                 <div class="tips">
-                  <pre><code>{{ setterExample }}</code></pre>
+                  <pre>{{ setterExample }}</pre>
                 </div>
               </div>
             </template>
           </monaco-editor>
           <div class="tips">
-            <pre><code>{{ setterExample }}</code></pre>
+            <pre>{{ setterExample }}</pre>
           </div>
         </tiny-form-item>
       </tiny-collapse-item>
@@ -409,13 +409,16 @@ export default {
   height: calc(100% - 45px);
   overflow-y: auto;
   .tips {
-    font-size: 11px;
+    font-size: 12px;
     line-height: 18px;
     margin-top: 8px;
     border-radius: 4px;
     padding: 8px 14px;
     background: var(--te-common-bg-container);
-    color: var(--ti-lowcode-datasource-tip-color);
+    color: var(--te-common-text-weaken);
+    & > pre {
+      font-family: Consolas, 'Courier New', monospace;
+    }
   }
   :deep(.toolbar) {
     position: absolute;
diff --git a/packages/plugins/state/src/Main.vue b/packages/plugins/state/src/Main.vue
index 879479c66..61f5756b4 100644
--- a/packages/plugins/state/src/Main.vue
+++ b/packages/plugins/state/src/Main.vue
@@ -22,10 +22,10 @@
         </template>
       </tiny-search>
       <div class="add-btn">
-        <tiny-button @click="openPanel(OPTION_TYPE.ADD)"
-          ><icon-plus class="icon-plus"></icon-plus
-          >{{ activeName === STATE.CURRENT_STATE ? '添加变量' : '添加全局变量' }}</tiny-button
-        >
+        <tiny-button @click="openPanel(OPTION_TYPE.ADD)">
+          <svg-icon name="add" class="add-btn-icon"></svg-icon>
+          <span class="add-btn-text">{{ activeName === STATE.CURRENT_STATE ? '添加变量' : '添加全局变量' }}</span>
+        </tiny-button>
       </div>
       <data-source-list
         :modelValue="Object.keys(state.dataSource)"
@@ -82,7 +82,6 @@ import {
   META_APP,
   META_SERVICE
 } from '@opentiny/tiny-engine-meta-register'
-import { iconPlus } from '@opentiny/vue-icon'
 import { getCommentByKey } from '@opentiny/tiny-engine-common/js/comment'
 import { iconSearch } from '@opentiny/vue-icon'
 import { CloseIcon, LinkButton } from '@opentiny/tiny-engine-common'
@@ -104,8 +103,7 @@ export default {
     TinyTabItem: TabItem,
     CreateStore,
     LinkButton,
-    TinyIconSearch: iconSearch(),
-    IconPlus: iconPlus()
+    TinyIconSearch: iconSearch()
   },
   setup(props, { emit }) {
     const variableRef = ref(null)
@@ -401,10 +399,19 @@ export default {
       .tiny-button {
         width: 100%;
         border-color: var(--te-common-border-default);
+        &:hover {
+          border-color: var(--te-common-border-hover);
+        }
       }
-      .icon-plus {
+      .add-btn-icon {
         margin-right: 4px;
+        font-size: 16px;
         stroke: var(--ti-lowcode-chat-model-button-text);
+        color: var(--te-common-icon-secondary);
+        vertical-align: sub;
+      }
+      .add-btn-text {
+        display: inline-block;
       }
     }
 
@@ -421,7 +428,7 @@ export default {
     }
 
     .left-filter {
-      margin-top: 12px;
+      margin-top: 4px;
       padding: 0 10px;
     }
 
diff --git a/packages/settings/events/src/components/BindEvents.vue b/packages/settings/events/src/components/BindEvents.vue
index 5dfade520..181d9fddc 100644
--- a/packages/settings/events/src/components/BindEvents.vue
+++ b/packages/settings/events/src/components/BindEvents.vue
@@ -12,7 +12,7 @@
         <template #reference>
           <tiny-button class="bind-event-btn">
             <span>绑定事件</span>
-            <icon-chevron-down class="icon-chevron-down"></icon-chevron-down>
+            <icon-chevron-down class="icon-chevron-down bind-event-btn-icon"></icon-chevron-down>
           </tiny-button>
         </template>
         <ul class="bind-event-list">
@@ -319,24 +319,15 @@ export default {
       }
     }
     .add-custom-event-button {
-      padding: 0 16px;
-      font-size: 12px;
       margin-right: 0;
-      .custom-event-button-text {
-        display: inline-block;
-        vertical-align: middle;
-      }
-      .custom-event-button-icon {
-        display: inline-block;
-        vertical-align: middle;
-        color: var(--ti-lowcode-events-custom-icon-color);
-        font-size: 13px;
-      }
     }
     .bind-event-btn {
       padding: 0 16px;
-      font-size: 12px;
       width: 100%;
+      .bind-event-btn-icon {
+        margin-right: 0;
+        margin-left: 4px;
+      }
     }
   }
   .empty-action {
diff --git a/packages/theme/base/src/component-common.less b/packages/theme/base/src/component-common.less
index d4b0c8b6e..29d76ff19 100644
--- a/packages/theme/base/src/component-common.less
+++ b/packages/theme/base/src/component-common.less
@@ -120,7 +120,7 @@
     border-bottom-style: none;
 
     .tiny-collapse-item__word-overflow {
-      margin: var(--te-common-vertical-item-spacing-normal) 0px;
+      margin: var(--te-common-vertical-item-spacing-normal) 0px var(--te-common-vertical-form-label-spacing);
       width: 100%;
       line-height: var(--te-base-line-height-4);
     }
@@ -226,15 +226,19 @@
 }
 
 // 6、search组件
-.tiny-search.tiny-search {
+.tiny-search.tiny-search.tiny-search {
   .tiny-search__line {
     height: 24px;
     border-radius: var(--te-base-border-radius-1);
     border: 1px solid var(--te-common-border-default);
     font-size: var(--te-base-font-size-base);
   }
+  .focus {
+    border-color: var(--te-common-border-active);
+  }
   .tiny-search__input {
-    padding: 0 8px 0 12px;
+    padding: 0 8px 0 4px;
+    color: var(--te-common-text-primary);
   }
   .tiny-search__input-btn {
     a {
@@ -246,6 +250,16 @@
     font-size: var(--te-base-font-size-2);
     color: var(--te-common-text-weaken);
   }
+  .tiny-search__prefix {
+    color: var(--te-common-icon-disabled);
+    svg {
+      margin-left: var(--te-common-vertical-form-label-spacing);
+    }
+  }
+  input::-webkit-input-placeholder {
+    color: var(--te-common-text-weaken);
+    font-size: 12px;
+  }
 }
 
 // 7、dialog组件
@@ -253,18 +267,31 @@
   padding: 20px;
   background-color: var(--te-common-bg-popover);
   .tiny-dialog-box__header {
+    height: auto;
     font-size: var(--te-base-font-size-1);
     color: var(--te-common-text-primary);
     padding: 0;
-    background-color: var(--te-common-bg-popover);
     .tiny-dialog-box__close {
-      color: var(--te-common-text-primary);
+      font-size: var(--ti-common-font-size-2);
+      color: var(--te-common-icon-secondary);
+      position: absolute;
+      top: -4px;
+      right: -4px;
+      &:hover {
+        color: var(--te-common-icon-primary);
+      }
     }
   }
   .tiny-dialog-box__body {
     color: var(--te-common-text-secondary);
     padding: 0;
     margin-top: 16px;
+    .tiny-form-item.is-text.is-no-asterisk.tiny-form-item--default {
+      margin-bottom: 12px;
+      &:last-of-type {
+        margin-bottom: 0px;
+      }
+    }
   }
   .tiny-dialog-box__footer {
     margin-top: 16px;
@@ -285,20 +312,24 @@
 }
 
 // 8、button按钮
-.tiny-button.tiny-button {
+.tiny-button.tiny-button.tiny-button {
   font-size: var(--te-base-font-size-base);
   border-radius: var(--te-base-border-radius-1);
   padding: 0 12px;
   height: 24px;
   line-height: 24px;
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
   // 默认按钮
   &.tiny-button--default {
-    border: 1px solid var(--te-common-border-secondary);
+    border: 1px solid var(--te-common-border-default);
     color: var(--te-common-text-primary);
     background-color: var(--te-common-bg-default);
     margin-right: 8px;
-    &:hover {
-      border: 1px solid var(--te-common-border-hover);
+    &:not(.is-disabled):hover {
+      color: var(--te-common-text-primary);
+      border-color: var(--te-common-border-hover);
     }
   }
   // 确认按钮
@@ -327,10 +358,23 @@
       text-decoration: none;
     }
   }
+  &.is-disabled {
+    background-color: var(--te-common-bg-disabled);
+    color: var(--te-common-text-disabled);
+    .btn-icon {
+      color: var(--te-common-icon-disabled);
+    }
+  }
   // 图标按钮
   &:not(.is-circle) .tiny-svg.is-text {
     margin-right: 4px;
   }
+  .svg-icon,
+  .tiny-svg {
+    margin-right: 4px;
+    color: var(--te-common-icon-secondary);
+    font-size: 16px;
+  }
 }
 
 .tiny-button-group.tiny-button-group {
@@ -370,7 +414,7 @@
 }
 
 // 9、modal模态框
-.tiny-modal__box.tiny-modal__box {
+.tiny-modal__box.tiny-modal__box.tiny-modal__box {
   padding: 20px;
   border-radius: var(--te-base-border-radius-1);
   box-shadow: 0 0 10px 0 var(--te-base-box-shadow-rgba-1);
@@ -379,6 +423,9 @@
     font-size: var(--te-base-font-size-1);
     color: var(--te-common-text-primary);
     font-weight: var(--te-base-font-weight-4);
+    .tiny-modal__title {
+      font-weight: var(--te-base-font-weight-bold);
+    }
   }
   .tiny-modal__close-btn,
   .tiny-modal__zoom-btn {
@@ -388,16 +435,31 @@
     right: 0;
     color: var(--te-common-text-weaken);
   }
+  .tiny-modal__close-btn {
+    top: -4px;
+    right: -4px;
+    &:hover {
+      color: var(--te-common-icon-primary);
+    }
+  }
   .tiny-modal__body {
     margin-top: 12px;
     font-size: var(--te-base-font-size-base);
     color: var(--te-common-text-secondary);
+    padding: 0;
+    .tiny-modal__text {
+      font-size: var(--te-base-font-size-base);
+      color: var(--te-common-text-secondary);
+    }
   }
   .tiny-modal__footer {
     padding: 0;
     margin-top: 16px;
     display: flex;
     flex-direction: row-reverse;
+    .tiny-button {
+      min-width: 48px;
+    }
   }
 }
 
@@ -671,6 +733,10 @@
 // 18、表单
 .tiny-form.tiny-form {
   .tiny-form-item {
+    margin-bottom: 12px;
+    &:last-of-type {
+      margin-bottom: 0px;
+    }
     .tiny-form-item__label {
       color: var(--te-common-text-secondary);
       font-size: var(--te-base-font-size-base);
@@ -680,7 +746,7 @@
     padding-left: 0;
     padding-right: 16px;
   }
-  .tiny-form-item.is-text.is-required.is-no-asterisk.tiny-form-item--default {
+  .tiny-form-item.is-text.is-no-asterisk.tiny-form-item--default {
     margin-bottom: 12px;
   }
   .tiny-form-item__error--block {
@@ -690,9 +756,21 @@
     font-size: var(--te-base-font-size-base);
   }
 }
+.tiny-form--label-left.label-align .tiny-form-item.is-required .tiny-form-item__label.tiny-form-item__label {
+  padding-left: 0;
+}
+.tiny-form--label-left.label-align
+  .tiny-form-item.is-required
+  ~ .tiny-form-item
+  .tiny-form-item__label.tiny-form-item__label {
+  padding-left: 0;
+}
+.tiny-form-item__label.tiny-form-item__label {
+  padding-right: 16px;
+}
 
 // 19、表格
-.tiny-grid__wrapper.tiny-grid__wrapper {
+.tiny-grid__wrapper.tiny-grid__wrapper.tiny-grid__wrapper {
   .tiny-grid {
     font-size: var(--te-base-font-size-base);
     background-color: var(--te-common-bg-default);
@@ -708,6 +786,13 @@
             &.col__center {
               text-align: left;
             }
+            .tiny-grid-required-icon {
+              align-self: center;
+            }
+            .tiny-grid-resizable.is__line:before,
+            .tiny-grid-thead-partition.is__line:before {
+              background-color: var(--te-common-border-bg-divider);
+            }
           }
           .tiny-grid-cell {
             border-color: var(--te-common-text-secondary);
@@ -715,7 +800,7 @@
             font-size: var(--te-base-font-size-base);
             .icon-half-select,
             .icon-checked-sur {
-              color: var(--te-common-text-primary);
+              color: var(--te-common-color-info);
             }
           }
           .tiny-grid-resizable.is__line {
@@ -744,7 +829,7 @@
           .tiny-grid-footer__column {
             height: 30px;
             text-align: left;
-            border-bottom: 0;
+            border-bottom-color: var(--te-common-border-divider);
             &:hover {
               background-color: var(--te-common-bg-container);
             }
@@ -752,12 +837,30 @@
               padding: 0;
             }
           }
+          .col__treenode {
+            border-bottom: 0;
+          }
           .tiny-grid-tree-wrapper .tiny-grid-tree__node-btn {
             fill: var(--te-common-icon-secondary);
           }
+          &:hover {
+            background-color: var(--te-common-bg-container);
+          }
+          .tiny-grid-default-input {
+            height: 24px;
+            border-radius: var(--te-base-border-radius-1);
+            border-color: var(--te-common-border-default);
+          }
         }
       }
     }
+    .tiny-grid-checkbox {
+      color: var(--te-common-border-hover);
+      border-radius: var(--te-base-border-radius-1);
+    }
+    .row__selected .tiny-grid-checkbox {
+      color: var(--te-common-color-info);
+    }
   }
 }
 
@@ -807,6 +910,24 @@
   }
 }
 
+// 24、textarea框
+.tiny-textarea.tiny-textarea {
+  .tiny-textarea__inner {
+    border-radius: var(--te-base-border-radius-1);
+    border-color: var(--te-common-border-default);
+    color: var(--te-common-text-primary);
+    &:hover {
+      border-color: var(--te-common-border-active);
+    }
+    &:focus {
+      border-color: var(--te-common-border-active);
+    }
+  }
+  &.is-disabled .tiny-textarea__inner {
+    background: var(--te-common-bg-disabled);
+    color: var(--te-common-text-disabled);
+  }
+}
 // 指引弹窗
 
 .tiny-guide.tiny-guide {
diff --git a/packages/toolbars/clean/src/Main.vue b/packages/toolbars/clean/src/Main.vue
index 146351ccd..b34f4a6f2 100644
--- a/packages/toolbars/clean/src/Main.vue
+++ b/packages/toolbars/clean/src/Main.vue
@@ -6,9 +6,8 @@
 </template>
 
 <script lang="jsx">
-import { ref, watch, getCurrentInstance } from 'vue'
-import { Modal } from '@opentiny/vue'
-import { useCanvas, useLayout } from '@opentiny/tiny-engine-meta-register'
+import { ref, watch } from 'vue'
+import { useCanvas, useLayout, useModal } from '@opentiny/tiny-engine-meta-register'
 import { constants } from '@opentiny/tiny-engine-utils'
 import { ToolbarBase } from '@opentiny/tiny-engine-common'
 
@@ -24,10 +23,9 @@ export default {
     }
   },
   setup() {
-    const app = getCurrentInstance()
-    const SvgIcon = app.appContext.components.SvgIcon
     const { pageState, clearCanvas } = useCanvas()
     const isLock = ref(pageState.isLock)
+    const { confirm } = useModal()
 
     watch(
       () => pageState.isLock,
@@ -41,14 +39,13 @@ export default {
       }
 
       if (!isLock.value) {
-        Modal.confirm({
+        confirm({
           title: '提示',
           message: () => {
             return [
               <div class="modal-content">
                 {
                   <div class="wrap">
-                    <SvgIcon name="warning"></SvgIcon>
                     <span>{`您确定要清除屏幕吗？`}</span>
                   </div>
                 }
diff --git a/packages/toolbars/setting/src/Main.vue b/packages/toolbars/setting/src/Main.vue
index db4cb1ab9..c0129a667 100644
--- a/packages/toolbars/setting/src/Main.vue
+++ b/packages/toolbars/setting/src/Main.vue
@@ -50,8 +50,7 @@ export default {
       if (pageStatus.state === PAGE_STATUS.Lock) {
         const username = pageStatus.data?.username || ''
         message({
-          message: `您点击的页面被${username}锁定，暂时无法编辑，请联系解锁`,
-          status: 'info'
+          message: `您点击的页面被${username}锁定，暂时无法编辑，请联系解锁`
         })
         return
       }