diff --git a/res/values-w600dp/dimensions.xml b/res/values-w600dp/dimensions.xml
index 3c8aeee28..e5efb6c6d 100644
--- a/res/values-w600dp/dimensions.xml
+++ b/res/values-w600dp/dimensions.xml
@@ -42,9 +42,9 @@
     <dimen name="setup_lower_headline_margin_bottom">10dp</dimen>
 
     <!-- Account setup checkboxes padding -->
-    <dimen name="setup_checkbox_padding_side">8dp</dimen>
-    <dimen name="setup_checkbox_padding_top">16dp</dimen>
-    <dimen name="setup_checkbox_padding_bottom">16dp</dimen>
+    <dimen name="setup_checkbox_margin_side">8dp</dimen>
+    <dimen name="setup_checkbox_margin_top">16dp</dimen>
+    <dimen name="setup_checkbox_margin_bottom">16dp</dimen>
 
     <!-- Account setup basics -->
     <dimen name="setup_basics_logo_margin_top">28dp</dimen>
diff --git a/res/values/dimensions.xml b/res/values/dimensions.xml
index f23e07e9c..8b3dba70c 100644
--- a/res/values/dimensions.xml
+++ b/res/values/dimensions.xml
@@ -75,9 +75,9 @@
 
     <!-- Account setup checkboxes padding -->
     <!-- see also w600dp -->
-    <dimen name="setup_checkbox_padding_side">0dp</dimen>
-    <dimen name="setup_checkbox_padding_top">8dp</dimen>
-    <dimen name="setup_checkbox_padding_bottom">8dp</dimen>
+    <dimen name="setup_checkbox_margin_side">0dp</dimen>
+    <dimen name="setup_checkbox_margin_top">8dp</dimen>
+    <dimen name="setup_checkbox_margin_bottom">8dp</dimen>
 
     <!-- Account setup basics -->
     <!-- See also w600dp -->
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 84013b20f..f78a14eb4 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -101,10 +101,10 @@
 
     <!-- Account setup checkboxes -->
     <style name="account_setup_checkbox">
-        <item name="android:paddingTop">@dimen/setup_checkbox_padding_top</item>
-        <item name="android:paddingBottom">@dimen/setup_checkbox_padding_bottom</item>
-        <item name="android:paddingLeft">@dimen/setup_checkbox_padding_side</item>
-        <item name="android:paddingRight">@dimen/setup_checkbox_padding_side</item>
+        <item name="android:layout_marginTop">@dimen/setup_checkbox_margin_top</item>
+        <item name="android:layout_marginBottom">@dimen/setup_checkbox_margin_bottom</item>
+        <item name="android:layout_marginLeft">@dimen/setup_checkbox_margin_side</item>
+        <item name="android:layout_marginRight">@dimen/setup_checkbox_margin_side</item>
     </style>
 
     <!-- Client certificate UI. See also values in styles-ldrtl.xml -->