diff --git a/app/build.gradle b/app/build.gradle
index e41437dff..23c31bb89 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -67,8 +67,8 @@ android {
 }
 
 dependencies {
-    compile 'com.android.support:appcompat-v7:24.1.1'
-    compile 'com.android.support:design:24.1.1'
+    compile 'com.android.support:appcompat-v7:24.2.0'
+    compile 'com.android.support:design:24.2.0'
     compile 'com.android.support:recyclerview-v7:24.1.1'
     compile 'com.google.android.gms:play-services-gcm:8.4.0'
     compile 'com.google.android.gms:play-services-auth:8.4.0'
@@ -102,7 +102,7 @@ dependencies {
     androidTestCompile('com.android.support.test.espresso:espresso-contrib:2.2.2') {
         exclude group: 'com.android.support'
     }
-    androidTestCompile('com.android.support:support-annotations:24.1.1') {
+    androidTestCompile('com.android.support:support-annotations:24.2.0') {
         exclude group: 'com.android.support'
     }
 
diff --git a/app/src/main/java/com/zulip/android/activities/LoginActivity.java b/app/src/main/java/com/zulip/android/activities/LoginActivity.java
index 57e33f748..7746f7424 100644
--- a/app/src/main/java/com/zulip/android/activities/LoginActivity.java
+++ b/app/src/main/java/com/zulip/android/activities/LoginActivity.java
@@ -11,10 +11,6 @@
 import android.os.Bundle;
 import android.support.customtabs.CustomTabsIntent;
 import android.support.v7.app.AlertDialog;
-import android.support.v7.widget.Toolbar;
-import android.text.Editable;
-import android.text.InputType;
-import android.text.TextWatcher;
 import android.util.Log;
 import android.util.Patterns;
 import android.view.View;
@@ -70,7 +66,7 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener,
     private EditText mServerEditText;
     private EditText mUserName;
     private EditText mPassword;
-    private ImageView mShowPassword;
+    private ImageView logo;
     private EditText serverIn;
     private boolean skipAnimations = false;
     //endregion
@@ -83,10 +79,6 @@ protected void onCreate(Bundle savedInstanceState) {
 
         setContentView(R.layout.login);
 
-        Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
-        toolbar.setTitle(R.string.title_login);
-        setSupportActionBar(toolbar);
-
         // Progress bar to be displayed if the connection failure is not resolved.
         commonProgressDialog = new CommonProgressDialog(this);
         mServerEditText = (EditText) findViewById(R.id.server_url);
@@ -95,7 +87,7 @@ protected void onCreate(Bundle savedInstanceState) {
         findViewById(R.id.zulip_login).setOnClickListener(this);
         mUserName = (EditText) findViewById(R.id.username);
         mPassword = (EditText) findViewById(R.id.password);
-        mShowPassword = (ImageView) findViewById(R.id.showPassword);
+        logo = (ImageView) findViewById(R.id.logo);
         serverIn = (EditText) findViewById(R.id.server_url_in);
         String serverUrl = getIntent().getStringExtra(Constants.SERVER_URL);
         if (serverUrl != null) {
@@ -118,6 +110,8 @@ public void onClick(View view) {
                 findViewById(R.id.passwordAuthLayout).setVisibility(View.GONE);
                 findViewById(R.id.google_sign_in_button).setVisibility(View.GONE);
                 findViewById(R.id.local_server_button).setVisibility(View.GONE);
+                findViewById(R.id.forgotRegister).setVisibility(View.GONE);
+                findViewById(R.id.logo).setVisibility(View.VISIBLE);
                 //remove error from all editText as user now corrected serverUrl
                 mPassword.setError(null);
                 mUserName.setError(null);
@@ -134,49 +128,6 @@ public void onClick(View view) {
             mPassword.setText(savedInstanceState.getString(PASSWORD));
         }
 
-        mShowPassword.setVisibility(View.GONE);
-        mPassword.setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_PASSWORD);
-        mPassword.addTextChangedListener(new TextWatcher() {
-            @Override
-            public void beforeTextChanged(CharSequence s, int start, int count, int after) {
-
-            }
-
-            @Override
-            public void onTextChanged(CharSequence s, int start, int before, int count) {
-
-                if (mPassword.getText().length() > 0) {
-                    mShowPassword.setVisibility(View.VISIBLE);
-                } else {
-                    mShowPassword.setVisibility(View.GONE);
-                }
-
-            }
-
-            @Override
-            public void afterTextChanged(Editable s) {
-
-            }
-        });
-
-
-        mShowPassword.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-
-                if (mShowPassword.getTag().toString().equals("visible")) {
-                    mShowPassword.setTag("hide");
-                    mShowPassword.setImageResource(R.drawable.ic_visibility_off_black_24dp);
-                    mPassword.setInputType(InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD);
-                    mPassword.setSelection(mPassword.length());
-                } else {
-                    mShowPassword.setTag("visible");
-                    mShowPassword.setImageResource(R.drawable.ic_visibility_black_24dp);
-                    mPassword.setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_PASSWORD);
-                    mPassword.setSelection(mPassword.length());
-                }
-            }
-        });
     }
 
     private void showLoginFields() {
@@ -314,6 +265,9 @@ public void onSuccess(Call<ZulipBackendResponse> call, Response<ZulipBackendResp
                             imm.hideSoftInputFromWindow(view.getWindowToken(), 0);
                         }
 
+                        findViewById(R.id.forgotRegister).setVisibility(View.VISIBLE);
+                        findViewById(R.id.logo).setVisibility(View.GONE);
+
                         if (response.body().isPassword()) {
                             findViewById(R.id.passwordAuthLayout).setVisibility(View.VISIBLE);
                         }
@@ -576,11 +530,35 @@ public void onTaskFailure(String result) {
             case R.id.register:
                 openRegister();
                 break;
+            case R.id.forgot:
+                forgotPassword();
+                break;
             default:
                 break;
         }
     }
 
+    private void forgotPassword() {
+
+        Uri uri;
+        if (serverIn == null || serverIn.getText().toString().isEmpty() || serverIn.getText().toString().equals("")) {
+            return;
+        } else {
+            uri = Uri.parse(serverIn.getText().toString() + "accounts/" + "password/" + "reset");
+        }
+        if (Build.VERSION.SDK_INT < 15) {
+            Intent intent = new Intent(Intent.ACTION_VIEW, uri);
+            startActivity(intent);
+            return;
+        }
+        CustomTabsIntent.Builder builder = new CustomTabsIntent.Builder();
+        builder.setStartAnimations(LoginActivity.this, R.anim.slide_in_right, R.anim.slide_out_left);
+        builder.setExitAnimations(LoginActivity.this, R.anim.slide_in_left, R.anim.slide_out_right);
+        builder.setToolbarColor(getResources().getColor(R.color.colorPrimaryDark));
+        CustomTabsIntent intent = builder.build();
+        intent.launchUrl(LoginActivity.this, uri);
+    }
+
     private void openRegister() {
         Uri uri;
         if (serverIn == null || serverIn.getText().toString().isEmpty() || serverIn.getText().toString().equals("")) {
@@ -594,6 +572,9 @@ private void openRegister() {
             return;
         }
         CustomTabsIntent.Builder builder = new CustomTabsIntent.Builder();
+        builder.setStartAnimations(LoginActivity.this, R.anim.slide_in_right, R.anim.slide_out_left);
+        builder.setExitAnimations(LoginActivity.this, R.anim.slide_in_left, R.anim.slide_out_right);
+        builder.setToolbarColor(getResources().getColor(R.color.colorPrimaryDark));
         CustomTabsIntent intent = builder.build();
         intent.launchUrl(LoginActivity.this, uri);
     }
@@ -619,14 +600,9 @@ private boolean isInputValidForDevAuth() {
     private boolean isInputValid() {
         boolean isValid = true;
 
-        if (mPassword.length() == 0) {
-            isValid = false;
-            mPassword.setError(getString(R.string.password_required));
-        }
-
-        if (mUserName.length() == 0) {
+        if (mPassword.length() == 0 || mUserName.length() == 0) {
             isValid = false;
-            mUserName.setError(getString(R.string.username_required));
+            Toast.makeText(LoginActivity.this, R.string.email_or_password_empty, Toast.LENGTH_SHORT).show();
         }
 
         if (mServerEditText.length() == 0) {
diff --git a/app/src/main/java/com/zulip/android/util/ActivityTransitionAnim.java b/app/src/main/java/com/zulip/android/util/ActivityTransitionAnim.java
index 97bf8a04e..286a3b2e7 100644
--- a/app/src/main/java/com/zulip/android/util/ActivityTransitionAnim.java
+++ b/app/src/main/java/com/zulip/android/util/ActivityTransitionAnim.java
@@ -3,6 +3,8 @@
 import android.app.Activity;
 import android.content.Context;
 
+import com.zulip.android.R;
+
 /**
  * Default Activity transition animation.
  */
@@ -16,7 +18,7 @@ public class ActivityTransitionAnim {
     public static void transition(Context activityContext) {
         // avoid invalid class cast exception
         if (activityContext instanceof Activity) {
-            ((Activity) activityContext).overridePendingTransition(android.R.anim.fade_in, android.R.anim.fade_out);
+            ((Activity) activityContext).overridePendingTransition(R.anim.slide_in_right, android.R.anim.fade_out);
         }
     }
 }
diff --git a/app/src/main/res/anim/slide_in_left.xml b/app/src/main/res/anim/slide_in_left.xml
new file mode 100644
index 000000000..86e2e99c3
--- /dev/null
+++ b/app/src/main/res/anim/slide_in_left.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <translate
+        android:fromXDelta="-100%p"
+        android:toXDelta="0"
+        android:duration="300"/>
+</set>
\ No newline at end of file
diff --git a/app/src/main/res/anim/slide_in_right.xml b/app/src/main/res/anim/slide_in_right.xml
new file mode 100644
index 000000000..891682ac1
--- /dev/null
+++ b/app/src/main/res/anim/slide_in_right.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <translate
+        android:fromXDelta="100%p"
+        android:toXDelta="0"
+        android:duration="300"/>
+</set>
\ No newline at end of file
diff --git a/app/src/main/res/anim/slide_out_left.xml b/app/src/main/res/anim/slide_out_left.xml
new file mode 100644
index 000000000..048a18b9d
--- /dev/null
+++ b/app/src/main/res/anim/slide_out_left.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <translate
+        android:fromXDelta="0"
+        android:toXDelta="-100%p"
+        android:duration="300"/>
+</set>
\ No newline at end of file
diff --git a/app/src/main/res/anim/slide_out_right.xml b/app/src/main/res/anim/slide_out_right.xml
new file mode 100644
index 000000000..c7fe2e4a0
--- /dev/null
+++ b/app/src/main/res/anim/slide_out_right.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <translate
+        android:fromXDelta="0"
+        android:toXDelta="100%p"
+        android:duration="300"/>
+</set>
\ No newline at end of file
diff --git a/app/src/main/res/animator-v21/appbar_always_elevated.xml b/app/src/main/res/animator-v21/appbar_always_elevated.xml
deleted file mode 100644
index 0b0c90800..000000000
--- a/app/src/main/res/animator-v21/appbar_always_elevated.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <objectAnimator
-            android:duration="1"
-            android:propertyName="elevation"
-            android:valueTo="8dp"
-            android:valueType="floatType" />
-    </item>
-</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-hdpi/ic_visibility_black_24dp.png b/app/src/main/res/drawable-hdpi/ic_visibility_black_24dp.png
deleted file mode 100644
index 329e617e9..000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_visibility_black_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_visibility_off_black_24dp.png b/app/src/main/res/drawable-hdpi/ic_visibility_off_black_24dp.png
deleted file mode 100644
index b21a68629..000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_visibility_off_black_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/logo.png b/app/src/main/res/drawable-hdpi/logo.png
new file mode 100644
index 000000000..efc466ab6
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/logo.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_visibility_black_24dp.png b/app/src/main/res/drawable-mdpi/ic_visibility_black_24dp.png
deleted file mode 100644
index 58597e91b..000000000
Binary files a/app/src/main/res/drawable-mdpi/ic_visibility_black_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_visibility_off_black_24dp.png b/app/src/main/res/drawable-mdpi/ic_visibility_off_black_24dp.png
deleted file mode 100644
index 3efdf4922..000000000
Binary files a/app/src/main/res/drawable-mdpi/ic_visibility_off_black_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_visibility_black_24dp.png b/app/src/main/res/drawable-xhdpi/ic_visibility_black_24dp.png
deleted file mode 100644
index 1f7b4cc8f..000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_visibility_black_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_visibility_off_black_24dp.png b/app/src/main/res/drawable-xhdpi/ic_visibility_off_black_24dp.png
deleted file mode 100644
index 46bf0c931..000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_visibility_off_black_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_visibility_black_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_visibility_black_24dp.png
deleted file mode 100644
index c816ab49d..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_visibility_black_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_visibility_off_black_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_visibility_off_black_24dp.png
deleted file mode 100644
index 13eb65df3..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_visibility_off_black_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_visibility_black_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_visibility_black_24dp.png
deleted file mode 100644
index e005b976c..000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_visibility_black_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_visibility_off_black_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_visibility_off_black_24dp.png
deleted file mode 100644
index ce3c9d84d..000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_visibility_off_black_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable/login_button.xml b/app/src/main/res/drawable/login_button.xml
new file mode 100644
index 000000000..fbe2776f6
--- /dev/null
+++ b/app/src/main/res/drawable/login_button.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android" >
+    <item android:state_pressed="true" >
+        <shape android:shape="rectangle"  >
+            <corners android:radius="5dip" />
+            <stroke android:width="4dip" android:color="#075818" />
+            <gradient android:angle="-90" android:startColor="#075818" android:endColor="#075818"  />
+        </shape>
+    </item>
+    <item android:state_focused="true">
+        <shape android:shape="rectangle"  >
+            <corners android:radius="5dip" />
+            <stroke android:width="1dip" android:color="#075818" />
+            <solid android:color="#075818"/>
+        </shape>
+    </item>
+    <item >
+        <shape android:shape="rectangle"  >
+            <corners android:radius="5dip" />
+            <stroke android:width="1dip" android:color="#075818" />
+            <gradient android:angle="-90" android:startColor="#075818" android:endColor="#075818" />
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/layout-large-v21/login.xml b/app/src/main/res/layout-large-v21/login.xml
new file mode 100644
index 000000000..8247b3877
--- /dev/null
+++ b/app/src/main/res/layout-large-v21/login.xml
@@ -0,0 +1,243 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.design.widget.CoordinatorLayout 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">
+
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@color/windowBackground"
+            android:gravity="center_horizontal"
+            android:orientation="vertical"
+            android:weightSum="1">
+
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="35dp"
+                android:gravity="center|center_horizontal"
+                android:padding="10dp"
+                android:text="@string/login_welcome_blurb"
+                android:textAppearance="?android:attr/textAppearanceLarge"
+                android:textSize="35dp" />
+
+            <ImageView
+                android:id="@+id/logo"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center|center_horizontal"
+                android:layout_marginTop="40dp"
+                android:src="@drawable/logo"
+                tools:ignore="ContentDescription" />
+
+            <LinearLayout
+                android:id="@+id/serverInput"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:orientation="vertical"
+                android:padding="16dp">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="30dp"
+                    android:gravity="center|center_horizontal"
+                    android:padding="30dp"
+                    android:text="@string/enter_server"
+                    android:textAppearance="?android:attr/textAppearanceMedium"
+                    android:textSize="30dp" />
+
+                <android.support.design.widget.TextInputLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:paddingTop="12dp">
+
+                    <EditText
+                        android:id="@+id/server_url_in"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:ems="10"
+                        android:hint="@string/server_url"
+                        android:inputType="textUri"
+                        android:selectAllOnFocus="true"
+                        android:textCursorDrawable="@null"
+                        android:textSize="40sp">
+
+                        <requestFocus />
+                    </EditText>
+
+                </android.support.design.widget.TextInputLayout>
+
+                <Button
+                    android:id="@+id/server_btn"
+                    style="android:buttonStyle"
+                    android:layout_width="300dp"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="60dp"
+                    android:layout_marginTop="20dp"
+                    android:background="@drawable/login_button"
+                    android:padding="20dp"
+                    android:text="Enter"
+                    android:textAppearance="@style/Base.TextAppearance.AppCompat.Medium"
+                    android:textColor="#fff"
+                    android:textSize="25dp" />
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:id="@+id/serverFieldLayout"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:orientation="vertical"
+                android:padding="16dp"
+                android:visibility="gone">
+
+
+                <EditText
+                    android:id="@+id/server_url"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:backgroundTint="#075818"
+                    android:ems="10"
+                    android:hint="@string/server_domain"
+                    android:inputType="textUri"
+                    android:selectAllOnFocus="true"
+                    android:textCursorDrawable="@null" />
+
+
+                <LinearLayout
+                    android:id="@+id/passwordAuthLayout"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical"
+                    android:paddingBottom="8dp"
+                    android:paddingTop="8dp"
+                    android:visibility="gone">
+
+
+                    <android.support.design.widget.TextInputLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:backgroundTint="#075818"
+                        android:textCursorDrawable="@null">
+
+                        <EditText
+                            android:id="@+id/username"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:ems="10"
+                            android:hint="@string/username"
+                            android:inputType="textEmailAddress"
+                            android:selectAllOnFocus="true"
+                            android:textSize="40sp" />
+
+                    </android.support.design.widget.TextInputLayout>
+
+                    <android.support.design.widget.TextInputLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:backgroundTint="#075818"
+                        android:textCursorDrawable="@null"
+                        app:passwordToggleEnabled="true">
+
+                        <EditText
+                            android:id="@+id/password"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:hint="@string/password"
+                            android:imeOptions="actionUnspecified"
+                            android:inputType="textPassword"
+                            android:selectAllOnFocus="true"
+                            android:textSize="40sp" />
+
+                    </android.support.design.widget.TextInputLayout>
+
+
+                </LinearLayout>
+
+                <Button
+                    android:id="@+id/zulip_login"
+                    android:layout_width="300dp"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="60dp"
+                    android:layout_marginTop="20dp"
+                    android:background="@drawable/login_button"
+                    android:padding="20dp"
+                    android:text="@string/signin_button"
+                    android:textAppearance="@style/Base.TextAppearance.AppCompat.Medium"
+                    android:textColor="#fff"
+                    android:textSize="25sp" />
+
+
+                <com.google.android.gms.common.SignInButton
+
+                    android:id="@+id/google_sign_in_button"
+                    android:layout_width="300dp"
+                    android:layout_height="wrap_content"
+                    android:textSize="25sp"
+                    android:visibility="gone" />
+
+                <View
+                    android:layout_width="400dp"
+                    android:layout_height="2dp"
+                    android:layout_gravity="center|center_horizontal"
+                    android:layout_marginBottom="20dp"
+                    android:layout_marginTop="20dp"
+                    android:background="@drawable/toolbar_shadow" />
+
+                <RelativeLayout
+                    android:id="@+id/forgotRegister"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:visibility="gone">
+
+                    <TextView
+                        android:id="@+id/forgot"
+                        style="@style/linksLarge"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center"
+                        android:layout_marginRight="5dp"
+                        android:text="Forgot Password?"
+                        tools:ignore="ContentDescription" />
+
+                    <TextView
+                        android:id="@+id/register"
+                        style="@style/linksLarge"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_alignParentEnd="true"
+                        android:layout_alignParentRight="true"
+                        android:gravity="center"
+                        android:text="@string/register_button"
+                        tools:ignore="RelativeOverlap" />
+
+                </RelativeLayout>
+
+                <TextView
+                    android:id="@+id/local_server_button"
+                    style="@style/links.gone"
+                    android:text="@string/local_server" />
+
+                <TextView
+                    android:id="@+id/input_another_server"
+                    style="@style/linksLarge"
+                    android:text="@string/another_server" />
+
+                <TextView
+                    android:id="@+id/legal_button"
+                    style="@style/linksLarge"
+                    android:text="@string/legal" />
+            </LinearLayout>
+        </LinearLayout>
+    </ScrollView>
+</android.support.design.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout-large/login.xml b/app/src/main/res/layout-large/login.xml
new file mode 100644
index 000000000..41b4c6c8e
--- /dev/null
+++ b/app/src/main/res/layout-large/login.xml
@@ -0,0 +1,238 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.design.widget.CoordinatorLayout 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">
+
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/windowBackground">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center_horizontal"
+            android:orientation="vertical"
+            android:weightSum="1">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="35dp"
+                android:gravity="center|center_horizontal"
+                android:padding="10dp"
+                android:text="@string/login_welcome_blurb"
+                android:textAppearance="?android:attr/textAppearanceLarge"
+                android:textSize="35dp" />
+
+            <ImageView
+                android:id="@+id/logo"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center|center_horizontal"
+                android:layout_marginTop="40dp"
+                android:src="@drawable/logo"
+                tools:ignore="ContentDescription" />
+
+            <LinearLayout
+                android:id="@+id/serverInput"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:orientation="vertical"
+                android:padding="16dp">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="30dp"
+                    android:gravity="center|center_horizontal"
+                    android:padding="30dp"
+                    android:text="@string/enter_server"
+                    android:textAppearance="?android:attr/textAppearanceMedium"
+                    android:textSize="30dp" />
+
+                <android.support.design.widget.TextInputLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content">
+
+                    <EditText
+                        android:id="@+id/server_url_in"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:ems="10"
+                        android:hint="@string/server_url"
+                        android:inputType="textUri"
+                        android:selectAllOnFocus="true"
+                        android:textCursorDrawable="@null"
+                        android:textSize="40dp">
+
+                        <requestFocus />
+                    </EditText>
+
+                </android.support.design.widget.TextInputLayout>
+
+                <Button
+                    android:id="@+id/server_btn"
+                    style="android:buttonStyle"
+                    android:layout_width="300dp"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="60dp"
+                    android:layout_marginTop="20dp"
+                    android:background="@drawable/login_button"
+                    android:padding="20dp"
+                    android:text="Enter"
+                    android:textAppearance="@style/Base.TextAppearance.AppCompat.Medium"
+                    android:textColor="#fff"
+                    android:textSize="25dp" />
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:id="@+id/serverFieldLayout"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:orientation="vertical"
+                android:padding="16dp"
+                android:visibility="gone">
+
+
+                <EditText
+                    android:id="@+id/server_url"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:ems="10"
+                    android:hint="@string/server_domain"
+                    android:inputType="textUri"
+                    android:selectAllOnFocus="true"
+                    android:textCursorDrawable="@null" />
+
+
+                <LinearLayout
+                    android:id="@+id/passwordAuthLayout"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical"
+                    android:paddingBottom="8dp"
+                    android:paddingTop="8dp"
+                    android:visibility="gone">
+
+
+                    <android.support.design.widget.TextInputLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:textCursorDrawable="@null">
+
+                        <EditText
+                            android:id="@+id/username"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:ems="10"
+                            android:hint="@string/username"
+                            android:inputType="textEmailAddress"
+                            android:selectAllOnFocus="true"
+                            android:textSize="40sp" />
+
+                    </android.support.design.widget.TextInputLayout>
+
+                    <android.support.design.widget.TextInputLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:textCursorDrawable="@null"
+                        app:passwordToggleEnabled="true">
+
+                        <EditText
+                            android:id="@+id/password"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:hint="@string/password"
+                            android:imeOptions="actionUnspecified"
+                            android:inputType="textPassword"
+                            android:selectAllOnFocus="true"
+                            android:textSize="40sp" />
+
+                    </android.support.design.widget.TextInputLayout>
+
+
+                </LinearLayout>
+
+                <Button
+                    android:id="@+id/zulip_login"
+                    android:layout_width="300dp"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="60dp"
+                    android:layout_marginTop="20dp"
+                    android:background="@drawable/login_button"
+                    android:padding="20dp"
+                    android:text="@string/signin_button"
+                    android:textAppearance="@style/Base.TextAppearance.AppCompat.Medium"
+                    android:textColor="#fff"
+                    android:textSize="25sp" />
+
+
+                <com.google.android.gms.common.SignInButton
+
+                    android:id="@+id/google_sign_in_button"
+                    android:layout_width="300dp"
+                    android:layout_height="wrap_content"
+                    android:textSize="25sp"
+                    android:visibility="gone" />
+
+                <View
+                    android:layout_width="400dp"
+                    android:layout_height="2dp"
+                    android:layout_gravity="center|center_horizontal"
+                    android:layout_marginBottom="20dp"
+                    android:layout_marginTop="20dp"
+                    android:background="@drawable/toolbar_shadow" />
+
+                <RelativeLayout
+                    android:id="@+id/forgotRegister"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:visibility="gone">
+
+                    <TextView
+                        android:id="@+id/forgot"
+                        style="@style/linksLarge"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center"
+                        android:layout_marginRight="5dp"
+                        android:text="Forgot Password?"
+                        tools:ignore="ContentDescription" />
+
+                    <TextView
+                        android:id="@+id/register"
+                        style="@style/linksLarge"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_alignParentEnd="true"
+                        android:layout_alignParentRight="true"
+                        android:gravity="center"
+                        android:text="@string/register_button"
+                        tools:ignore="RelativeOverlap" />
+
+                </RelativeLayout>
+
+                <TextView
+                    android:id="@+id/local_server_button"
+                    style="@style/links.gone"
+                    android:text="@string/local_server" />
+
+                <TextView
+                    android:id="@+id/input_another_server"
+                    style="@style/linksLarge"
+                    android:text="@string/another_server" />
+
+                <TextView
+                    android:id="@+id/legal_button"
+                    style="@style/linksLarge"
+                    android:text="@string/legal" />
+            </LinearLayout>
+        </LinearLayout>
+    </ScrollView>
+</android.support.design.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout-v21/login.xml b/app/src/main/res/layout-v21/login.xml
index cd84fb0f6..a8668dc04 100644
--- a/app/src/main/res/layout-v21/login.xml
+++ b/app/src/main/res/layout-v21/login.xml
@@ -1,179 +1,230 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<android.support.design.widget.CoordinatorLayout 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">
 
-    <LinearLayout
+    <ScrollView
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="@color/windowBackground"
-        android:gravity="center_horizontal"
-        android:orientation="vertical">
-
-        <android.support.design.widget.AppBarLayout
-            android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
-            android:fitsSystemWindows="true"
-            android:stateListAnimator="@animator/appbar_always_elevated"
-            android:theme="@style/AppTheme.AppBarOverlay">
-
-            <include
-                android:id="@+id/toolbar"
-                layout="@layout/toolbar" />
-
-        </android.support.design.widget.AppBarLayout>
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="16dp"
-            android:gravity="center|center_horizontal"
-            android:padding="10dp"
-            android:text="@string/login_welcome_blurb"
-            android:textAppearance="?android:attr/textAppearanceLarge" />
-
+        android:layout_height="match_parent">
 
         <LinearLayout
-            android:id="@+id/serverInput"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:gravity="center"
+            android:background="@color/windowBackground"
+            android:gravity="center_horizontal"
             android:orientation="vertical"
-            android:padding="16dp">
+            android:weightSum="1">
+
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_marginTop="16dp"
                 android:gravity="center|center_horizontal"
                 android:padding="10dp"
-                android:text="@string/enter_server"
-                android:textAppearance="?android:attr/textAppearanceMedium" />
+                android:text="@string/login_welcome_blurb"
+                android:textAppearance="?android:attr/textAppearanceLarge" />
 
-            <EditText
-                android:id="@+id/server_url_in"
-                android:layout_width="match_parent"
+            <ImageView
+                android:id="@+id/logo"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:ems="10"
-                android:hint="@string/server_url"
-                android:inputType="textUri"
-                android:selectAllOnFocus="true">
-
-                <requestFocus />
-            </EditText>
+                android:layout_gravity="center|center_horizontal"
+                android:layout_marginTop="2dp"
+                android:src="@drawable/logo"
+                tools:ignore="ContentDescription" />
 
-            <Button
-                android:id="@+id/server_btn"
-                style="android:buttonStyle"
+            <LinearLayout
+                android:id="@+id/serverInput"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="20dp"
-                android:text="@string/enter" />
-
-        </LinearLayout>
-
-        <LinearLayout
-            android:id="@+id/serverFieldLayout"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:orientation="vertical"
-            android:padding="16dp"
-            android:visibility="gone">
+                android:gravity="center"
+                android:orientation="vertical"
+                android:padding="16dp">
 
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="10dp"
-                android:text="@string/auth_login" />
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:gravity="center|center_horizontal"
+                    android:padding="10dp"
+                    android:text="@string/enter_server"
+                    android:textAppearance="?android:attr/textAppearanceMedium" />
 
-            <EditText
-                android:id="@+id/server_url"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:ems="10"
-                android:hint="@string/server_domain"
-                android:inputType="textUri"
-                android:selectAllOnFocus="true" />
+                <android.support.design.widget.TextInputLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content">
+
+                    <EditText
+                        android:id="@+id/server_url_in"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:ems="10"
+                        android:hint="@string/server_url"
+                        android:inputType="textUri"
+                        android:selectAllOnFocus="true"
+                        android:textCursorDrawable="@null">
+
+                        <requestFocus />
+                    </EditText>
+
+                </android.support.design.widget.TextInputLayout>
+
+                <Button
+                    android:id="@+id/server_btn"
+                    style="android:buttonStyle"
+                    android:layout_width="176dp"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="25dp"
+                    android:layout_marginTop="20dp"
+                    android:background="@drawable/login_button"
+                    android:text="Enter"
+                    android:textAppearance="@style/Base.TextAppearance.AppCompat.Medium"
+                    android:textColor="#fff" />
 
+            </LinearLayout>
 
-            <RelativeLayout
-                android:id="@+id/passwordAuthLayout"
+            <LinearLayout
+                android:id="@+id/serverFieldLayout"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:gravity="center"
                 android:orientation="vertical"
-                android:paddingBottom="8dp"
-                android:paddingTop="8dp"
+                android:padding="16dp"
                 android:visibility="gone">
 
 
                 <EditText
-                    android:id="@+id/username"
+                    android:id="@+id/server_url"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:backgroundTint="#075818"
                     android:ems="10"
-                    android:hint="@string/username"
-                    android:inputType="textEmailAddress"
-                    android:selectAllOnFocus="true" />
+                    android:hint="@string/server_domain"
+                    android:inputType="textUri"
+                    android:selectAllOnFocus="true"
+                    android:textCursorDrawable="@null" />
 
-                <EditText
-                    android:id="@+id/password"
+
+                <LinearLayout
+                    android:id="@+id/passwordAuthLayout"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_below="@+id/username"
-                    android:ems="10"
-                    android:hint="@string/password"
-                    android:inputType="textPassword"
-                    android:selectAllOnFocus="true" />
-
-                <ImageView
-                    android:id="@+id/showPassword"
-                    android:layout_width="wrap_content"
+                    android:orientation="vertical"
+                    android:paddingBottom="8dp"
+                    android:paddingTop="8dp"
+                    android:visibility="gone">
+
+
+                    <android.support.design.widget.TextInputLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:backgroundTint="#075818"
+                        android:textCursorDrawable="@null">
+
+                        <EditText
+                            android:id="@+id/username"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:ems="10"
+                            android:hint="@string/username"
+                            android:inputType="textEmailAddress"
+                            android:selectAllOnFocus="true" />
+
+                    </android.support.design.widget.TextInputLayout>
+
+                    <android.support.design.widget.TextInputLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:backgroundTint="#075818"
+                        android:textCursorDrawable="@null"
+                        app:passwordToggleEnabled="true">
+
+                        <EditText
+                            android:id="@+id/password"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:hint="@string/password"
+                            android:imeOptions="actionUnspecified"
+                            android:inputType="textPassword"
+                            android:selectAllOnFocus="true" />
+
+                    </android.support.design.widget.TextInputLayout>
+
+
+                </LinearLayout>
+
+                <Button
+                    android:id="@+id/zulip_login"
+                    android:layout_width="176dp"
                     android:layout_height="wrap_content"
-                    android:layout_alignParentEnd="true"
-                    android:layout_alignParentRight="true"
-                    android:layout_below="@+id/username"
-                    android:layout_marginEnd="11dp"
-                    android:layout_marginRight="11dp"
-                    android:src="@drawable/ic_visibility_black_24dp"
-                    android:tag="visible"
-                    tools:ignore="ContentDescription" />
-
-
-            </RelativeLayout>
-
-            <Button
-                android:id="@+id/zulip_login"
-                style="android:buttonStyle"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/login_button" />
-
-            <com.google.android.gms.common.SignInButton
-                android:id="@+id/google_sign_in_button"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:visibility="gone" />
-
-            <TextView
-                android:id="@+id/register"
-                style="@style/links"
-                android:text="@string/register_button" />
+                    android:layout_margin="25dp"
+                    android:background="@drawable/login_button"
+                    android:text="@string/signin_button"
+                    android:textAppearance="@style/Base.TextAppearance.AppCompat.Medium"
+                    android:textColor="#fff" />
 
-            <TextView
-                android:id="@+id/local_server_button"
-                style="@style/links.gone"
-                android:text="@string/local_server" />
 
-            <TextView
-                android:id="@+id/input_another_server"
-                style="@style/links"
-                android:text="@string/another_server" />
+                <com.google.android.gms.common.SignInButton
 
-            <TextView
-                android:id="@+id/legal_button"
-                style="@style/links"
-                android:text="@string/legal" />
+                    android:id="@+id/google_sign_in_button"
+                    android:layout_width="181dp"
+                    android:layout_height="wrap_content"
+                    android:visibility="gone" />
+
+                <View
+                    android:layout_width="270dp"
+                    android:layout_height="2dp"
+                    android:layout_gravity="center|center_horizontal"
+                    android:layout_marginBottom="20dp"
+                    android:layout_marginTop="20dp"
+                    android:background="@drawable/toolbar_shadow" />
+
+                <RelativeLayout
+                    android:id="@+id/forgotRegister"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:visibility="gone">
+
+                    <TextView
+                        android:id="@+id/forgot"
+                        style="@style/links"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center"
+                        android:layout_marginRight="5dp"
+                        android:text="Forgot Password?"
+                        tools:ignore="ContentDescription" />
+
+                    <TextView
+                        android:id="@+id/register"
+                        style="@style/links"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_alignParentEnd="true"
+                        android:layout_alignParentRight="true"
+                        android:gravity="center"
+                        android:text="@string/register_button"
+                        tools:ignore="RelativeOverlap" />
+
+                </RelativeLayout>
+
+                <TextView
+                    android:id="@+id/local_server_button"
+                    style="@style/links.gone"
+                    android:text="@string/local_server" />
+
+                <TextView
+                    android:id="@+id/input_another_server"
+                    style="@style/links"
+                    android:text="@string/another_server" />
+
+                <TextView
+                    android:id="@+id/legal_button"
+                    style="@style/links"
+                    android:text="@string/legal" />
+            </LinearLayout>
         </LinearLayout>
-    </LinearLayout>
-</ScrollView>
+    </ScrollView>
+</android.support.design.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout-xlarge-v21/login.xml b/app/src/main/res/layout-xlarge-v21/login.xml
new file mode 100644
index 000000000..5bf5acd17
--- /dev/null
+++ b/app/src/main/res/layout-xlarge-v21/login.xml
@@ -0,0 +1,243 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.design.widget.CoordinatorLayout 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">
+
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@color/windowBackground"
+            android:gravity="center_horizontal"
+            android:orientation="vertical"
+            android:weightSum="1">
+
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="35dp"
+                android:gravity="center|center_horizontal"
+                android:padding="15dp"
+                android:text="@string/login_welcome_blurb"
+                android:textAppearance="?android:attr/textAppearanceLarge"
+                android:textSize="50dp" />
+
+            <ImageView
+                android:id="@+id/logo"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center|center_horizontal"
+                android:layout_marginTop="60dp"
+                android:src="@drawable/logo"
+                tools:ignore="ContentDescription" />
+
+            <LinearLayout
+                android:id="@+id/serverInput"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:orientation="vertical"
+                android:padding="16dp">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="30dp"
+                    android:gravity="center|center_horizontal"
+                    android:padding="30dp"
+                    android:text="@string/enter_server"
+                    android:textAppearance="?android:attr/textAppearanceMedium"
+                    android:textSize="45sp" />
+
+                <android.support.design.widget.TextInputLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:paddingTop="12dp">
+
+                    <EditText
+                        android:id="@+id/server_url_in"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:ems="10"
+                        android:hint="@string/server_url"
+                        android:inputType="textUri"
+                        android:selectAllOnFocus="true"
+                        android:textCursorDrawable="@null"
+                        android:textSize="50sp">
+
+                        <requestFocus />
+                    </EditText>
+
+                </android.support.design.widget.TextInputLayout>
+
+                <Button
+                    android:id="@+id/server_btn"
+                    style="android:buttonStyle"
+                    android:layout_width="400dp"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="80dp"
+                    android:layout_marginTop="20dp"
+                    android:background="@drawable/login_button"
+                    android:padding="30dp"
+                    android:text="Enter"
+                    android:textAppearance="@style/Base.TextAppearance.AppCompat.Medium"
+                    android:textColor="#fff"
+                    android:textSize="35sp" />
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:id="@+id/serverFieldLayout"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:orientation="vertical"
+                android:padding="16dp"
+                android:visibility="gone">
+
+
+                <EditText
+                    android:id="@+id/server_url"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:backgroundTint="#075818"
+                    android:ems="10"
+                    android:hint="@string/server_domain"
+                    android:inputType="textUri"
+                    android:selectAllOnFocus="true"
+                    android:textCursorDrawable="@null" />
+
+
+                <LinearLayout
+                    android:id="@+id/passwordAuthLayout"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical"
+                    android:paddingBottom="8dp"
+                    android:paddingTop="8dp"
+                    android:visibility="gone">
+
+
+                    <android.support.design.widget.TextInputLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:backgroundTint="#075818"
+                        android:textCursorDrawable="@null">
+
+                        <EditText
+                            android:id="@+id/username"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:ems="10"
+                            android:hint="@string/username"
+                            android:inputType="textEmailAddress"
+                            android:selectAllOnFocus="true"
+                            android:textSize="50sp" />
+
+                    </android.support.design.widget.TextInputLayout>
+
+                    <android.support.design.widget.TextInputLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:backgroundTint="#075818"
+                        android:textCursorDrawable="@null"
+                        app:passwordToggleEnabled="true">
+
+                        <EditText
+                            android:id="@+id/password"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:hint="@string/password"
+                            android:imeOptions="actionUnspecified"
+                            android:inputType="textPassword"
+                            android:selectAllOnFocus="true"
+                            android:textSize="50sp" />
+
+                    </android.support.design.widget.TextInputLayout>
+
+
+                </LinearLayout>
+
+                <Button
+                    android:id="@+id/zulip_login"
+                    android:layout_width="400dp"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="80dp"
+                    android:layout_marginTop="20dp"
+                    android:background="@drawable/login_button"
+                    android:padding="30dp"
+                    android:text="@string/signin_button"
+                    android:textAppearance="@style/Base.TextAppearance.AppCompat.Medium"
+                    android:textColor="#fff"
+                    android:textSize="35sp" />
+
+
+                <com.google.android.gms.common.SignInButton
+
+                    android:id="@+id/google_sign_in_button"
+                    android:layout_width="400dp"
+                    android:layout_height="wrap_content"
+                    android:textSize="45sp"
+                    android:visibility="gone" />
+
+                <View
+                    android:layout_width="400dp"
+                    android:layout_height="2dp"
+                    android:layout_gravity="center|center_horizontal"
+                    android:layout_marginBottom="20dp"
+                    android:layout_marginTop="20dp"
+                    android:background="@drawable/toolbar_shadow" />
+
+                <RelativeLayout
+                    android:id="@+id/forgotRegister"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:visibility="gone">
+
+                    <TextView
+                        android:id="@+id/forgot"
+                        style="@style/linksxLarge"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center"
+                        android:layout_marginRight="5dp"
+                        android:text="Forgot Password?"
+                        tools:ignore="ContentDescription" />
+
+                    <TextView
+                        android:id="@+id/register"
+                        style="@style/linksxLarge"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_alignParentEnd="true"
+                        android:layout_alignParentRight="true"
+                        android:gravity="center"
+                        android:text="@string/register_button"
+                        tools:ignore="RelativeOverlap" />
+
+                </RelativeLayout>
+
+                <TextView
+                    android:id="@+id/local_server_button"
+                    style="@style/links.gone"
+                    android:text="@string/local_server" />
+
+                <TextView
+                    android:id="@+id/input_another_server"
+                    style="@style/linksxLarge"
+                    android:text="@string/another_server" />
+
+                <TextView
+                    android:id="@+id/legal_button"
+                    style="@style/linksxLarge"
+                    android:text="@string/legal" />
+            </LinearLayout>
+        </LinearLayout>
+    </ScrollView>
+</android.support.design.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout-xlarge/login.xml b/app/src/main/res/layout-xlarge/login.xml
new file mode 100644
index 000000000..59a35c6c2
--- /dev/null
+++ b/app/src/main/res/layout-xlarge/login.xml
@@ -0,0 +1,239 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.design.widget.CoordinatorLayout 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">
+
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/windowBackground">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center_horizontal"
+            android:orientation="vertical"
+            android:weightSum="1">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="35dp"
+                android:gravity="center|center_horizontal"
+                android:padding="15dp"
+                android:text="@string/login_welcome_blurb"
+                android:textAppearance="?android:attr/textAppearanceLarge"
+                android:textSize="50dp" />
+
+            <ImageView
+                android:id="@+id/logo"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center|center_horizontal"
+                android:layout_marginTop="60dp"
+                android:src="@drawable/logo"
+                tools:ignore="ContentDescription" />
+
+            <LinearLayout
+                android:id="@+id/serverInput"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:orientation="vertical"
+                android:padding="16dp">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="30dp"
+                    android:gravity="center|center_horizontal"
+                    android:padding="30dp"
+                    android:text="@string/enter_server"
+                    android:textAppearance="?android:attr/textAppearanceMedium"
+                    android:textSize="45sp" />
+
+                <android.support.design.widget.TextInputLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:paddingTop="12dp">
+
+                    <EditText
+                        android:id="@+id/server_url_in"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:ems="10"
+                        android:hint="@string/server_url"
+                        android:inputType="textUri"
+                        android:selectAllOnFocus="true"
+                        android:textCursorDrawable="@null"
+                        android:textSize="50sp">
+
+                        <requestFocus />
+                    </EditText>
+
+                </android.support.design.widget.TextInputLayout>
+
+                <Button
+                    android:id="@+id/server_btn"
+                    style="android:buttonStyle"
+                    android:layout_width="400dp"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="80dp"
+                    android:layout_marginTop="20dp"
+                    android:background="@drawable/login_button"
+                    android:padding="30dp"
+                    android:text="Enter"
+                    android:textAppearance="@style/Base.TextAppearance.AppCompat.Medium"
+                    android:textColor="#fff"
+                    android:textSize="35sp" />
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:id="@+id/serverFieldLayout"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:orientation="vertical"
+                android:padding="16dp"
+                android:visibility="gone">
+
+
+                <EditText
+                    android:id="@+id/server_url"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:ems="10"
+                    android:hint="@string/server_domain"
+                    android:inputType="textUri"
+                    android:selectAllOnFocus="true"
+                    android:textCursorDrawable="@null" />
+
+
+                <LinearLayout
+                    android:id="@+id/passwordAuthLayout"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical"
+                    android:paddingBottom="8dp"
+                    android:paddingTop="8dp"
+                    android:visibility="gone">
+
+
+                    <android.support.design.widget.TextInputLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:textCursorDrawable="@null">
+
+                        <EditText
+                            android:id="@+id/username"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:ems="10"
+                            android:hint="@string/username"
+                            android:inputType="textEmailAddress"
+                            android:selectAllOnFocus="true"
+                            android:textSize="50sp" />
+
+                    </android.support.design.widget.TextInputLayout>
+
+                    <android.support.design.widget.TextInputLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:textCursorDrawable="@null"
+                        app:passwordToggleEnabled="true">
+
+                        <EditText
+                            android:id="@+id/password"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:hint="@string/password"
+                            android:imeOptions="actionUnspecified"
+                            android:inputType="textPassword"
+                            android:selectAllOnFocus="true"
+                            android:textSize="50sp" />
+
+                    </android.support.design.widget.TextInputLayout>
+
+
+                </LinearLayout>
+
+                <Button
+                    android:id="@+id/zulip_login"
+                    android:layout_width="400dp"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="80dp"
+                    android:layout_marginTop="20dp"
+                    android:background="@drawable/login_button"
+                    android:padding="30dp"
+                    android:text="@string/signin_button"
+                    android:textAppearance="@style/Base.TextAppearance.AppCompat.Medium"
+                    android:textColor="#fff"
+                    android:textSize="35sp" />
+
+
+                <com.google.android.gms.common.SignInButton
+
+                    android:id="@+id/google_sign_in_button"
+                    android:layout_width="400dp"
+                    android:layout_height="wrap_content"
+                    android:textSize="45sp"
+                    android:visibility="gone" />
+
+                <View
+                    android:layout_width="400dp"
+                    android:layout_height="2dp"
+                    android:layout_gravity="center|center_horizontal"
+                    android:layout_marginBottom="20dp"
+                    android:layout_marginTop="20dp"
+                    android:background="@drawable/toolbar_shadow" />
+
+                <RelativeLayout
+                    android:id="@+id/forgotRegister"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:visibility="gone">
+
+                    <TextView
+                        android:id="@+id/forgot"
+                        style="@style/linksxLarge"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center"
+                        android:layout_marginRight="5dp"
+                        android:text="Forgot Password?"
+                        tools:ignore="ContentDescription" />
+
+                    <TextView
+                        android:id="@+id/register"
+                        style="@style/linksxLarge"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_alignParentEnd="true"
+                        android:layout_alignParentRight="true"
+                        android:gravity="center"
+                        android:text="@string/register_button"
+                        tools:ignore="RelativeOverlap" />
+
+                </RelativeLayout>
+
+                <TextView
+                    android:id="@+id/local_server_button"
+                    style="@style/links.gone"
+                    android:text="@string/local_server" />
+
+                <TextView
+                    android:id="@+id/input_another_server"
+                    style="@style/linksxLarge"
+                    android:text="@string/another_server" />
+
+                <TextView
+                    android:id="@+id/legal_button"
+                    style="@style/linksxLarge"
+                    android:text="@string/legal" />
+            </LinearLayout>
+        </LinearLayout>
+    </ScrollView>
+</android.support.design.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/login.xml b/app/src/main/res/layout/login.xml
index 18b4d4d9d..cbdbb1ba9 100644
--- a/app/src/main/res/layout/login.xml
+++ b/app/src/main/res/layout/login.xml
@@ -1,175 +1,226 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<android.support.design.widget.CoordinatorLayout 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">
 
-    <LinearLayout
+    <ScrollView
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center_horizontal"
-        android:orientation="vertical">
-
-        <include
-            android:id="@+id/toolbar"
-            layout="@layout/toolbar" />
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="5dp"
-            android:background="@drawable/toolbar_shadow" />
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="16dp"
-            android:gravity="center|center_horizontal"
-            android:padding="10dp"
-            android:text="@string/login_welcome_blurb"
-            android:textAppearance="?android:attr/textAppearanceLarge" />
-
+        android:layout_height="match_parent"
+        android:background="@color/windowBackground">
 
         <LinearLayout
-            android:id="@+id/serverInput"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:gravity="center"
+            android:gravity="center_horizontal"
             android:orientation="vertical"
-            android:padding="16dp">
+            android:weightSum="1">
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_marginTop="16dp"
                 android:gravity="center|center_horizontal"
                 android:padding="10dp"
-                android:text="@string/enter_server"
-                android:textAppearance="?android:attr/textAppearanceMedium" />
-
-            <EditText
-                android:id="@+id/server_url_in"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:ems="10"
-                android:hint="@string/server_url"
-                android:inputType="textUri"
-                android:selectAllOnFocus="true" />
-
-            <Button
-                android:id="@+id/server_btn"
-                style="android:buttonStyle"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="20dp"
-                android:text="@string/enter" />
-
-        </LinearLayout>
+                android:text="@string/login_welcome_blurb"
+                android:textAppearance="?android:attr/textAppearanceLarge" />
 
-        <LinearLayout
-            android:id="@+id/serverFieldLayout"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:orientation="vertical"
-            android:padding="16dp"
-            android:visibility="gone">
-
-            <TextView
+            <ImageView
+                android:id="@+id/logo"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="10dp"
-                android:text="@string/auth_login" />
+                android:layout_gravity="center|center_horizontal"
+                android:layout_marginTop="2dp"
+                android:src="@drawable/logo"
+                tools:ignore="ContentDescription" />
 
-            <EditText
-                android:id="@+id/server_url"
+            <LinearLayout
+                android:id="@+id/serverInput"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:ems="10"
-                android:hint="@string/server_domain"
-                android:inputType="textUri"
-                android:selectAllOnFocus="true" />
+                android:gravity="center"
+                android:orientation="vertical"
+                android:padding="16dp">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:gravity="center|center_horizontal"
+                    android:padding="10dp"
+                    android:text="@string/enter_server"
+                    android:textAppearance="?android:attr/textAppearanceMedium" />
+
+                <android.support.design.widget.TextInputLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content">
+
+                    <EditText
+                        android:id="@+id/server_url_in"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:ems="10"
+                        android:hint="@string/server_url"
+                        android:inputType="textUri"
+                        android:selectAllOnFocus="true"
+                        android:textCursorDrawable="@null">
+
+                        <requestFocus />
+                    </EditText>
+
+                </android.support.design.widget.TextInputLayout>
+
+                <Button
+                    android:id="@+id/server_btn"
+                    style="android:buttonStyle"
+                    android:layout_width="176dp"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="25dp"
+                    android:layout_marginTop="20dp"
+                    android:background="@drawable/login_button"
+                    android:text="Enter"
+                    android:textAppearance="@style/Base.TextAppearance.AppCompat.Medium"
+                    android:textColor="#fff" />
 
+            </LinearLayout>
 
-            <RelativeLayout
-                android:id="@+id/passwordAuthLayout"
+            <LinearLayout
+                android:id="@+id/serverFieldLayout"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:gravity="center"
                 android:orientation="vertical"
-                android:paddingBottom="8dp"
-                android:paddingTop="8dp"
+                android:padding="16dp"
                 android:visibility="gone">
 
 
                 <EditText
-                    android:id="@+id/username"
+                    android:id="@+id/server_url"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:ems="10"
-                    android:hint="@string/username"
-                    android:inputType="textEmailAddress"
-                    android:selectAllOnFocus="true" />
+                    android:hint="@string/server_domain"
+                    android:inputType="textUri"
+                    android:selectAllOnFocus="true"
+                    android:textCursorDrawable="@null" />
 
-                <EditText
-                    android:id="@+id/password"
+
+                <LinearLayout
+                    android:id="@+id/passwordAuthLayout"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_below="@+id/username"
-                    android:ems="10"
-                    android:hint="@string/password"
-                    android:inputType="textPassword"
-                    android:selectAllOnFocus="true" />
-
-                <ImageView
-                    android:id="@+id/showPassword"
-                    android:layout_width="wrap_content"
+                    android:orientation="vertical"
+                    android:paddingBottom="8dp"
+                    android:paddingTop="8dp"
+                    android:visibility="gone">
+
+
+                    <android.support.design.widget.TextInputLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:textCursorDrawable="@null">
+
+                        <EditText
+                            android:id="@+id/username"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:ems="10"
+                            android:hint="@string/username"
+                            android:inputType="textEmailAddress"
+                            android:selectAllOnFocus="true" />
+
+                    </android.support.design.widget.TextInputLayout>
+
+                    <android.support.design.widget.TextInputLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:textCursorDrawable="@null"
+                        app:passwordToggleEnabled="true">
+
+                        <EditText
+                            android:id="@+id/password"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:hint="@string/password"
+                            android:imeOptions="actionUnspecified"
+                            android:inputType="textPassword"
+                            android:selectAllOnFocus="true" />
+
+                    </android.support.design.widget.TextInputLayout>
+
+
+                </LinearLayout>
+
+                <Button
+                    android:id="@+id/zulip_login"
+                    android:layout_width="176dp"
                     android:layout_height="wrap_content"
-                    android:layout_alignParentEnd="true"
-                    android:layout_alignParentRight="true"
-                    android:layout_below="@+id/username"
-                    android:layout_marginEnd="11dp"
-                    android:layout_marginRight="11dp"
-                    android:src="@drawable/ic_visibility_black_24dp"
-                    android:tag="visible"
-                    tools:ignore="ContentDescription" />
-
+                    android:layout_margin="25dp"
+                    android:background="@drawable/login_button"
+                    android:text="@string/signin_button"
+                    android:textAppearance="@style/Base.TextAppearance.AppCompat.Medium"
+                    android:textColor="#fff" />
 
-            </RelativeLayout>
 
-            <Button
-                android:id="@+id/zulip_login"
-                style="android:buttonStyle"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/login_button" />
-
-
-            <com.google.android.gms.common.SignInButton
-                android:id="@+id/google_sign_in_button"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:visibility="gone" />
-
-            <TextView
-                android:id="@+id/register"
-                style="@style/links"
-                android:text="@string/register_button" />
-
-            <TextView
-                android:id="@+id/local_server_button"
-                style="@style/links.gone"
-                android:text="@string/local_server" />
-
-            <TextView
-                android:id="@+id/input_another_server"
-                style="@style/links"
-                android:text="@string/another_server" />
-
-            <TextView
-                android:id="@+id/legal_button"
-                style="@style/links"
-                android:text="@string/legal" />
+                <com.google.android.gms.common.SignInButton
 
+                    android:id="@+id/google_sign_in_button"
+                    android:layout_width="181dp"
+                    android:layout_height="wrap_content"
+                    android:visibility="gone" />
+
+                <View
+                    android:layout_width="270dp"
+                    android:layout_height="2dp"
+                    android:layout_gravity="center|center_horizontal"
+                    android:layout_marginBottom="20dp"
+                    android:layout_marginTop="20dp"
+                    android:background="@drawable/toolbar_shadow" />
+
+                <RelativeLayout
+                    android:id="@+id/forgotRegister"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:visibility="gone">
+
+                    <TextView
+                        android:id="@+id/forgot"
+                        style="@style/links"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center"
+                        android:layout_marginRight="5dp"
+                        android:text="Forgot Password?"
+                        tools:ignore="ContentDescription" />
+
+                    <TextView
+                        android:id="@+id/register"
+                        style="@style/links"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_alignParentEnd="true"
+                        android:layout_alignParentRight="true"
+                        android:gravity="center"
+                        android:text="@string/register_button"
+                        tools:ignore="RelativeOverlap" />
+
+                </RelativeLayout>
+
+                <TextView
+                    android:id="@+id/local_server_button"
+                    style="@style/links.gone"
+                    android:text="@string/local_server" />
+
+                <TextView
+                    android:id="@+id/input_another_server"
+                    style="@style/links"
+                    android:text="@string/another_server" />
+
+                <TextView
+                    android:id="@+id/legal_button"
+                    style="@style/links"
+                    android:text="@string/legal" />
+            </LinearLayout>
         </LinearLayout>
-    </LinearLayout>
-</ScrollView>
-
-
+    </ScrollView>
+</android.support.design.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values-v21/style.xml b/app/src/main/res/values-v21/style.xml
index 01e77487d..3376c207d 100644
--- a/app/src/main/res/values-v21/style.xml
+++ b/app/src/main/res/values-v21/style.xml
@@ -14,4 +14,15 @@
     <style name="links.gone" parent="links">
         <item name="android:visibility">gone</item>
     </style>
+
+    <style name="linksxLarge">
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:onClick">onClick</item>
+        <item name="android:padding">28dp</item>
+        <item name="android:textSize">28dp</item>
+        <item name="android:layout_gravity">center_horizontal</item>
+        <item name="android:layout_marginTop">28dp</item>
+        <item name="android:textColor">#ff0099cc</item>
+    </style>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 607007be5..ab4617186 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -3,7 +3,7 @@
 
     <string name="app_name">Zulip</string>
     <string name="login_welcome_blurb">Welcome to Zulip!</string>
-    <string name="login_button">Log in</string>
+    <string name="signin_button">Sign in</string>
     <string name="username">Email</string>
     <string name="password">Password</string>
     <string name="server_url">Server URL</string>
@@ -28,6 +28,7 @@
     <string name="streams_open">Open stream sidebar</string>
     <string name="streams_close">Close stream sidebar</string>
     <string name="press_again_to_exit">Press again to exit</string>
+    <string name="email_or_password_empty">Email or password field is empty</string>
 
     <!-- Used on the indicator when loading messages -->
     <string name="editing_message">Editing message</string>
@@ -49,8 +50,6 @@
     <string name="signing_in">Signing in…</string>
     <string name="network_error">Network error</string>
     <string name="invalid_server_domain">Invalid server domain</string>
-    <string name="password_required">Password required</string>
-    <string name="username_required">Username required</string>
     <string name="server_domain_required">Server domain required</string>
     <string name="invalid_domain">Invalid domain</string>
     <string name="hint_person">Person</string>
@@ -70,11 +69,9 @@
     <string name="normal_user">Normal users</string>
     <string name="method_null">Method should not be null</string>
     <string name="method_error">Method not supported</string>
-    <string name="tap_message">Tap on a message to compose reply</string>
-    <string name="title_login">Login</string>
+    <string name="tap_message">Tap on a message to compose reply</string>>
     <string name="enter">Enter</string>
     <string name="enter_server">Please enter your server URL</string>
-    <string name="auth_login">Your server allows these authentication options:</string>
     <string name="another_server">Another server</string>
     <string name="no_message">No messages to receive.</string>
     <string name="menu_filter">Filter</string>
diff --git a/app/src/main/res/values/style.xml b/app/src/main/res/values/style.xml
index 01e77487d..23d751b26 100644
--- a/app/src/main/res/values/style.xml
+++ b/app/src/main/res/values/style.xml
@@ -14,4 +14,26 @@
     <style name="links.gone" parent="links">
         <item name="android:visibility">gone</item>
     </style>
+
+    <style name="linksLarge">
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:onClick">onClick</item>
+        <item name="android:padding">18dp</item>
+        <item name="android:textSize">22dp</item>
+        <item name="android:layout_gravity">center_horizontal</item>
+        <item name="android:layout_marginTop">18dp</item>
+        <item name="android:textColor">#ff0099cc</item>
+    </style>
+
+    <style name="linksxLarge">
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:onClick">onClick</item>
+        <item name="android:padding">28dp</item>
+        <item name="android:textSize">28dp</item>
+        <item name="android:layout_gravity">center_horizontal</item>
+        <item name="android:layout_marginTop">28dp</item>
+        <item name="android:textColor">#ff0099cc</item>
+    </style>
 </resources>
\ No newline at end of file