diff --git a/packages/common/component/MonacoEditor.vue b/packages/common/component/MonacoEditor.vue
index ffa33cc3d..8c6fc8582 100644
--- a/packages/common/component/MonacoEditor.vue
+++ b/packages/common/component/MonacoEditor.vue
@@ -6,7 +6,7 @@
         <div class="toolbar-start">
           <slot name="toolbarStart"></slot>
         </div>
-        <div :class="['buttons', { fullscreen: fullscreen }]">
+        <div :class="['buttons', { fullscreen: fullscreen }]" id="icon-buttons">
           <slot name="buttons"></slot>
           <tiny-tooltip v-if="showFormatBtn && options.language === 'json'" content="格式化" placement="top">
             <public-icon name="json" @click="formatCode"></public-icon>
@@ -158,8 +158,10 @@ export default {
     gap: 8px;
     color: var(--ti-lowcode-component-svg-button-color);
     cursor: pointer;
-    :hover {
-      color: var(--ti-lowcode-component-svg-button-hover-color);
+  }
+  #icon-buttons {
+    :deep(.svg-icon) {
+      color: var(--te-common-icon-secondary);
     }
   }
   .fullscreen {
diff --git a/packages/common/component/ToolbarBase.vue b/packages/common/component/ToolbarBase.vue
index 3494266c3..ffc2a1f88 100644
--- a/packages/common/component/ToolbarBase.vue
+++ b/packages/common/component/ToolbarBase.vue
@@ -71,6 +71,10 @@ export default {
   margin: 0 4px;
   font-size: 14px;
 }
+.toolbar-item-wrap {
+  display: flex;
+  align-items: center;
+}
 .toolbar-item-wrap div {
   display: inline-block;
 }
diff --git a/packages/design-core/assets/cn-en.svg b/packages/design-core/assets/cn-en.svg
new file mode 100644
index 000000000..e8b36bf74
--- /dev/null
+++ b/packages/design-core/assets/cn-en.svg
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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;}
+	.st2{fill:none;stroke:currentColor;stroke-opacity:0;}
+</style>
+<rect id="size" class="st0" width="132" height="132"/>
+<g>
+	<path id="形状结合" class="st1" d="M66,49.5c9.1,0,16.4,7.3,16.4,16.4v38.5c0,9.1-7.3,16.5-16.4,16.5H27.5
+		c-9.1,0-16.5-7.4-16.5-16.5V66c0-9.1,7.4-16.4,16.5-16.4H66z M51.2,64l-8.2,0.3c0.2,0.6,0.4,1.6,0.7,3c0.3,1.2,0.6,2.2,0.7,2.9
+		H26.9v6.5h6.2c2.1,6.4,5,11.6,8.6,15.8c-3.9,2.4-8.9,4.5-15.1,6.4c0.9,1.2,2.2,3.1,4,5.9c6.7-2.4,12.5-4.5,16.8-7.3
+		c4.5,2.9,10.1,5.4,16.8,7.4c1.2-2.1,2.6-4.5,4.3-6.7c-6.2-1.2-11.3-3.1-15.4-5.7c3.9-3.8,6.8-9.1,8.7-15.8H68v-6.5H52
+		C51.8,68.1,51.5,66,51.2,64z M54.1,76.7c-1.2,4.5-3.5,8.2-6.7,11.4c-2.9-3.1-5.1-6.9-6.7-11.4H54.1z M104.5,11
+		c9.1,0,16.5,7.4,16.5,16.5V66c0,9.1-7.4,16.5-16.5,16.5H88v-8.2h16.5c4.5,0,8.2-3.7,8.2-8.2V27.5c0-4.5-3.7-8.2-8.2-8.2H66
+		c-4.5,0-8.2,3.7-8.2,8.2V44h-8.2V27.5C49.5,18.4,56.9,11,66,11H104.5z M85.3,25.1c2.4,0,4.5,1.4,5.2,3.6l12.5,34.1
+		c0.7,2.1-0.3,4.5-2.5,5.3c-0.5,0.2-1,0.2-1.4,0.2c-1.7,0-3.3-1-3.9-2.7L93,59.9h-5.9c-0.9-3.1-2.5-5.9-4.5-8.2H90l-4.8-13.2
+		L81.1,50c-2.1-2-4.5-3.5-7.2-4.5L80,28.8C80.8,26.5,82.9,25.1,85.3,25.1z"/>
+	<path id="形状结合_00000010998318707575897520000013027657123687105463_" class="st2" d="M82.5,66v38.5
+		c0,9.1-7.3,16.5-16.4,16.5H27.5c-9.1,0-16.5-7.4-16.5-16.5V66c0-9.1,7.4-16.4,16.5-16.4H66C75.1,49.5,82.5,56.9,82.5,66z
+		 M42.9,64.3c0.2,0.6,0.4,1.6,0.7,3c0.3,1.2,0.6,2.2,0.7,2.9H26.9v6.5h6.2c2.1,6.4,5,11.6,8.6,15.8c-3.9,2.4-8.9,4.5-15.1,6.4
+		c0.9,1.2,2.2,3.1,4,5.9c6.7-2.4,12.5-4.5,16.8-7.3c4.5,2.9,10.1,5.4,16.8,7.4c1.2-2.1,2.6-4.5,4.3-6.7c-6.2-1.2-11.3-3.1-15.4-5.7
+		c3.9-3.8,6.8-9.1,8.7-15.8H68v-6.5H52c-0.2-2.1-0.5-4.1-0.8-6.2L42.9,64.3z M47.4,88.1c-2.9-3.1-5.1-6.9-6.7-11.4h13.4
+		C52.8,81.1,50.6,84.9,47.4,88.1z M121,27.5V66c0,9.1-7.4,16.5-16.5,16.5H88v-8.2h16.5c4.5,0,8.2-3.7,8.2-8.2V27.5
+		c0-4.5-3.7-8.2-8.2-8.2H66c-4.5,0-8.2,3.7-8.2,8.2V44h-8.2V27.5C49.5,18.4,56.9,11,66,11h38.5C113.6,11,121,18.4,121,27.5z
+		 M90.5,28.8l12.5,34.1c0.7,2.1-0.3,4.5-2.5,5.3c-0.5,0.2-1,0.2-1.4,0.2c-1.7,0-3.3-1-3.9-2.7L93,59.9h-5.9
+		c-0.9-3.1-2.5-5.9-4.5-8.2H90l-4.8-13.2L81.1,50c-2.1-2-4.5-3.5-7.2-4.5L80,28.8c0.8-2.2,2.9-3.6,5.3-3.6S89.7,26.5,90.5,28.8z"/>
+</g>
+</svg>
diff --git a/packages/design-core/assets/full-screen.svg b/packages/design-core/assets/full-screen.svg
index 3d8a81f82..9c8a77f1a 100644
--- a/packages/design-core/assets/full-screen.svg
+++ b/packages/design-core/assets/full-screen.svg
@@ -1,12 +1,15 @@
-<svg width="16.000000" height="16.000000" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-	<desc>
-			Created with Pixso.
-	</desc>
-	<defs/>
-	<mask id="mask413_9851" mask-type="alpha" maskUnits="userSpaceOnUse" x="0.000000" y="0.000000" width="16.000000" height="16.000000">
-		<rect id="全屏-full-screen" width="16.000000" height="16.000000" fill="#000000" fill-opacity="1.000000"/>
-	</mask>
-	<g mask="url(#mask413_9851)">
-		<path id="path" d="M9 3.5C8.71 3.5 8.5 3.71 8.5 4C8.5 4.27 8.71 4.5 9 4.5L10.81 4.5L8.31 7C8.13 7.17 8.09 7.44 8.26 7.65C8.45 7.83 8.82 7.9 9.02 7.7L11.5 5.21L11.5 7C11.5 7.23 11.67 7.44 11.91 7.48C12.17 7.48 12.5 7.27 12.5 6.98L12.5 4.4C12.5 3.9 12.1 3.5 11.6 3.5L9 3.5ZM7.67 8.28C7.48 8.09 7.17 8.09 6.97 8.28L4.5 10.77L4.5 9C4.5 8.76 4.32 8.55 4.08 8.51C3.81 8.51 3.5 8.72 3.5 9.01L3.5 11.6C3.5 12.1 3.9 12.51 4.4 12.51L7 12.51C7.27 12.51 7.5 12.28 7.5 12.01C7.5 11.73 7.27 11.51 7 11.51L5.17 11.51L7.67 9C7.84 8.8 7.84 8.47 7.67 8.28ZM4 2.5L12 2.5C12.83 2.5 13.5 3.17 13.5 4L13.5 12C13.5 12.83 12.83 13.5 12 13.5L4 13.5C3.17 13.5 2.5 12.83 2.5 12L2.5 4C2.5 3.17 3.17 2.5 4 2.5ZM4 1.5C2.6 1.5 1.5 2.6 1.5 4L1.5 12C1.5 13.38 2.6 14.5 4 14.5L12 14.5C13.38 14.5 14.5 13.38 14.5 12L14.5 4C14.5 2.6 13.38 1.5 12 1.5L4 1.5Z" fill="#191919" fill-opacity="1.000000" fill-rule="nonzero"/>
-	</g>
+<?xml version="1.0" encoding="utf-8"?>
+<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:currentColor;}
+</style>
+<rect class="st0" width="132" height="132"/>
+<path class="st1" d="M74.2,28.9c-2.3,0-4.1,1.8-4.1,4.1s1.8,4.1,4.1,4.1h14.9L68.6,57.8c-1.5,1.4-1.7,3.7-0.4,5.4l0.4,0.5
+	c1.7,1.6,4.2,1.6,5.9,0l20.5-20.5v14.7c0,2,1.4,3.7,3.4,4H99c2.3,0,4.1-1.8,4.1-4.1V36.3c0-4.1-3.3-7.4-7.4-7.4H74.2z M63.4,68.4
+	c-1.6-1.6-4.2-1.6-5.9,0L37.1,88.9V74.2c0-2-1.4-3.7-3.4-4H33c-2.3,0-4.1,1.8-4.1,4.1v21.4c0,4.1,3.3,7.4,7.4,7.4h21.5
+	c2.3,0,4.1-1.8,4.1-4.1S60.1,95,57.8,95H42.8l20.6-20.7c1.3-1.6,1.3-3.8,0-5.4V68.4z M33,20.6h66c6.8,0,12.4,5.5,12.4,12.4v66
+	c0,6.8-5.5,12.4-12.4,12.4H33c-6.8,0-12.4-5.5-12.4-12.4V33C20.6,26.2,26.2,20.6,33,20.6z M33,12.4c-11.4,0-20.6,9.2-20.6,20.6v66
+	c0,11.4,9.2,20.6,20.6,20.6h66c11.4,0,20.6-9.2,20.6-20.6V33c0-11.4-9.2-20.6-20.6-20.6H33z"/>
 </svg>
diff --git a/packages/design-core/assets/refresh.svg b/packages/design-core/assets/refresh.svg
index b3a1b75c7..7e9fec1bb 100644
--- a/packages/design-core/assets/refresh.svg
+++ b/packages/design-core/assets/refresh.svg
@@ -1,12 +1,14 @@
-<svg width="16.000000" height="16.000000" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-	<desc>
-			Created with Pixso.
-	</desc>
-	<defs/>
-	<mask id="mask413_10001" mask-type="alpha" maskUnits="userSpaceOnUse" x="0.000000" y="0.000000" width="16.000000" height="16.000000">
-		<rect id="刷新-refresh" width="16.000000" height="16.000000" fill="#000000" fill-opacity="1.000000"/>
-	</mask>
-	<g mask="url(#mask413_10001)">
-		<path id="形状结合" d="M11.79 2.74C14.54 4.72 15.26 8.45 13.53 11.29L15.24 10.84C15.47 10.77 15.7 10.89 15.79 11.09C15.87 11.35 15.75 11.69 15.49 11.76L12.59 12.53C12.34 12.6 12.08 12.45 12 12.19L11.23 9.3C11.15 9.05 11.3 8.78 11.56 8.71C11.81 8.64 12.09 8.8 12.15 9.05L12.64 10.9C14.21 8.48 13.62 5.23 11.24 3.51C8.76 1.73 5.31 2.27 3.52 4.72C1.73 7.17 2.28 10.6 4.75 12.38C6.41 13.59 8.27 13.84 10.38 13.15C10.63 13.08 10.9 13.21 11 13.46C11.08 13.71 10.93 13.98 10.68 14.06C8.28 14.84 6.1 14.54 4.19 13.16C1.29 11.06 0.64 7.03 2.75 4.16C4.85 1.28 8.9 0.64 11.79 2.74Z" fill="#191919" fill-opacity="1.000000" fill-rule="nonzero"/>
-	</g>
+<?xml version="1.0" encoding="utf-8"?>
+<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:currentColor;}
+</style>
+<rect id="size" class="st0" width="132" height="132"/>
+<path id="形状结合" class="st1" d="M97.4,22.7c22.7,16.4,28.6,47.1,14.4,70.5l14-3.7c1.9-0.5,3.8,0.4,4.6,2.1l0.2,0.7
+	c0.6,2.1-0.7,4.3-2.8,4.8l-23.9,6.4c-2.1,0.6-4.3-0.7-4.8-2.8l-6.4-23.9c-0.6-2.1,0.7-4.3,2.8-4.9c2.1-0.6,4.3,0.7,4.9,2.8l4.1,15.2
+	c12.9-20,8-46.8-11.6-60.9c-20.4-14.7-48.8-10.2-63.6,10c-14.8,20.2-10.2,48.5,10.1,63.2c13.7,9.9,29.1,12,46.5,6.4
+	c2.1-0.7,4.3,0.5,5,2.5c0.7,2.1-0.5,4.3-2.5,5c-19.8,6.4-37.8,3.9-53.5-7.5C10.8,91.4,5.4,58.2,22.8,34.4
+	C40.1,10.7,73.5,5.5,97.4,22.7z"/>
 </svg>
diff --git a/packages/design-core/assets/team-collaboration.svg b/packages/design-core/assets/team-collaboration.svg
new file mode 100644
index 000000000..a951158a6
--- /dev/null
+++ b/packages/design-core/assets/team-collaboration.svg
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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:currentColor;}
+</style>
+<rect id="size" class="st0" width="132" height="132"/>
+<path id="形状结合" class="st1" d="M65.9,24.8c13.6,0,24.8,10.9,24.8,24.4v9.2c0,5.7-2,11-5.4,15.3l11.8,3.3
+	c7.8,1.7,13.6,8.4,14.2,16.4l0.1,0.9v16.3c0,7.3-6,13.2-13.4,13.2H33.9c-7.3,0-13.3-5.9-13.3-13.2V94.3c-0.1-8.3,5.9-15.6,14.1-17.4
+	l12.5-2.6c-1.6-2-3.5-5-4.5-7.7l-0.5-1.2l-0.4-1.5l-0.3-1.5l-0.1-1l-0.2-1.2c-0.1-0.7-0.1-1.3-0.1-2v-9.5l0.2-2.1l0.2-1.7l0.5-2.2
+	C44.9,32.3,54.7,24.8,65.9,24.8z M65.9,33c-7.5,0-14,5-15.9,12l-0.3,1.2l-0.1,0.9l-0.2,1c0,0.6,0,0.7,0,1.1v9.6
+	c0,0.4,0.1,1.1,0.2,1.7l0.2,0.9l0.2,1.1l0.6,1.6c1.4,3.7,4.2,6.8,7.8,8.7c3.5,1.8,2.8,6.9-1,7.8l-21,4.5c-4.5,0.9-7.6,4.8-7.6,9.2
+	v16.3c0,2.6,2.2,5,5,5H98c2.8,0,5.1-2.3,5.1-5V94.3c-0.1-4.5-3.3-8.3-7.8-9.2l-21-4.5c-3.8-0.8-4.5-5.9-1-7.8c5.4-2.8,9-8.2,9-14.4
+	v-9.2C82.4,40.3,75,33,65.9,33z M113.6,56.5c7.9,1.6,14.3,8.2,14.3,15.9v14.2c0,2.2-1.9,4.1-4.1,4.1c-2.3,0-4.1-1.9-4.1-4.1V72.4
+	c0-3.7-2.9-6.9-7-7.8c-2.2-0.3-3.7-2.6-3.2-4.8C109.8,57.6,111.4,56.1,113.6,56.5z M22.6,59.9c0.4,2.2-1.1,4.5-3.3,4.8
+	c-4.1,0.8-6.9,4-6.9,7.8v14.2c0,2.2-1.9,4.1-4.1,4.1c-2.3,0-4.1-1.9-4.1-4.1V72.4C4,64.7,9.8,58.2,17.7,56.7
+	C20,56.2,22.1,57.6,22.6,59.9z M82.5,8.2c11,0,20.8,6.2,23.8,15.1l0.4,1.4l0.4,2.1l0.1,1.3l0.1,0.9v7.4c0,0.8-0.1,1.6-0.2,2.6
+	l-0.6,2.3l-0.3,1.2c-0.9,1.8-3.4,3.5-5.4,2.6c-2.1-0.7-3.3-3.1-2.5-5.2l0.2-1l0.3-1.1c0-0.3,0.2-1.2,0.2-1.4v-7.8l-0.1-0.8l-0.2-1
+	L98.4,26c-1.7-5.4-8.2-9.5-15.9-9.5c-2.3,0-4.1-1.9-4.1-4.1C78.4,10,80.2,8.2,82.5,8.2z M49.5,8.2c2.2,0,4.1,1.7,4.1,4.1
+	c0,2.2-1.9,4.1-4.1,4.1c-7.7,0-14.3,4.1-16,9.5l-0.2,0.9l-0.2,1L33,28.7v7.8c0,0.2,0,0.5,0.1,1.1l0.3,1.4c0.7,2.3-0.1,5.5-2.2,6.2
+	c-2,0.8-4.1-0.2-5-2l-0.7-1.8L25,39.5c-0.2-0.9-0.2-2.2-0.2-3.1V29v-0.9l0.2-1.3l0.2-1.4l0.6-2.1C28.6,14.4,38.4,8.2,49.5,8.2z"/>
+</svg>
diff --git "a/packages/design-core/assets/\345\205\250\345\261\217.svg" "b/packages/design-core/assets/\345\205\250\345\261\217.svg"
deleted file mode 100644
index 9c8a77f1a..000000000
--- "a/packages/design-core/assets/\345\205\250\345\261\217.svg"
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<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:currentColor;}
-</style>
-<rect class="st0" width="132" height="132"/>
-<path class="st1" d="M74.2,28.9c-2.3,0-4.1,1.8-4.1,4.1s1.8,4.1,4.1,4.1h14.9L68.6,57.8c-1.5,1.4-1.7,3.7-0.4,5.4l0.4,0.5
-	c1.7,1.6,4.2,1.6,5.9,0l20.5-20.5v14.7c0,2,1.4,3.7,3.4,4H99c2.3,0,4.1-1.8,4.1-4.1V36.3c0-4.1-3.3-7.4-7.4-7.4H74.2z M63.4,68.4
-	c-1.6-1.6-4.2-1.6-5.9,0L37.1,88.9V74.2c0-2-1.4-3.7-3.4-4H33c-2.3,0-4.1,1.8-4.1,4.1v21.4c0,4.1,3.3,7.4,7.4,7.4h21.5
-	c2.3,0,4.1-1.8,4.1-4.1S60.1,95,57.8,95H42.8l20.6-20.7c1.3-1.6,1.3-3.8,0-5.4V68.4z M33,20.6h66c6.8,0,12.4,5.5,12.4,12.4v66
-	c0,6.8-5.5,12.4-12.4,12.4H33c-6.8,0-12.4-5.5-12.4-12.4V33C20.6,26.2,26.2,20.6,33,20.6z M33,12.4c-11.4,0-20.6,9.2-20.6,20.6v66
-	c0,11.4,9.2,20.6,20.6,20.6h66c11.4,0,20.6-9.2,20.6-20.6V33c0-11.4-9.2-20.6-20.6-20.6H33z"/>
-</svg>
diff --git a/packages/layout/src/ToolbarCollapse.vue b/packages/layout/src/ToolbarCollapse.vue
index c18b8cde6..4bbce01ac 100644
--- a/packages/layout/src/ToolbarCollapse.vue
+++ b/packages/layout/src/ToolbarCollapse.vue
@@ -1,5 +1,5 @@
 <template>
-  <tiny-popover width="140" trigger="hover">
+  <tiny-popover :visible-arrow="false" width="140" trigger="hover">
     <template #reference>
       <span class="toolbar-ellipsis">
         <svg-icon name="ellipsis"></svg-icon>
@@ -59,28 +59,33 @@ export default {
   }
 }
 
-.empty-bar {
-  font-size: 12px;
+.collapse-content {
+  margin: 8px 4px;
+  .empty-bar {
+    font-size: 12px;
 
-  .toolbar-list-button {
-    padding-top: 4px;
-    box-sizing: border-box;
+    .toolbar-list-button {
+      height: 24px;
+      line-height: 24px;
 
-    &:hover {
-      background-color: var(--ti-lowcode-toolbar-ellipsis-hover-bg);
-      cursor: pointer;
+      &:hover {
+        background-color: var(--ti-lowcode-toolbar-ellipsis-hover-bg);
+        cursor: pointer;
+      }
     }
-  }
 
-  .empty-line {
-    margin: 4px 0px;
-    border-top: 1px solid var(--ti-lowcode-canvas-wrap-bg);
-  }
+    .empty-line {
+      margin: 4px 0px;
+      border-top: 1px solid var(--ti-lowcode-canvas-wrap-bg);
+    }
 
-  .icon-hides {
-    margin-right: 8px;
+    .icon-hides {
+      margin-right: 8px;
+      color: var(--te-common-icon-secondary);
+    }
   }
 }
+
 .collapse-content .empty-bar:last-child {
   margin-bottom: 4px;
   .empty-line {
diff --git a/packages/plugins/help/src/HelpIcon.vue b/packages/plugins/help/src/HelpIcon.vue
index 840ead23b..14bb9ef37 100644
--- a/packages/plugins/help/src/HelpIcon.vue
+++ b/packages/plugins/help/src/HelpIcon.vue
@@ -1,40 +1,55 @@
 <template>
   <div id="help-plugin">
-    <div title="帮助">
-      <svg-icon name="plugin-icon-plugin-help" @click.stop="openHelpBox"></svg-icon>
-    </div>
-    <div v-if="state.helpBox" class="help-plugin-box">
-      <div class="help-plugin-box-top">
-        <svg-icon name="close" class="help-plugin-close" @click.stop="closeHelpBox"></svg-icon>
-      </div>
-      <div class="help-plugin-box-title">
-        {{ helpTitle }}
-      </div>
-      <div class="help-plugin-box-body">
-        <a :href="courseUrl" target="_blank" class="help-plugin-box-item">
-          <span><svg-icon class="svg-icon" name="user-guide"></svg-icon>使用手册</span
-          ><icon-fillet-external-link class="icon-fillet-external-link" />
-        </a>
-        <tiny-tooltip v-model="state.showTooltip" :manual="true" effect="light" placement="right-end">
-          <template #content>
-            <div>
-              <span>{{ toolTipContent }}</span>
-              <svg-icon name="close" class="help-plugin-tooltip-close" @click="closeToolTip"></svg-icon>
+    <tiny-popover
+      :offset="50"
+      placement="right"
+      width="208"
+      trigger="click"
+      :visible-arrow="false"
+      id="help-icon-popover"
+    >
+      <template #reference>
+        <div title="帮助">
+          <svg-icon name="plugin-icon-plugin-help"></svg-icon>
+        </div>
+      </template>
+      <div class="help-plugin-box">
+        <div class="help-plugin-box-title">
+          {{ helpTitle }}
+        </div>
+        <div class="help-plugin-box-body">
+          <a :href="courseUrl" target="_blank" class="help-plugin-box-item">
+            <span><svg-icon class="svg-icon" name="user-guide"></svg-icon>使用手册</span
+            ><icon-fillet-external-link class="icon-fillet-external-link" />
+          </a>
+          <tiny-tooltip v-model="state.showTooltip" :manual="true" effect="light" placement="right-end">
+            <template #content>
+              <div>
+                <span>{{ toolTipContent }}</span>
+                <svg-icon name="close" class="help-plugin-tooltip-close" @click="closeToolTip"></svg-icon>
+              </div>
+            </template>
+            <div class="help-plugin-box-item" @click="toShowStep">
+              <span><svg-icon class="svg-icon" name="beginner-guide"></svg-icon>新手引导</span>
             </div>
-          </template>
-          <div class="help-plugin-box-item" @click="toShowStep">
-            <span><svg-icon class="svg-icon" name="beginner-guide"></svg-icon>新手引导</span>
-          </div>
-        </tiny-tooltip>
-      </div>
-      <div class="help-plugin-box-ques">
-        <div class="help-plugin-box-title help-plugin-box-ques-title">{{ questionTitle }}</div>
-        <a v-for="(item, idx) in questionList" :key="idx" :href="item.url" target="_blank" class="help-plugin-box-item">
-          <span> {{ idx + 1 }}.{{ item.label }} </span>
-          <icon-fillet-external-link class="icon-fillet-external-link" />
-        </a>
+          </tiny-tooltip>
+        </div>
+        <div class="help-plugin-box-ques">
+          <div class="help-plugin-box-title help-plugin-box-ques-title">{{ questionTitle }}</div>
+          <a
+            v-for="(item, idx) in questionList"
+            :key="idx"
+            :href="item.url"
+            target="_blank"
+            class="help-plugin-box-item"
+          >
+            <span> {{ idx + 1 }}.{{ item.label }} </span>
+            <icon-fillet-external-link class="icon-fillet-external-link" />
+          </a>
+        </div>
       </div>
-    </div>
+    </tiny-popover>
+
     <tiny-guide
       ref="tinyGuideRef"
       :show-step="state.showStep"
@@ -46,7 +61,7 @@
 
 <script>
 import { reactive, onMounted, ref } from 'vue'
-import { Guide, Tooltip } from '@opentiny/vue'
+import { Guide, Tooltip, Popover } from '@opentiny/vue'
 import { IconFilletExternalLink } from '@opentiny/vue-icon'
 import { useLayout, META_APP } from '@opentiny/tiny-engine-meta-register'
 
@@ -57,6 +72,7 @@ export default {
   components: {
     TinyTooltip: Tooltip,
     TinyGuide: Guide,
+    TinyPopover: Popover,
     IconFilletExternalLink: IconFilletExternalLink()
   },
   setup() {
@@ -87,7 +103,6 @@ export default {
       showStep: false,
       guideWidth: '360',
       showTooltip: false,
-      showHelpDialog: false,
       helpBox: false
     })
 
@@ -249,13 +264,6 @@ export default {
   margin-left: 20px;
   cursor: pointer;
 }
-.help-plugin-close {
-  cursor: pointer;
-  position: absolute;
-  right: 16px;
-  top: 14px;
-  font-size: 12px;
-}
 </style>
 
 <!-- tiny-guide在body元素上，所以不使用scoped -->
@@ -327,13 +335,8 @@ div.tiny-guide.shepherd-element {
 
 .help-plugin-box {
   cursor: auto;
-  position: absolute;
-  left: var(--base-nav-panel-width);
-  bottom: 68px;
-  width: 208px;
   background-color: var(--ti-lowcode-help-box-bg-color);
   border-radius: 6px;
-  box-shadow: var(--ti-lowcode-help-box-shadow);
   padding: 16px 0;
   &-top {
     text-align: right;
@@ -343,13 +346,13 @@ div.tiny-guide.shepherd-element {
     font-size: 12px;
     font-weight: 600;
     line-height: 18px;
-    margin: 0 16px 8px 16px;
+    margin: 0 8px 8px 8px;
   }
   &-body {
     padding-bottom: 8px;
   }
   &-item {
-    padding: 0 16px;
+    padding: 0 8px;
     display: flex;
     justify-content: space-between;
     align-items: center;
diff --git a/packages/plugins/state/src/CreateStore.vue b/packages/plugins/state/src/CreateStore.vue
index a09a3d633..48fb9cbee 100644
--- a/packages/plugins/state/src/CreateStore.vue
+++ b/packages/plugins/state/src/CreateStore.vue
@@ -254,6 +254,9 @@ export default {
   overflow-y: auto;
   :deep(.tiny-collapse-item__wrap) {
     padding: 0 12px;
+    .tiny-collapse-item__content {
+      padding: 0;
+    }
   }
   :deep(.toolbar) {
     position: absolute;
diff --git a/packages/plugins/state/src/CreateVariable.vue b/packages/plugins/state/src/CreateVariable.vue
index 4614d61fc..63978d7da 100644
--- a/packages/plugins/state/src/CreateVariable.vue
+++ b/packages/plugins/state/src/CreateVariable.vue
@@ -419,14 +419,11 @@ export default {
     right: 4px;
   }
   .var {
-    padding: 12px;
+    padding: 12px 12px 0 12px;
   }
   .var-type-item {
     padding: 0 12px;
   }
-  .tiny-form-item:first-child {
-    padding-bottom: 12px;
-  }
   .tiny-form-item:not(:last-child) {
     margin-bottom: 12px;
   }
@@ -441,6 +438,12 @@ export default {
   }
   :deep(.tiny-collapse-item__wrap) {
     padding: 0 12px;
+    .tiny-collapse-item__content {
+      padding: 0;
+      .tiny-form-item:first-child {
+        padding-bottom: 12px;
+      }
+    }
   }
 }
 
diff --git a/packages/plugins/state/src/StateFullscreenHead.vue b/packages/plugins/state/src/StateFullscreenHead.vue
index 86f17ddf6..2c2847405 100644
--- a/packages/plugins/state/src/StateFullscreenHead.vue
+++ b/packages/plugins/state/src/StateFullscreenHead.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="fullscreen-head-content">
-    <span>{{ title }}</span>
+    <span class="title">{{ title }}</span>
     <close-icon @close="close"></close-icon>
   </div>
 </template>
@@ -37,5 +37,10 @@ export default {
   width: 100%;
   display: flex;
   justify-content: space-between;
+  .title {
+    font-size: var(--te-base-font-size-base);
+    color: var(--te-common-text-primary);
+    font-weight: var(--te-base-font-weight-7);
+  }
 }
 </style>
diff --git a/packages/theme/base/src/base.less b/packages/theme/base/src/base.less
index cce9ac5c8..a195c7a41 100644
--- a/packages/theme/base/src/base.less
+++ b/packages/theme/base/src/base.less
@@ -433,6 +433,7 @@
   --te-base-rgba-24: rgba(0, 0, 0, 0.16);
   --te-base-rgba-25: rgba(0, 255, 0, 0.1);
   --te-base-rgba-26: rgba(242, 48, 48, 0.3);
+  --te-base-rgba-27: rgba(0, 0, 0, 0.16);
   --te-base-rgb-1: rgb(80, 212, 171);
 
   // 状态色
diff --git a/packages/theme/base/src/component-common.less b/packages/theme/base/src/component-common.less
index 1513c1d3b..cea32d76d 100644
--- a/packages/theme/base/src/component-common.less
+++ b/packages/theme/base/src/component-common.less
@@ -460,6 +460,9 @@
   font-size: var(--te-base-font-size-base);
   color: var(--te-common-text-primary);
   background-color: var(--te-common-bg-default);
+  border: 0;
+  box-shadow: 0 8px 24px 0 var(--te-base-rgba-27);
+
   height: auto;
 }
 
diff --git a/packages/toolbars/collaboration/meta.js b/packages/toolbars/collaboration/meta.js
index ef6892448..fa1b892bd 100644
--- a/packages/toolbars/collaboration/meta.js
+++ b/packages/toolbars/collaboration/meta.js
@@ -4,7 +4,7 @@ export default {
   title: 'collaboration',
   options: {
     icon: {
-      default: 'user'
+      default: 'team-collaboration'
     },
     renderType: 'slot',
     collapsed: true
diff --git a/packages/toolbars/lang/meta.js b/packages/toolbars/lang/meta.js
index a098b916e..4a2146e71 100644
--- a/packages/toolbars/lang/meta.js
+++ b/packages/toolbars/lang/meta.js
@@ -4,8 +4,7 @@ export default {
   title: 'lang',
   options: {
     icon: {
-      zh_CN: 'cn',
-      en_US: 'en'
+      default: 'cn-en'
     },
     renderType: 'icon',
     collapsed: true
diff --git a/packages/toolbars/lang/src/Main.vue b/packages/toolbars/lang/src/Main.vue
index 560cce89f..a4c215bcf 100644
--- a/packages/toolbars/lang/src/Main.vue
+++ b/packages/toolbars/lang/src/Main.vue
@@ -1,5 +1,10 @@
 <template>
-  <toolbar-base content="画布中英文切换" :icon="options.icon[langVal]" :options="options" @click-api="changeLang">
+  <toolbar-base
+    content="画布中英文切换"
+    :icon="options.icon.default || options.icon"
+    :options="options"
+    @click-api="changeLang"
+  >
   </toolbar-base>
 </template>
 
diff --git a/packages/toolbars/save/src/Main.vue b/packages/toolbars/save/src/Main.vue
index 1014760e7..c60980d9d 100644
--- a/packages/toolbars/save/src/Main.vue
+++ b/packages/toolbars/save/src/Main.vue
@@ -200,9 +200,37 @@ export default {
 }
 
 .save-style {
-  padding: 14px;
+  padding: 20px 12px;
   font-size: 12px;
 
+  .save-setting {
+    font-size: 14px;
+    font-weight: 600;
+    line-height: 20px;
+    height: 20px;
+    margin-bottom: 16px;
+  }
+
+  .save-time {
+    line-height: 24px;
+    font-size: 12px;
+    margin: 12px 0 16px 0;
+    display: flex;
+    .save-time-label {
+      width: 60px;
+    }
+
+    .tiny-select {
+      width: 103px;
+      margin-left: 12px;
+
+      :deep(.tiny-input__suffix) {
+        width: 12px;
+        top: 12px;
+      }
+    }
+  }
+
   .save-button-group {
     text-align: right;
 
@@ -211,31 +239,12 @@ export default {
       padding: 0 8px;
       height: 26px;
       line-height: 24px;
+      border: 0;
       border-radius: 4px;
     }
   }
 }
 
-.save-time {
-  line-height: 24px;
-  font-size: 12px;
-  margin: 13px 0 14px 0;
-  display: flex;
-  .save-time-label {
-    width: 60px;
-  }
-
-  .tiny-select {
-    width: 103px;
-    margin-left: 12px;
-
-    :deep(.tiny-input__suffix) {
-      width: 12px;
-      top: 12px;
-    }
-  }
-}
-
 #saving {
   cursor: not-allowed;
   color: var(--ti-lowcode-disabled-color);