diff --git a/res/layout-land/fingerprint_enroll_find_sensor.xml b/res/layout-land/fingerprint_enroll_find_sensor.xml
index 60d93a64e0f..1d923fa99d5 100644
--- a/res/layout-land/fingerprint_enroll_find_sensor.xml
+++ b/res/layout-land/fingerprint_enroll_find_sensor.xml
@@ -45,13 +45,11 @@
                 android:text="@string/security_settings_fingerprint_enroll_find_sensor_message"/>
 
             <Button
-                style="@style/Button.FingerprintButton"
+                style="@style/SetupWizardButton.Positive"
                 android:id="@+id/next_button"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="8dp"
-                android:layout_marginStart="-12dp"
-                android:gravity="start|center_vertical"
                 android:text="@string/fingerprint_enroll_button_next" />
         </LinearLayout>
 
diff --git a/res/layout-land/fingerprint_enroll_finish.xml b/res/layout-land/fingerprint_enroll_finish.xml
index a84f46d318b..26c0cf195eb 100644
--- a/res/layout-land/fingerprint_enroll_finish.xml
+++ b/res/layout-land/fingerprint_enroll_finish.xml
@@ -63,7 +63,7 @@
                 android:orientation="horizontal">
 
                 <Button
-                    style="@style/Button.FingerprintButton"
+                    style="@style/SetupWizardButton.Negative"
                     android:id="@+id/add_another_button"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -72,7 +72,7 @@
                     android:text="@string/fingerprint_enroll_button_add" />
 
                 <Button
-                    style="@style/Button.FingerprintButton"
+                    style="@style/SetupWizardButton.Positive"
                     android:id="@+id/next_button"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
diff --git a/res/layout-land/setup_fingerprint_enroll_find_sensor.xml b/res/layout-land/setup_fingerprint_enroll_find_sensor.xml
index bb2c02de708..8a81d15a2d9 100644
--- a/res/layout-land/setup_fingerprint_enroll_find_sensor.xml
+++ b/res/layout-land/setup_fingerprint_enroll_find_sensor.xml
@@ -45,13 +45,11 @@
                     android:text="@string/security_settings_fingerprint_enroll_find_sensor_message"/>
 
             <Button
-                    style="@style/Button.FingerprintButton"
+                    style="@style/SetupWizardButton.Positive"
                     android:id="@+id/next_button"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="8dp"
-                    android:layout_marginStart="-12dp"
-                    android:gravity="start|center_vertical"
                     android:text="@string/fingerprint_enroll_button_next" />
         </LinearLayout>
 
diff --git a/res/layout/fingerprint_enroll_find_sensor_base.xml b/res/layout/fingerprint_enroll_find_sensor_base.xml
index 471c2891735..d38818b32ef 100644
--- a/res/layout/fingerprint_enroll_find_sensor_base.xml
+++ b/res/layout/fingerprint_enroll_find_sensor_base.xml
@@ -56,12 +56,11 @@
                 android:layout_weight="1"/>
 
             <Button
-                style="@style/Button.FingerprintButton"
+                style="@style/SetupWizardButton.Positive"
                 android:id="@+id/next_button"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginBottom="4dp"
-                android:layout_marginEnd="-12dp"
                 android:layout_gravity="end"
                 android:text="@string/fingerprint_enroll_button_next" />
 
diff --git a/res/layout/fingerprint_enroll_finish_base.xml b/res/layout/fingerprint_enroll_finish_base.xml
index 21eb4e2b014..80f136b390c 100644
--- a/res/layout/fingerprint_enroll_finish_base.xml
+++ b/res/layout/fingerprint_enroll_finish_base.xml
@@ -80,14 +80,14 @@
             android:orientation="horizontal">
 
             <Button
-                style="@style/Button.FingerprintButton"
+                style="@style/SetupWizardButton.Negative"
                 android:id="@+id/add_another_button"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@string/fingerprint_enroll_button_add" />
 
             <Button
-                style="@style/Button.FingerprintButton"
+                style="@style/SetupWizardButton.Positive"
                 android:id="@+id/next_button"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
diff --git a/res/layout/setup_fingerprint_enroll_find_sensor_base.xml b/res/layout/setup_fingerprint_enroll_find_sensor_base.xml
index 45af088ee27..2455896f9c0 100644
--- a/res/layout/setup_fingerprint_enroll_find_sensor_base.xml
+++ b/res/layout/setup_fingerprint_enroll_find_sensor_base.xml
@@ -56,14 +56,12 @@
                     android:layout_weight="1"/>
 
             <Button
-                    style="@style/Button.FingerprintButton"
+                    style="@style/SetupWizardButton.Positive"
                     android:id="@+id/next_button"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginBottom="4dp"
-                    android:layout_marginEnd="-12dp"
                     android:layout_gravity="end"
-                    android:gravity="end|center_vertical"
                     android:text="@string/fingerprint_enroll_button_next" />
 
         </LinearLayout>