diff --git a/android/app/src/main/res/layout/fragment_login.xml b/android/app/src/main/res/layout/fragment_login.xml
index 343822e243..d12b84cc8d 100644
--- a/android/app/src/main/res/layout/fragment_login.xml
+++ b/android/app/src/main/res/layout/fragment_login.xml
@@ -32,7 +32,7 @@
         android:id="@+id/loggingInFrame"
         android:layout_width="0dp"
         android:layout_height="0dp"
-        android:layout_marginTop="100dp"
+        android:layout_marginTop="@dimen/login_form_margin_top"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toBottomOf="@id/header"
@@ -66,7 +66,7 @@
         android:id="@+id/loggedInFrame"
         android:layout_width="0dp"
         android:layout_height="0dp"
-        android:layout_marginTop="100dp"
+        android:layout_marginTop="@dimen/login_form_margin_top"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toBottomOf="@id/header"
@@ -86,15 +86,15 @@
             />
         <Button
             android:id="@+id/getStarted"
-            android:layout_width="171dp"
-            android:layout_height="42dp"
+            android:layout_width="@dimen/button_medium_width"
+            android:layout_height="@dimen/button_medium_height"
             android:layout_marginTop="22dp"
             android:background="@drawable/rounded_button_color1"
             android:fontFamily="@font/raleway_bold"
             android:text="@string/get_started"
             android:textColor="@color/white_opaque"
             android:textAllCaps="false"
-            android:textSize="18sp"
+            android:textSize="@dimen/button_medium_text_size"
             app:layout_constraintTop_toBottomOf="@id/loggedInText"
             app:layout_constraintLeft_toLeftOf="parent"
             app:layout_constraintRight_toRightOf="parent"
@@ -106,7 +106,7 @@
         android:id="@+id/loginForm"
         android:layout_width="0dp"
         android:layout_height="0dp"
-        android:layout_marginTop="100dp"
+        android:layout_marginTop="@dimen/login_form_margin_top"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toBottomOf="@id/header"
@@ -130,13 +130,13 @@
             android:id="@+id/username"
             android:layout_width="match_parent"
             android:layout_height="27dp"
-            android:layout_marginLeft="72dp"
-            android:layout_marginRight="72dp"
+            android:layout_marginLeft="@dimen/login_margin"
+            android:layout_marginRight="@dimen/login_margin"
             android:background="@color/white_opaque"
-            android:paddingLeft="16dp"
+            android:paddingLeft="@dimen/edit_text_padding"
             android:ems="10"
             android:fontFamily="sans-serif"
-            android:textSize="14sp"
+            android:textSize="@dimen/login_edit_text_size"
             android:inputType="textEmailAddress"
             android:textColor="@color/editTextColor"
             android:textColorHint="@color/editTextColor"
@@ -149,8 +149,8 @@
             android:id="@+id/passwordLayout"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="72dp"
-            android:layout_marginRight="72dp"
+            android:layout_marginLeft="@dimen/login_margin"
+            android:layout_marginRight="@dimen/login_margin"
             android:background="@color/white_opaque"
             app:passwordToggleTint="@color/showPasswordColor"
             app:passwordToggleEnabled="true"
@@ -163,14 +163,14 @@
             <android.support.design.widget.TextInputEditText
                 android:id="@+id/password"
                 android:layout_width="match_parent"
-                android:layout_height="27dp"
+                android:layout_height="@dimen/login_edit_text_height"
                 android:background="@color/white_opaque"
-                android:paddingLeft="16dp"
+                android:paddingLeft="@dimen/edit_text_padding"
                 android:drawablePadding="45dp"
                 android:drawableEnd="@drawable/ic_eye_noshow"
                 android:ems="10"
                 android:fontFamily="sans-serif"
-                android:textSize="14sp"
+                android:textSize="@dimen/login_edit_text_size"
                 android:textColor="@color/editTextColor"
                 android:textColorHint="@color/editTextColor"
                 android:gravity="left|center_vertical"
@@ -203,15 +203,15 @@
 
         <Button
             android:id="@+id/loginButton"
-            android:layout_width="171dp"
-            android:layout_height="42dp"
+            android:layout_width="@dimen/button_medium_width"
+            android:layout_height="@dimen/button_medium_height"
             android:background="@drawable/rounded_button_color3"
             android:fontFamily="@font/raleway_bold"
-            android:layout_marginTop="10dp"
+            android:layout_marginTop="@dimen/button_medium_margin"
             android:text="@string/log_in"
             android:textColor="@color/white_opaque"
             android:textAllCaps="false"
-            android:textSize="18sp"
+            android:textSize="@dimen/button_medium_text_size"
             app:layout_constraintRight_toRightOf="@id/username"
             app:layout_constraintTop_toBottomOf="@id/keepMeLoggedIn" />
 
@@ -226,7 +226,7 @@
             app:layout_constraintRight_toLeftOf="@id/loginButton"
             android:textColor="@color/white_opaque"
             android:fontFamily="@font/raleway_bold"
-            android:textSize="18sp"
+            android:textSize="@dimen/button_medium_text_size"
             android:text="@string/cancel_uppercase" />
 
         <TextView
diff --git a/android/app/src/main/res/layout/fragment_login_menu.xml b/android/app/src/main/res/layout/fragment_login_menu.xml
index 7484713b6b..edfa4dd9fd 100644
--- a/android/app/src/main/res/layout/fragment_login_menu.xml
+++ b/android/app/src/main/res/layout/fragment_login_menu.xml
@@ -29,7 +29,7 @@ tools:context=".fragment.StartMenuFragment">
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:fontFamily="@font/raleway_bold"
-        android:textSize="22sp"
+        android:textSize="@dimen/login_menu_text_size"
         android:layout_marginTop="37dp"
         android:text="@string/be_anywere"
         android:gravity="center"
@@ -40,44 +40,44 @@ tools:context=".fragment.StartMenuFragment">
 
     <Button
         android:id="@+id/signupButton"
-        android:layout_width="238dp"
-        android:layout_height="41dp"
+        android:layout_width="@dimen/button_large_width"
+        android:layout_height="@dimen/button_large_height"
         android:layout_marginTop="48dp"
         android:background="@drawable/rounded_button_color1"
         android:fontFamily="@font/raleway_bold"
         android:text="@string/signup_uppercase"
         android:textColor="@color/white_opaque"
         android:textAllCaps="false"
-        android:textSize="18sp"
+        android:textSize="@dimen/button_large_text_size"
         app:layout_constraintTop_toBottomOf="@id/text"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent" />
 
     <android.support.constraint.ConstraintLayout
         android:layout_width="match_parent"
-        android:layout_height="270dp"
+        android:layout_height="@dimen/login_menu_translucent_rectangle_height"
         app:layout_constraintBottom_toBottomOf="parent" android:background="#B2000000">
 
 
         <Button
             android:id="@+id/loginButton"
-            android:layout_width="238dp"
-            android:layout_height="42dp"
+            android:layout_width="@dimen/button_large_width"
+            android:layout_height="@dimen/button_large_height"
             android:background="@drawable/rounded_button_color3"
             android:fontFamily="@font/raleway_bold"
-            android:layout_marginTop="86dp"
+            android:layout_marginTop="@dimen/login_menu_button_margin_top"
             android:text="@string/log_in"
             android:textColor="@color/white_opaque"
             android:textAllCaps="false"
-            android:textSize="18sp"
+            android:textSize="@dimen/button_large_text_size"
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintLeft_toLeftOf="parent"
             app:layout_constraintRight_toRightOf="parent"/>
 
         <Button
             android:id="@+id/steamLoginButton"
-            android:layout_width="238dp"
-            android:layout_height="42dp"
+            android:layout_width="@dimen/button_large_width"
+            android:layout_height="@dimen/button_large_height"
             android:background="@drawable/rounded_button_color4"
             android:fontFamily="@font/raleway_bold"
             android:layout_marginTop="10dp"
@@ -85,7 +85,7 @@ tools:context=".fragment.StartMenuFragment">
             android:textAlignment="center"
             android:textColor="@color/white_opaque"
             android:textAllCaps="false"
-            android:textSize="18sp"
+            android:textSize="@dimen/button_large_text_size"
             android:drawableLeft="@drawable/ic_steam"
             android:paddingLeft="38dp"
             android:paddingRight="38dp"
diff --git a/android/app/src/main/res/layout/fragment_signup.xml b/android/app/src/main/res/layout/fragment_signup.xml
index 3265814eae..a83eb1b229 100644
--- a/android/app/src/main/res/layout/fragment_signup.xml
+++ b/android/app/src/main/res/layout/fragment_signup.xml
@@ -87,15 +87,15 @@
             />
         <Button
             android:id="@+id/getStarted"
-            android:layout_width="171dp"
-            android:layout_height="42dp"
+            android:layout_width="@dimen/button_medium_width"
+            android:layout_height="@dimen/button_medium_height"
             android:layout_marginTop="22dp"
             android:background="@drawable/rounded_button_color1"
             android:fontFamily="@font/raleway_bold"
             android:text="@string/get_started"
             android:textColor="@color/white_opaque"
             android:textAllCaps="false"
-            android:textSize="18sp"
+            android:textSize="@dimen/button_medium_text_size"
             app:layout_constraintTop_toBottomOf="@id/loggedInText"
             app:layout_constraintLeft_toLeftOf="parent"
             app:layout_constraintRight_toRightOf="parent" />
@@ -130,14 +130,14 @@
     <EditText
         android:id="@+id/username"
         android:layout_width="match_parent"
-        android:layout_height="27dp"
-        android:layout_marginLeft="76dp"
-        android:layout_marginRight="76dp"
+        android:layout_height="@dimen/login_edit_text_height"
+        android:layout_marginLeft="@dimen/signup_margin"
+        android:layout_marginRight="@dimen/signup_margin"
         android:background="@color/white_opaque"
-        android:paddingLeft="16dp"
+        android:paddingLeft="@dimen/login_edit_text_padding"
         android:ems="10"
         android:fontFamily="sans-serif"
-        android:textSize="14sp"
+        android:textSize="@dimen/login_edit_text_size"
         android:inputType="text"
         android:textColor="@color/editTextColor"
         android:textColorHint="@color/editTextColor"
@@ -150,13 +150,13 @@
         android:id="@+id/email"
         android:layout_width="match_parent"
         android:layout_height="27dp"
-        android:layout_marginLeft="76dp"
-        android:layout_marginRight="76dp"
+        android:layout_marginLeft="@dimen/signup_margin"
+        android:layout_marginRight="@dimen/signup_margin"
         android:background="@color/white_opaque"
-        android:paddingLeft="16dp"
+        android:paddingLeft="@dimen/edit_text_padding"
         android:ems="10"
         android:fontFamily="sans-serif"
-        android:textSize="14sp"
+        android:textSize="@dimen/login_edit_text_size"
         android:inputType="textEmailAddress"
         android:textColor="@color/editTextColor"
         android:textColorHint="@color/editTextColor"
@@ -170,8 +170,8 @@
         android:id="@+id/passwordLayout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="76dp"
-        android:layout_marginRight="76dp"
+        android:layout_marginLeft="@dimen/signup_margin"
+        android:layout_marginRight="@dimen/signup_margin"
         app:passwordToggleTint="@color/showPasswordColor"
         app:passwordToggleEnabled="true"
         app:hintAnimationEnabled="false"
@@ -185,12 +185,12 @@
         android:layout_width="match_parent"
         android:layout_height="27dp"
         android:background="@color/white_opaque"
-        android:paddingLeft="16dp"
+        android:paddingLeft="@dimen/edit_text_padding"
         android:drawablePadding="55dp"
         android:drawableEnd="@drawable/ic_eye_noshow"
         android:ems="10"
         android:fontFamily="sans-serif"
-        android:textSize="14sp"
+        android:textSize="@dimen/login_edit_text_size"
         android:textColor="@color/editTextColor"
         android:textColorHint="@color/editTextColor"
         android:gravity="left|center_vertical"
@@ -223,15 +223,15 @@
 
     <Button
         android:id="@+id/signupButton"
-        android:layout_width="171dp"
-        android:layout_height="42dp"
+        android:layout_width="@dimen/button_medium_width"
+        android:layout_height="@dimen/button_medium_height"
         android:layout_marginTop="10dp"
         android:background="@drawable/rounded_button_color1"
         android:fontFamily="@font/raleway_bold"
         android:text="@string/signup_uppercase"
         android:textColor="@color/white_opaque"
         android:textAllCaps="false"
-        android:textSize="18sp"
+        android:textSize="@dimen/button_medium_text_size"
         app:layout_constraintRight_toRightOf="@id/username"
         app:layout_constraintTop_toBottomOf="@id/keepMeLoggedIn" />
 
@@ -245,7 +245,7 @@
         app:layout_constraintRight_toLeftOf="@id/signupButton"
         android:textColor="@color/white_opaque"
         android:fontFamily="@font/raleway_bold"
-        android:textSize="18dp"
+        android:textSize="@dimen/button_medium_text_size"
         android:text="@string/cancel_uppercase" />
     </android.support.constraint.ConstraintLayout>
 
diff --git a/android/app/src/main/res/values-w385dp/dimens.xml b/android/app/src/main/res/values-w385dp/dimens.xml
new file mode 100644
index 0000000000..7463700d2a
--- /dev/null
+++ b/android/app/src/main/res/values-w385dp/dimens.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="header_hifi_margin_top">35dp</dimen>
+    <dimen name="header_hifi_height">84dp</dimen>
+    <dimen name="header_hifi_width">340dp</dimen>
+    <dimen name="button_medium_width">171dp</dimen>
+    <dimen name="button_medium_height">42dp</dimen>
+    <dimen name="button_medium_margin">10dp</dimen>
+    <dimen name="login_edit_text_size">14sp</dimen>
+    <dimen name="button_large_text_size">18sp</dimen>
+    <dimen name="button_medium_text_size">18sp</dimen>
+    <dimen name="login_margin">72dp</dimen>
+    <dimen name="signup_margin">76dp</dimen>
+    <dimen name="login_form_margin_top">100dp</dimen>
+    <dimen name="login_edit_text_height">27dp</dimen>
+    <dimen name="button_large_width">238dp</dimen>
+    <dimen name="button_large_height">42dp</dimen>
+    <dimen name="login_menu_translucent_rectangle_height">270dp</dimen>
+    <dimen name="login_menu_button_margin_top">86dp</dimen>
+    <dimen name="login_menu_text_size">22sp</dimen>
+    <dimen name="login_edit_text_padding">16dp</dimen>
+</resources>
\ No newline at end of file
diff --git a/android/app/src/main/res/values/dimens.xml b/android/app/src/main/res/values/dimens.xml
index 10b488296e..85d79509ba 100644
--- a/android/app/src/main/res/values/dimens.xml
+++ b/android/app/src/main/res/values/dimens.xml
@@ -33,10 +33,26 @@
     <dimen name="domainMarginBottom">6dp</dimen>
     <dimen name="domainNameHeight">64dp</dimen>
 
-    <dimen name="header_hifi_margin_top">35dp</dimen>
-    <dimen name="header_hifi_height">84dp</dimen>
-    <dimen name="header_hifi_width">340dp</dimen>
+    <dimen name="header_hifi_margin_top">32dp</dimen>
+    <dimen name="header_hifi_height">76dp</dimen>
+    <dimen name="header_hifi_width">306dp</dimen>
 
     <dimen name="list_vertical_padding">8dp</dimen>
+    <dimen name="button_medium_width">150dp</dimen>
+    <dimen name="button_medium_height">38dp</dimen>
+    <dimen name="login_margin">65dp</dimen>
+    <dimen name="signup_margin">68dp</dimen>
+    <dimen name="login_form_margin_top">90dp</dimen>
+    <dimen name="button_medium_margin">9dp</dimen>
+    <dimen name="button_medium_text_size">16sp</dimen>
+    <dimen name="button_large_text_size">16sp</dimen>
+    <dimen name="login_edit_text_size">13sp</dimen>
+    <dimen name="login_edit_text_height">24dp</dimen>
+    <dimen name="button_large_width">214dp</dimen>
+    <dimen name="button_large_height">38dp</dimen>
+    <dimen name="login_menu_translucent_rectangle_height">300dp</dimen>
+    <dimen name="login_menu_button_margin_top">77dp</dimen>
+    <dimen name="login_menu_text_size">20sp</dimen>
+    <dimen name="login_edit_text_padding">14dp</dimen>
 
 </resources>