diff --git a/res/layout-w600dp/account_setup_basics_fragment.xml b/res/layout-w600dp/account_setup_basics_fragment.xml
index 791cfe27e..c3aaf4aac 100644
--- a/res/layout-w600dp/account_setup_basics_fragment.xml
+++ b/res/layout-w600dp/account_setup_basics_fragment.xml
@@ -54,9 +54,4 @@
                 android:layout_height="wrap_content"
                 android:inputType="textEmailAddress" />
     </LinearLayout>
-    <TextView
-            android:id="@+id/manual_setup"
-            android:layout_height="wrap_content"
-            android:layout_width="wrap_content"
-            android:text="@string/account_setup_basics_manual_setup_action" />
 </LinearLayout>
diff --git a/res/layout-w800dp/account_setup_template.xml b/res/layout-w800dp/account_setup_template.xml
index 599052bd9..a21200acf 100644
--- a/res/layout-w800dp/account_setup_template.xml
+++ b/res/layout-w800dp/account_setup_template.xml
@@ -63,13 +63,24 @@
                     android:id="@+id/setup_fragment_content"
                     style="@style/account_setup_fragment_container"
                     />
-            <TextView
-                    android:id="@+id/manual_setup"
+            <LinearLayout
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_width="wrap_content"
-                    android:text="@string/account_setup_basics_manual_setup_action"
-                    android:visibility="gone"
-                    style="@style/account_setup_manual_button" />
+                    android:orientation="horizontal"
+                    android:paddingLeft="@dimen/setup_fragment_padding_side"
+                    android:paddingRight="@dimen/setup_fragment_padding_side" >
+                <View
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1" />
+                <Button
+                        android:id="@+id/manual_setup"
+                        android:layout_height="wrap_content"
+                        android:layout_width="wrap_content"
+                        android:text="@string/account_setup_basics_manual_setup_action"
+                        android:visibility="gone"
+                        style="@style/account_setup_manual_button" />
+            </LinearLayout>
         </LinearLayout>
     </ScrollView>
     <ImageButton
diff --git a/res/layout/account_setup_template.xml b/res/layout/account_setup_template.xml
index b989126c9..8137bb967 100644
--- a/res/layout/account_setup_template.xml
+++ b/res/layout/account_setup_template.xml
@@ -64,7 +64,7 @@
                     android:layout_width="wrap_content"
                     android:src="@drawable/ic_nav_arrow_previous_button"
                     android:text="@string/next_action" />
-            <TextView
+            <Button
                     android:id="@+id/manual_setup"
                     android:layout_height="wrap_content"
                     android:layout_width="wrap_content"
diff --git a/res/values/constants.xml b/res/values/constants.xml
index 895252e21..f9664b934 100644
--- a/res/values/constants.xml
+++ b/res/values/constants.xml
@@ -22,4 +22,9 @@
     <!-- Int value for whether we want the 'previous' button on the Basics setup screen to be
      invisible or gone. See also w800dp -->
     <bool name="setup_basics_prev_button_gone">true</bool>
+
+    <!-- Alpha value for 'manual setup' button when disabled -->
+    <fraction name="manual_setup_disabled_alpha">40%</fraction>
+    <!-- Alpha value for 'manual setup' button when enabled -->
+    <fraction name="manual_setup_enabled_alpha">100%</fraction>
 </resources>
\ No newline at end of file
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 49893f595..2df10b352 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -70,6 +70,7 @@
         <item name="android:textSize">16sp</item>
         <item name="android:textColor">@color/account_setup_manual_button_color</item>
         <item name="android:alpha">0.4</item>
+        <item name="android:background">?android:attr/selectableItemBackground</item>
     </style>
 
     <!-- Account setup row label text -->
diff --git a/src/com/android/email/activity/setup/AccountSetupBasicsFragment.java b/src/com/android/email/activity/setup/AccountSetupBasicsFragment.java
index ebb1d0d09..0de2d415a 100644
--- a/src/com/android/email/activity/setup/AccountSetupBasicsFragment.java
+++ b/src/com/android/email/activity/setup/AccountSetupBasicsFragment.java
@@ -131,6 +131,15 @@ public class AccountSetupBasicsFragment extends AccountSetupFragment {
     public void setNextButtonEnabled(boolean enabled) {
         super.setNextButtonEnabled(enabled);
         mManualSetupView.setEnabled(enabled);
+        final float manualButtonAlpha;
+        if (enabled) {
+            manualButtonAlpha =
+                    getResources().getFraction(R.fraction.manual_setup_enabled_alpha, 1, 1);
+        } else {
+            manualButtonAlpha =
+                    getResources().getFraction(R.fraction.manual_setup_disabled_alpha, 1, 1);
+        }
+        mManualSetupView.setAlpha(manualButtonAlpha);
     }
 
     public void setEmail(final String email) {