diff --git a/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatLaf.properties b/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatLaf.properties
index 641d93f3..7d252e80 100644
--- a/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatLaf.properties
+++ b/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatLaf.properties
@@ -736,10 +736,10 @@ TitlePane.closePressedForeground = #fff
 
 #---- ToggleButton ----
 
-ToggleButton.border = com.formdev.flatlaf.ui.FlatButtonBorder
-ToggleButton.margin = 2,14,2,14
-ToggleButton.iconTextGap = 4
-ToggleButton.rollover = true
+ToggleButton.border = $Button.border
+ToggleButton.margin = $Button.margin
+ToggleButton.iconTextGap = $Button.iconTextGap
+ToggleButton.rollover = $Button.rollover
 
 ToggleButton.background = $Button.background
 ToggleButton.pressedBackground = $Button.pressedBackground