diff --git a/res/layout-land/fingerprint_enroll_finish.xml b/res/layout-land/fingerprint_enroll_finish.xml
index 26c0cf195eb..664123d3502 100644
--- a/res/layout-land/fingerprint_enroll_finish.xml
+++ b/res/layout-land/fingerprint_enroll_finish.xml
@@ -56,10 +56,9 @@
                 android:visibility="gone" />
 
             <LinearLayout
-                android:layout_width="wrap_content"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="8dp"
-                android:layout_marginStart="-12dp"
                 android:orientation="horizontal">
 
                 <Button
@@ -68,9 +67,13 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginEnd="8dp"
-                    android:gravity="start|center_vertical"
                     android:text="@string/fingerprint_enroll_button_add" />
 
+                <Space
+                    android:layout_width="0dp"
+                    android:layout_height="0dp"
+                    android:layout_weight="1" />
+
                 <Button
                     style="@style/SetupWizardButton.Positive"
                     android:id="@+id/next_button"
diff --git a/res/layout-land/setup_choose_lock_pattern.xml b/res/layout-land/setup_choose_lock_pattern.xml
index 86f1841d70d..29b2b42df0b 100644
--- a/res/layout-land/setup_choose_lock_pattern.xml
+++ b/res/layout-land/setup_choose_lock_pattern.xml
@@ -55,9 +55,10 @@
 
                 <!-- confirm / restart buttons -->
                 <LinearLayout android:id="@+id/buttonContainer"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
                     android:layout_centerHorizontal="true"
                     android:layout_alignParentBottom="true"
-                    android:gravity="end"
                     android:orientation="horizontal">
 
                     <!-- left / top button: skip, or re-try -->
@@ -67,6 +68,11 @@
                         android:layout_height="wrap_content"
                         android:text="@string/lockpattern_restart_button_text" />
 
+                    <Space
+                        android:layout_width="0dp"
+                        android:layout_height="0dp"
+                        android:layout_weight="1" />
+
                     <!-- right / bottom button: confirm or ok -->
                     <Button android:id="@+id/footerRightButton"
                         style="@style/SetupWizardButton.Positive"
diff --git a/res/layout/fingerprint_enroll_enrolling_base.xml b/res/layout/fingerprint_enroll_enrolling_base.xml
index 4b9c32e7414..e9e33854b22 100644
--- a/res/layout/fingerprint_enroll_enrolling_base.xml
+++ b/res/layout/fingerprint_enroll_enrolling_base.xml
@@ -75,7 +75,6 @@
             style="@style/SetupWizardButton.Negative"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_gravity="end"
             android:text="@string/skip_label"
             android:visibility="gone" />
 
diff --git a/res/layout/fingerprint_enroll_finish_base.xml b/res/layout/fingerprint_enroll_finish_base.xml
index 80f136b390c..bcbbadf5fa7 100644
--- a/res/layout/fingerprint_enroll_finish_base.xml
+++ b/res/layout/fingerprint_enroll_finish_base.xml
@@ -72,11 +72,9 @@
             android:layout_weight="1"/>
 
         <LinearLayout
-            android:layout_width="wrap_content"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginEnd="-12dp"
             android:layout_marginBottom="4dp"
-            android:layout_gravity="end"
             android:orientation="horizontal">
 
             <Button
@@ -86,6 +84,11 @@
                 android:layout_height="wrap_content"
                 android:text="@string/fingerprint_enroll_button_add" />
 
+            <Space
+                android:layout_width="0dp"
+                android:layout_height="0dp"
+                android:layout_weight="1" />
+
             <Button
                 style="@style/SetupWizardButton.Positive"
                 android:id="@+id/next_button"
diff --git a/res/layout/setup_choose_lock_password.xml b/res/layout/setup_choose_lock_password.xml
index a91a67111ea..99657b4e145 100644
--- a/res/layout/setup_choose_lock_password.xml
+++ b/res/layout/setup_choose_lock_password.xml
@@ -64,6 +64,11 @@
                 android:layout_height="wrap_content"
                 android:text="@string/lockpassword_cancel_label" />
 
+            <Space
+                android:layout_width="0dp"
+                android:layout_height="0dp"
+                android:layout_weight="1" />
+
             <!-- right : continue -->
             <Button android:id="@+id/next_button"
                 style="@style/SetupWizardButton.Positive"
diff --git a/res/layout/setup_choose_lock_pattern_common.xml b/res/layout/setup_choose_lock_pattern_common.xml
index 20e46f36592..6557e6a846e 100644
--- a/res/layout/setup_choose_lock_pattern_common.xml
+++ b/res/layout/setup_choose_lock_pattern_common.xml
@@ -56,7 +56,6 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:gravity="end"
                 android:orientation="horizontal">
 
                 <!-- left : cancel, or re-try -->
@@ -66,6 +65,11 @@
                     android:layout_height="wrap_content"
                     android:text="@string/lockpattern_tutorial_cancel_label" />
 
+                <Space
+                    android:layout_width="0dp"
+                    android:layout_height="0dp"
+                    android:layout_weight="1" />
+
                 <!-- right : confirm or ok -->
                 <Button android:id="@+id/footerRightButton"
                     style="@style/SetupWizardButton.Positive"
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 24d7905b884..827a92bdb07 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -286,7 +286,12 @@
         <item name="android:singleLine">true</item>
     </style>
 
-    <style name="SetupWizardButton.Negative" parent="@android:style/Widget.Material.Button.Borderless" />
+    <style name="SetupWizardButton.Negative" parent="@android:style/TextAppearance.Widget.TextView">
+        <item name="android:background">@null</item>
+        <item name="android:minWidth">0dp</item>
+        <item name="android:textAllCaps">false</item>
+        <item name="android:textColor">?android:attr/colorControlActivated</item>
+    </style>
 
     <style name="SetupWizardButton.Positive" parent="@android:style/Widget.Material.Button.Colored" />