diff --git a/android/app/src/main/res/layout/fragment_login.xml b/android/app/src/main/res/layout/fragment_login.xml
index e5a16b453f..e9b2577ee7 100644
--- a/android/app/src/main/res/layout/fragment_login.xml
+++ b/android/app/src/main/res/layout/fragment_login.xml
@@ -97,8 +97,6 @@
         android:background="@drawable/rounded_button"
         android:fontFamily="@font/raleway_semibold"
         android:paddingBottom="0dp"
-        android:paddingLeft="25dp"
-        android:paddingRight="25dp"
         android:paddingTop="0dp"
         android:text="@string/login"
         android:textColor="@color/white_opaque"
@@ -123,20 +121,21 @@
 
     <Button
         android:id="@+id/signupButton"
-        android:layout_width="154dp"
+        android:layout_width="0dp"
+        app:layout_constraintWidth_default="spread"
         android:layout_height="38dp"
         android:background="@drawable/rounded_secondary_button"
         android:fontFamily="@font/raleway_semibold"
         android:paddingBottom="0dp"
-        android:paddingLeft="25dp"
-        android:paddingRight="25dp"
         android:paddingTop="0dp"
+        android:layout_marginRight="15dp"
         android:text="@string/signup"
         android:textColor="@color/white_opaque"
         android:textAllCaps="false"
         android:textSize="18sp"
         app:layout_constraintLeft_toLeftOf="@id/passwordLayout"
         app:layout_constraintTop_toTopOf="@id/loginButton"
+        app:layout_constraintRight_toLeftOf="@id/loginButton"
         app:layout_goneMarginTop="4dp"/>
 
 
diff --git a/android/app/src/main/res/layout/fragment_signup.xml b/android/app/src/main/res/layout/fragment_signup.xml
index f83c8abd81..41c4a8cbbe 100644
--- a/android/app/src/main/res/layout/fragment_signup.xml
+++ b/android/app/src/main/res/layout/fragment_signup.xml
@@ -120,8 +120,6 @@
         android:background="@drawable/rounded_button"
         android:fontFamily="@font/raleway_semibold"
         android:paddingBottom="0dp"
-        android:paddingLeft="20dp"
-        android:paddingRight="20dp"
         android:paddingTop="0dp"
         android:text="@string/signup"
         android:textColor="@color/white_opaque"
@@ -133,20 +131,21 @@
 
     <Button
         android:id="@+id/cancelButton"
-        android:layout_width="154dp"
+        android:layout_width="0dp"
+        app:layout_constraintWidth_default="spread"
         android:layout_height="38dp"
         android:background="@drawable/rounded_secondary_button"
         android:fontFamily="@font/raleway_semibold"
         android:paddingBottom="0dp"
-        android:paddingLeft="20dp"
-        android:paddingRight="20dp"
         android:paddingTop="0dp"
+        android:layout_marginRight="15dp"
         android:text="@string/cancel"
         android:textColor="@color/white_opaque"
         android:textAllCaps="false"
         android:textSize="18sp"
         app:layout_constraintLeft_toLeftOf="@id/passwordLayout"
         app:layout_constraintTop_toTopOf="@id/signupButton"
+        app:layout_constraintRight_toLeftOf="@id/signupButton"
         app:layout_goneMarginTop="4dp"/>
 
 </android.support.constraint.ConstraintLayout>