diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 697e455a8..27db59419 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -54,6 +54,7 @@ dependencies {
     // demonstrative purposes, and you may find them useful in your own apps; YMMV.
     implementation(Config.Libs.Misc.permissions)
     implementation(Config.Libs.Misc.butterKnife)
+    implementation(Config.Libs.Support.constraint)
     annotationProcessor(Config.Libs.Misc.butterKnifeCompiler)
     debugImplementation(Config.Libs.Misc.leakCanary)
     debugImplementation(Config.Libs.Misc.leakCanaryFragments)
diff --git a/app/src/main/java/com/firebase/uidemo/auth/AuthUiActivity.java b/app/src/main/java/com/firebase/uidemo/auth/AuthUiActivity.java
index 7dd027952..7b0d45f71 100644
--- a/app/src/main/java/com/firebase/uidemo/auth/AuthUiActivity.java
+++ b/app/src/main/java/com/firebase/uidemo/auth/AuthUiActivity.java
@@ -49,7 +49,6 @@
 import com.google.firebase.auth.FirebaseAuth;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 
 import butterknife.BindView;
@@ -79,6 +78,9 @@ public class AuthUiActivity extends AppCompatActivity {
     @BindView(R.id.phone_provider) CheckBox mUsePhoneProvider;
     @BindView(R.id.anonymous_provider) CheckBox mUseAnonymousProvider;
 
+    @BindView(R.id.default_layout) RadioButton mDefaultLayout;
+    @BindView(R.id.custom_layout) RadioButton mCustomLayout;
+
     @BindView(R.id.default_theme) RadioButton mDefaultTheme;
     @BindView(R.id.green_theme) RadioButton mGreenTheme;
     @BindView(R.id.purple_theme) RadioButton mPurpleTheme;
@@ -187,6 +189,24 @@ public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
         mUseEmailLinkProvider.setChecked(false);
         mUseEmailProvider.setChecked(true);
 
+        // The custom layout in this app only supports Email and Google providers.
+        mCustomLayout.setOnCheckedChangeListener(new OnCheckedChangeListener() {
+            @Override
+            public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
+                if (checked) {
+                    mUseGoogleProvider.setChecked(true);
+                    mUseEmailProvider.setChecked(true);
+
+                    mUseFacebookProvider.setChecked(false);
+                    mUseTwitterProvider.setChecked(false);
+                    mUseGitHubProvider.setChecked(false);
+                    mUseEmailLinkProvider.setChecked(false);
+                    mUsePhoneProvider.setChecked(false);
+                    mUseAnonymousProvider.setChecked(false);
+                }
+            }
+        });
+
         if (ConfigurationUtils.isGoogleMisconfigured(this)
                 || ConfigurationUtils.isFacebookMisconfigured(this)
                 || ConfigurationUtils.isTwitterMisconfigured(this)
@@ -241,6 +261,18 @@ public Intent buildSignInIntent(@Nullable String link) {
                 .setIsSmartLockEnabled(mEnableCredentialSelector.isChecked(),
                         mEnableHintSelector.isChecked());
 
+        if (mCustomLayout.isChecked()) {
+            AuthMethodPickerLayout customLayout = new AuthMethodPickerLayout
+                    .Builder(R.layout.auth_method_picker_custom_layout)
+                    .setGoogleButtonId(R.id.custom_google_signin_button)
+                    .setEmailButtonId(R.id.custom_email_signin_clickable_text)
+                    .setTosAndPrivacyPolicyId(R.id.custom_tos_pp)
+                    .build();
+
+            builder.setTheme(R.style.CustomTheme);
+            builder.setAuthMethodPickerLayout(customLayout);
+        }
+
         if (getSelectedTosUrl() != null && getSelectedPrivacyPolicyUrl() != null) {
             builder.setTosAndPrivacyPolicyUrls(
                     getSelectedTosUrl(),
@@ -260,32 +292,6 @@ public Intent buildSignInIntent(@Nullable String link) {
         return builder.build();
     }
 
-    @OnClick(R.id.customised_sign_in)
-    public void signInCustomLayout() {
-        AuthMethodPickerLayout customLayout = new AuthMethodPickerLayout
-                .Builder(R.layout.auth_method_picker_custom_layout)
-                .setupGoogleButtonId(R.id.custom_google_signin_button)
-                .setupEmailButtonId(R.id.custom_email_signin_clickable_text)
-                .build();
-
-        //For now we only test Google and Email
-        List<IdpConfig> availableProviders = Arrays.asList(
-                new AuthUI.IdpConfig.GoogleBuilder()
-                        .setScopes(getGoogleScopes())
-                        .build(),
-                new IdpConfig.EmailBuilder()
-                        .setRequireName(mRequireName.isChecked())
-                        .setAllowNewAccounts(mAllowNewEmailAccounts.isChecked())
-                        .build());
-
-        startActivityForResult(
-                AuthUI.getInstance().createSignInIntentBuilder()
-                        .setAvailableProviders(availableProviders)
-                        .setAuthMethodPickerLayout(customLayout)
-                        .build(),
-                RC_SIGN_IN);
-    }
-
     @OnClick(R.id.sign_in_silent)
     public void silentSignIn() {
         AuthUI.getInstance().silentSignIn(this, getSelectedProviders())
diff --git a/app/src/main/res/drawable/custom_bg_gradient.xml b/app/src/main/res/drawable/custom_bg_gradient.xml
new file mode 100644
index 000000000..58479ea3c
--- /dev/null
+++ b/app/src/main/res/drawable/custom_bg_gradient.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <gradient
+        android:startColor="#7986cb"
+        android:endColor="#7e57c2"
+        android:angle="270"/>
+</shape>
diff --git a/app/src/main/res/layout-land/auth_method_picker_custom_layout.xml b/app/src/main/res/layout-land/auth_method_picker_custom_layout.xml
new file mode 100644
index 000000000..4a4c98863
--- /dev/null
+++ b/app/src/main/res/layout-land/auth_method_picker_custom_layout.xml
@@ -0,0 +1,190 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@drawable/custom_bg_gradient">
+
+    <android.support.constraint.Guideline
+        android:id="@+id/guideline"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        app:layout_constraintGuide_percent="0.4" />
+
+    <ImageView
+        android:id="@+id/custom_logo"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="16dp"
+        android:layout_marginLeft="16dp"
+        android:layout_marginEnd="16dp"
+        android:layout_marginRight="16dp"
+        android:layout_marginBottom="8dp"
+        android:src="@mipmap/ic_launcher_foreground"
+        app:layout_constraintBottom_toTopOf="@+id/custom_subheader"
+        app:layout_constraintEnd_toStartOf="@+id/guideline"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="@+id/header_idp_choice"
+        app:layout_constraintVertical_bias="0.0"
+        app:layout_constraintVertical_chainStyle="packed"
+        tools:ignore="ContentDescription" />
+
+    <TextView
+        android:id="@+id/custom_subheader"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="16dp"
+        android:layout_marginLeft="16dp"
+        android:layout_marginEnd="16dp"
+        android:layout_marginRight="16dp"
+        android:layout_marginBottom="8dp"
+        android:text="@string/custom_layout_subheader"
+        android:textColor="#FFFFFF"
+        app:layout_constraintTop_toBottomOf="@+id/custom_logo"
+        app:layout_constraintBottom_toTopOf="@+id/custom_tos_pp"
+        app:layout_constraintEnd_toEndOf="@+id/guideline"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintStart_toStartOf="parent" />
+
+
+    <!-- Horiz line, left of provider header -->
+    <FrameLayout
+        android:id="@+id/header_idp_wing_left"
+        style="@style/CustomWingOuter"
+        app:layout_constraintBottom_toBottomOf="@+id/header_idp_choice"
+        app:layout_constraintEnd_toStartOf="@+id/header_idp_choice"
+        app:layout_constraintStart_toEndOf="@+id/guideline"
+        app:layout_constraintTop_toTopOf="@+id/header_idp_choice">
+
+        <View style="@style/CustomWingInner" />
+
+    </FrameLayout>
+
+    <TextView
+        android:id="@+id/header_idp_choice"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/custom_layout_idp_header"
+        android:textAllCaps="true"
+        android:textColor="#FFFFFF"
+        app:layout_constraintVertical_chainStyle="packed"
+        app:layout_constraintBottom_toTopOf="@+id/custom_google_signin_button"
+        app:layout_constraintEnd_toStartOf="@+id/header_idp_wing_right"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintStart_toEndOf="@+id/header_idp_wing_left"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <!-- Horiz line, right of provider header -->
+    <FrameLayout
+        android:id="@+id/header_idp_wing_right"
+        style="@style/CustomWingOuter"
+        app:layout_constraintBottom_toBottomOf="@+id/header_idp_choice"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@+id/header_idp_choice"
+        app:layout_constraintTop_toTopOf="@+id/header_idp_choice">
+
+        <View style="@style/CustomWingInner" />
+
+    </FrameLayout>
+
+    <!--
+      NOTE: This sample app uses this class from the FirebaseUI library to show the Google Sign
+      in button. However this button is NOT considered part of the public API and you should not
+      use it in your own app.
+    -->
+    <com.firebase.ui.auth.util.ui.SupportVectorDrawablesButton xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/custom_google_signin_button"
+        style="@style/FirebaseUI.Button.AccountChooser.GoogleButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="32dp"
+        android:text="@string/fui_sign_in_with_google"
+        app:layout_constraintBottom_toTopOf="@+id/header_email"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintStart_toStartOf="@+id/guideline"
+        app:layout_constraintTop_toBottomOf="@+id/header_idp_choice" />
+
+    <!-- Horiz line, left of email header -->
+    <FrameLayout
+        android:id="@+id/header_email_wing_left"
+        style="@style/CustomWingOuter"
+        app:layout_constraintBottom_toBottomOf="@+id/header_email"
+        app:layout_constraintEnd_toStartOf="@+id/header_email"
+        app:layout_constraintStart_toEndOf="@+id/guideline"
+        app:layout_constraintTop_toTopOf="@+id/header_email">
+
+        <View style="@style/CustomWingInner" />
+
+    </FrameLayout>
+
+    <TextView
+        android:id="@+id/header_email"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="32dp"
+        android:text="@string/custom_layout_email_header"
+        android:textAllCaps="true"
+        android:textColor="#FFFFFF"
+        app:layout_constraintBottom_toTopOf="@+id/custom_email_signin_clickable_text"
+        app:layout_constraintEnd_toStartOf="@+id/header_email_wing_right"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintStart_toEndOf="@+id/header_email_wing_left"
+        app:layout_constraintTop_toBottomOf="@+id/custom_google_signin_button" />
+
+    <!-- Horiz line, right of email header -->
+    <FrameLayout
+        android:id="@+id/header_email_wing_right"
+        style="@style/CustomWingOuter"
+        app:layout_constraintBottom_toBottomOf="@+id/header_email"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@+id/header_email"
+        app:layout_constraintTop_toTopOf="@+id/header_email">
+
+        <View style="@style/CustomWingInner" />
+
+    </FrameLayout>
+
+    <TextView
+        android:id="@+id/custom_email_signin_clickable_text"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="16dp"
+        android:layout_marginLeft="16dp"
+        android:layout_marginTop="32dp"
+        android:layout_marginEnd="16dp"
+        android:layout_marginRight="16dp"
+        android:layout_marginBottom="8dp"
+        android:clickable="true"
+        android:focusable="true"
+        android:text="@string/custom_layout_email_click_text"
+        android:textColor="#FFFFFF"
+        android:textStyle="bold"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintStart_toEndOf="@+id/guideline"
+        app:layout_constraintTop_toBottomOf="@+id/header_email" />
+
+    <TextView
+        android:id="@+id/custom_tos_pp"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_margin="16dp"
+        android:layout_marginStart="8dp"
+        android:layout_marginLeft="8dp"
+        android:layout_marginEnd="8dp"
+        android:layout_marginRight="8dp"
+        android:gravity="center_horizontal"
+        android:textColor="#FFFFFF"
+        app:layout_constraintTop_toBottomOf="@+id/custom_subheader"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="@+id/guideline"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintStart_toStartOf="parent"
+        tools:text="Terms of Service and Privacy Policy" />
+
+</android.support.constraint.ConstraintLayout>
diff --git a/app/src/main/res/layout/auth_method_picker_custom_layout.xml b/app/src/main/res/layout/auth_method_picker_custom_layout.xml
index 6e3ac625a..430f79318 100644
--- a/app/src/main/res/layout/auth_method_picker_custom_layout.xml
+++ b/app/src/main/res/layout/auth_method_picker_custom_layout.xml
@@ -1,57 +1,160 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:orientation="vertical"
-              android:layout_width="match_parent"
-              android:layout_height="match_parent" android:gravity="center_horizontal">
+<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@drawable/custom_bg_gradient">
+
+    <ImageView
+        android:id="@+id/custom_logo"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="16dp"
+        android:layout_marginLeft="16dp"
+        android:layout_marginTop="16dp"
+        android:layout_marginEnd="16dp"
+        android:layout_marginRight="16dp"
+        android:src="@mipmap/ic_launcher_foreground"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:ignore="ContentDescription" />
+
+    <TextView
+        android:id="@+id/custom_subheader"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="16dp"
+        android:layout_marginLeft="16dp"
+        android:layout_marginEnd="16dp"
+        android:layout_marginRight="16dp"
+        android:text="@string/custom_layout_subheader"
+        android:textColor="#FFFFFF"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/custom_logo" />
+
+    <!-- Horiz line, left of provider header -->
+    <FrameLayout
+        android:id="@+id/header_idp_wing_left"
+        style="@style/CustomWingOuter"
+        app:layout_constraintBottom_toBottomOf="@+id/header_idp_choice"
+        app:layout_constraintEnd_toStartOf="@+id/header_idp_choice"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="@+id/header_idp_choice">
+
+        <View style="@style/CustomWingInner" />
+
+    </FrameLayout>
 
     <TextView
-            android:text="@string/launch_title"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:textSize="25sp"
-            android:textAlignment="center"
-            android:layout_margin="24dp"
-            android:layout_marginBottom="0dp"/>
-
-    <TextView android:layout_width="match_parent"
-              android:layout_height="wrap_content"
-              android:textAlignment="center"
-              android:textSize="16sp"
-              android:layout_margin="16dp"
-              android:layout_marginBottom="32dp"
-              android:text="@string/custom_auth_picker_hint"/>
-
-    <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            android:gravity="center_horizontal">
-
-        <Button
-                android:id="@+id/custom_google_signin_button"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/providers_google"/>
-    </LinearLayout>
-
-    <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:gravity="center_horizontal"
-            android:layout_marginTop="8dp">
-
-        <TextView android:layout_width="wrap_content"
-                  android:layout_height="wrap_content"
-                  android:text="@string/custom_auth_use_email"/>
-
-        <TextView android:id="@+id/custom_email_signin_clickable_text"
-                  android:layout_width="wrap_content"
-                  android:layout_height="wrap_content"
-                  android:text="@string/providers_email"
-                  android:clickable="true"
-                  android:focusable="true"
-                  android:textStyle="bold"
-                  android:layout_marginLeft="4dp"
-                  android:layout_marginStart="4dp"/>
-    </LinearLayout>
-</LinearLayout>
+        android:id="@+id/header_idp_choice"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="32dp"
+        android:text="@string/custom_layout_idp_header"
+        android:textAllCaps="true"
+        android:textColor="#FFFFFF"
+        app:layout_constraintEnd_toStartOf="@+id/header_idp_wing_right"
+        app:layout_constraintStart_toEndOf="@+id/header_idp_wing_left"
+        app:layout_constraintTop_toBottomOf="@+id/custom_subheader" />
+
+    <!-- Horiz line, right of provider header -->
+    <FrameLayout
+        android:id="@+id/header_idp_wing_right"
+        style="@style/CustomWingOuter"
+        app:layout_constraintBottom_toBottomOf="@+id/header_idp_choice"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@+id/header_idp_choice"
+        app:layout_constraintTop_toTopOf="@+id/header_idp_choice">
+
+        <View style="@style/CustomWingInner" />
+
+    </FrameLayout>
+
+    <!--
+      NOTE: This sample app uses this class from the FirebaseUI library to show the Google Sign
+      in button. However this button is NOT considered part of the public API and you should not
+      use it in your own app.
+    -->
+    <com.firebase.ui.auth.util.ui.SupportVectorDrawablesButton xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/custom_google_signin_button"
+        style="@style/FirebaseUI.Button.AccountChooser.GoogleButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="32dp"
+        android:text="@string/fui_sign_in_with_google"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/header_idp_choice" />
+
+    <!-- Horiz line, left of email header -->
+    <FrameLayout
+        android:id="@+id/header_email_wing_left"
+        style="@style/CustomWingOuter"
+        app:layout_constraintBottom_toBottomOf="@+id/header_email"
+        app:layout_constraintEnd_toStartOf="@+id/header_email"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="@+id/header_email">
+
+        <View style="@style/CustomWingInner" />
+
+    </FrameLayout>
+
+    <TextView
+        android:id="@+id/header_email"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="32dp"
+        android:text="@string/custom_layout_email_header"
+        android:textAllCaps="true"
+        android:textColor="#FFFFFF"
+        app:layout_constraintEnd_toStartOf="@+id/header_email_wing_right"
+        app:layout_constraintStart_toEndOf="@+id/header_email_wing_left"
+        app:layout_constraintTop_toBottomOf="@+id/custom_google_signin_button" />
+
+    <!-- Horiz line, right of email header -->
+    <FrameLayout
+        android:id="@+id/header_email_wing_right"
+        style="@style/CustomWingOuter"
+        app:layout_constraintBottom_toBottomOf="@+id/header_email"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@+id/header_email"
+        app:layout_constraintTop_toTopOf="@+id/header_email">
+
+        <View style="@style/CustomWingInner" />
+
+    </FrameLayout>
+
+    <TextView
+        android:id="@+id/custom_email_signin_clickable_text"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="16dp"
+        android:layout_marginLeft="16dp"
+        android:layout_marginTop="32dp"
+        android:layout_marginEnd="16dp"
+        android:layout_marginRight="16dp"
+        android:clickable="true"
+        android:focusable="true"
+        android:text="@string/custom_layout_email_click_text"
+        android:textColor="#FFFFFF"
+        android:textStyle="bold"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/header_email" />
+
+    <TextView
+        android:id="@+id/custom_tos_pp"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_margin="16dp"
+        android:gravity="center_horizontal"
+        android:textColor="#FFFFFF"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        tools:text="Terms of Service and Privacy Policy" />
+
+</android.support.constraint.ConstraintLayout>
diff --git a/app/src/main/res/layout/auth_ui_layout.xml b/app/src/main/res/layout/auth_ui_layout.xml
index 441a4b781..f1df0c5fc 100644
--- a/app/src/main/res/layout/auth_ui_layout.xml
+++ b/app/src/main/res/layout/auth_ui_layout.xml
@@ -46,16 +46,6 @@
                 android:layout_marginBottom="16dp"
                 android:text="@string/sign_in_silent" />
 
-            <Button
-                    android:id="@+id/customised_sign_in"
-                    style="@style/Widget.AppCompat.Button.Colored"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="8dp"
-                    android:layout_gravity="center"
-                    android:layout_marginBottom="16dp"
-                    android:text="@string/custom_auth_picker_start"/>
-
             <TextView
                 style="@style/Base.TextAppearance.AppCompat.Subhead"
                 android:layout_width="wrap_content"
@@ -119,6 +109,34 @@
                 android:checked="true"
                 android:text="@string/providers_anonymous" />
 
+            <TextView
+                style="@style/Base.TextAppearance.AppCompat.Subhead"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="16dp"
+                android:layout_marginBottom="8dp"
+                android:text="@string/layout_header" />
+
+            <RadioGroup
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:orientation="vertical">
+
+                <RadioButton
+                    android:id="@+id/default_layout"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:checked="true"
+                    android:text="@string/layout_default" />
+
+                <RadioButton
+                    android:id="@+id/custom_layout"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/layout_custom" />
+
+            </RadioGroup>
+
             <TextView
                 style="@style/Base.TextAppearance.AppCompat.Subhead"
                 android:layout_width="wrap_content"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index ab356e82d..3344be035 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -30,6 +30,10 @@
     <string name="providers_phone">Phone</string>
     <string name="providers_anonymous">Anonymous</string>
 
+    <string name="layout_header">Layout</string>
+    <string name="layout_default">Default</string>
+    <string name="layout_custom">Custom</string>
+
     <string name="theme_header">Theme</string>
     <string name="theme_default">Default theme</string>
     <string name="theme_purple">Purple Theme</string>
@@ -95,10 +99,10 @@
     <string name="idp_secret">IDP Secret</string>
 
     <!-- Auth UI - Custom AuthMethodPickerLayout -->
-    <string name="custom_auth_picker_start">Start with Custom Layout</string>
-    <string name="custom_auth_picker_hint">You can use customised layout like this to improve your user experience!
-    </string>
-    <string name="custom_auth_use_email">Or you can also sign in by using</string>
+    <string name="custom_layout_subheader">Sign in using this nice custom layout!</string>
+    <string name="custom_layout_idp_header">Choose a provider</string>
+    <string name="custom_layout_email_header">Use your email</string>
+    <string name="custom_layout_email_click_text">Continue with Email</string>
 
 
     <!-- Storage -->
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 7acf1516f..fe1c0233c 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -26,4 +26,25 @@
         <item name="android:textColor">@android:color/white</item>
     </style>
 
+    <!-- Theme used in custom layout example -->
+    <style name="CustomTheme" parent="ThemeOverlay.AppCompat.Light">
+        <item name="colorPrimary">#7c4dff</item>
+        <item name="colorPrimaryDark">#4527a0</item>
+        <item name="colorAccent">@color/colorAccent</item>
+    </style>
+
+    <style name="CustomWingInner">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">1dp</item>
+        <item name="android:layout_gravity">center_vertical</item>
+        <item name="android:background">#FFFFFF</item>
+    </style>
+
+    <style name="CustomWingOuter">
+        <item name="android:layout_width">0dp</item>
+        <item name="android:layout_height">0dp</item>
+        <item name="android:layout_marginLeft">16dp</item>
+        <item name="android:layout_marginRight">16dp</item>
+    </style>
+
 </resources>
diff --git a/auth/README.md b/auth/README.md
index 5632b20b1..351e70da5 100644
--- a/auth/README.md
+++ b/auth/README.md
@@ -43,6 +43,7 @@ and [Web](https://github.com/firebase/firebaseui-web/).
 1. [Customization](#ui-customization)
    1. [Required setup](#required-setup)
    1. [Themes](#themes)
+   1. [Auth method picker layout](#custom-layout)
    1. [Strings](#strings)
 1. [OAuth scopes](#oauth-scope-customization)
    1. [Google](#google-1)
@@ -864,6 +865,33 @@ startActivityForResult(
 
 Your application theme could also simply be used, rather than defining a new one.
 
+### Custom Layout
+
+The first screen shown in most cases is the auth method picker screen, where the user selects
+from a list of authentication methods. While customization in other screens of FirebaseUI is
+limited to themes, this screen can be fully customized with your own XML layout.
+
+To customize the auth method picker screen, build an `AuthMethodPickerLayout` object and pass
+it to the `SignInIntentBuilder` before launching the AuthUI flow:
+
+```java
+// You must provide a custom layout XML resource and configure at least one
+// provider button ID. It's important that that you set the button ID for every provider
+// that you have enabled. 
+AuthMethodPickerLayout customLayout = new AuthMethodPickerLayout
+    .Builder(R.layout.your_custom_layout_xml)
+    .setGoogleButtonId(R.id.bar)
+    .setEmailButtonId(R.id.foo)
+    // ...
+    .setTosAndPrivacyPolicyId(R.id.baz)
+    .build();
+
+AuthUI.getInstance(this).createSignInIntentBuilder()
+    // ...
+    .setAuthMethodPickerLayout(customLayout)
+    .build());
+```
+
 ### Strings
 
 If you wish to change the string messages, the existing strings can be overridden
diff --git a/auth/src/main/java/com/firebase/ui/auth/AuthMethodPickerLayout.java b/auth/src/main/java/com/firebase/ui/auth/AuthMethodPickerLayout.java
index 266766971..3e4279ab1 100644
--- a/auth/src/main/java/com/firebase/ui/auth/AuthMethodPickerLayout.java
+++ b/auth/src/main/java/com/firebase/ui/auth/AuthMethodPickerLayout.java
@@ -11,26 +11,32 @@
 import java.util.*;
 
 /**
- * Layout model to help customizing the AuthPicker
+ * Layout model to help customizing layout of the AuthMethodPickerActivity screen,
+ * where the user is presented with a list of sign-in providers to choose from.
+ *
+ * To create a new instance, use {@link AuthMethodPickerLayout.Builder}.
  */
 public class AuthMethodPickerLayout implements Parcelable {
 
     @LayoutRes
     private int mainLayout;
 
+    @IdRes
+    private int tosPpView = -1;
+
     /**
      * PROVIDER_ID -> IdRes of the Button
      */
     private Map<String, Integer> providersButton;
 
-    private AuthMethodPickerLayout() {
-    }
+    private AuthMethodPickerLayout() {}
 
     private AuthMethodPickerLayout(@NonNull Parcel in) {
         this.mainLayout = in.readInt();
+        this.tosPpView = in.readInt();
+
         Bundle buttonsBundle = in.readBundle(getClass().getClassLoader());
         this.providersButton = new HashMap<>();
-
         for (String key : buttonsBundle.keySet()) {
             this.providersButton.put(key, buttonsBundle.getInt(key));
         }
@@ -41,6 +47,11 @@ public int getMainLayout() {
         return mainLayout;
     }
 
+    @IdRes
+    public int getTosPpView() {
+        return tosPpView;
+    }
+
     public Map<String, Integer> getProvidersButton() {
         return providersButton;
     }
@@ -53,6 +64,7 @@ public int describeContents() {
     @Override
     public void writeToParcel(Parcel parcel, int flags) {
         parcel.writeInt(mainLayout);
+        parcel.writeInt(tosPpView);
 
         Bundle bundle = new Bundle();
         for (String key : providersButton.keySet()) {
@@ -75,56 +87,90 @@ public AuthMethodPickerLayout[] newArray(int size) {
     };
 
     /**
-     * Builder for AuthMethodPickerLayout
+     * Builder for {@link AuthMethodPickerLayout}.
      */
     public static class Builder {
 
         private Map<String, Integer> providersMapping;
         private AuthMethodPickerLayout instance;
 
+        /**
+         * Create a new builder, specifying the ID of the XML layout resource to be sued.
+         */
         public Builder(@LayoutRes int mainLayout) {
             instance = new AuthMethodPickerLayout();
             instance.mainLayout = mainLayout;
             providersMapping = new HashMap<>();
         }
 
-        public AuthMethodPickerLayout.Builder setupGoogleButtonId(@IdRes int googleBtn) {
+        /**
+         * Set the ID of the Google sign in button in the custom layout.
+         */
+        public AuthMethodPickerLayout.Builder setGoogleButtonId(@IdRes int googleBtn) {
             providersMapping.put(GoogleAuthProvider.PROVIDER_ID, googleBtn);
             return this;
         }
 
-        public AuthMethodPickerLayout.Builder setupFacebookButtonId(@IdRes int facebookBtn) {
+        /**
+         * Set the ID of the Facebook sign in button in the custom layout.
+         */
+        public AuthMethodPickerLayout.Builder setFacebookButtonId(@IdRes int facebookBtn) {
             providersMapping.put(FacebookAuthProvider.PROVIDER_ID, facebookBtn);
             return this;
         }
 
-        public AuthMethodPickerLayout.Builder setupTwitterButtonId(@IdRes int twitterBtn) {
+        /**
+         * Set the ID of the Twitter sign in button in the custom layout.
+         */
+        public AuthMethodPickerLayout.Builder setTwitterButtonId(@IdRes int twitterBtn) {
             providersMapping.put(TwitterAuthProvider.PROVIDER_ID, twitterBtn);
             return this;
         }
 
-        public AuthMethodPickerLayout.Builder setupEmailButtonId(@IdRes int emailButton) {
+        /**
+         * Set the ID of the Email sign in button in the custom layout.
+         */
+        public AuthMethodPickerLayout.Builder setEmailButtonId(@IdRes int emailButton) {
             providersMapping.put(EmailAuthProvider.PROVIDER_ID, emailButton);
             return this;
         }
 
-        public AuthMethodPickerLayout.Builder setupPhoneButtonId(@IdRes int phoneButton) {
+        /**
+         * Set the ID of the Phone Number sign in button in the custom layout.
+         */
+        public AuthMethodPickerLayout.Builder setPhoneButtonId(@IdRes int phoneButton) {
             providersMapping.put(PhoneAuthProvider.PROVIDER_ID, phoneButton);
             return this;
         }
 
-        public AuthMethodPickerLayout.Builder setupAnonymousButtonId(@IdRes int anonymousButton) {
+        /**
+         * Set the ID of the Anonymous sign in button in the custom layout.
+         */
+        public AuthMethodPickerLayout.Builder setAnonymousButtonId(@IdRes int anonymousButton) {
             providersMapping.put(AuthUI.ANONYMOUS_PROVIDER, anonymousButton);
             return this;
         }
 
+        /**
+         * Set the ID of a TextView where terms of service and privacy policy should be
+         * displayed.
+         */
+        public AuthMethodPickerLayout.Builder setTosAndPrivacyPolicyId(@IdRes int tosPpView) {
+            instance.tosPpView = tosPpView;
+            return this;
+        }
+
         public AuthMethodPickerLayout build() {
-            //Validating the button set
+            if (providersMapping.isEmpty()) {
+                throw new IllegalArgumentException("Must configure at least one button.");
+            }
+
             for (String key : providersMapping.keySet()) {
                 if (!AuthUI.SUPPORTED_PROVIDERS.contains(key)) {
                     throw new IllegalArgumentException("Unknown provider: " + key);
                 }
             }
+
             instance.providersButton = providersMapping;
             return instance;
         }
diff --git a/auth/src/main/java/com/firebase/ui/auth/AuthUI.java b/auth/src/main/java/com/firebase/ui/auth/AuthUI.java
index e835e8c37..6c7c8839c 100644
--- a/auth/src/main/java/com/firebase/ui/auth/AuthUI.java
+++ b/auth/src/main/java/com/firebase/ui/auth/AuthUI.java
@@ -1231,6 +1231,11 @@ public T setIsSmartLockEnabled(boolean enableCredentials, boolean enableHints) {
             return (T) this;
         }
 
+        /**
+         * Set a custom layout for the AuthMethodPickerActivity screen.
+         * See {@link AuthMethodPickerLayout}.
+         * @param authMethodPickerLayout custom layout descriptor object.
+         */
         @NonNull
         public T setAuthMethodPickerLayout(@NonNull AuthMethodPickerLayout authMethodPickerLayout) {
             mAuthMethodPickerLayout = authMethodPickerLayout;
diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/idp/AuthMethodPickerActivity.java b/auth/src/main/java/com/firebase/ui/auth/ui/idp/AuthMethodPickerActivity.java
index 000dd8c47..1a619fa02 100644
--- a/auth/src/main/java/com/firebase/ui/auth/ui/idp/AuthMethodPickerActivity.java
+++ b/auth/src/main/java/com/firebase/ui/auth/ui/idp/AuthMethodPickerActivity.java
@@ -86,6 +86,7 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
         mHandler = ViewModelProviders.of(this).get(SocialProviderResponseHandler.class);
         mHandler.init(params);
 
+
         mProviders = new ArrayList<>();
         if (customLayout != null) {
             setContentView(customLayout.getMainLayout());
@@ -115,18 +116,26 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
                 ImageView logo = findViewById(R.id.logo);
                 logo.setImageResource(logoId);
             }
+        }
+
+        boolean tosAndPpConfigured = getFlowParams().isPrivacyPolicyUrlProvided()
+                && getFlowParams().isTermsOfServiceUrlProvided();
+
+        int termsTextId = customLayout == null
+                ? R.id.main_tos_and_pp
+                : customLayout.getTosPpView();
+
+        if (termsTextId >= 0) {
+            TextView termsText = findViewById(termsTextId);
 
-            TextView termsText = findViewById(R.id.main_tos_and_pp);
-            PrivacyDisclosureUtils.setupTermsOfServiceAndPrivacyPolicyText(this,
-                    getFlowParams(),
-                    termsText);
-          
             // No ToS or PP provided, so we should hide the view entirely
-            if (!getFlowParams().isPrivacyPolicyUrlProvided() &&
-                    !getFlowParams().isTermsOfServiceUrlProvided()) {
-                 termsText.setVisibility(View.GONE);
-             }
-      
+            if (!tosAndPpConfigured) {
+                termsText.setVisibility(View.GONE);
+            } else {
+                PrivacyDisclosureUtils.setupTermsOfServiceAndPrivacyPolicyText(this,
+                        getFlowParams(),
+                        termsText);
+            }
         }
 
         //Handler for both
@@ -198,11 +207,12 @@ private void populateIdpListCustomLayout(List<IdpConfig> providerConfigs) {
         Map<String, Integer> providerButtonIds = customLayout.getProvidersButton();
         for (IdpConfig idpConfig : providerConfigs) {
             final String providerId = idpConfig.getProviderId();
+            if (!providerButtonIds.containsKey(providerId)) {
+                throw new IllegalStateException("No button found for auth provider: " + providerId);
+            }
+
             @IdRes int buttonId = providerButtonIds.get(providerId);
             View loginButton = findViewById(buttonId);
-            if (loginButton == null) {
-                throw new IllegalStateException("No button found for this auth provider");
-            }
             handleSignInOperation(idpConfig, loginButton);
         }
     }
diff --git a/auth/src/test/java/com/firebase/ui/auth/AuthUITest.java b/auth/src/test/java/com/firebase/ui/auth/AuthUITest.java
index eea9ec509..2fc7263c8 100644
--- a/auth/src/test/java/com/firebase/ui/auth/AuthUITest.java
+++ b/auth/src/test/java/com/firebase/ui/auth/AuthUITest.java
@@ -217,7 +217,7 @@ public void testPhoneBuilder_passNullForBlacklistedCountries_expectNullPointerEx
     }
 
     @Test
-    public void testAnonymousBuilder_expectSucess() {
+    public void testAnonymousBuilder_expectSuccess() {
         new IdpConfig.AnonymousBuilder()
                 .build();
     }
@@ -225,9 +225,10 @@ public void testAnonymousBuilder_expectSucess() {
     @Test
     public void testCustomAuthMethodPickerLayout() {
         //Testing with some random layout res
-        AuthMethodPickerLayout customLayout = new AuthMethodPickerLayout
-                .Builder(R.layout.fui_phone_layout)
-                .build();
+        AuthMethodPickerLayout customLayout =
+                new AuthMethodPickerLayout.Builder(R.layout.fui_phone_layout)
+                        .setAnonymousButtonId(123)
+                        .build();
 
         FlowParameters flowParameters = mAuthUi
                 .createSignInIntentBuilder()
diff --git a/auth/src/test/java/com/firebase/ui/auth/ui/idp/AuthMethodPickerActivityTest.java b/auth/src/test/java/com/firebase/ui/auth/ui/idp/AuthMethodPickerActivityTest.java
index 6dd22eafc..ff5689fee 100644
--- a/auth/src/test/java/com/firebase/ui/auth/ui/idp/AuthMethodPickerActivityTest.java
+++ b/auth/src/test/java/com/firebase/ui/auth/ui/idp/AuthMethodPickerActivityTest.java
@@ -106,7 +106,7 @@ public void testCustomAuthMethodPickerLayout() {
 
         AuthMethodPickerLayout customLayout = new AuthMethodPickerLayout
                 .Builder(R.layout.fui_provider_button_email)
-                .setupEmailButtonId(R.id.email_button)
+                .setEmailButtonId(R.id.email_button)
                 .build();
 
         AuthMethodPickerActivity authMethodPickerActivity = createActivityWithCustomLayout(providers, customLayout);