diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/icons/FlatCheckBoxIcon.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/icons/FlatCheckBoxIcon.java
index fa4199e9..130160bd 100644
--- a/flatlaf-core/src/main/java/com/formdev/flatlaf/icons/FlatCheckBoxIcon.java
+++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/icons/FlatCheckBoxIcon.java
@@ -40,21 +40,21 @@ import com.formdev.flatlaf.ui.FlatUIUtils;
  * @uiDefault Component.focusColor						Color
  * @uiDefault CheckBox.icon.focusedColor				Color	optional; defaults to Component.focusColor
  * @uiDefault CheckBox.icon.borderColor					Color
- * @uiDefault CheckBox.icon.disabledBorderColor			Color
- * @uiDefault CheckBox.icon.selectedBorderColor			Color
- * @uiDefault CheckBox.icon.focusedBorderColor			Color
- * @uiDefault CheckBox.icon.hoverBorderColor			Color	optional
- * @uiDefault CheckBox.icon.selectedFocusedBorderColor	Color	optional
  * @uiDefault CheckBox.icon.background					Color
- * @uiDefault CheckBox.icon.disabledBackground			Color
- * @uiDefault CheckBox.icon.focusedBackground			Color	optional
- * @uiDefault CheckBox.icon.hoverBackground				Color	optional
- * @uiDefault CheckBox.icon.pressedBackground			Color	optional
+ * @uiDefault CheckBox.icon.selectedBorderColor			Color
  * @uiDefault CheckBox.icon.selectedBackground			Color
- * @uiDefault CheckBox.icon.selectedHoverBackground		Color	optional
- * @uiDefault CheckBox.icon.selectedPressedBackground	Color	optional
  * @uiDefault CheckBox.icon.checkmarkColor				Color
+ * @uiDefault CheckBox.icon.disabledBorderColor			Color
+ * @uiDefault CheckBox.icon.disabledBackground			Color
  * @uiDefault CheckBox.icon.disabledCheckmarkColor		Color
+ * @uiDefault CheckBox.icon.focusedBorderColor			Color
+ * @uiDefault CheckBox.icon.focusedBackground			Color	optional
+ * @uiDefault CheckBox.icon.selectedFocusedBorderColor	Color	optional
+ * @uiDefault CheckBox.icon.hoverBorderColor			Color	optional
+ * @uiDefault CheckBox.icon.hoverBackground				Color	optional
+ * @uiDefault CheckBox.icon.selectedHoverBackground		Color	optional
+ * @uiDefault CheckBox.icon.pressedBackground			Color	optional
+ * @uiDefault CheckBox.icon.selectedPressedBackground	Color	optional
  * @uiDefault CheckBox.arc								int
  *
  * @author Karl Tauber
@@ -67,23 +67,32 @@ public class FlatCheckBoxIcon
 		UIManager.getColor( "Component.focusColor" ) );
 	protected final int arc = FlatUIUtils.getUIInt( "CheckBox.arc", 2 );
 
+	// enabled
 	protected final Color borderColor = UIManager.getColor( "CheckBox.icon.borderColor" );
-	protected final Color disabledBorderColor = UIManager.getColor( "CheckBox.icon.disabledBorderColor" );
-	protected final Color selectedBorderColor = UIManager.getColor( "CheckBox.icon.selectedBorderColor" );
-	protected final Color focusedBorderColor = UIManager.getColor( "CheckBox.icon.focusedBorderColor" );
-	protected final Color hoverBorderColor = UIManager.getColor( "CheckBox.icon.hoverBorderColor" );
-	protected final Color selectedFocusedBorderColor = UIManager.getColor( "CheckBox.icon.selectedFocusedBorderColor" );
 	protected final Color background = UIManager.getColor( "CheckBox.icon.background" );
-	protected final Color disabledBackground = UIManager.getColor( "CheckBox.icon.disabledBackground" );
-	protected final Color focusedBackground = UIManager.getColor( "CheckBox.icon.focusedBackground" );
-	protected final Color hoverBackground = UIManager.getColor( "CheckBox.icon.hoverBackground" );
-	protected final Color pressedBackground = UIManager.getColor( "CheckBox.icon.pressedBackground" );
+	protected final Color selectedBorderColor = UIManager.getColor( "CheckBox.icon.selectedBorderColor" );
 	protected final Color selectedBackground = UIManager.getColor( "CheckBox.icon.selectedBackground" );
-	protected final Color selectedHoverBackground = UIManager.getColor( "CheckBox.icon.selectedHoverBackground" );
-	protected final Color selectedPressedBackground = UIManager.getColor( "CheckBox.icon.selectedPressedBackground" );
 	protected final Color checkmarkColor = UIManager.getColor( "CheckBox.icon.checkmarkColor" );
+
+	// disabled
+	protected final Color disabledBorderColor = UIManager.getColor( "CheckBox.icon.disabledBorderColor" );
+	protected final Color disabledBackground = UIManager.getColor( "CheckBox.icon.disabledBackground" );
 	protected final Color disabledCheckmarkColor = UIManager.getColor( "CheckBox.icon.disabledCheckmarkColor" );
 
+	// focused
+	protected final Color focusedBorderColor = UIManager.getColor( "CheckBox.icon.focusedBorderColor" );
+	protected final Color focusedBackground = UIManager.getColor( "CheckBox.icon.focusedBackground" );
+	protected final Color selectedFocusedBorderColor = UIManager.getColor( "CheckBox.icon.selectedFocusedBorderColor" );
+
+	// hover
+	protected final Color hoverBorderColor = UIManager.getColor( "CheckBox.icon.hoverBorderColor" );
+	protected final Color hoverBackground = UIManager.getColor( "CheckBox.icon.hoverBackground" );
+	protected final Color selectedHoverBackground = UIManager.getColor( "CheckBox.icon.selectedHoverBackground" );
+
+	// pressed
+	protected final Color pressedBackground = UIManager.getColor( "CheckBox.icon.pressedBackground" );
+	protected final Color selectedPressedBackground = UIManager.getColor( "CheckBox.icon.selectedPressedBackground" );
+
 	static final int ICON_SIZE = 15;
 
 	public FlatCheckBoxIcon() {
diff --git a/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatDarkLaf.properties b/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatDarkLaf.properties
index ccf68b08..37d18a2a 100644
--- a/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatDarkLaf.properties
+++ b/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatDarkLaf.properties
@@ -96,20 +96,29 @@ Button.toolbar.pressedBackground=lighten($Button.background,4%,derived)
 
 #---- CheckBox ----
 
+# enabled
 CheckBox.icon.borderColor=#6B6B6B
-CheckBox.icon.disabledBorderColor=#545556
-CheckBox.icon.selectedBorderColor=#6B6B6B
-CheckBox.icon.focusedBorderColor=#466D94
-CheckBox.icon.hoverBorderColor=$CheckBox.icon.focusedBorderColor
-CheckBox.icon.selectedFocusedBorderColor=#466D94
 CheckBox.icon.background=#43494A
-CheckBox.icon.disabledBackground=@background
-CheckBox.icon.hoverBackground=lighten($CheckBox.icon.background,3%,derived)
-CheckBox.icon.pressedBackground=lighten($CheckBox.icon.background,6%,derived)
+CheckBox.icon.selectedBorderColor=#6B6B6B
 CheckBox.icon.selectedBackground=#43494A
 CheckBox.icon.checkmarkColor=#A7A7A7
+
+# disabled
+CheckBox.icon.disabledBorderColor=#545556
+CheckBox.icon.disabledBackground=@background
 CheckBox.icon.disabledCheckmarkColor=#606060
 
+# focused
+CheckBox.icon.focusedBorderColor=#466D94
+CheckBox.icon.selectedFocusedBorderColor=#466D94
+
+# hover
+CheckBox.icon.hoverBorderColor=$CheckBox.icon.focusedBorderColor
+CheckBox.icon.hoverBackground=lighten($CheckBox.icon.background,3%,derived)
+
+# pressed
+CheckBox.icon.pressedBackground=lighten($CheckBox.icon.background,6%,derived)
+
 
 #---- ComboBox ----
 
diff --git a/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatIntelliJLaf.properties b/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatIntelliJLaf.properties
index 77fe04ce..fd7e09f6 100644
--- a/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatIntelliJLaf.properties
+++ b/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatIntelliJLaf.properties
@@ -35,12 +35,18 @@ Button.default.borderWidth=1
 
 #---- CheckBox ----
 
+# enabled
 CheckBox.icon.selectedBorderColor=#4B97D9
-CheckBox.icon.selectedFocusedBorderColor=#ACCFF7
 CheckBox.icon.selectedBackground=#4F9EE3
 CheckBox.icon.checkmarkColor=#FFFFFF
 
+# focused
+CheckBox.icon.selectedFocusedBorderColor=#ACCFF7
+
+# hover
 CheckBox.icon.selectedHoverBackground=#5E94CE
+
+# pressed
 CheckBox.icon.selectedPressedBackground=#72A1D4
 
 
diff --git a/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatLightLaf.properties b/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatLightLaf.properties
index b8dd8fe4..4e8cb28f 100644
--- a/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatLightLaf.properties
+++ b/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatLightLaf.properties
@@ -98,20 +98,29 @@ Button.toolbar.pressedBackground=darken($Button.background,15%,derived)
 
 #---- CheckBox ----
 
+# enabled
 CheckBox.icon.borderColor=#b0b0b0
-CheckBox.icon.disabledBorderColor=#BDBDBD
-CheckBox.icon.selectedBorderColor=$CheckBox.icon.borderColor
-CheckBox.icon.focusedBorderColor=#7B9FC7
-CheckBox.icon.hoverBorderColor=$CheckBox.icon.focusedBorderColor
 CheckBox.icon.background=#FFFFFF
-CheckBox.icon.disabledBackground=@background
-CheckBox.icon.focusedBackground=$Button.focusedBackground
-CheckBox.icon.hoverBackground=$Button.hoverBackground
-CheckBox.icon.pressedBackground=$Button.pressedBackground
+CheckBox.icon.selectedBorderColor=$CheckBox.icon.borderColor
 CheckBox.icon.selectedBackground=#FFFFFF
 CheckBox.icon.checkmarkColor=#4F9EE3
+
+# disabled
+CheckBox.icon.disabledBorderColor=#BDBDBD
+CheckBox.icon.disabledBackground=@background
 CheckBox.icon.disabledCheckmarkColor=#ABABAB
 
+# focused
+CheckBox.icon.focusedBorderColor=#7B9FC7
+CheckBox.icon.focusedBackground=$Button.focusedBackground
+
+# hover
+CheckBox.icon.hoverBorderColor=$CheckBox.icon.focusedBorderColor
+CheckBox.icon.hoverBackground=$Button.hoverBackground
+
+# pressed
+CheckBox.icon.pressedBackground=$Button.pressedBackground
+
 
 #---- ComboBox ----
 
diff --git a/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/FlatTestLaf.properties b/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/FlatTestLaf.properties
index 9c007558..8d7612fb 100644
--- a/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/FlatTestLaf.properties
+++ b/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/FlatTestLaf.properties
@@ -97,21 +97,30 @@ Button.toolbar.pressedBackground=#eeeeee
 
 #---- CheckBox ----
 
+# enabled
 CheckBox.icon.borderColor=#878787
-CheckBox.icon.disabledBorderColor=#BDBDBD
-CheckBox.icon.selectedBorderColor=#4982CC
-CheckBox.icon.focusedBorderColor=#7B9FC7
-CheckBox.icon.hoverBorderColor=#ff0000
-CheckBox.icon.selectedFocusedBorderColor=#ACCFF7
 CheckBox.icon.background=#FFFFFF
-CheckBox.icon.disabledBackground=#F2F2F2
-CheckBox.icon.focusedBackground=#00ffff
-CheckBox.icon.hoverBackground=#ffff00
-CheckBox.icon.pressedBackground=#FFC800
+CheckBox.icon.selectedBorderColor=#4982CC
 CheckBox.icon.selectedBackground=#4D89C9
 CheckBox.icon.checkmarkColor=#FFFFFF
+
+# disabled
+CheckBox.icon.disabledBorderColor=#BDBDBD
+CheckBox.icon.disabledBackground=#F2F2F2
 CheckBox.icon.disabledCheckmarkColor=#ABABAB
 
+# focused
+CheckBox.icon.focusedBorderColor=#7B9FC7
+CheckBox.icon.focusedBackground=#00ffff
+CheckBox.icon.selectedFocusedBorderColor=#ACCFF7
+
+# hover
+CheckBox.icon.hoverBorderColor=#ff0000
+CheckBox.icon.hoverBackground=#ffff00
+
+# pressed
+CheckBox.icon.pressedBackground=#FFC800
+
 
 #---- ComboBox ----