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 5496fd35..3ff1f2bf 100644
--- a/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatLaf.properties
+++ b/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatLaf.properties
@@ -65,12 +65,16 @@ ViewportUI=com.formdev.flatlaf.ui.FlatViewportUI
 Button.border=com.formdev.flatlaf.ui.FlatButtonBorder
 Button.arc=6
 Button.minimumWidth=72
+Button.margin=2,14,2,14
+Button.rollover=true
 
 
 #---- CheckBox ----
 
 CheckBox.border=com.formdev.flatlaf.ui.FlatMarginBorder
 CheckBox.icon=com.formdev.flatlaf.icons.FlatCheckBoxIcon
+CheckBox.margin=2,2,2,2
+CheckBox.rollover=true
 
 
 #---- CheckBoxMenuItem ----
@@ -78,6 +82,7 @@ CheckBox.icon=com.formdev.flatlaf.icons.FlatCheckBoxIcon
 CheckBoxMenuItem.border=com.formdev.flatlaf.ui.FlatMarginBorder
 CheckBoxMenuItem.checkIcon=com.formdev.flatlaf.icons.FlatCheckBoxMenuItemIcon
 CheckBoxMenuItem.arrowIcon=com.formdev.flatlaf.icons.FlatMenuItemArrowIcon
+CheckBoxMenuItem.margin=2,2,2,2
 
 
 #---- ColorChooser ----
@@ -173,6 +178,7 @@ List.selectionInactiveForeground=@selectionInactiveForeground
 
 Menu.border=com.formdev.flatlaf.ui.FlatMarginBorder
 Menu.arrowIcon=com.formdev.flatlaf.icons.FlatMenuArrowIcon
+Menu.margin=2,2,2,2
 
 
 #---- MenuBar ----
@@ -184,6 +190,7 @@ MenuBar.border=com.formdev.flatlaf.ui.FlatMenuBarBorder
 
 MenuItem.border=com.formdev.flatlaf.ui.FlatMarginBorder
 MenuItem.arrowIcon=com.formdev.flatlaf.icons.FlatMenuItemArrowIcon
+MenuItem.margin=2,2,2,2
 
 
 #---- OptionPane ----
@@ -240,6 +247,8 @@ ProgressBar.verticalSize=6,146
 RadioButton.border=com.formdev.flatlaf.ui.FlatMarginBorder
 RadioButton.icon=com.formdev.flatlaf.icons.FlatRadioButtonIcon
 RadioButton.icon.centerDiameter=8
+RadioButton.margin=2,2,2,2
+RadioButton.rollover=true
 
 
 #---- RadioButtonMenuItem ----
@@ -247,6 +256,7 @@ RadioButton.icon.centerDiameter=8
 RadioButtonMenuItem.border=com.formdev.flatlaf.ui.FlatMarginBorder
 RadioButtonMenuItem.checkIcon=com.formdev.flatlaf.icons.FlatRadioButtonMenuItemIcon
 RadioButtonMenuItem.arrowIcon=com.formdev.flatlaf.icons.FlatMenuItemArrowIcon
+RadioButtonMenuItem.margin=2,2,2,2
 
 
 #---- ScrollBar ----
@@ -291,6 +301,7 @@ SplitPane.dividerSize=5
 SplitPane.continuousLayout=true
 SplitPane.border=null
 SplitPane.centerOneTouchButtons=true
+
 SplitPaneDivider.border=null
 SplitPaneDivider.oneTouchArrowColor=@@ComboBox.buttonArrowColor
 
@@ -359,6 +370,7 @@ TitledBorder.border=1,1,1,1,@@Separator.foreground
 
 ToggleButton.border=com.formdev.flatlaf.ui.FlatButtonBorder
 ToggleButton.arc=6
+ToggleButton.margin=2,14,2,14
 ToggleButton.rollover=true
 
 ToggleButton.background=@@Button.background