REPORT-42238 【10.0.13】JDK11设计器图标模糊问题优化

No.14: ①vito建议中的前三点功能其实已经实现了，只是没用一个类似Manager的方式写出来，对这种不是很熟，听vito说要配齐一大套，而这次任务已经是超时了，所以放在下次迭代任务中与缓存一起做；②将几乎所有已经改成svg的图标，传入方式统一为传入url；③补充了test

designer-base/src/main/java/com/fr/base/svg/IconUtils.java

@@ -26,6 +26,7 @@ public class IconUtils {
 
     /**
      * 可以读取SVG图标或者普通图标，并且可以读取不带扩展名的文件
+     * 不带扩展名时以svg优先、其次png，最后gif
      * @param resource 图片路径
      * @return 图标
      */

designer-base/src/main/java/com/fr/design/actions/AllowAuthorityEditAction.java

@@ -22,7 +22,7 @@ public class AllowAuthorityEditAction extends TemplateComponentAction {
         this.setMenuKeySet(KeySetUtils.ALLOW_AUTHORITY_EDIT);
         this.setName(getMenuKeySet().getMenuName());
         this.setMnemonic(getMenuKeySet().getMnemonic());
-        this.setSmallIcon(IconUtils.readIcon("/com/fr/design/images/m_report/allow_authority_edit_normal.svg"));
+        this.setSmallIcon("/com/fr/design/images/m_report/allow_authority_edit");
     }
 
     /**

designer-base/src/main/java/com/fr/design/actions/ExitAuthorityEditAction.java

@@ -19,7 +19,7 @@ public class ExitAuthorityEditAction extends TemplateComponentAction {
 	public ExitAuthorityEditAction(TargetComponent t) {
 		super(t);
 		this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Authority_Edit_Status_Exit"));
-		this.setSmallIcon(IconUtils.readIcon("/com/fr/design/images/m_report/exit_authority_edit_normal.svg"));
+		this.setSmallIcon("/com/fr/design/images/m_report/exit_authority_edit");
 	}
 
 

designer-base/src/main/java/com/fr/design/actions/TableDataSourceAction.java

@@ -26,7 +26,7 @@ public class TableDataSourceAction extends TemplateComponentAction<JTemplate<?,
         this.setMenuKeySet(KeySetUtils.TEMPLATE_TABLE_DATA_SOURCE);
         this.setName(getMenuKeySet().getMenuKeySetName() + "...");
         this.setMnemonic(getMenuKeySet().getMnemonic());
-        this.setSmallIcon(IconUtils.readIcon("/com/fr/design/images/m_web/datasource_normal.svg"));
+        this.setSmallIcon("/com/fr/design/images/m_web/datasource");
     }
 
     /**

designer-base/src/main/java/com/fr/design/actions/UpdateAction.java

@@ -183,22 +183,10 @@ public abstract class UpdateAction extends ShortCut implements Action {
 	 * @param resource
 	 */
 	public void setSmallIcon(String resource) {
-		this.putValue(Action.SMALL_ICON, IconUtils.readSVGIcon(resource, IconUtils.ICON_TYPE_NORMAL));
+		this.putValue(Action.SMALL_ICON, IconUtils.readIcon(resource));
 		this.putValue(UpdateAction.DISABLED_ICON, IconUtils.readSVGIcon(resource, IconUtils.ICON_TYPE_DISABLED));
 	}
 
-	/**
-	 * 使用方式同上，但这个可以多设置一个PressedIcon
-	 * 设计器里面用到的比较少，因此与上面的方法区分一下，避免设计器启动的时候有过多无用操作
-	 * @param resource
-	 * @param needPressedIcon
-	 */
-	public void setSmallIcon(String resource, boolean needPressedIcon) {
-		this.putValue(Action.SMALL_ICON, IconUtils.readSVGIcon(resource, IconUtils.ICON_TYPE_NORMAL));
-		this.putValue(UpdateAction.DISABLED_ICON, IconUtils.readSVGIcon(resource, IconUtils.ICON_TYPE_DISABLED));
-		this.putValue(UpdateAction.PRESSED_ICON, IconUtils.readSVGIcon(resource, IconUtils.ICON_TYPE_PRESSED));
-	}
-
 	public void setSmallIcon(Icon[] smallIcon, boolean white) {
 		this.putValue(Action.SMALL_ICON, smallIcon);
 	}

designer-base/src/main/java/com/fr/design/actions/community/BBSAction.java

@@ -20,7 +20,7 @@ public class BBSAction extends UpdateAction
 		 this.setMenuKeySet(BBS);
 	     this.setName(getMenuKeySet().getMenuName());
 	     this.setMnemonic(getMenuKeySet().getMnemonic());
-	     this.setSmallIcon(IconUtils.readIcon("/com/fr/design/images/bbs/bbs_normal.svg"));
+	     this.setSmallIcon("/com/fr/design/images/bbs/bbs");
 
 	}
 

designer-base/src/main/java/com/fr/design/actions/community/BugAction.java

@@ -17,7 +17,7 @@ public class BugAction extends UpdateAction
 	{ this.setMenuKeySet(BUG);
     this.setName(getMenuKeySet().getMenuName());
     this.setMnemonic(getMenuKeySet().getMnemonic());
-    this.setSmallIcon(IconUtils.readIcon("/com/fr/design/images/bbs/bug_normal.svg"));
+    this.setSmallIcon("/com/fr/design/images/bbs/bug");
 }
 
 @Override

designer-base/src/main/java/com/fr/design/actions/community/BugNeedAction.java

@@ -20,7 +20,7 @@ public class BugNeedAction extends UpdateAction {
         this.setMenuKeySet(BugAndNeed);
         this.setName(getMenuKeySet().getMenuName());
         this.setMnemonic(getMenuKeySet().getMnemonic());
-        this.setSmallIcon(IconUtils.readIcon("/com/fr/design/images/bbs/need_normal.svg"));
+        this.setSmallIcon("/com/fr/design/images/bbs/need");
     }
 
     @Override

designer-base/src/main/java/com/fr/design/actions/community/CenterAction.java

@@ -17,7 +17,7 @@ public class CenterAction extends UpAction{
         this.setMenuKeySet(CENTER);
         this.setName(getMenuKeySet().getMenuName());
         this.setMnemonic(getMenuKeySet().getMnemonic());
-        this.setSmallIcon(IconUtils.readIcon("/com/fr/design/images/bbs/center_normal.svg"));
+        this.setSmallIcon("/com/fr/design/images/bbs/center");
 
     }
 

designer-base/src/main/java/com/fr/design/actions/community/FacebookFansAction.java

@@ -13,7 +13,7 @@ public class FacebookFansAction extends UpAction {
         this.setMenuKeySet(FACEBOOKFANS);
         this.setName(getMenuKeySet().getMenuName());
         this.setMnemonic(getMenuKeySet().getMnemonic());
-        this.setSmallIcon(IconUtils.readIcon("/com/fr/design/images/bbs/facebook_normal.svg"));
+        this.setSmallIcon("/com/fr/design/images/bbs/facebook");
     }
 
     @Override

designer-base/src/main/java/com/fr/design/actions/community/NeedAction.java

@@ -18,7 +18,7 @@ public class NeedAction extends UpdateAction
 		 this.setMenuKeySet(NEED);
 	     this.setName(getMenuKeySet().getMenuName());
 	     this.setMnemonic(getMenuKeySet().getMnemonic());
-	     this.setSmallIcon(IconUtils.readIcon("/com/fr/design/images/bbs/need_normal.svg"));
+	     this.setSmallIcon("/com/fr/design/images/bbs/need");
 
 	}
 

designer-base/src/main/java/com/fr/design/actions/community/QuestionAction.java

@@ -16,7 +16,7 @@ public class QuestionAction extends UpdateAction {
         this.setMenuKeySet(QUESTIONS);
         this.setName(getMenuKeySet().getMenuName());
         this.setMnemonic(getMenuKeySet().getMnemonic());
-        this.setSmallIcon(IconUtils.readIcon("/com/fr/design/images/bbs/question_normal.svg"));
+        this.setSmallIcon("/com/fr/design/images/bbs/question");
 
     }
 

designer-base/src/main/java/com/fr/design/actions/community/SignAction.java

@@ -19,7 +19,7 @@ public class SignAction extends UpdateAction
 		 this.setMenuKeySet(SIGN);
 	     this.setName(getMenuKeySet().getMenuName());
 	     this.setMnemonic(getMenuKeySet().getMnemonic());
-	     this.setSmallIcon(IconUtils.readIcon("/com/fr/design/images/bbs/sign_normal.svg"));
+	     this.setSmallIcon("/com/fr/design/images/bbs/sign");
 	}
 
 	@Override

designer-base/src/main/java/com/fr/design/actions/community/TechSolutionAction.java

@@ -21,7 +21,7 @@ public class TechSolutionAction extends UpdateAction{
         this.setMenuKeySet(TSO);
         this.setName(getMenuKeySet().getMenuName());
         this.setMnemonic(getMenuKeySet().getMnemonic());
-        this.setSmallIcon(IconUtils.readIcon("/com/fr/design/images/bbs/solution_normal.svg"));
+        this.setSmallIcon("/com/fr/design/images/bbs/solution");
 
     }
 

designer-base/src/main/java/com/fr/design/actions/community/VideoAction.java

@@ -20,7 +20,7 @@ public class VideoAction extends UpdateAction
 		 this.setMenuKeySet(VIDEO);
 	     this.setName(getMenuKeySet().getMenuName());
 	     this.setMnemonic(getMenuKeySet().getMnemonic());
-		 this.setSmallIcon(IconUtils.readIcon("/com/fr/design/images/bbs/video_normal.svg"));
+		 this.setSmallIcon("/com/fr/design/images/bbs/video");
 	}
 
 	@Override

designer-base/src/main/java/com/fr/design/actions/edit/CopyAction.java

@@ -21,7 +21,7 @@ public class CopyAction extends TemplateComponentAction {
 
         this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_M_Edit_Copy"));
         this.setMnemonic('C');
-        this.setSmallIcon("/com/fr/design/images/m_edit/copy.png");
+        this.setSmallIcon("/com/fr/design/images/m_edit/copy");
         this.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_C, DEFAULT_MODIFIER));
         this.setEnabled(!DesignModeContext.isBanCopyAndCut());
     }

designer-base/src/main/java/com/fr/design/actions/edit/CutAction.java

@@ -25,7 +25,7 @@ public class CutAction extends TemplateComponentAction {
 
         this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_M_Edit_Cut"));
         this.setMnemonic('T');
-        this.setSmallIcon("/com/fr/design/images/m_edit/cut.png");
+        this.setSmallIcon("/com/fr/design/images/m_edit/cut");
         this.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_X, DEFAULT_MODIFIER));
         this.setEnabled(!DesignModeContext.isBanCopyAndCut());
     }

designer-base/src/main/java/com/fr/design/actions/edit/PasteAction.java

@@ -24,7 +24,7 @@ public class PasteAction extends TemplateComponentAction {
 
         this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_M_Edit_Paste"));
         this.setMnemonic('P');
-        this.setSmallIcon("/com/fr/design/images/m_edit/paste.png");
+        this.setSmallIcon("/com/fr/design/images/m_edit/paste");
         this.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_V, DEFAULT_MODIFIER));
     }
 

designer-base/src/main/java/com/fr/design/actions/edit/RedoAction.java

@@ -22,7 +22,7 @@ public class RedoAction extends UpdateAction implements TemplateComponentActionI
         this.setMenuKeySet(KeySetUtils.REDO);
         this.setName(getMenuKeySet().getMenuKeySetName());
         this.setMnemonic(getMenuKeySet().getMnemonic());
-		this.setSmallIcon("com/fr/design/images/m_edit/redo.png");
+		this.setSmallIcon("com/fr/design/images/m_edit/redo");
         this.setAccelerator(getMenuKeySet().getKeyStroke());
 	}
 

designer-base/src/main/java/com/fr/design/actions/edit/UndoAction.java

@@ -22,7 +22,7 @@ public class UndoAction extends UpdateAction implements TemplateComponentActionI
         this.setMenuKeySet(KeySetUtils.UNDO);
         this.setName(getMenuKeySet().getMenuKeySetName());
         this.setMnemonic(getMenuKeySet().getMnemonic());
-        this.setSmallIcon("/com/fr/design/images/m_edit/undo.png");
+        this.setSmallIcon("/com/fr/design/images/m_edit/undo");
         this.setAccelerator(getMenuKeySet().getKeyStroke());
     }
 

designer-base/src/main/java/com/fr/design/actions/file/OpenTemplateAction.java

@@ -22,7 +22,7 @@ public class OpenTemplateAction extends UpdateAction {
         this.setMenuKeySet(KeySetUtils.OPEN_TEMPLATE);
         this.setName(getMenuKeySet().getMenuKeySetName());
         this.setMnemonic(getMenuKeySet().getMnemonic());
-        this.setSmallIcon(IconUtils.readIcon("/com/fr/design/images/buttonicon/open_normal.svg"));
+        this.setSmallIcon("/com/fr/design/images/buttonicon/open");
         this.setAccelerator(getMenuKeySet().getKeyStroke());
     }
 

designer-base/src/main/java/com/fr/design/actions/file/SaveAsTemplateAction.java

@@ -20,7 +20,7 @@ public class SaveAsTemplateAction extends JTemplateAction<JTemplate<?, ?>> {
         this.setMenuKeySet(KeySetUtils.SAVE_AS_TEMPLATE);
         this.setName(getMenuKeySet().getMenuKeySetName() + "...");
         this.setMnemonic(getMenuKeySet().getMnemonic());
-        this.setSmallIcon(IconUtils.readIcon("/com/fr/design/images/m_file/saveAs_normal.svg"));
+        this.setSmallIcon("/com/fr/design/images/m_file/saveAs");
     }
 
     /**

designer-base/src/main/java/com/fr/design/actions/file/SaveTemplateAction.java

@@ -20,7 +20,7 @@ public class SaveTemplateAction extends JTemplateAction<JTemplate<?, ?>> {
         this.setMenuKeySet(KeySetUtils.SAVE_TEMPLATE);
         this.setName(getMenuKeySet().getMenuKeySetName());
         this.setMnemonic(getMenuKeySet().getMnemonic());
-		this.setSmallIcon("/com/fr/design/images/m_file/save.png");
+		this.setSmallIcon("/com/fr/design/images/m_file/save");
         this.setAccelerator(getMenuKeySet().getKeyStroke());
 	}
 

designer-base/src/main/java/com/fr/design/actions/file/SwitchExistEnv.java

@@ -25,7 +25,7 @@ public class SwitchExistEnv extends MenuDef {
         Iterator<String> nameIt = DesignerEnvManager.getEnvManager().getEnvNameIterator();
         while (nameIt.hasNext()) {
             String name = nameIt.next();
-            this.setIconPath("com/fr/design/images/m_file/switch_normal.svg");
+            this.setIconPath("com/fr/design/images/m_file/switch");
             this.addShortCut(new GetExistEnvAction(name));
         }
         this.addShortCut(SeparatorDef.DEFAULT);
@@ -42,11 +42,11 @@ public class SwitchExistEnv extends MenuDef {
             DesignerWorkspaceInfo env = DesignerEnvManager.getEnvManager().getWorkspaceInfo(envName);
             switch (env.getType()) {
                 case Local: {
-                    this.setSmallIcon(IconUtils.readIcon("com/fr/design/images/data/bind/localconnect_normal.svg"));
+                    this.setSmallIcon("com/fr/design/images/data/bind/localconnect");
                     break;
                 }
                 case Remote: {
-                    this.setSmallIcon(IconUtils.readIcon("com/fr/design/images/data/bind/distanceconnect_normal.svg"));
+                    this.setSmallIcon("com/fr/design/images/data/bind/distanceconnect");
                     break;
                 }
             }

designer-base/src/main/java/com/fr/design/actions/help/TutorialAction.java

@@ -28,7 +28,7 @@ public class TutorialAction extends UpdateAction {
         this.setMenuKeySet(HELP_TUTORIAL);
         this.setName(getMenuKeySet().getMenuName());
         this.setMnemonic(getMenuKeySet().getMnemonic());
-        this.setSmallIcon(IconUtils.readIcon("/com/fr/design/images/bbs/help_normal.svg"));
+        this.setSmallIcon("/com/fr/design/images/bbs/help");
         this.setAccelerator(getMenuKeySet().getKeyStroke());
     }
 

designer-base/src/main/java/com/fr/design/actions/help/WebDemoAction.java

@@ -16,7 +16,7 @@ public class WebDemoAction extends UpdateAction {
         this.setMenuKeySet(PRODUCT_DEMO);
         this.setName(getMenuKeySet().getMenuName());
         this.setMnemonic(getMenuKeySet().getMnemonic());
-        this.setSmallIcon(IconUtils.readIcon("/com/fr/design/images/m_help/demo_normal.svg"));
+        this.setSmallIcon("/com/fr/design/images/m_help/demo");
     }
 
     /**

designer-base/src/main/java/com/fr/design/actions/help/alphafine/AlphaFineAction.java

@@ -21,7 +21,7 @@ public class AlphaFineAction extends UpdateAction {
         this.setMenuKeySet(ALPHAFINE);
         this.setName(getMenuKeySet().getMenuName());
         this.setMnemonic(getMenuKeySet().getMnemonic());
-        this.setSmallIcon(SVGIcon.readSVGIcon("com/fr/design/mainframe/alphafine/images/smallsearch_normal.svg"));
+        this.setSmallIcon("com/fr/design/mainframe/alphafine/images/smallsearch");
         this.generateAndSetSearchText(AlphaFineConfigPane.class.getName());
     }
 

designer-base/src/main/java/com/fr/design/actions/server/ConnectionListAction.java

@@ -26,7 +26,7 @@ public class ConnectionListAction extends UpdateAction {
         this.setMenuKeySet(DEFINE_DATA_CONNECTION);
         this.setName(getMenuKeySet().getMenuKeySetName());
         this.setMnemonic(getMenuKeySet().getMnemonic());
-        this.setSmallIcon(IconUtils.readIcon("/com/fr/design/images/m_web/connection_normal.svg"));
+        this.setSmallIcon("/com/fr/design/images/m_web/connection");
         this.generateAndSetSearchText(DatabaseConnectionPane.JDBC.class.getName());
     }
 

designer-base/src/main/java/com/fr/design/actions/server/FunctionManagerAction.java

@@ -29,7 +29,7 @@ public class FunctionManagerAction extends UpdateAction {
         this.setMenuKeySet(FUNCTION_MANAGER);
         this.setName(getMenuKeySet().getMenuKeySetName()+"...");
         this.setMnemonic(getMenuKeySet().getMnemonic());
-        this.setSmallIcon(IconUtils.readIcon("/com/fr/design/images/m_web/function_normal.svg"));
+        this.setSmallIcon("/com/fr/design/images/m_web/function");
         this.generateAndSetSearchText(FunctionManagerPane.class.getName());
     }
 

designer-base/src/main/java/com/fr/design/actions/server/GlobalParameterAction.java

@@ -31,7 +31,7 @@ public class GlobalParameterAction extends UpdateAction {
         this.setMenuKeySet(GLOBAL_PARAMETER);
         this.setName(getMenuKeySet().getMenuKeySetName() + "...");
         this.setMnemonic(getMenuKeySet().getMnemonic());
-        this.setSmallIcon(IconUtils.readIcon("/com/fr/design/images/m_report/p_normal.svg"));
+        this.setSmallIcon("/com/fr/design/images/m_report/p");
     }
 
     /**

designer-base/src/main/java/com/fr/design/actions/server/GlobalTableDataAction.java

@@ -40,7 +40,7 @@ public class GlobalTableDataAction extends UpdateAction implements ResponseDataS
         this.setMenuKeySet(SERVER_TABLEDATA);
         this.setName(getMenuKeySet().getMenuKeySetName());
         this.setMnemonic(getMenuKeySet().getMnemonic());
-        this.setSmallIcon(IconUtils.readIcon("/com/fr/design/images/data/dock/serverdatabase_normal.svg"));
+        this.setSmallIcon("/com/fr/design/images/data/dock/serverdatabase");
     }
 
     public static final MenuKeySet SERVER_TABLEDATA = new MenuKeySet() {

designer-base/src/main/java/com/fr/design/actions/server/PlatformManagerAction.java

@@ -14,7 +14,7 @@ public class PlatformManagerAction extends UpdateAction {
         this.setMenuKeySet(PLATEFORM_MANAGER);
         this.setName(getMenuKeySet().getMenuKeySetName());
         this.setMnemonic(getMenuKeySet().getMnemonic());
-		this.setSmallIcon(IconUtils.readIcon("/com/fr/design/images/server/platform_16_16_normal.svg"));
+		this.setSmallIcon("/com/fr/design/images/server/platform_16_16");
 	}
 
     /**

designer-base/src/main/java/com/fr/design/actions/server/PluginManagerAction.java

@@ -20,7 +20,7 @@ public class PluginManagerAction extends UpdateAction {
         this.setMenuKeySet(PLUGIN_MANAGER);
         this.setName(getMenuKeySet().getMenuKeySetName());
         this.setMnemonic(getMenuKeySet().getMnemonic());
-        this.setSmallIcon(IconUtils.readIcon("/com/fr/design/images/server/plugin_normal.svg"));
+        this.setSmallIcon("/com/fr/design/images/server/plugin");
     }
     @Override
     public void actionPerformed(ActionEvent e) {

designer-base/src/main/java/com/fr/design/constants/UIConstants.java

@@ -180,7 +180,7 @@ public interface UIConstants {
     public static final Icon YES_ICON = IOUtils.readIcon("com/fr/design/images/buttonicon/yes.png");
     public static final Icon CHOOSEN_ICON = IOUtils.readIcon("com/fr/design/images/buttonicon/select_item.png");
     public static final Icon PRE_WIDGET_ICON = IOUtils.readIcon("com/fr/design/images/buttonicon/prewidget.png");
-    public static final Icon PRE_WIDGET_NORMAL_ICON = IconUtils.readIcon("com/fr/design/images/buttonicon/prewidget_normal.svg");
+    public static final Icon PRE_WIDGET_NORMAL_ICON = IconUtils.readIcon("com/fr/design/images/buttonicon/prewidget");
     public static final Icon EDIT_NORMAL_ICON = IOUtils.readIcon("com/fr/design/images/buttonicon/editn.png");
     public static final Icon EDIT_PRESSED_ICON = IOUtils.readIcon("com/fr/design/images/buttonicon/editp.png");
     public static final Icon HIDE_NORMAL_ICON = IOUtils.readIcon("com/fr/design/images/buttonicon/hiden.png");

designer-base/src/main/java/com/fr/design/data/BasicTableDataTreePane.java

@@ -398,7 +398,7 @@ public abstract class BasicTableDataTreePane extends DockingView implements Resp
         public PreviewTableDataAction(TableDataTree dataTree) {
             this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Preview"));
             this.setMnemonic('p');
-            this.setSmallIcon(IconPathConstants.PREVIEW_ICON_PATH);
+            this.setSmallIcon("/com/fr/design/images/m_file/preview");
             this.dataTree = dataTree;
         }
 
@@ -437,7 +437,7 @@ public abstract class BasicTableDataTreePane extends DockingView implements Resp
         public ConnectionTableAction() {
             this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Server_Define_Data_Connection"));
             this.setMnemonic('D');
-            this.setSmallIcon(IconPathConstants.TD_CONNECTION_ICON_PATH);
+            this.setSmallIcon("/com/fr/design/images/m_web/connection");
         }
     }
 

designer-base/src/main/java/com/fr/design/data/datapane/TableDataTreePane.java

@@ -278,7 +278,7 @@ public class TableDataTreePane extends BasicTableDataTreePane {
         public EditAction() {
             this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Edit"));
             this.setMnemonic('E');
-            this.setSmallIcon(IconPathConstants.TD_EDIT_ICON_PATH);
+            this.setSmallIcon("/com/fr/design/images/control/edit");
         }
 
         public void actionPerformed(ActionEvent e) {
@@ -296,7 +296,7 @@ public class TableDataTreePane extends BasicTableDataTreePane {
         public RemoveAction() {
             this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Remove"));
             this.setMnemonic('R');
-            this.setSmallIcon(IconPathConstants.TD_REMOVE_ICON_PATH);
+            this.setSmallIcon("/com/fr/design/images/control/remove");
         }
 
         @Override

designer-base/src/main/java/com/fr/design/gui/core/WidgetOption.java

@@ -128,27 +128,27 @@ public abstract class WidgetOption implements Serializable {
     }
 
     public static final WidgetOption DATEEDITOR = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Type_Date"),
-            IconUtils.readIcon("/com/fr/design/images/buttonicon/widget/date_16_normal.svg"),
+            "/com/fr/design/images/buttonicon/widget/date_16",
             DateEditor.class);
 
     public static final WidgetOption TREE = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_View_Tree"),
-            IconUtils.readIcon("/com/fr/design/images/buttonicon/widget/tree_16_normal.svg"), TreeEditor.class);
+            "/com/fr/design/images/buttonicon/widget/tree_16", TreeEditor.class);
 
-    public static final WidgetOption TREECOMBOBOX = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Tree_ComboBox"), IconUtils.readIcon("/com/fr/design/images/buttonicon/widget/comboboxtree16_normal.svg"),
+    public static final WidgetOption TREECOMBOBOX = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Tree_ComboBox"), "/com/fr/design/images/buttonicon/widget/comboboxtree16",
             TreeComboBoxEditor.class);
 
     public static final WidgetOption CHECKBOXGROUP = WidgetOptionFactory.createByWidgetClass(
-            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Type_Checkbox_Group"), IconUtils.readIcon("/com/fr/design/images/buttonicon/widget/checkbox_group_16_normal.svg"), CheckBoxGroup.class);
+            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Type_Checkbox_Group"), "/com/fr/design/images/buttonicon/widget/checkbox_group_16", CheckBoxGroup.class);
 
     public static final WidgetOption RADIOGROUP = WidgetOptionFactory.createByWidgetClass(
-            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Type_Radio_Group"), IconUtils.readIcon("/com/fr/design/images/buttonicon/widget/button_group_16_normal.svg"),
+            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Type_Radio_Group"), "/com/fr/design/images/buttonicon/widget/button_group_16",
             RadioGroup.class);
 
     public static final WidgetOption NUMBEREDITOR = WidgetOptionFactory.createByWidgetClass(
-            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Type_Number"), IconUtils.readIcon("/com/fr/design/images/buttonicon/widget/number_field_16_normal.svg"), NumberEditor.class);
+            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Type_Number"), "/com/fr/design/images/buttonicon/widget/number_field_16", NumberEditor.class);
 
     public static final WidgetOption LABEL = WidgetOptionFactory.createByWidgetClass(
-            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Type_Label"), IconUtils.readIcon("/com/fr/design/images/buttonicon/widget/label_16_normal.svg"),
+            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Type_Label"), "/com/fr/design/images/buttonicon/widget/label_16",
             Label.class);
 
     public static final WidgetOption BUTTON = WidgetOptionFactory.createByWidgetClass(
@@ -156,23 +156,23 @@ public abstract class WidgetOption implements Serializable {
             Button.class);
 
     public static final WidgetOption FREEBUTTON = WidgetOptionFactory.createByWidgetClass(
-            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Type_Button"), IconUtils.readIcon("/com/fr/design/images/buttonicon/widget/button_16_normal.svg"),
+            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Type_Button"), "/com/fr/design/images/buttonicon/widget/button_16",
             FreeButton.class);
 
     public static final WidgetOption MULTI_FILEEDITOR = WidgetOptionFactory.createByWidgetClass(
-            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Type_File"), IconUtils.readIcon("/com/fr/design/images/buttonicon/widget/files_up_normal.svg"),
+            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Type_File"), "/com/fr/design/images/buttonicon/widget/files_up",
             MultiFileEditor.class);
 
     public static final WidgetOption COMBOBOX = WidgetOptionFactory.createByWidgetClass(
-            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Type_Combo_Box"), IconUtils.readIcon("/com/fr/design/images/buttonicon/widget/combo_box_16_normal.svg"),
+            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Type_Combo_Box"), "/com/fr/design/images/buttonicon/widget/combo_box_16",
             ComboBox.class);
 
     public static final WidgetOption COMBOCHECKBOX = WidgetOptionFactory.createByWidgetClass(
-            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Type_Combo_Checkbox"), IconUtils.readIcon("/com/fr/design/images/buttonicon/widget/combo_check_16_normal.svg"),
+            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Type_Combo_Checkbox"), "/com/fr/design/images/buttonicon/widget/combo_check_16",
             ComboCheckBox.class);
 
     public static final WidgetOption CHECKBOX = WidgetOptionFactory.createByWidgetClass(
-            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Type_Checkbox"), IconUtils.readIcon("/com/fr/design/images/buttonicon/widget/check_box_16_normal.svg"),
+            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Type_Checkbox"), "/com/fr/design/images/buttonicon/widget/check_box_16",
             CheckBox.class);
 
     public static final WidgetOption LIST = WidgetOptionFactory.createByWidgetClass(
@@ -182,16 +182,16 @@ public abstract class WidgetOption implements Serializable {
 
     public static final WidgetOption TEXTEDITOR = WidgetOptionFactory.createByWidgetClass(
             com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Type_Text")
-            , IconUtils.readIcon("/com/fr/design/images/buttonicon/widget/text_field_16_normal.svg"),
+            , "/com/fr/design/images/buttonicon/widget/text_field_16",
             TextEditor.class);
 
     public static final WidgetOption TEXTAREA = WidgetOptionFactory.createByWidgetClass(
-            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Type_Textarea"), IconUtils.readIcon("/com/fr/design/images/buttonicon/widget/text_area_16_normal.svg"),
+            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Type_Textarea"), "/com/fr/design/images/buttonicon/widget/text_area_16",
             TextArea.class);
 
     public static final WidgetOption PASSWORD = WidgetOptionFactory.createByWidgetClass(
             com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Type_Password"),
-            IconUtils.readIcon("/com/fr/design/images/buttonicon/widget/password_field_16_normal.svg"), Password.class);
+            "/com/fr/design/images/buttonicon/widget/password_field_16", Password.class);
 
     public static final WidgetOption IFRAMEDITOR = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Form_Iframe"), BaseUtils.readIcon("/com/fr/web/images/form/resources/iframe_16.png"),
             IframeEditor.class);

designer-base/src/main/java/com/fr/design/gui/core/WidgetOptionFactory.java

@@ -1,6 +1,7 @@
 package com.fr.design.gui.core;
 
 import com.fr.base.BaseUtils;
+import com.fr.base.svg.IconUtils;
 import com.fr.form.ui.Widget;
 
 import javax.swing.*;
@@ -14,4 +15,9 @@ public class WidgetOptionFactory {
     public static WidgetOption createByWidgetClass(String optionName, Icon optionIcon, Class<? extends Widget> widgetClass) {
         return new CustomWidgetOption(optionName, optionIcon, widgetClass);
     }
+
+    public static WidgetOption createByWidgetClass(String optionName, String resource, Class<? extends Widget> widgetClass) {
+        Icon optionIcon = IconUtils.readIcon(resource);
+        return new CustomWidgetOption(optionName, optionIcon, widgetClass);
+    }
 }

designer-base/src/main/java/com/fr/design/icon/IconPathConstants.java

@@ -14,8 +14,6 @@ public class IconPathConstants {
     }
 
     public static final String ADD_POPMENU_ICON_PATH = "/com/fr/design/images/control/addPopup.png";
-    public static final String ADD_POPMENU_NORMAL_ICON_PATH = "/com/fr/design/images/control/addPopup_normal.svg";
-    public static final String ADD_POPMENU_DISABLED_ICON_PATH = "/com/fr/design/images/control/addPopup_disabled.svg";
 
     public static final String DS_ICON_PATH = "/com/fr/design/images/data/datasource.png";
     public static final String CLASS_TD_ICON_PATH = "/com/fr/design/images/data/source/classTableData.png";
@@ -25,18 +23,11 @@ public class IconPathConstants {
     public static final String DS_TREE_TD_ICON_PATH = "/com/fr/design/images/data/tree.png";
     public static final String DS_QUERY_ICON_PATH = "/com/fr/design/images/data/database.png";
     public static final String PREVIEW_ICON_PATH = "/com/fr/design/images/m_file/preview.png";
-    public static final String PREVIEW_NORMAL_ICON_PATH = "/com/fr/design/images/m_file/preview_normal.svg";
-    public static final String PREVIEW_DISABLED_ICON_PATH = "/com/fr/design/images/m_file/preview_disabled.svg";
     public static final String TD_EDIT_ICON_PATH = "/com/fr/design/images/control/edit.png";
-    public static final String TD_EDIT_NORMAL_ICON_PATH = "/com/fr/design/images/control/edit_normal.svg";
-    public static final String TD_EDIT_DISABLED_ICON_PATH = "/com/fr/design/images/control/edit_disabled.svg";
     public static final String TD_EL_SHARE_HELP_ICON_PATH = "/com/fr/design/images/control/help_open.png";
     public static final String TD_EL_SHARE_CLOSE_ICON_PATH = "/com/fr/design/images/control/help_close.png";
     public static final String TD_REMOVE_ICON_PATH = "/com/fr/design/images/control/remove.png";
-    public static final String TD_REMOVE_NORMAL_ICON_PATH = "/com/fr/design/images/control/remove_normal.svg";
-    public static final String TD_REMOVE_DISABLED_ICON_PATH = "/com/fr/design/images/control/remove_disabled.svg";
     public static final String TD_CONNECTION_ICON_PATH = "/com/fr/design/images/m_web/connection.png";
-    public static final String TD_CONNECTION_NORMAL_ICON_PATH = "/com/fr/design/images/m_web/connection_normal.svg";
     public static final String SP_SHOW_ICON_PATH = "/com/fr/design/images/data/store_procedure.png";
     public static final String STD_SHOW_ICON_PATH = "/com/fr/design/images/data/dock/serverdatabase.png";
     public static final String XMLA_ICON_PATH = "/com/fr/design/images/data/cube.png";

designer-base/src/main/java/com/fr/design/mainframe/DesignerFrameFileDealerPane.java

@@ -316,7 +316,7 @@ public class DesignerFrameFileDealerPane extends JPanel implements FileToolbarSt
         public NewFolderAction() {
 
             this.setName(KeySetUtils.NEW_FOLDER.getMenuKeySetName());
-            this.setSmallIcon("/com/fr/design/images/FileDealerPaneIcon/new_folder.png");
+            this.setSmallIcon("/com/fr/design/images/FileDealerPaneIcon/new_folder");
         }
 
         @Override
@@ -342,7 +342,7 @@ public class DesignerFrameFileDealerPane extends JPanel implements FileToolbarSt
     private class VcsAction extends UpdateAction {
 
         public VcsAction() {
-            this.setSmallIcon("/com/fr/design/images/FileDealerPaneIcon/vcs_list.png");
+            this.setSmallIcon("/com/fr/design/images/FileDealerPaneIcon/vcs_list");
         }
 
         @Override
@@ -424,7 +424,7 @@ public class DesignerFrameFileDealerPane extends JPanel implements FileToolbarSt
         public ShowInExplorerAction() {
 
             this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Show_In_Containing_Folder"));
-            this.setSmallIcon("/com/fr/design/images/FileDealerPaneIcon/view_folder.png");
+            this.setSmallIcon("/com/fr/design/images/FileDealerPaneIcon/view_folder");
         }
 
         @Override
@@ -441,7 +441,7 @@ public class DesignerFrameFileDealerPane extends JPanel implements FileToolbarSt
         public RefreshTreeAction() {
 
             this.setName(Toolkit.i18nText("Fine-Design_Basic_Refresh"));
-            this.setSmallIcon("/com/fr/design/images/FileDealerPaneIcon/refresh.png");
+            this.setSmallIcon("/com/fr/design/images/FileDealerPaneIcon/refresh");
         }
 
         @Override
@@ -459,7 +459,7 @@ public class DesignerFrameFileDealerPane extends JPanel implements FileToolbarSt
         public RenameAction() {
 
             this.setName(Toolkit.i18nText("Fine-Design_Basic_Rename"));
-            this.setSmallIcon("/com/fr/design/images/FileDealerPaneIcon/rename.png");
+            this.setSmallIcon("/com/fr/design/images/FileDealerPaneIcon/rename");
         }
 
         @Override
@@ -498,7 +498,7 @@ public class DesignerFrameFileDealerPane extends JPanel implements FileToolbarSt
         public DelFileAction() {
 
             this.setName(Toolkit.i18nText("Fine-Design_Basic_Remove"));
-            this.setSmallIcon("/com/fr/design/images/FileDealerPaneIcon/remove.png");
+            this.setSmallIcon("/com/fr/design/images/FileDealerPaneIcon/remove");
         }
 
         @Override

designer-base/src/main/java/com/fr/design/remote/action/RemoteDesignAuthManagerAction.java

@@ -27,7 +27,7 @@ public class RemoteDesignAuthManagerAction extends UpdateAction {
     public RemoteDesignAuthManagerAction() {
         this.setName(Toolkit.i18nText("Fine-Design_Basic_Remote_Design_Authority_Manager"));
         // 远程设计权限管理
-        this.setSmallIcon(IconUtils.readIcon("com/fr/design/remote/images/icon_Remote_Design_Auth_Manager_normal@1x_normal.svg"));
+        this.setSmallIcon("com/fr/design/remote/images/icon_Remote_Design_Auth_Manager_normal@1x");
     }
 
 

designer-base/src/main/java/com/fr/design/report/fit/menupane/ReportFitAttrAction.java

@@ -66,7 +66,7 @@ public class ReportFitAttrAction extends JTemplateAction {
         }
         this.setName(getMenuKeySet().getMenuKeySetName() + "...");
         this.setMnemonic(getMenuKeySet().getMnemonic());
-        this.setSmallIcon(IconUtils.readIcon("/com/fr/design/images/reportfit/fit_normal.svg"));
+        this.setSmallIcon("/com/fr/design/images/reportfit/fit");
     }
 
     /**

designer-base/src/main/java/com/fr/design/roleAuthority/ReportAndFSManagePane.java

@@ -254,7 +254,7 @@ public class ReportAndFSManagePane extends DockingView implements Prepare4DataSo
 
         public RefreshAction() {
             this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Refresh"));
-            this.setSmallIcon(UIConstants.REFRESH_ICON);
+            this.setSmallIcon("/com/fr/design/images/buttonicon/refresh");
         }
 
         @Override

designer-base/src/main/java/com/fr/design/style/color/UIToolbarColorButton.java

@@ -35,7 +35,7 @@ public class UIToolbarColorButton extends UICombinationButton implements PopupHi
     private UIObserverListener uiObserverListener;
 
     public UIToolbarColorButton(Icon icon) {
-        super(new UIColorButton(icon), new UIButton(IconUtils.readIcon("/com/fr/design/images/gui/popup_normal.svg")));
+        super(new UIColorButton(icon), new UIButton(IconUtils.readIcon("/com/fr/design/images/gui/popup")));
         getLeftButton().setEventBanned(true);
         getRightButton().addFocusListener(new FocusListener() {
 

designer-base/src/main/java/com/fr/design/update/actions/SoftwareUpdateAction.java

@@ -15,7 +15,7 @@ public class SoftwareUpdateAction extends UpdateAction {
 
     public SoftwareUpdateAction() {
         setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Updater_UpdateAndUpgrade"));
-        setSmallIcon(IconUtils.readIcon("/com/fr/design/images/update/update_new_normal.svg"));
+        setSmallIcon("/com/fr/design/images/update/update_new");
 
     }
 

designer-base/src/test/java/com/fr/base/svg/IconUtilsTest.java

@@ -0,0 +1,41 @@
+package com.fr.base.svg;
+
+import com.fr.cert.token.lang.Assert;
+import junit.framework.TestCase;
+
+import javax.swing.Icon;
+import javax.swing.ImageIcon;
+
+/**
+ * @author Yvan
+ * @version 10.0
+ * Created by Yvan on 2020/12/25
+ */
+public class IconUtilsTest extends TestCase {
+
+    public void testReadIcon() {
+        String resource = "com/fr/design/images/m_edit/copy.png";
+
+        Icon pngIcon = IconUtils.readIcon(resource);
+        assertTrue(pngIcon instanceof ImageIcon);
+
+        resource = "com/fr/design/images/m_edit/copy_normal.svg";
+        Icon suffixIcon = IconUtils.readIcon(resource);
+        assertTrue(suffixIcon instanceof SVGIcon);
+
+        resource = "com/fr/design/images/m_edit/copy";
+        Icon noSuffixIcon = IconUtils.readIcon(resource);
+        assertTrue(noSuffixIcon instanceof SVGIcon);
+    }
+
+    public void testReadSVGIcon() {
+        String resource = "com/fr/design/images/m_edit/copy.png";
+
+        Icon suffixIcon = IconUtils.readSVGIcon(resource, IconUtils.ICON_TYPE_NORMAL);
+        assertTrue(suffixIcon instanceof SVGIcon);
+
+        resource = "com/fr/design/images/m_edit/copy";
+        Icon noSuffixIcon = IconUtils.readSVGIcon(resource, IconUtils.ICON_TYPE_NORMAL);
+        assertTrue(noSuffixIcon instanceof SVGIcon);
+    }
+}

designer-chart/src/main/java/com/fr/design/module/ChartPreStyleAction.java

@@ -33,7 +33,7 @@ public class ChartPreStyleAction extends UpdateAction {
         this.setMenuKeySet(CHART_DEFAULT_STYLE);
         this.setName(getMenuKeySet().getMenuKeySetName()+ "...");
         this.setMnemonic(getMenuKeySet().getMnemonic());
-		this.setSmallIcon(IconUtils.readIcon("com/fr/design/images/chart/ChartType_normal.svg"));
+		this.setSmallIcon("com/fr/design/images/chart/ChartType");
 		this.generateAndSetSearchText(ChartPreStyleManagerPane.class.getName());
 	}
 

designer-chart/src/main/java/com/fr/van/chart/map/server/ChartMapEditorAction.java

@@ -17,7 +17,7 @@ import java.awt.event.ActionEvent;
 public class ChartMapEditorAction extends UpdateAction {
 
     public ChartMapEditorAction(){
-        this.setSmallIcon(IconUtils.readIcon("/com/fr/van/chart/map/images/mapData_normal.svg"));
+        this.setSmallIcon("/com/fr/van/chart/map/images/mapData");
         this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Map_Data"));
     }
 

designer-form/src/main/java/com/fr/design/actions/NewFormAction.java

@@ -21,7 +21,7 @@ public class NewFormAction extends UpdateAction {
         this.setMenuKeySet(NEW_FORM);
         this.setName(getMenuKeySet().getMenuKeySetName());
         this.setMnemonic(getMenuKeySet().getMnemonic());
-        this.setSmallIcon(IconUtils.readIcon("/com/fr/design/images/buttonicon/new_form_for_dock_normal.svg"));
+        this.setSmallIcon("/com/fr/design/images/buttonicon/new_form3");
         this.setAccelerator(getMenuKeySet().getKeyStroke());
     }
 

designer-form/src/main/java/com/fr/design/designer/beans/actions/CopyAction.java

@@ -16,7 +16,7 @@ public class CopyAction extends FormWidgetEditAction {
         super(t);
         this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_M_Edit_Copy"));
         this.setMnemonic('C');
-        this.setSmallIcon("/com/fr/design/images/m_edit/copy.png");
+        this.setSmallIcon("/com/fr/design/images/m_edit/copy");
         this.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_C, DEFAULT_MODIFIER));
         setUpdateBehavior(new ComponentEnable());
         this.setEnabled(!DesignModeContext.isBanCopyAndCut());

designer-form/src/main/java/com/fr/design/designer/beans/actions/CutAction.java

@@ -16,7 +16,7 @@ public class CutAction extends FormWidgetEditAction {
         super(t);
         this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_M_Edit_Cut"));
         this.setMnemonic('T');
-        this.setSmallIcon("/com/fr/design/images/m_edit/cut.png");
+        this.setSmallIcon("/com/fr/design/images/m_edit/cut");
         this.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_X, DEFAULT_MODIFIER));
         this.setUpdateBehavior(new ComponentEnable());
         this.setEnabled(!DesignModeContext.isBanCopyAndCut());

designer-form/src/main/java/com/fr/design/designer/beans/actions/FormDeleteAction.java

@@ -24,7 +24,7 @@ public class FormDeleteAction extends FormWidgetEditAction {
         this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_M_Edit_Delete"));
         this.setMnemonic('D');
         // Richie:删除菜单图标
-        this.setSmallIcon("/com/fr/design/images/m_report/delete.png");
+        this.setSmallIcon("/com/fr/design/images/m_report/delete");
         this.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_BACK_SPACE, 0));
         this.setUpdateBehavior(new ComponentEnable());
     }

designer-form/src/main/java/com/fr/design/designer/beans/actions/PasteAction.java

@@ -14,7 +14,7 @@ public class PasteAction extends FormWidgetEditAction {
         super(t);
         this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_M_Edit_Paste"));
         this.setMnemonic('P');
-        this.setSmallIcon("/com/fr/design/images/m_edit/paste.png");
+        this.setSmallIcon("/com/fr/design/images/m_edit/paste");
         this.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_V, DEFAULT_MODIFIER));
     }
 

designer-form/src/main/java/com/fr/design/form/parameter/FormParaTargetMode.java

@@ -28,7 +28,7 @@ public class FormParaTargetMode extends FormDesignerModeForSpecial<FormParaDesig
     public WidgetOption[] getPredefinedWidgetOptions() {
         return new WidgetOption[]{
                 WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Query_Button"),
-                        IconUtils.readIcon("/com/fr/web/images/form/resources/preview_16_normal.svg"), FormSubmitButton.class)};
+                        "/com/fr/web/images/form/resources/preview_16", FormSubmitButton.class)};
     }
 
     @Override

designer-form/src/main/java/com/fr/design/gui/core/FormWidgetOption.java

@@ -75,13 +75,13 @@ public class FormWidgetOption extends WidgetOption {
         return new WidgetOption[] {CARDLAYOUTCONTAINER, ABSOLUTELAYOUTCONTAINER};
     }
 
-	public static final WidgetOption ABSOLUTELAYOUTCONTAINER = WidgetOptionFactory.createByWidgetClass(Toolkit.i18nText("Fine-Design_Form_Layout_Block_Absolute"), IconUtils.readIcon("/com/fr/design/images/buttonicon/absolute_layout_normal.svg"),
+	public static final WidgetOption ABSOLUTELAYOUTCONTAINER = WidgetOptionFactory.createByWidgetClass(Toolkit.i18nText("Fine-Design_Form_Layout_Block_Absolute"), "/com/fr/design/images/buttonicon/absolute_layout",
 			WAbsoluteLayout.class);
 
 	public static final WidgetOption BORDERLAYOUTCONTAINER = WidgetOptionFactory.createByWidgetClass(Toolkit.i18nText("Fine-Design_Report_Border_Layout"), BaseUtils.readIcon("/com/fr/web/images/form/resources/layout_border.png"),
 			WBorderLayout.class);
 
-	public static final WidgetOption CARDLAYOUTCONTAINER = WidgetOptionFactory.createByWidgetClass(Toolkit.i18nText("Fine-Design_Form_Layout_Block_Tab"), IconUtils.readIcon("/com/fr/design/images/buttonicon/card_layout_16_normal.svg"),
+	public static final WidgetOption CARDLAYOUTCONTAINER = WidgetOptionFactory.createByWidgetClass(Toolkit.i18nText("Fine-Design_Form_Layout_Block_Tab"), "/com/fr/design/images/buttonicon/card_layout_16",
 			WCardLayout.class);
 
 	public static final WidgetOption HORIZONTALBOXLAYOUTCONTAINER = WidgetOptionFactory.createByWidgetClass(Toolkit.i18nText("Fine-Design_Form_Layout_HBox"), BaseUtils.readIcon("/com/fr/web/images/form/resources/boxlayout_h_16.png"),
@@ -94,9 +94,9 @@ public class FormWidgetOption extends WidgetOption {
 			BaseUtils.readIcon("/com/fr/web/images/form/resources/boxlayout_v_16.png"),
 			WFitLayout.class);
 
-	public static final WidgetOption PARAMETERCONTAINER = WidgetOptionFactory.createByWidgetClass(Toolkit.i18nText("Fine-Design_Form_Parameter_Body"), IconUtils.readIcon("/com/fr/web/images/form/resources/layout_parameter2_normal.svg"),
+	public static final WidgetOption PARAMETERCONTAINER = WidgetOptionFactory.createByWidgetClass(Toolkit.i18nText("Fine-Design_Form_Parameter_Body"), "/com/fr/web/images/form/resources/layout_parameter2",
 			WParameterLayout.class);
 
-	public static final WidgetOption ELEMENTCASE = WidgetOptionFactory.createByWidgetClass(Toolkit.i18nText("Fine-Design_Form_Report"), IconUtils.readIcon("/com/fr/design/images/buttonicon/report_16_normal.svg"),
+	public static final WidgetOption ELEMENTCASE = WidgetOptionFactory.createByWidgetClass(Toolkit.i18nText("Fine-Design_Form_Report"), "/com/fr/design/images/buttonicon/report_16",
 			ElementCaseEditor.class);
 }

designer-form/src/main/java/com/fr/design/mainframe/FormTargetMode.java

@@ -23,7 +23,7 @@ public class FormTargetMode extends FormDesignerModeForSpecial<FormDesigner> {
 	public WidgetOption[] getPredefinedWidgetOptions() {
         return new WidgetOption[]{
                 WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Query_Button"),
-                        IconUtils.readIcon("/com/fr/web/images/form/resources/preview_16_normal.svg"), FormSubmitButton.class)};
+                        "/com/fr/web/images/form/resources/preview_16", FormSubmitButton.class)};
     }
 
 	public ArrayList<PropertyGroup> createRootDesignerPropertyGroup() {

designer-form/src/main/java/com/fr/design/mainframe/JForm.java

@@ -247,7 +247,7 @@ public class JForm extends JTemplate<Form, FormUndoState> implements BaseJForm<F
 
     private MenuDef createWorkBookExportMenu() {
         MenuDef exportMenuDef = new MenuDef(KeySetUtils.EXPORT.getMenuName());
-        exportMenuDef.setIconPath("/com/fr/design/images/m_file/export_normal.svg");
+        exportMenuDef.setIconPath("/com/fr/design/images/m_file/export");
         exportMenuDef.addShortCut(new EmbeddedFormExportExportAction(this));
 
         return exportMenuDef;

designer-realize/src/main/java/com/fr/design/actions/cell/CellAttributeAction.java

@@ -12,7 +12,7 @@ public class CellAttributeAction extends CellAttributeTableAction {
         this.setMenuKeySet(KeySetUtils.CELL_OTHER_ATTR);
         this.setName(getMenuKeySet().getMenuKeySetName());
         this.setMnemonic(getMenuKeySet().getMnemonic());
-        this.setSmallIcon(IconUtils.readIcon("/com/fr/design/images/m_format/cellAttr_normal.svg"));
+        this.setSmallIcon("/com/fr/design/images/m_format/cellAttr");
 	}
 
 	@Override

designer-realize/src/main/java/com/fr/design/actions/cell/CellExpandAttrAction.java

@@ -11,7 +11,7 @@ public class CellExpandAttrAction extends  CellAttributeTableAction{
         this.setMenuKeySet(KeySetUtils.CELL_EXPAND_ATTR);
         this.setName(getMenuKeySet().getMenuKeySetName());
         this.setMnemonic(getMenuKeySet().getMnemonic());
-		this.setSmallIcon(IconUtils.readIcon("/com/fr/design/images/expand/cellAttr_normal.svg"));
+		this.setSmallIcon("/com/fr/design/images/expand/cellAttr");
 	}
 
 

designer-realize/src/main/java/com/fr/design/actions/cell/CellWidgetAttrAction.java

@@ -16,7 +16,7 @@ public class CellWidgetAttrAction extends UpdateAction {
         this.setMenuKeySet(KeySetUtils.CELL_WIDGET_ATTR);
         this.setName(getMenuKeySet().getMenuKeySetName());
         this.setMnemonic(getMenuKeySet().getMnemonic());
-        this.setSmallIcon(IconUtils.readIcon("/com/fr/design/images/m_format/modified_normal.svg"));
+        this.setSmallIcon("/com/fr/design/images/m_format/modified");
     }
 
     @Override

designer-realize/src/main/java/com/fr/design/actions/cell/ConditionAttributesAction.java

@@ -18,7 +18,7 @@ public class ConditionAttributesAction extends UpdateAction {
         this.setMenuKeySet(KeySetUtils.CONDITION_ATTR);
         this.setName(getMenuKeySet().getMenuKeySetName());
         this.setMnemonic(getMenuKeySet().getMnemonic());
-        this.setSmallIcon(IconUtils.readIcon("/com/fr/design/images/m_format/highlight_normal.svg"));
+        this.setSmallIcon("/com/fr/design/images/m_format/highlight");
     }
 
     @Override

designer-realize/src/main/java/com/fr/design/actions/cell/EditCellAction.java

@@ -20,7 +20,7 @@ public class EditCellAction extends ElementCaseAction {
 
         this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Edit"));
         this.setMnemonic('I');
-        this.setSmallIcon(IconUtils.readIcon("/com/fr/design/images/control/edit_normal.svg"));
+        this.setSmallIcon("/com/fr/design/images/control/edit");
     }
 
     @Override

designer-realize/src/main/java/com/fr/design/actions/cell/GlobalStyleMenuDef.java

@@ -33,7 +33,7 @@ public class GlobalStyleMenuDef extends MenuDef {
         this.setMenuKeySet(KeySetUtils.GLOBAL_STYLE);
         this.setName(getMenuKeySet().getMenuKeySetName());
         this.setMnemonic(getMenuKeySet().getMnemonic());
-        this.setIconPath("/com/fr/design/images/m_web/style_normal.svg");
+        this.setIconPath("/com/fr/design/images/m_web/style");
     }
 
     protected ContainerListener getContainerListener() {

designer-realize/src/main/java/com/fr/design/actions/cell/UIToolbarBorderButton.java

@@ -47,7 +47,7 @@ public class UIToolbarBorderButton extends UICombinationButton implements PopupH
 	private JPopupMenu popupWin;
 
 	public UIToolbarBorderButton(Icon icon, ElementCasePane reportPane) {
-		super(new UIButton(icon), new UIButton(IconUtils.readIcon("/com/fr/design/images/gui/popup_normal.svg")));
+		super(new UIButton(icon), new UIButton(IconUtils.readIcon("/com/fr/design/images/gui/popup")));
 		this.reportPane = reportPane;
 	}
 

designer-realize/src/main/java/com/fr/design/actions/cell/style/AlignmentAction.java

@@ -23,9 +23,9 @@ import javax.swing.*;
 public class AlignmentAction extends ButtonGroupAction implements StyleActionInterface {
 
     private static final Icon[][] ICONS = new Icon[][]{
-            {IconUtils.readIcon("/com/fr/design/images/m_format/cellstyle/h_left_normal.svg"), IconUtils.readIcon("/com/fr/design/images/m_format/cellstyle/h_left_selected.svg")},
-            {IconUtils.readIcon("/com/fr/design/images/m_format/cellstyle/h_center_normal.svg"), IconUtils.readIcon("/com/fr/design/images/m_format/cellstyle/h_center_selected.svg")},
-            {IconUtils.readIcon("/com/fr/design/images/m_format/cellstyle/h_right_normal.svg"), IconUtils.readIcon("/com/fr/design/images/m_format/cellstyle/h_right_selected.svg")}};
+            {IconUtils.readIcon("/com/fr/design/images/m_format/cellstyle/h_left"), IconUtils.readIcon("/com/fr/design/images/m_format/cellstyle/h_left_selected.svg")},
+            {IconUtils.readIcon("/com/fr/design/images/m_format/cellstyle/h_center"), IconUtils.readIcon("/com/fr/design/images/m_format/cellstyle/h_center_selected.svg")},
+            {IconUtils.readIcon("/com/fr/design/images/m_format/cellstyle/h_right"), IconUtils.readIcon("/com/fr/design/images/m_format/cellstyle/h_right_selected.svg")}};
 
 
     private static final Integer[] valueArray = new Integer[]{Constants.LEFT, Constants.CENTER, Constants.RIGHT};

designer-realize/src/main/java/com/fr/design/actions/cell/style/ReportFontBoldAction.java

@@ -21,7 +21,7 @@ import javax.swing.*;
 public class ReportFontBoldAction extends AbstractStyleAction implements ToggleButtonUpdateAction {
     private UIToggleButton button;
     protected Style style;
-    private final static Icon[] ICONS = {IconUtils.readIcon("/com/fr/design/images/m_format/cellstyle/bold_normal.svg"), IconUtils.readIcon("/com/fr/design/images/m_format/cellstyle/bold_selected.svg")};
+    private final static Icon[] ICONS = {IconUtils.readIcon("/com/fr/design/images/m_format/cellstyle/bold"), IconUtils.readIcon("/com/fr/design/images/m_format/cellstyle/bold_selected.svg")};
 
     public ReportFontBoldAction(ElementCasePane t) {
         super(t);

designer-realize/src/main/java/com/fr/design/actions/cell/style/ReportFontForegroundAction.java

@@ -51,7 +51,7 @@ public class ReportFontForegroundAction extends AbstractStyleAction implements C
 	public JComponent createToolBarComponent() {
 		Object object = this.getValue(UIToolbarColorButton.class.getName());
 		if (object == null || !(object instanceof UIToolbarColorButton)) {
-			UIToolbarColorButton tbButton = new UIToolbarColorButton(IconUtils.readIcon("/com/fr/design/images/gui/color/foreground_normal.svg"));
+			UIToolbarColorButton tbButton = new UIToolbarColorButton(IconUtils.readIcon("/com/fr/design/images/gui/color/foreground"));
 			this.putValue(UIToolbarColorButton.class.getName(), tbButton);
 			tbButton.set4Toolbar();
 			tbButton.setEnabled(this.isEnabled());

designer-realize/src/main/java/com/fr/design/actions/cell/style/ReportFontItalicAction.java

@@ -17,7 +17,7 @@ import javax.swing.*;
  */
 public class ReportFontItalicAction extends ReportFontBoldAction {
 
-    private final static Icon[] ICONS = {IconUtils.readIcon("/com/fr/design/images/m_format/cellstyle/italic_normal.svg"), IconUtils.readIcon("/com/fr/design/images/m_format/cellstyle/italic_selected.svg")};
+    private final static Icon[] ICONS = {IconUtils.readIcon("/com/fr/design/images/m_format/cellstyle/italic"), IconUtils.readIcon("/com/fr/design/images/m_format/cellstyle/italic_selected.svg")};
 
     public ReportFontItalicAction(ElementCasePane t) {
 		super(t);

designer-realize/src/main/java/com/fr/design/actions/cell/style/ReportFontUnderlineAction.java

@@ -18,7 +18,7 @@ import javax.swing.*;
  */
 public class ReportFontUnderlineAction extends ReportFontBoldAction {
 
-    private final static Icon[] ICONS = {IconUtils.readIcon("/com/fr/design/images/m_format/cellstyle/underline_normal.svg"), IconUtils.readIcon("/com/fr/design/images/m_format/cellstyle/underline_selected.svg")};
+    private final static Icon[] ICONS = {IconUtils.readIcon("/com/fr/design/images/m_format/cellstyle/underline"), IconUtils.readIcon("/com/fr/design/images/m_format/cellstyle/underline_selected.svg")};
 
     public ReportFontUnderlineAction(ElementCasePane t) {
 		super(t);

designer-realize/src/main/java/com/fr/design/actions/cell/style/StyleBackgroundAction.java

@@ -60,7 +60,7 @@ public class StyleBackgroundAction extends AbstractStyleAction implements Change
         public JComponent createToolBarComponent() {
             Object object = this.getValue(UIToolbarColorButton.class.getName());
             if (object == null || !(object instanceof UIToolbarColorButton)) {
-                UIToolbarColorButton tbButton = new UIToolbarColorButton(IconUtils.readIcon("/com/fr/design/images/gui/color/background_normal.svg"));
+                UIToolbarColorButton tbButton = new UIToolbarColorButton(IconUtils.readIcon("/com/fr/design/images/gui/color/background"));
                 tbButton.set4Toolbar();
                 this.putValue(UIToolbarColorButton.class.getName(), tbButton);
 

designer-realize/src/main/java/com/fr/design/actions/columnrow/InsertColumnAction.java

@@ -27,7 +27,7 @@ public class InsertColumnAction extends CellSelectionAction {
 
         this.setName(name);
         this.setMnemonic(INSERT_COLUMN.getMnemonic());
-        this.setSmallIcon(IconUtils.readIcon("/com/fr/design/images/m_insert/insertColumn_normal.svg"));
+        this.setSmallIcon("/com/fr/design/images/m_insert/insertColumn");
     }
 
     public static final MenuKeySet INSERT_COLUMN = new MenuKeySet() {

designer-realize/src/main/java/com/fr/design/actions/columnrow/InsertRowAction.java

@@ -26,7 +26,7 @@ public class InsertRowAction extends CellSelectionAction {
 		super(t);
         this.setName(name);
         this.setMnemonic(INSERT_ROW.getMnemonic());
-		this.setSmallIcon(IconUtils.readIcon("/com/fr/design/images/m_insert/insertRow_normal.svg"));
+		this.setSmallIcon("/com/fr/design/images/m_insert/insertRow");
 	}
 
 	public static final MenuKeySet INSERT_ROW = new MenuKeySet() {

designer-realize/src/main/java/com/fr/design/actions/edit/DeleteAction.java

@@ -20,7 +20,7 @@ public class DeleteAction extends ElementCaseAction {
         this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_M_Edit_Delete"));
         this.setMnemonic('D');
         //Richie:删除菜单图标
-        this.setSmallIcon("/com/fr/design/images/m_report/delete.png");
+        this.setSmallIcon("/com/fr/design/images/m_report/delete");
 //        this.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_BACK_SPACE, 0));
     }
 

designer-realize/src/main/java/com/fr/design/actions/edit/HyperlinkAction.java

@@ -19,7 +19,7 @@ public class HyperlinkAction extends UpdateAction {
         this.setMenuKeySet(KeySetUtils.HYPER_LINK);
         this.setName(getMenuKeySet().getMenuKeySetName());
         this.setMnemonic(getMenuKeySet().getMnemonic());
-        this.setSmallIcon(IconUtils.readIcon("/com/fr/design/images/m_insert/hyperLink_normal.svg"));
+        this.setSmallIcon("/com/fr/design/images/m_insert/hyperLink");
     }
 
     @Override

designer-realize/src/main/java/com/fr/design/actions/edit/merge/MergeCellAction.java

@@ -21,7 +21,7 @@ public class MergeCellAction extends ElementCaseAction  {
         this.setMenuKeySet(KeySetUtils.MERGE_CELL);
         this.setName(getMenuKeySet().getMenuKeySetName());
         this.setMnemonic(getMenuKeySet().getMnemonic());
-		this.setSmallIcon("/com/fr/design/images/m_edit/merge.png");
+		this.setSmallIcon("/com/fr/design/images/m_edit/merge");
 	}
 
     /**

designer-realize/src/main/java/com/fr/design/actions/edit/merge/UnmergeCellAction.java

@@ -20,7 +20,7 @@ public class UnmergeCellAction extends ElementCaseAction {
         this.setMenuKeySet(KeySetUtils.UNMERGE_CELL);
         this.setName(getMenuKeySet().getMenuKeySetName());
         this.setMnemonic(getMenuKeySet().getMnemonic());
-        this.setSmallIcon("/com/fr/design/images/m_edit/unmerge.png");
+        this.setSmallIcon("/com/fr/design/images/m_edit/unmerge");
     }
 
 	@Override

designer-realize/src/main/java/com/fr/design/actions/file/newReport/NewPolyReportAction.java

@@ -19,7 +19,7 @@ public class NewPolyReportAction extends UpdateAction {
     public NewPolyReportAction() {
         this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_M_New_Multi_Report"));
         this.setMnemonic('F');
-        this.setSmallIcon(IconUtils.readIcon("/com/fr/design/images/m_file/formExport_normal.svg"));
+        this.setSmallIcon("/com/fr/design/images/m_file/formExport");
         this.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_M, DEFAULT_MODIFIER));
     }
 

designer-realize/src/main/java/com/fr/design/actions/file/newReport/NewWorkBookAction.java

@@ -26,7 +26,7 @@ public class NewWorkBookAction extends UpdateAction {
     }
 
     protected Icon icon() {
-        return IconUtils.readIcon("/com/fr/design/images/buttonicon/newcpts_normal.svg");
+        return IconUtils.readIcon("/com/fr/design/images/buttonicon/newcpts");
     }
 
     /**

designer-realize/src/main/java/com/fr/design/actions/insert/cell/BiasCellAction.java

@@ -30,7 +30,7 @@ public class BiasCellAction extends AbstractCellAction implements WorkBookSuppor
         this.setMenuKeySet(INSERT_SLOPE_LINE);
         this.setName(getMenuKeySet().getMenuKeySetName()+ "...");
         this.setMnemonic(getMenuKeySet().getMnemonic());
-        this.setSmallIcon("/com/fr/design/images/m_insert/bias.png");
+        this.setSmallIcon("/com/fr/design/images/m_insert/bias");
     }
 
     public static final MenuKeySet INSERT_SLOPE_LINE = new MenuKeySet() {

designer-realize/src/main/java/com/fr/design/actions/insert/cell/ChartCellAction.java

@@ -29,7 +29,7 @@ public class ChartCellAction extends AbstractCellAction implements WorkBookSuppo
 		this.setMenuKeySet(INSERT_CHART);
 		this.setName(getMenuKeySet().getMenuKeySetName()+ "...");
 		this.setMnemonic(getMenuKeySet().getMnemonic());
-		this.setSmallIcon("/com/fr/design/images/m_insert/chart.png");
+		this.setSmallIcon("/com/fr/design/images/m_insert/chart");
 	}
 
 	public static final MenuKeySet INSERT_CHART = new MenuKeySet() {

designer-realize/src/main/java/com/fr/design/actions/insert/cell/DSColumnCellAction.java

@@ -22,7 +22,7 @@ public class DSColumnCellAction extends AbstractCellAction implements WorkBookSu
         this.setMenuKeySet(KeySetUtils.INSERT_DATA_COLUMN);
         this.setName(getMenuKeySet().getMenuKeySetName() + "...");
         this.setMnemonic(getMenuKeySet().getMnemonic());
-        this.setSmallIcon("/com/fr/design/images/m_insert/bindColumn.png");
+        this.setSmallIcon("/com/fr/design/images/m_insert/bindColumn");
     }
 
     @Override

designer-realize/src/main/java/com/fr/design/actions/insert/cell/FormulaCellAction.java

@@ -26,7 +26,7 @@ public class FormulaCellAction extends AbstractCellAction implements WorkBookSup
         this.setMenuKeySet(INSERT_FORMULA);
         this.setName(getMenuKeySet().getMenuKeySetName() + "...");
         this.setMnemonic(getMenuKeySet().getMnemonic());
-        this.setSmallIcon("/com/fr/design/images/m_insert/formula.png");
+        this.setSmallIcon("/com/fr/design/images/m_insert/formula");
     }
 
     public static final MenuKeySet INSERT_FORMULA = new MenuKeySet() {

designer-realize/src/main/java/com/fr/design/actions/insert/cell/GeneralCellAction.java

@@ -28,7 +28,7 @@ public class GeneralCellAction extends AbstractCellAction implements WorkBookSup
         this.setMenuKeySet(INSERT_TEXT);
         this.setName(getMenuKeySet().getMenuKeySetName() + "...");
         this.setMnemonic(getMenuKeySet().getMnemonic());
-        this.setSmallIcon("/com/fr/design/images/m_insert/text.png");
+        this.setSmallIcon("/com/fr/design/images/m_insert/text");
     }
 
     public static final MenuKeySet INSERT_TEXT = new MenuKeySet() {

designer-realize/src/main/java/com/fr/design/actions/insert/cell/ImageCellAction.java

@@ -29,7 +29,7 @@ public class ImageCellAction extends AbstractCellAction implements WorkBookSuppo
         this.setMenuKeySet(INSERT_IMAGE);
         this.setName(getMenuKeySet().getMenuKeySetName() + "...");
         this.setMnemonic(getMenuKeySet().getMnemonic());
-        this.setSmallIcon("/com/fr/design/images/m_insert/image.png");
+        this.setSmallIcon("/com/fr/design/images/m_insert/image");
     }
 
     public static final MenuKeySet INSERT_IMAGE = new MenuKeySet() {

designer-realize/src/main/java/com/fr/design/actions/insert/cell/RichTextCellAction.java

@@ -25,7 +25,7 @@ public class RichTextCellAction extends AbstractCellAction implements WorkBookSu
         this.setMenuKeySet(INSERT_RICHTEXT);
         this.setName(getMenuKeySet().getMenuKeySetName() + "...");
         this.setMnemonic(getMenuKeySet().getMnemonic());
-        this.setSmallIcon("/com/fr/design/images/m_insert/richtext.png");
+        this.setSmallIcon("/com/fr/design/images/m_insert/richtext");
     }
 
     @Override

designer-realize/src/main/java/com/fr/design/actions/insert/cell/SubReportCellAction.java

@@ -24,7 +24,7 @@ public class SubReportCellAction extends AbstractCellAction {
         this.setMenuKeySet(INSERT_SUB_REPORT);
         this.setName(getMenuKeySet().getMenuKeySetName() + "...");
         this.setMnemonic(getMenuKeySet().getMnemonic());
-        this.setSmallIcon("/com/fr/design/images/m_insert/subReport.png");
+        this.setSmallIcon("/com/fr/design/images/m_insert/subReport");
     }
 
     public static final MenuKeySet INSERT_SUB_REPORT = new MenuKeySet() {

designer-realize/src/main/java/com/fr/design/actions/insert/flot/ChartFloatAction.java

@@ -48,7 +48,7 @@ public class ChartFloatAction extends ElementCaseAction {
         this.setMenuKeySet(FLOAT_INSERT_CHART);
         this.setName(getMenuKeySet().getMenuKeySetName());
         this.setMnemonic(getMenuKeySet().getMnemonic());
-        this.setSmallIcon("/com/fr/design/images/m_insert/chart.png");
+        this.setSmallIcon("/com/fr/design/images/m_insert/chart");
     }
 
     public static final MenuKeySet FLOAT_INSERT_CHART = new MenuKeySet() {

designer-realize/src/main/java/com/fr/design/actions/insert/flot/FormulaFloatAction.java

@@ -37,7 +37,7 @@ public class FormulaFloatAction extends ElementCaseAction {
         this.setMenuKeySet(FLOAT_INSERT_FORMULA);
         this.setName(getMenuKeySet().getMenuKeySetName());
         this.setMnemonic(getMenuKeySet().getMnemonic());
-        this.setSmallIcon("/com/fr/design/images/m_insert/formula.png");
+        this.setSmallIcon("/com/fr/design/images/m_insert/formula");
     }
 
     public static final MenuKeySet FLOAT_INSERT_FORMULA = new MenuKeySet() {

designer-realize/src/main/java/com/fr/design/actions/insert/flot/ImageFloatAction.java

@@ -39,7 +39,7 @@ public class ImageFloatAction extends ElementCaseAction {
         this.setMenuKeySet(FLOAT_INSERT_IMAGE);
         this.setName(getMenuKeySet().getMenuKeySetName());
         this.setMnemonic(getMenuKeySet().getMnemonic());
-        this.setSmallIcon("/com/fr/design/images/m_insert/image.png");
+        this.setSmallIcon("/com/fr/design/images/m_insert/image");
     }
 
     public static final MenuKeySet FLOAT_INSERT_IMAGE = new MenuKeySet() {

designer-realize/src/main/java/com/fr/design/actions/insert/flot/TextBoxFloatAction.java

@@ -27,7 +27,7 @@ public class TextBoxFloatAction extends AbstractShapeAction {
         this.setMenuKeySet(FLOAT_INSERT_TEXT);
         this.setName(getMenuKeySet().getMenuKeySetName());
         this.setMnemonic(getMenuKeySet().getMnemonic());
-        this.setSmallIcon("/com/fr/design/images/m_insert/text.png");
+        this.setSmallIcon("/com/fr/design/images/m_insert/text");
     }
 
     public static final MenuKeySet FLOAT_INSERT_TEXT = new MenuKeySet() {

designer-realize/src/main/java/com/fr/design/actions/report/ReportBackgroundAction.java

@@ -23,7 +23,7 @@ public class ReportBackgroundAction extends ReportComponentAction<ReportComponen
         this.setMenuKeySet(KeySetUtils.REPORT_BACKGROUND);
         this.setName(getMenuKeySet().getMenuKeySetName() + "...");
         this.setMnemonic(getMenuKeySet().getMnemonic());
-        this.setSmallIcon(IconUtils.readIcon("/com/fr/design/images/m_report/background_normal.svg"));
+        this.setSmallIcon("/com/fr/design/images/m_report/background");
     }
 
     /**

designer-realize/src/main/java/com/fr/design/actions/report/ReportColumnsAction.java

@@ -17,7 +17,7 @@ public class ReportColumnsAction extends ReportComponentAction<WorkSheetDesigner
         this.setMenuKeySet(KeySetUtils.REPORT_COLUMN);
         this.setName(getMenuKeySet().getMenuKeySetName() + "...");
         this.setMnemonic(getMenuKeySet().getMnemonic());
-        this.setSmallIcon(IconUtils.readIcon("/com/fr/design/images/m_report/linearAttr_normal.svg"));
+        this.setSmallIcon("/com/fr/design/images/m_report/linearAttr");
     }
 
     /**

designer-realize/src/main/java/com/fr/design/actions/report/ReportEngineAttrAction.java

@@ -18,7 +18,7 @@ public class ReportEngineAttrAction extends ReportComponentAction<WorkSheetDesig
         this.setMenuKeySet(KeySetUtils.REPORT_ENGINE);
         this.setName(getMenuKeySet().getMenuKeySetName() + "...");
         this.setMnemonic(getMenuKeySet().getMnemonic());
-		this.setSmallIcon(IconUtils.readIcon("/com/fr/design/images/m_report/reportEngineAttr_normal.svg"));
+		this.setSmallIcon("/com/fr/design/images/m_report/reportEngineAttr");
         this.generateAndSetSearchText(LayerReportPane.class.getName());
 
     }

designer-realize/src/main/java/com/fr/design/actions/report/ReportExportAttrAction.java

@@ -19,7 +19,7 @@ public class ReportExportAttrAction extends JWorkBookAction {
         this.setMenuKeySet(KeySetUtils.REPORT_EXPORT_ATTR);
         this.setName(getMenuKeySet().getMenuKeySetName()+"...");
         this.setMnemonic(getMenuKeySet().getMnemonic());
-        this.setSmallIcon(IconUtils.readIcon("/com/fr/design/images/m_file/export_normal.svg"));
+        this.setSmallIcon("/com/fr/design/images/m_file/export");
         this.generateAndSetSearchText(ReportExportAttrPane.class.getName());
     }
 

designer-realize/src/main/java/com/fr/design/actions/report/ReportFooterAction.java

@@ -30,7 +30,7 @@ public class ReportFooterAction extends ReportComponentAction<ReportComponent> {
         this.setMenuKeySet(KeySetUtils.REPORT_FOOTER);
         this.setName(getMenuKeySet().getMenuKeySetName() + "...");
         this.setMnemonic(getMenuKeySet().getMnemonic());
-        this.setSmallIcon(IconUtils.readIcon("/com/fr/design/images/m_report/footer_normal.svg"));
+        this.setSmallIcon("/com/fr/design/images/m_report/footer");
     }
 
     /**

designer-realize/src/main/java/com/fr/design/actions/report/ReportHeaderAction.java

@@ -33,7 +33,7 @@ public class ReportHeaderAction extends ReportComponentAction<ReportComponent> {
         this.setMenuKeySet(KeySetUtils.REPORT_HEADER);
         this.setName(getMenuKeySet().getMenuKeySetName() + "...");
         this.setMnemonic(getMenuKeySet().getMnemonic());
-        this.setSmallIcon(IconUtils.readIcon("/com/fr/design/images/m_report/header_normal.svg"));
+        this.setSmallIcon("/com/fr/design/images/m_report/header");
     }
 
     /**

designer-realize/src/main/java/com/fr/design/actions/report/ReportMobileAttrAction.java

@@ -35,7 +35,7 @@ public class ReportMobileAttrAction extends JWorkBookAction{
         this.setMenuKeySet(REPORT_APP_ATTR);
         this.setName(getMenuKeySet().getMenuKeySetName() + "...");
         this.setMnemonic(getMenuKeySet().getMnemonic());
-        this.setSmallIcon(IconUtils.readIcon("/com/fr/design/images/m_report/mobile_normal.svg"));
+        this.setSmallIcon("/com/fr/design/images/m_report/mobile");
         this.generateAndSetSearchText(ReportMobileAttrPane.class.getName());
     }
 

designer-realize/src/main/java/com/fr/design/actions/report/ReportPageAttrAction.java

@@ -27,7 +27,7 @@ public class ReportPageAttrAction extends ReportComponentAction<WorkSheetDesigne
         this.setMenuKeySet(KeySetUtils.REPORT_PAGE);
         this.setName(getMenuKeySet().getMenuKeySetName() + "...");
         this.setMnemonic(getMenuKeySet().getMnemonic());
-        this.setSmallIcon(IconUtils.readIcon("/com/fr/design/images/m_file/repeatAndFrozen_normal.svg"));
+        this.setSmallIcon("/com/fr/design/images/m_file/repeatAndFrozen");
         this.generateAndSetSearchText(RepeatAndFreezeSettingPane.class.getName());
     }
 

designer-realize/src/main/java/com/fr/design/actions/report/ReportPageSetupAction.java

@@ -28,7 +28,7 @@ public class ReportPageSetupAction extends ReportComponentAction<ReportComponent
         this.setMenuKeySet(KeySetUtils.REPORT_PAGE_SETUP);
         this.setName(getMenuKeySet().getMenuKeySetName()+"...");
         this.setMnemonic(getMenuKeySet().getMnemonic());
-        this.setSmallIcon(IconUtils.readIcon("/com/fr/design/images/m_file/pageSetup_normal.svg"));
+        this.setSmallIcon("/com/fr/design/images/m_file/pageSetup");
         this.generateAndSetSearchText(PageSetupPane.class.getName());
     }