diff --git a/res/layout-sw600dp-land/account_setup_basics.xml b/res/layout-sw600dp-land/account_setup_basics.xml
index 76c2e1503..085bd968b 100644
--- a/res/layout-sw600dp-land/account_setup_basics.xml
+++ b/res/layout-sw600dp-land/account_setup_basics.xml
@@ -46,29 +46,25 @@
             android:background="@color/account_setup_divider_color" />
 
         <!-- Buttons on the right -->
-        <Button
+        <TextView
             android:id="@+id/manual_setup"
+            android:layout_height="wrap_content"
+            android:layout_width="wrap_content"
             android:layout_below="@+id/top_divider"
             android:layout_alignParentRight="true"
             android:layout_marginTop="@dimen/setup_buttons_padding_top"
             android:layout_marginRight="@dimen/setup_buttons_padding_right"
-            style="@style/accountSetupButton"
+            android:textAppearance="?android:attr/textAppearanceMedium"
             android:text="@string/account_setup_basics_manual_setup_action" />
-        <Button
-            android:id="@+id/oauth_setup"
+        <ImageButton
+            android:id="@+id/next"
+            android:layout_height="wrap_content"
+            android:layout_width="wrap_content"
             android:layout_below="@+id/manual_setup"
             android:layout_alignParentRight="true"
             android:layout_marginTop="@dimen/setup_buttons_vertical_spacing"
             android:layout_marginRight="@dimen/setup_buttons_padding_right"
-            style="@style/accountSetupButton"
-            android:text="@string/account_setup_basics_oauth_setup_action" />
-        <Button
-            android:id="@+id/next"
-            android:layout_below="@+id/oauth_setup"
-            android:layout_alignParentRight="true"
-            android:layout_marginTop="@dimen/setup_buttons_vertical_spacing"
-            android:layout_marginRight="@dimen/setup_buttons_padding_right"
-            style="@style/accountSetupButton"
+            android:src="@drawable/ic_nav_arrow_forward"
             android:text="@string/next_action" />
 
         <!-- Frame on the left containing the (common) setup info -->
diff --git a/res/layout-sw600dp-port/account_setup_basics.xml b/res/layout-sw600dp-port/account_setup_basics.xml
index 8d973e650..ab17ea672 100644
--- a/res/layout-sw600dp-port/account_setup_basics.xml
+++ b/res/layout-sw600dp-port/account_setup_basics.xml
@@ -78,26 +78,22 @@
             android:layout_marginBottom="@dimen/setup_buttons_padding_bottom"
             >
             <!-- Buttons below -->
-            <Button
+            <TextView
                 android:id="@+id/manual_setup"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
                 android:layout_alignParentTop="true"
                 android:layout_alignParentLeft="true"
                 android:layout_marginLeft="@dimen/setup_buttons_padding_left"
-                style="@style/accountSetupButton"
                 android:text="@string/account_setup_basics_manual_setup_action" />
-            <Button
-                android:id="@+id/oauth_setup"
-                android:layout_below="@+id/manual_setup"
-                android:layout_alignParentLeft="true"
-                android:layout_marginLeft="@dimen/setup_buttons_padding_left"
-                style="@style/accountSetupButton"
-                android:text="@string/account_setup_basics_oauth_setup_action" />
-            <Button
+            <ImageButton
                 android:id="@+id/next"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
                 android:layout_alignParentTop="true"
                 android:layout_alignParentRight="true"
                 android:layout_marginRight="@dimen/setup_buttons_padding_right"
-                style="@style/accountSetupButton"
+                android:src="@drawable/ic_nav_arrow_forward"
                 android:text="@string/next_action" />
         </RelativeLayout>
     </LinearLayout>