diff --git a/designer-base/src/main/java/com/fr/design/gui/ispinner/UISpinner.java b/designer-base/src/main/java/com/fr/design/gui/ispinner/UISpinner.java
index b47d162a27..f6b75b7c4f 100644
--- a/designer-base/src/main/java/com/fr/design/gui/ispinner/UISpinner.java
+++ b/designer-base/src/main/java/com/fr/design/gui/ispinner/UISpinner.java
@@ -2,6 +2,7 @@ package com.fr.design.gui.ispinner;
 
 import com.fine.theme.icon.LazyIcon;
 import com.fine.theme.utils.FineUIUtils;
+import com.formdev.flatlaf.util.ScaledEmptyBorder;
 import com.fr.design.event.GlobalNameListener;
 import com.fr.design.event.GlobalNameObserver;
 import com.fr.design.event.HoverAware;
@@ -284,8 +285,8 @@ public class UISpinner extends JPanel implements UIObserver, GlobalNameObserver,
         textField = initNumberField();
         textField.setMaxValue(maxValue);
         textField.setMinValue(minValue);
-        Insets insets = FineUIUtils.getAndScaleUIInsets("InputTextField.borderInsets", defaultInsets);
-        textField.setBorder(BorderFactory.createEmptyBorder(insets.top, insets.left, insets.bottom, insets.right));
+        Insets insets = FineUIUtils.getUIInsets("InputTextField.borderInsets", defaultInsets);
+        textField.setBorder(new ScaledEmptyBorder(insets.top, insets.left, insets.bottom, insets.right));
         textField.setOpaque(false);
 
         setValue(value);
diff --git a/designer-base/src/main/resources/com/fine/theme/light/ui/laf/FineLightLaf.properties b/designer-base/src/main/resources/com/fine/theme/light/ui/laf/FineLightLaf.properties
index f31bda6cf5..9c0ee9c9f8 100644
--- a/designer-base/src/main/resources/com/fine/theme/light/ui/laf/FineLightLaf.properties
+++ b/designer-base/src/main/resources/com/fine/theme/light/ui/laf/FineLightLaf.properties
@@ -319,6 +319,7 @@ ComboBox.selectionArc = 0
 ComboBox.borderCornerRadius = 3
 ComboBox.comboHeight = 24
 ComboBox.selectBox.button.height = 22
+ComboBox.renderInset = 0,6,0,6
 
 #---- Component ----