diff --git a/designer-form/src/main/java/com/fr/design/widgettheme/common/EditorSettingPane.java b/designer-form/src/main/java/com/fr/design/widgettheme/common/EditorSettingPane.java
index ea547eb674..17bbbe2c12 100644
--- a/designer-form/src/main/java/com/fr/design/widgettheme/common/EditorSettingPane.java
+++ b/designer-form/src/main/java/com/fr/design/widgettheme/common/EditorSettingPane.java
@@ -78,6 +78,7 @@ public class EditorSettingPane<T extends Widget> extends BaseStyleSettingPane<T>
             colorSelectBox.setSelectObject(editorTheme.getThemeColor());
             lineComboBox.setSelectedLineStyle(editorTheme.getBorderStyle().getLineType());
             borderRadiusSpinner.setValue(editorTheme.getBorderStyle().getRadius());
+            borderColorSelectBox.setSelectObject(editorTheme.getBorderStyle().getBorderColor());
             widgetBgColorSelectBox.setSelectObject(ColorUtils.ignoreColorAlpha(editorTheme.getWidgetBackground().getColor()));
             widgetBgAlphaDragPane.populateBean(ColorUtils.roundColorAlphaDouble(editorTheme.getWidgetBackground().getColor()));
             iconColorSelectBox.setSelectObject(editorTheme.getIconColor());
@@ -110,6 +111,7 @@ public class EditorSettingPane<T extends Widget> extends BaseStyleSettingPane<T>
         editorTheme.setSelectBoxBgColor(selectBgColorBox.getSelectObject());
         editorTheme.setBorderStyle(new BorderStyle((int) borderRadiusSpinner.getValue(), lineComboBox.getSelectedLineStyle(), borderColorSelectBox.getSelectObject()));
         editorTheme.setWidgetBackground(ColorUtils.createColorBackgroundWithAlpha(widgetBgColorSelectBox.getSelectObject(), widgetBgAlphaDragPane.updateBean()));
+        editorTheme.setIconColor(iconColorSelectBox.getSelectObject());
         assignFontSizeStyle(editorTheme);
         switchCard();
     }