diff --git a/res/layout-w600dp/account_setup_basics_fragment.xml b/res/layout-w600dp/account_setup_basics_fragment.xml
index fb257dd0d..85375bff5 100644
--- a/res/layout-w600dp/account_setup_basics_fragment.xml
+++ b/res/layout-w600dp/account_setup_basics_fragment.xml
@@ -39,7 +39,7 @@
     <LinearLayout
             android:paddingTop="16dip"
             android:orientation="horizontal"
-            android:layout_width="wrap_content"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content" >
         <TextView
                 android:layout_height="wrap_content"
@@ -50,7 +50,7 @@
         <EditText
                 android:id="@+id/account_email"
                 android:contentDescription="@string/account_setup_basics_email_label"
-                android:layout_width="@dimen/setup_credentials_input_width"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:inputType="textEmailAddress" />
     </LinearLayout>
diff --git a/res/layout/account_credentials_fragment.xml b/res/layout/account_credentials_fragment.xml
index 4d80e7a6f..c79b65f6f 100644
--- a/res/layout/account_credentials_fragment.xml
+++ b/res/layout/account_credentials_fragment.xml
@@ -16,12 +16,10 @@
 
 <LinearLayout
         xmlns:android="http://schemas.android.com/apk/res/android"
+        style="@style/account_setup_fragment_container"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:orientation="vertical"
-        android:paddingTop="@dimen/setup_fragment_padding_top"
-        android:paddingLeft="@dimen/setup_fragment_padding_side"
-        android:paddingRight="@dimen/setup_fragment_padding_side" >
+        android:orientation="vertical" >
 
     <FrameLayout
             android:id="@+id/account_credentials_fragment_container"
diff --git a/res/values-w600dp/dimensions.xml b/res/values-w600dp/dimensions.xml
index b3f235516..5a599de4e 100644
--- a/res/values-w600dp/dimensions.xml
+++ b/res/values-w600dp/dimensions.xml
@@ -21,11 +21,21 @@
     <dimen name="settings_fragment_padding_side">32dp</dimen>
     <dimen name="settings_fragment_padding_bottom">24dp</dimen>
 
+    <!-- Account setup fragments -->
+    <dimen name="setup_fragment_padding_top">16dp</dimen>
+    <dimen name="setup_fragment_padding_side">64dp</dimen>
+    <dimen name="setup_fragment_padding_bottom">16dp</dimen>
+
     <!-- Account setup text buttons -->
     <dimen name="setup_text_button_width">208sp</dimen>
     <dimen name="setup_text_button_height">48sp</dimen>
     <dimen name="setup_text_button_text_size">20sp</dimen>
 
+    <!-- Account setup headline -->
+    <dimen name="setup_headline_text_size">30sp</dimen>
+    <dimen name="setup_headline_padding_top">24dp</dimen>
+    <dimen name="setup_headline_padding_side">64dp</dimen>
+
     <!-- In setup screens, the inset for all items below the headline+hairline -->
     <dimen name="setup_item_inset_start">16dip</dimen>
     <dimen name="setup_item_inset_end">64dip</dimen>
diff --git a/res/values/dimensions.xml b/res/values/dimensions.xml
index 2bb1a80ef..63e2a3547 100644
--- a/res/values/dimensions.xml
+++ b/res/values/dimensions.xml
@@ -33,11 +33,13 @@
     <dimen name="setup_account_ab_button_height">54dp</dimen>
 
     <!-- Account settings fragments -->
+    <!-- See also w600dp -->
     <dimen name="settings_fragment_padding_top">16dp</dimen>
     <dimen name="settings_fragment_padding_side">16dp</dimen>
     <dimen name="settings_fragment_padding_bottom">24dp</dimen>
 
     <!-- Account setup fragments -->
+    <!-- See also w600dp -->
     <dimen name="setup_fragment_padding_top">16dp</dimen>
     <dimen name="setup_fragment_padding_side">16dp</dimen>
     <dimen name="setup_fragment_padding_bottom">16dp</dimen>
@@ -48,11 +50,13 @@
     <dimen name="setup_nav_button_padding_bottom">24dp</dimen>
 
     <!-- Account setup text buttons -->
+    <!-- See also w600dp -->
     <dimen name="setup_text_button_width">160sp</dimen>
     <dimen name="setup_text_button_height">40sp</dimen>
     <dimen name="setup_text_button_text_size">18sp</dimen>
 
     <!-- Account setup headline -->
+    <!-- See also w600dp -->
     <dimen name="setup_headline_text_size">30sp</dimen>
     <dimen name="setup_headline_padding_top">24dp</dimen>
     <dimen name="setup_headline_padding_side">24dp</dimen>
@@ -69,9 +73,6 @@
     <dimen name="setup_basics_logo_margin_top">28dp</dimen>
     <dimen name="setup_basics_logo_margin_bottom">56dp</dimen>
 
-    <!-- Username/password entry -->
-    <dimen name="setup_credentials_input_width">340dp</dimen>
-
     <!-- TODO: probably delete these -->
     <!-- Notification dialog -->
     <dimen name="dialog_text_size">10sp</dimen>