diff --git a/res/layout-w600dp/account_setup_incoming_fragment.xml b/res/layout-w600dp/account_setup_incoming_fragment.xml
index f2b8e41bb..e15045944 100644
--- a/res/layout-w600dp/account_setup_incoming_fragment.xml
+++ b/res/layout-w600dp/account_setup_incoming_fragment.xml
@@ -63,7 +63,7 @@
 
     <TableRow
         android:id="@+id/device_id_section"
-        android:paddingTop="32dip"
+        android:paddingTop="16dip"
         android:visibility="gone" >
         <TextView
             android:layout_height="wrap_content"
@@ -76,7 +76,8 @@
             android:id="@+id/device_id"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:textColor="#ffbebebe" />
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:textColor="#ffbebebe"/>
     </TableRow>
 
     <TableRow
diff --git a/res/layout/account_setup_incoming_fragment.xml b/res/layout/account_setup_incoming_fragment.xml
index e7fffe38d..886a07d32 100644
--- a/res/layout/account_setup_incoming_fragment.xml
+++ b/res/layout/account_setup_incoming_fragment.xml
@@ -48,7 +48,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical"
-        android:visibility="gone">
+        android:visibility="gone"
+        android:paddingTop="@dimen/setup_label_text_padding_top">
 
         <TextView
             android:text="@string/account_setup_exchange_device_id_label"
diff --git a/res/layout/client_certificate_selector.xml b/res/layout/client_certificate_selector.xml
index 52209002b..90d4b5681 100644
--- a/res/layout/client_certificate_selector.xml
+++ b/res/layout/client_certificate_selector.xml
@@ -20,7 +20,8 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:gravity="center_vertical" >
+    android:gravity="center_vertical"
+    android:paddingTop="@dimen/certificate_selector_padding_top">
 
     <Button
         android:id="@+id/select_button"
diff --git a/res/values-ldrtl/styles-ldrtl.xml b/res/values-ldrtl/styles-ldrtl.xml
index b0b04fb19..4b7bcbe0e 100644
--- a/res/values-ldrtl/styles-ldrtl.xml
+++ b/res/values-ldrtl/styles-ldrtl.xml
@@ -28,7 +28,6 @@
     <!-- Client certificate title, see also styles.xml -->
     <style name="client_certificate_title">
         <item name="android:layout_alignParentStart">true</item>
-        <item name="android:paddingTop">@dimen/setup_label_text_padding_top</item>
         <item name="android:layout_toStartOf">@+id/select_button</item>
     </style>
 
diff --git a/res/values-w600dp/dimensions.xml b/res/values-w600dp/dimensions.xml
index 48aff28bf..3c8aeee28 100644
--- a/res/values-w600dp/dimensions.xml
+++ b/res/values-w600dp/dimensions.xml
@@ -53,4 +53,6 @@
     <!-- Account setup row labels -->
     <dimen name="setup_label_text_padding_top">0dp</dimen>
 
+    <dimen name="certificate_selector_padding_top">16dp</dimen>
+
 </resources>
diff --git a/res/values/dimensions.xml b/res/values/dimensions.xml
index 50be7ba25..591668b4a 100644
--- a/res/values/dimensions.xml
+++ b/res/values/dimensions.xml
@@ -84,6 +84,8 @@
     <!-- Account setup row labels -->
     <dimen name="setup_label_text_padding_top">24dp</dimen>
 
+    <dimen name="certificate_selector_padding_top">24dp</dimen>
+
     <dimen name="setup_input_text_padding_bottom">8dp</dimen>
 
     <!-- TODO: probably delete these -->
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 1f356fd40..3ecbd57b7 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -109,7 +109,6 @@
     <!-- Client certificate title, see also styles-ldrtl.xml -->
     <style name="client_certificate_title">
         <item name="android:layout_alignParentLeft">true</item>
-        <item name="android:paddingTop">@dimen/setup_label_text_padding_top</item>
         <item name="android:layout_toLeftOf">@id/select_button</item>
     </style>