diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatMarginBorder.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatMarginBorder.java
new file mode 100644
index 00000000..212b03e0
--- /dev/null
+++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatMarginBorder.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright 2019 FormDev Software GmbH
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.formdev.flatlaf.ui;
+
+import static com.formdev.flatlaf.util.UIScale.*;
+import java.awt.Component;
+import java.awt.Insets;
+import javax.swing.plaf.basic.BasicBorders;
+
+/**
+ * Border that scales component margin.
+ *
+ * @author Karl Tauber
+ */
+public class FlatMarginBorder
+	extends BasicBorders.MarginBorder
+{
+	@Override
+	public Insets getBorderInsets( Component c, Insets insets ) {
+		insets = super.getBorderInsets( c, insets );
+		insets.top = scale( insets.top );
+		insets.left = scale( insets.left );
+		insets.bottom = scale( insets.bottom );
+		insets.right = scale( insets.right );
+		return insets;
+	}
+}
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 2aba775d..875f3bcf 100644
--- a/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatLaf.properties
+++ b/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatLaf.properties
@@ -30,6 +30,7 @@ Button.arc=6
 
 #---- CheckBox ----
 
+CheckBox.border=com.formdev.flatlaf.ui.FlatMarginBorder
 CheckBox.icon=com.formdev.flatlaf.ui.FlatCheckBoxIcon
 
 
@@ -41,4 +42,5 @@ Component.arc=5
 
 #---- RadioButton ----
 
+RadioButton.border=com.formdev.flatlaf.ui.FlatMarginBorder
 RadioButton.icon=com.formdev.flatlaf.ui.FlatRadioButtonIcon