diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 51f668172ca..f696e4b678c 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1394,7 +1394,7 @@
         <activity android:name=".accessibility.AccessibilitySettingsForSetupWizardActivity"
                 android:icon="@drawable/ic_accessibility_suggestion"
                 android:label="@string/vision_settings_title"
-                android:theme="@style/GlifTheme.Light">
+                android:theme="@style/GlifV3Theme.Light">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.ACCESSIBILITY_SETTINGS_FOR_SUW" />
                 <category android:name="android.intent.category.DEFAULT" />
diff --git a/tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizardActivityTest.java b/tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizardActivityTest.java
index d6b12c35a32..a0a9de9c88a 100644
--- a/tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizardActivityTest.java
+++ b/tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizardActivityTest.java
@@ -39,6 +39,6 @@ public class AccessibilitySettingsForSetupWizardActivityTest {
     AccessibilitySettingsForSetupWizardActivity activity =
         Robolectric.buildActivity(AccessibilitySettingsForSetupWizardActivity.class, intent).get();
 
-    assertThat(activity.getThemeResId()).isEqualTo(R.style.GlifTheme_Light);
+    assertThat(activity.getThemeResId()).isEqualTo(R.style.GlifV3Theme_Light);
   }
 }