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 668a11b0e..7dd027952 100644
--- a/app/src/main/java/com/firebase/uidemo/auth/AuthUiActivity.java
+++ b/app/src/main/java/com/firebase/uidemo/auth/AuthUiActivity.java
@@ -33,6 +33,7 @@
 import android.widget.RadioButton;
 import android.widget.TextView;
 
+import com.firebase.ui.auth.AuthMethodPickerLayout;
 import com.firebase.ui.auth.AuthUI;
 import com.firebase.ui.auth.AuthUI.IdpConfig;
 import com.firebase.ui.auth.ErrorCodes;
@@ -48,6 +49,7 @@
 import com.google.firebase.auth.FirebaseAuth;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 import butterknife.BindView;
@@ -258,6 +260,32 @@ 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/layout/auth_method_picker_custom_layout.xml b/app/src/main/res/layout/auth_method_picker_custom_layout.xml
new file mode 100644
index 000000000..6e3ac625a
--- /dev/null
+++ b/app/src/main/res/layout/auth_method_picker_custom_layout.xml
@@ -0,0 +1,57 @@
+<?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">
+
+    <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>
diff --git a/app/src/main/res/layout/auth_ui_layout.xml b/app/src/main/res/layout/auth_ui_layout.xml
index 7edc9f76f..441a4b781 100644
--- a/app/src/main/res/layout/auth_ui_layout.xml
+++ b/app/src/main/res/layout/auth_ui_layout.xml
@@ -46,6 +46,16 @@
                 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"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 3f34c209c..ab356e82d 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -94,6 +94,13 @@
     <string name="idp_token">IDP Token</string>
     <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>
+
+
     <!-- Storage -->
     <string name="choose_image">Choose Image</string>
     <string name="upload">Upload</string>
diff --git a/auth/src/main/java/com/firebase/ui/auth/AuthMethodPickerLayout.java b/auth/src/main/java/com/firebase/ui/auth/AuthMethodPickerLayout.java
new file mode 100644
index 000000000..266766971
--- /dev/null
+++ b/auth/src/main/java/com/firebase/ui/auth/AuthMethodPickerLayout.java
@@ -0,0 +1,132 @@
+package com.firebase.ui.auth;
+
+import android.os.Bundle;
+import android.os.Parcel;
+import android.os.Parcelable;
+import android.support.annotation.IdRes;
+import android.support.annotation.LayoutRes;
+import android.support.annotation.NonNull;
+import com.google.firebase.auth.*;
+
+import java.util.*;
+
+/**
+ * Layout model to help customizing the AuthPicker
+ */
+public class AuthMethodPickerLayout implements Parcelable {
+
+    @LayoutRes
+    private int mainLayout;
+
+    /**
+     * PROVIDER_ID -> IdRes of the Button
+     */
+    private Map<String, Integer> providersButton;
+
+    private AuthMethodPickerLayout() {
+    }
+
+    private AuthMethodPickerLayout(@NonNull Parcel in) {
+        this.mainLayout = in.readInt();
+        Bundle buttonsBundle = in.readBundle(getClass().getClassLoader());
+        this.providersButton = new HashMap<>();
+
+        for (String key : buttonsBundle.keySet()) {
+            this.providersButton.put(key, buttonsBundle.getInt(key));
+        }
+    }
+
+    @LayoutRes
+    public int getMainLayout() {
+        return mainLayout;
+    }
+
+    public Map<String, Integer> getProvidersButton() {
+        return providersButton;
+    }
+
+    @Override
+    public int describeContents() {
+        return 0;
+    }
+
+    @Override
+    public void writeToParcel(Parcel parcel, int flags) {
+        parcel.writeInt(mainLayout);
+
+        Bundle bundle = new Bundle();
+        for (String key : providersButton.keySet()) {
+            bundle.putInt(key, providersButton.get(key));
+        }
+        parcel.writeBundle(bundle);
+    }
+
+    public static final Creator<AuthMethodPickerLayout> CREATOR = new Creator<AuthMethodPickerLayout>() {
+
+        @Override
+        public AuthMethodPickerLayout createFromParcel(Parcel in) {
+            return new AuthMethodPickerLayout(in);
+        }
+
+        @Override
+        public AuthMethodPickerLayout[] newArray(int size) {
+            return new AuthMethodPickerLayout[size];
+        }
+    };
+
+    /**
+     * Builder for AuthMethodPickerLayout
+     */
+    public static class Builder {
+
+        private Map<String, Integer> providersMapping;
+        private AuthMethodPickerLayout instance;
+
+        public Builder(@LayoutRes int mainLayout) {
+            instance = new AuthMethodPickerLayout();
+            instance.mainLayout = mainLayout;
+            providersMapping = new HashMap<>();
+        }
+
+        public AuthMethodPickerLayout.Builder setupGoogleButtonId(@IdRes int googleBtn) {
+            providersMapping.put(GoogleAuthProvider.PROVIDER_ID, googleBtn);
+            return this;
+        }
+
+        public AuthMethodPickerLayout.Builder setupFacebookButtonId(@IdRes int facebookBtn) {
+            providersMapping.put(FacebookAuthProvider.PROVIDER_ID, facebookBtn);
+            return this;
+        }
+
+        public AuthMethodPickerLayout.Builder setupTwitterButtonId(@IdRes int twitterBtn) {
+            providersMapping.put(TwitterAuthProvider.PROVIDER_ID, twitterBtn);
+            return this;
+        }
+
+        public AuthMethodPickerLayout.Builder setupEmailButtonId(@IdRes int emailButton) {
+            providersMapping.put(EmailAuthProvider.PROVIDER_ID, emailButton);
+            return this;
+        }
+
+        public AuthMethodPickerLayout.Builder setupPhoneButtonId(@IdRes int phoneButton) {
+            providersMapping.put(PhoneAuthProvider.PROVIDER_ID, phoneButton);
+            return this;
+        }
+
+        public AuthMethodPickerLayout.Builder setupAnonymousButtonId(@IdRes int anonymousButton) {
+            providersMapping.put(AuthUI.ANONYMOUS_PROVIDER, anonymousButton);
+            return this;
+        }
+
+        public AuthMethodPickerLayout build() {
+            //Validating the button set
+            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 7916b8d79..e835e8c37 100644
--- a/auth/src/main/java/com/firebase/ui/auth/AuthUI.java
+++ b/auth/src/main/java/com/firebase/ui/auth/AuthUI.java
@@ -1101,6 +1101,7 @@ private abstract class AuthIntentBuilder<T extends AuthIntentBuilder> {
         boolean mAlwaysShowProviderChoice = false;
         boolean mEnableCredentials = true;
         boolean mEnableHints = true;
+        AuthMethodPickerLayout mAuthMethodPickerLayout = null;
 
         /**
          * Specifies the theme to use for the application flow. If no theme is specified, a
@@ -1230,6 +1231,12 @@ public T setIsSmartLockEnabled(boolean enableCredentials, boolean enableHints) {
             return (T) this;
         }
 
+        @NonNull
+        public T setAuthMethodPickerLayout(@NonNull AuthMethodPickerLayout authMethodPickerLayout) {
+            mAuthMethodPickerLayout = authMethodPickerLayout;
+            return (T) this;
+        }
+          
         /**
          * Forces the sign-in method choice screen to always show, even if there is only
          * a single provider configured.
@@ -1301,7 +1308,8 @@ protected FlowParameters getFlowParams() {
                     mEnableHints,
                     mEnableAnonymousUpgrade,
                     mAlwaysShowProviderChoice,
-                    mEmailLink);
+                    mEmailLink,
+                    mAuthMethodPickerLayout);
         }
     }
 }
diff --git a/auth/src/main/java/com/firebase/ui/auth/data/model/FlowParameters.java b/auth/src/main/java/com/firebase/ui/auth/data/model/FlowParameters.java
index 68b461f2d..5b0e169c1 100644
--- a/auth/src/main/java/com/firebase/ui/auth/data/model/FlowParameters.java
+++ b/auth/src/main/java/com/firebase/ui/auth/data/model/FlowParameters.java
@@ -23,6 +23,7 @@
 import android.support.annotation.StyleRes;
 import android.text.TextUtils;
 
+import com.firebase.ui.auth.AuthMethodPickerLayout;
 import com.firebase.ui.auth.AuthUI.IdpConfig;
 import com.firebase.ui.auth.util.ExtraConstants;
 import com.firebase.ui.auth.util.Preconditions;
@@ -51,6 +52,7 @@ public FlowParameters createFromParcel(Parcel in) {
             boolean enableAnonymousUpgrade = in.readInt() != 0;
             boolean alwaysShowProviderChoice = in.readInt() != 0;
             String emailLink = in.readString();
+            AuthMethodPickerLayout customLayout = in.readParcelable(AuthMethodPickerLayout.class.getClassLoader());
 
             return new FlowParameters(
                     appName,
@@ -63,7 +65,8 @@ public FlowParameters createFromParcel(Parcel in) {
                     enableHints,
                     enableAnonymousUpgrade,
                     alwaysShowProviderChoice,
-                    emailLink);
+                    emailLink,
+                    customLayout);
         }
 
         @Override
@@ -98,6 +101,9 @@ public FlowParameters[] newArray(int size) {
     public final boolean enableAnonymousUpgrade;
     public final boolean alwaysShowProviderChoice;
 
+    @Nullable
+    public final AuthMethodPickerLayout authMethodPickerLayout;
+
     public FlowParameters(
             @NonNull String appName,
             @NonNull List<IdpConfig> providers,
@@ -109,7 +115,8 @@ public FlowParameters(
             boolean enableHints,
             boolean enableAnonymousUpgrade,
             boolean alwaysShowProviderChoice,
-            @Nullable String emailLink) {
+            @Nullable String emailLink,
+            @Nullable AuthMethodPickerLayout authMethodPickerLayout) {
         this.appName = Preconditions.checkNotNull(appName, "appName cannot be null");
         this.providers = Collections.unmodifiableList(
                 Preconditions.checkNotNull(providers, "providers cannot be null"));
@@ -122,6 +129,7 @@ public FlowParameters(
         this.enableAnonymousUpgrade = enableAnonymousUpgrade;
         this.alwaysShowProviderChoice = alwaysShowProviderChoice;
         this.emailLink = emailLink;
+        this.authMethodPickerLayout = authMethodPickerLayout;
     }
 
     /**
@@ -144,6 +152,7 @@ public void writeToParcel(Parcel dest, int flags) {
         dest.writeInt(enableAnonymousUpgrade ? 1 : 0);
         dest.writeInt(alwaysShowProviderChoice ? 1 : 0);
         dest.writeString(emailLink);
+        dest.writeParcelable(authMethodPickerLayout, flags);
     }
 
     @Override
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 a0c93a6e6..000dd8c47 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
@@ -19,10 +19,7 @@
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.annotation.LayoutRes;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.RestrictTo;
+import android.support.annotation.*;
 import android.support.constraint.ConstraintLayout;
 import android.support.constraint.ConstraintSet;
 import android.view.View;
@@ -32,13 +29,8 @@
 import android.widget.TextView;
 import android.widget.Toast;
 
-import com.firebase.ui.auth.AuthUI;
+import com.firebase.ui.auth.*;
 import com.firebase.ui.auth.AuthUI.IdpConfig;
-import com.firebase.ui.auth.ErrorCodes;
-import com.firebase.ui.auth.FirebaseAuthAnonymousUpgradeException;
-import com.firebase.ui.auth.FirebaseUiException;
-import com.firebase.ui.auth.IdpResponse;
-import com.firebase.ui.auth.R;
 import com.firebase.ui.auth.data.model.FlowParameters;
 import com.firebase.ui.auth.data.model.UserCancellationException;
 import com.firebase.ui.auth.data.remote.AnonymousSignInHandler;
@@ -62,6 +54,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 import static com.firebase.ui.auth.AuthUI.EMAIL_LINK_PROVIDER;
 
@@ -77,6 +70,8 @@ public class AuthMethodPickerActivity extends AppCompatBase {
     private ProgressBar mProgressBar;
     private ViewGroup mProviderHolder;
 
+    private AuthMethodPickerLayout customLayout;
+
     public static Intent createIntent(Context context, FlowParameters flowParams) {
         return createBaseIntent(context, AuthMethodPickerActivity.class, flowParams);
     }
@@ -84,32 +79,57 @@ public static Intent createIntent(Context context, FlowParameters flowParams) {
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.fui_auth_method_picker_layout);
-
-        mProgressBar = findViewById(R.id.top_progress_bar);
-        mProviderHolder = findViewById(R.id.btn_holder);
 
         FlowParameters params = getFlowParams();
+        customLayout = params.authMethodPickerLayout;
+
         mHandler = ViewModelProviders.of(this).get(SocialProviderResponseHandler.class);
         mHandler.init(params);
 
-        populateIdpList(params.providers);
-
-        int logoId = params.logoId;
-        if (logoId == AuthUI.NO_LOGO) {
-            findViewById(R.id.logo).setVisibility(View.GONE);
+        mProviders = new ArrayList<>();
+        if (customLayout != null) {
+            setContentView(customLayout.getMainLayout());
 
-            ConstraintLayout layout = findViewById(R.id.root);
-            ConstraintSet constraints = new ConstraintSet();
-            constraints.clone(layout);
-            constraints.setHorizontalBias(R.id.container, 0.5f);
-            constraints.setVerticalBias(R.id.container, 0.5f);
-            constraints.applyTo(layout);
+            //Setup using custom layout
+            populateIdpListCustomLayout(params.providers);
         } else {
-            ImageView logo = findViewById(R.id.logo);
-            logo.setImageResource(logoId);
+            setContentView(R.layout.fui_auth_method_picker_layout);
+
+            //UI only with default layout
+            mProgressBar = findViewById(R.id.top_progress_bar);
+            mProviderHolder = findViewById(R.id.btn_holder);
+
+            populateIdpList(params.providers);
+
+            int logoId = params.logoId;
+            if (logoId == AuthUI.NO_LOGO) {
+                findViewById(R.id.logo).setVisibility(View.GONE);
+
+                ConstraintLayout layout = findViewById(R.id.root);
+                ConstraintSet constraints = new ConstraintSet();
+                constraints.clone(layout);
+                constraints.setHorizontalBias(R.id.container, 0.5f);
+                constraints.setVerticalBias(R.id.container, 0.5f);
+                constraints.applyTo(layout);
+            } else {
+                ImageView logo = findViewById(R.id.logo);
+                logo.setImageResource(logoId);
+            }
+
+            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);
+             }
+      
         }
 
+        //Handler for both
         mHandler.getOperation().observe(this, new ResourceObserver<IdpResponse>(
                 this, R.string.fui_progress_dialog_signing_in) {
             @Override
@@ -131,127 +151,154 @@ protected void onFailure(@NonNull Exception e) {
                 }
             }
         });
-
-        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);
-        }
     }
 
     private void populateIdpList(List<IdpConfig> providerConfigs) {
+      
         ViewModelProvider supplier = ViewModelProviders.of(this);
-
         mProviders = new ArrayList<>();
         for (IdpConfig idpConfig : providerConfigs) {
-            final ProviderSignInBase<?> provider;
             @LayoutRes int buttonLayout;
 
             final String providerId = idpConfig.getProviderId();
             switch (providerId) {
                 case GoogleAuthProvider.PROVIDER_ID:
-                    GoogleSignInHandler google = supplier.get(GoogleSignInHandler.class);
-                    google.init(new GoogleSignInHandler.Params(idpConfig));
-                    provider = google;
-
                     buttonLayout = R.layout.fui_idp_button_google;
                     break;
                 case FacebookAuthProvider.PROVIDER_ID:
-                    FacebookSignInHandler facebook = supplier.get(FacebookSignInHandler.class);
-                    facebook.init(idpConfig);
-                    provider = facebook;
-
                     buttonLayout = R.layout.fui_idp_button_facebook;
                     break;
                 case TwitterAuthProvider.PROVIDER_ID:
-                    TwitterSignInHandler twitter = supplier.get(TwitterSignInHandler.class);
-                    twitter.init(null);
-                    provider = twitter;
-
                     buttonLayout = R.layout.fui_idp_button_twitter;
                     break;
                 case GithubAuthProvider.PROVIDER_ID:
-                    ProviderSignInBase<IdpConfig> github =
-                            supplier.get(GitHubSignInHandlerBridge.HANDLER_CLASS);
-                    github.init(idpConfig);
-                    provider = github;
-
                     buttonLayout = R.layout.fui_idp_button_github;
                     break;
                 case EMAIL_LINK_PROVIDER:
                 case EmailAuthProvider.PROVIDER_ID:
-                    EmailSignInHandler email = supplier.get(EmailSignInHandler.class);
-                    email.init(null);
-                    provider = email;
-
                     buttonLayout = R.layout.fui_provider_button_email;
                     break;
                 case PhoneAuthProvider.PROVIDER_ID:
-                    PhoneSignInHandler phone = supplier.get(PhoneSignInHandler.class);
-                    phone.init(idpConfig);
-                    provider = phone;
-
                     buttonLayout = R.layout.fui_provider_button_phone;
                     break;
                 case AuthUI.ANONYMOUS_PROVIDER:
-                    AnonymousSignInHandler anonymous = supplier.get(AnonymousSignInHandler.class);
-                    anonymous.init(getFlowParams());
-                    provider = anonymous;
-
                     buttonLayout = R.layout.fui_provider_button_anonymous;
                     break;
                 default:
                     throw new IllegalStateException("Unknown provider: " + providerId);
             }
-            mProviders.add(provider);
 
-            provider.getOperation().observe(this, new ResourceObserver<IdpResponse>(this) {
-                @Override
-                protected void onSuccess(@NonNull IdpResponse response) {
-                    handleResponse(response);
-                }
+            View loginButton = getLayoutInflater().inflate(buttonLayout, mProviderHolder, false);
+            handleSignInOperation(idpConfig, loginButton);
+            mProviderHolder.addView(loginButton);
+        }
+    }
 
-                @Override
-                protected void onFailure(@NonNull Exception e) {
-                    handleResponse(IdpResponse.from(e));
-                }
+    private void populateIdpListCustomLayout(List<IdpConfig> providerConfigs) {
+        Map<String, Integer> providerButtonIds = customLayout.getProvidersButton();
+        for (IdpConfig idpConfig : providerConfigs) {
+            final String providerId = idpConfig.getProviderId();
+            @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);
+        }
+    }
 
-                private void handleResponse(@NonNull IdpResponse response) {
-                    if (!response.isSuccessful()) {
-                        // We have no idea what provider this error stemmed from so just forward
-                        // this along to the handler.
-                        mHandler.startSignIn(response);
-                    } else if (AuthUI.SOCIAL_PROVIDERS.contains(providerId)) {
-                        // Don't use the response's provider since it can be different than the one
-                        // that launched the sign-in attempt. Ex: the email flow is started, but
-                        // ends up turning into a Google sign-in because that account already
-                        // existed. In the previous example, an extra sign-in would incorrectly
-                        // started.
-                        mHandler.startSignIn(response);
-                    } else {
-                        // Email or phone: the credentials should have already been saved so
-                        // simply move along. Anononymous sign in also does not require any
-                        // other operations.
-                        finish(response.isSuccessful() ? RESULT_OK : RESULT_CANCELED,
-                                response.toIntent());
-                    }
-                }
-            });
+    private void handleSignInOperation(IdpConfig idpConfig, View view) {
+        ViewModelProvider supplier = ViewModelProviders.of(this);
+        final String providerId = idpConfig.getProviderId();
+        final ProviderSignInBase<?> provider;
+
+        switch (providerId) {
+            case GoogleAuthProvider.PROVIDER_ID:
+                GoogleSignInHandler google = supplier.get(GoogleSignInHandler.class);
+                google.init(new GoogleSignInHandler.Params(idpConfig));
+                provider = google;
+
+                break;
+            case FacebookAuthProvider.PROVIDER_ID:
+                FacebookSignInHandler facebook = supplier.get(FacebookSignInHandler.class);
+                facebook.init(idpConfig);
+                provider = facebook;
+
+                break;
+            case TwitterAuthProvider.PROVIDER_ID:
+                TwitterSignInHandler twitter = supplier.get(TwitterSignInHandler.class);
+                twitter.init(null);
+                provider = twitter;
+
+                break;
+            case GithubAuthProvider.PROVIDER_ID:
+                ProviderSignInBase<IdpConfig> github =
+                        supplier.get(GitHubSignInHandlerBridge.HANDLER_CLASS);
+                github.init(idpConfig);
+                provider = github;
+
+                break;
+            case EmailAuthProvider.PROVIDER_ID:
+                EmailSignInHandler email = supplier.get(EmailSignInHandler.class);
+                email.init(null);
+                provider = email;
+
+                break;
+            case PhoneAuthProvider.PROVIDER_ID:
+                PhoneSignInHandler phone = supplier.get(PhoneSignInHandler.class);
+                phone.init(idpConfig);
+                provider = phone;
+
+                break;
+            case AuthUI.ANONYMOUS_PROVIDER:
+                AnonymousSignInHandler anonymous = supplier.get(AnonymousSignInHandler.class);
+                anonymous.init(getFlowParams());
+                provider = anonymous;
+
+                break;
+            default:
+                throw new IllegalStateException("Unknown provider: " + providerId);
+        }
+        mProviders.add(provider);
 
-            View loginButton = getLayoutInflater().inflate(buttonLayout, mProviderHolder, false);
-            loginButton.setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View view) {
-                    provider.startSignIn(AuthMethodPickerActivity.this);
+        provider.getOperation().observe(this, new ResourceObserver<IdpResponse>(this) {
+            @Override
+            protected void onSuccess(@NonNull IdpResponse response) {
+                handleResponse(response);
+            }
+
+            @Override
+            protected void onFailure(@NonNull Exception e) {
+                handleResponse(IdpResponse.from(e));
+            }
+
+            private void handleResponse(@NonNull IdpResponse response) {
+                if (!response.isSuccessful()) {
+                    // We have no idea what provider this error stemmed from so just forward
+                    // this along to the handler.
+                    mHandler.startSignIn(response);
+                } else if (AuthUI.SOCIAL_PROVIDERS.contains(providerId)) {
+                    // Don't use the response's provider since it can be different than the one
+                    // that launched the sign-in attempt. Ex: the email flow is started, but
+                    // ends up turning into a Google sign-in because that account already
+                    // existed. In the previous example, an extra sign-in would incorrectly
+                    // started.
+                    mHandler.startSignIn(response);
+                } else {
+                    // Email or phone: the credentials should have already been saved so
+                    // simply move along. Anononymous sign in also does not require any
+                    // other operations.
+                    finish(response.isSuccessful() ? RESULT_OK : RESULT_CANCELED,
+                            response.toIntent());
                 }
-            });
-            mProviderHolder.addView(loginButton);
-        }
+            }
+        });
+        view.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                provider.startSignIn(AuthMethodPickerActivity.this);
+            }
+        });
     }
 
     @Override
@@ -265,21 +312,27 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
 
     @Override
     public void showProgress(int message) {
-        mProgressBar.setVisibility(View.VISIBLE);
-        for (int i = 0; i < mProviderHolder.getChildCount(); i++) {
-            View child = mProviderHolder.getChildAt(i);
-            child.setEnabled(false);
-            child.setAlpha(0.75f);
+        //mProgressBar & mProviderHolder might be null if using custom AuthMethodPickerLayout
+        if (customLayout == null) {
+            mProgressBar.setVisibility(View.VISIBLE);
+            for (int i = 0; i < mProviderHolder.getChildCount(); i++) {
+                View child = mProviderHolder.getChildAt(i);
+                child.setEnabled(false);
+                child.setAlpha(0.75f);
+            }
         }
     }
 
     @Override
     public void hideProgress() {
-        mProgressBar.setVisibility(View.INVISIBLE);
-        for (int i = 0; i < mProviderHolder.getChildCount(); i++) {
-            View child = mProviderHolder.getChildAt(i);
-            child.setEnabled(true);
-            child.setAlpha(1.0f);
+        //mProgressBar & mProviderHolder might be null if using custom AuthMethodPickerLayout
+        if (customLayout == null) {
+            mProgressBar.setVisibility(View.INVISIBLE);
+            for (int i = 0; i < mProviderHolder.getChildCount(); i++) {
+                View child = mProviderHolder.getChildAt(i);
+                child.setEnabled(true);
+                child.setAlpha(1.0f);
+            }
         }
     }
 }
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 a5620c36e..eea9ec509 100644
--- a/auth/src/test/java/com/firebase/ui/auth/AuthUITest.java
+++ b/auth/src/test/java/com/firebase/ui/auth/AuthUITest.java
@@ -223,8 +223,24 @@ public void testAnonymousBuilder_expectSucess() {
     }
 
     @Test
-    public void
-    testEmailBuilder_withValidActionCodeSettings_expectSuccess() {
+    public void testCustomAuthMethodPickerLayout() {
+        //Testing with some random layout res
+        AuthMethodPickerLayout customLayout = new AuthMethodPickerLayout
+                .Builder(R.layout.fui_phone_layout)
+                .build();
+
+        FlowParameters flowParameters = mAuthUi
+                .createSignInIntentBuilder()
+                .setAuthMethodPickerLayout(customLayout)
+                .build()
+                .getParcelableExtra(ExtraConstants.FLOW_PARAMS);
+
+        assert flowParameters.authMethodPickerLayout != null;
+        assertEquals(customLayout.getMainLayout(), flowParameters.authMethodPickerLayout.getMainLayout());
+    }
+
+    @Test
+    public void testEmailBuilder_withValidActionCodeSettings_expectSuccess() {
         ActionCodeSettings actionCodeSettings = ActionCodeSettings.newBuilder().setUrl(URL)
                 .setHandleCodeInApp(true)
                 .build();
diff --git a/auth/src/test/java/com/firebase/ui/auth/testhelpers/TestHelper.java b/auth/src/test/java/com/firebase/ui/auth/testhelpers/TestHelper.java
index 6540655d9..8dc4e7863 100644
--- a/auth/src/test/java/com/firebase/ui/auth/testhelpers/TestHelper.java
+++ b/auth/src/test/java/com/firebase/ui/auth/testhelpers/TestHelper.java
@@ -18,6 +18,7 @@
 import android.content.res.Resources;
 import android.util.Log;
 
+import com.firebase.ui.auth.AuthMethodPickerLayout;
 import com.firebase.ui.auth.AuthUI;
 import com.firebase.ui.auth.AuthUI.IdpConfig;
 import com.firebase.ui.auth.R;
@@ -113,6 +114,12 @@ public static FlowParameters getFlowParameters(Collection<String> providerIds) {
 
     public static FlowParameters getFlowParameters(Collection<String> providerIds,
                                                    boolean enableAnonymousUpgrade) {
+        return getFlowParameters(providerIds, enableAnonymousUpgrade, null);
+    }
+
+    public static FlowParameters getFlowParameters(Collection<String> providerIds,
+                                                   boolean enableAnonymousUpgrade,
+                                                   AuthMethodPickerLayout customLayout) {
         List<IdpConfig> idpConfigs = new ArrayList<>();
         for (String providerId : providerIds) {
             switch (providerId) {
@@ -157,7 +164,8 @@ public static FlowParameters getFlowParameters(Collection<String> providerIds,
                 true,
                 enableAnonymousUpgrade,
                 false,
-                null);
+                null,
+                customLayout);
     }
 
     /**
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 9da3b2a73..6dd22eafc 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
@@ -18,6 +18,7 @@
 import android.widget.Button;
 import android.widget.LinearLayout;
 
+import com.firebase.ui.auth.AuthMethodPickerLayout;
 import com.firebase.ui.auth.AuthUI;
 import com.firebase.ui.auth.R;
 import com.firebase.ui.auth.testhelpers.TestHelper;
@@ -99,6 +100,41 @@ public void testPhoneLoginFlow() {
                 nextIntent.intent.getComponent().getClassName());
     }
 
+    @Test
+    public void testCustomAuthMethodPickerLayout() {
+        List<String> providers = Arrays.asList(EmailAuthProvider.PROVIDER_ID);
+
+        AuthMethodPickerLayout customLayout = new AuthMethodPickerLayout
+                .Builder(R.layout.fui_provider_button_email)
+                .setupEmailButtonId(R.id.email_button)
+                .build();
+
+        AuthMethodPickerActivity authMethodPickerActivity = createActivityWithCustomLayout(providers, customLayout);
+
+        Button emailButton = authMethodPickerActivity.findViewById(R.id.email_button);
+        emailButton.performClick();
+
+        //Expected result -> Directing users to EmailActivity
+        ShadowActivity.IntentForResult nextIntent =
+                Shadows.shadowOf(authMethodPickerActivity).getNextStartedActivityForResult();
+        assertEquals(
+                EmailActivity.class.getName(),
+                nextIntent.intent.getComponent().getClassName());
+    }
+
+    private AuthMethodPickerActivity createActivityWithCustomLayout(List<String> providers,
+                                                                    AuthMethodPickerLayout layout) {
+        Intent startIntent = AuthMethodPickerActivity.createIntent(
+                RuntimeEnvironment.application,
+                TestHelper.getFlowParameters(providers, false, layout));
+
+        return Robolectric
+                .buildActivity(AuthMethodPickerActivity.class, startIntent)
+                .create()
+                .visible()
+                .get();
+    }
+
     private AuthMethodPickerActivity createActivity(List<String> providers) {
         Intent startIntent = AuthMethodPickerActivity.createIntent(
                 RuntimeEnvironment.application,