diff --git a/packages/amis-editor/src/component/BaseControl.ts b/packages/amis-editor/src/component/BaseControl.ts
index f7dba779f..5a0606524 100644
--- a/packages/amis-editor/src/component/BaseControl.ts
+++ b/packages/amis-editor/src/component/BaseControl.ts
@@ -463,12 +463,10 @@ export function remarkTpl(config: {
                   }
                 ]
               },
-              {
+              getSchemaTpl('icon', {
                 name: 'icon',
-                label: '图标',
-                type: 'icon-picker',
-                className: 'fix-icon-picker-overflow'
-              },
+                label: '图标'
+              }),
               {
                 name: 'className',
                 label: 'CSS 类名',
diff --git a/packages/amis-editor/src/plugin/Avatar.tsx b/packages/amis-editor/src/plugin/Avatar.tsx
index 548ebed68..85a4b3b08 100644
--- a/packages/amis-editor/src/plugin/Avatar.tsx
+++ b/packages/amis-editor/src/plugin/Avatar.tsx
@@ -96,13 +96,11 @@ export class AvatarPlugin extends BasePlugin {
                   className: 'ae-ExtendMore mb-3',
                   body: [
                     // 图标
-                    {
-                      label: '图标',
+                    getSchemaTpl('icon', {
                       name: 'icon',
-                      type: 'icon-picker',
-                      className: 'fix-icon-picker-overflow',
+                      label: '图标',
                       visibleOn: 'data.showtype === "icon"'
-                    },
+                    }),
                     // 图片
                     getSchemaTpl('valueFormula', {
                       rendererSchema: {
diff --git a/packages/amis-editor/src/plugin/Breadcrumb.tsx b/packages/amis-editor/src/plugin/Breadcrumb.tsx
index 48d2fe2e7..bc50ccb4c 100644
--- a/packages/amis-editor/src/plugin/Breadcrumb.tsx
+++ b/packages/amis-editor/src/plugin/Breadcrumb.tsx
@@ -73,12 +73,10 @@ export class BreadcrumbPlugin extends BasePlugin {
                 name: 'href',
                 placeholder: '链接'
               },
-              {
+              getSchemaTpl('icon', {
                 name: 'icon',
-                label: '图标',
-                type: 'icon-picker',
-                className: 'fix-icon-picker-overflow'
-              }
+                label: '图标'
+              })
             ]
           }
         ]
diff --git a/packages/amis-editor/src/plugin/CollapseGroup.tsx b/packages/amis-editor/src/plugin/CollapseGroup.tsx
index f8214e00f..017465348 100644
--- a/packages/amis-editor/src/plugin/CollapseGroup.tsx
+++ b/packages/amis-editor/src/plugin/CollapseGroup.tsx
@@ -96,18 +96,16 @@ export class CollapseGroupPlugin extends BasePlugin {
                   autoFocus: false,
                   form: {
                     body: [
-                      {
-                        label: '图标',
+                      getSchemaTpl('icon', {
                         name: 'expandIcon',
-                        type: 'icon-picker',
-                        className: 'fix-icon-picker-overflow',
+                        label: '图标',
                         pipeIn: (value: any) => value?.icon,
                         pipeOut: (value: any) => ({
                           type: 'icon',
                           vendor: '',
                           icon: value
                         })
-                      }
+                      })
                     ]
                   },
                   pipeIn: (value: string) => {
diff --git a/packages/amis-editor/src/plugin/Form/InputTable.tsx b/packages/amis-editor/src/plugin/Form/InputTable.tsx
index 8089cc9ed..7e814e280 100644
--- a/packages/amis-editor/src/plugin/Form/InputTable.tsx
+++ b/packages/amis-editor/src/plugin/Form/InputTable.tsx
@@ -189,13 +189,11 @@ export class TableControlPlugin extends BasePlugin {
             visibleOn: 'data.addable',
             pipeIn: defaultValue('')
           },
-          {
+          getSchemaTpl('icon', {
             name: 'addBtnIcon',
             label: '增加按钮图标',
-            type: 'icon-picker',
-            className: 'fix-icon-picker-overflow',
             visibleOn: 'data.addable'
-          },
+          }),
           getSchemaTpl('api', {
             name: 'addApi',
             label: '新增时提交的 API',
@@ -212,13 +210,11 @@ export class TableControlPlugin extends BasePlugin {
             visibleOn: 'data.removable',
             pipeIn: defaultValue('')
           },
-          {
+          getSchemaTpl('icon', {
             name: 'deleteBtnIcon',
             label: '删除按钮图标',
-            type: 'icon-picker',
-            className: 'fix-icon-picker-overflow',
             visibleOn: 'data.removable'
-          },
+          }),
           getSchemaTpl('api', {
             name: 'deleteApi',
             label: '删除时提交的 API',
@@ -235,13 +231,11 @@ export class TableControlPlugin extends BasePlugin {
             visibleOn: 'data.editable',
             pipeIn: defaultValue('')
           },
-          {
+          getSchemaTpl('icon', {
             name: 'editBtnIcon',
             label: '编辑按钮图标',
-            type: 'icon-picker',
-            className: 'fix-icon-picker-overflow',
             visibleOn: 'data.editable'
-          },
+          }),
           getSchemaTpl('switch', {
             label: '是否可复制',
             name: 'copyable'
@@ -253,13 +247,11 @@ export class TableControlPlugin extends BasePlugin {
             visibleOn: 'data.copyable',
             pipeIn: defaultValue('')
           },
-          {
+          getSchemaTpl('icon', {
             name: 'copyBtnIcon',
             label: '复制按钮图标',
-            type: 'icon-picker',
-            className: 'fix-icon-picker-overflow',
             visibleOn: 'data.copyable'
-          },
+          }),
           getSchemaTpl('api', {
             name: 'updateApi',
             label: '修改时提交的 API',
@@ -272,13 +264,11 @@ export class TableControlPlugin extends BasePlugin {
             visibleOn: 'data.editable',
             pipeIn: defaultValue('')
           },
-          {
+          getSchemaTpl('icon', {
             name: 'confirmBtnIcon',
             label: '确认编辑按钮图标',
-            type: 'icon-picker',
-            className: 'fix-icon-picker-overflow',
             visibleOn: 'data.editable'
-          },
+          }),
           {
             type: 'input-text',
             name: 'cancelBtnLabel',
@@ -286,13 +276,11 @@ export class TableControlPlugin extends BasePlugin {
             visibleOn: 'data.editable',
             pipeIn: defaultValue('')
           },
-          {
+          getSchemaTpl('icon', {
             name: 'cancelBtnIcon',
             label: '取消编辑按钮图标',
-            type: 'icon-picker',
-            className: 'fix-icon-picker-overflow',
             visibleOn: 'data.editable'
-          },
+          }),
           getSchemaTpl('switch', {
             label: '是否可拖拽排序',
             name: 'draggable'
diff --git a/packages/amis-editor/src/plugin/Nav.tsx b/packages/amis-editor/src/plugin/Nav.tsx
index 57bcb7fb4..28a6ffe25 100644
--- a/packages/amis-editor/src/plugin/Nav.tsx
+++ b/packages/amis-editor/src/plugin/Nav.tsx
@@ -66,12 +66,10 @@ export class NavPlugin extends BasePlugin {
           required: true
         },
 
-        {
-          type: 'icon-picker',
+        getSchemaTpl('icon', {
           name: 'icon',
-          label: '图标',
-          className: 'fix-icon-picker-overflow'
-        },
+          label: '图标'
+        }),
 
         {
           type: 'group',
diff --git a/packages/amis-editor/src/tpl/common.tsx b/packages/amis-editor/src/tpl/common.tsx
index cfd3803c7..b79ae418c 100644
--- a/packages/amis-editor/src/tpl/common.tsx
+++ b/packages/amis-editor/src/tpl/common.tsx
@@ -509,9 +509,8 @@ setSchemaTpl('expression', {
 
 setSchemaTpl('icon', {
   label: '图标',
-  type: 'icon-picker',
+  type: 'icon-select',
   name: 'icon',
-  className: 'fix-icon-picker-overflow',
   placeholder: '点击选择图标',
   clearable: true,
   description: ''
@@ -1047,31 +1046,13 @@ setSchemaTpl(
   'iconLink',
   (schema: {name: 'icon' | 'rightIcon'; visibleOn: boolean}) => {
     const {name, visibleOn} = schema;
-    return {
+    return getSchemaTpl('icon', {
       name: name,
       visibleOn,
       label: '图标',
-      type: 'icon-picker',
-      className: 'fix-icon-picker-overflow',
       placeholder: '点击选择图标',
       clearable: true,
       description: ''
-    };
-  }
-);
-
-setSchemaTpl(
-  'iconLink',
-  (schema: {name: 'icon' | 'rightIcon'; visibleOn: boolean}) => {
-    const {name, visibleOn} = schema;
-    return {
-      name: name,
-      visibleOn,
-      label: '图标',
-      type: 'icon-picker',
-      placeholder: '点击选择图标',
-      clearable: true,
-      description: ''
-    };
+    });
   }
 );