diff --git a/res/layout-w600dp/account_setup_basics_fragment.xml b/res/layout-w600dp/account_setup_basics_fragment.xml
index b9c67ad91..87add7fbc 100644
--- a/res/layout-w600dp/account_setup_basics_fragment.xml
+++ b/res/layout-w600dp/account_setup_basics_fragment.xml
@@ -62,12 +62,10 @@
                 android:layout_height="wrap_content"
                 android:layout_width="wrap_content"
                 android:layout_marginRight="16dip"
-                android:textAppearance="?android:attr/textAppearanceSmall"
                 android:text="@string/account_setup_basics_email_label"
                 style="@style/account_setup_label_text" />
         <EditText
                 android:id="@+id/account_email"
-                android:textAppearance="?android:attr/textAppearanceSmall"
                 android:contentDescription="@string/account_setup_basics_email_label"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
diff --git a/res/layout/account_setup_credentials_fragment.xml b/res/layout/account_setup_credentials_fragment.xml
index d4041b1c5..89393fb31 100644
--- a/res/layout/account_setup_credentials_fragment.xml
+++ b/res/layout/account_setup_credentials_fragment.xml
@@ -83,6 +83,8 @@
                 android:text="@string/sign_in_with_google"
                 android:layout_gravity="center"
                 android:layout_width="wrap_content"
+                android:paddingLeft="10sp"
+                android:paddingRight="10sp"
                 android:layout_height="wrap_content"/>
     </LinearLayout>
 
diff --git a/res/values-ldrtl/styles-ldrtl.xml b/res/values-ldrtl/styles-ldrtl.xml
index 44ca26ab9..b0b04fb19 100644
--- a/res/values-ldrtl/styles-ldrtl.xml
+++ b/res/values-ldrtl/styles-ldrtl.xml
@@ -21,6 +21,8 @@
     <style name="client_certificate_button"
            parent="account_setup_text_button">
         <item name="android:layout_alignParentEnd">true</item>
+        <item name="android:paddingLeft">10sp</item>
+        <item name="android:paddingRight">10sp</item>
     </style>
 
     <!-- Client certificate title, see also styles.xml -->
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 07f43ed80..1f356fd40 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -102,6 +102,8 @@
     <style name="client_certificate_button"
            parent="account_setup_text_button">
         <item name="android:layout_alignParentRight">true</item>
+        <item name="android:paddingLeft">10sp</item>
+        <item name="android:paddingRight">10sp</item>
    </style>
 
     <!-- Client certificate title, see also styles-ldrtl.xml -->