diff --git a/res/layout-land/confirm_lock_password.xml b/res/layout-land/confirm_lock_password.xml
index a6a85d3b390..8d742fa5cd5 100644
--- a/res/layout-land/confirm_lock_password.xml
+++ b/res/layout-land/confirm_lock_password.xml
@@ -78,7 +78,7 @@
                     android:gravity="center"
                     style="@style/TextAppearance.PasswordEntry"/>
 
-                <TextView style="@style/TextAppearance.ConfirmDeviceCredentialsErrorText"
+                <TextView style="@style/TextAppearance.ErrorText"
                     android:accessibilityLiveRegion="polite"
                     android:id="@+id/errorText"
                     android:layout_width="wrap_content"
diff --git a/res/layout-land/confirm_lock_pattern.xml b/res/layout-land/confirm_lock_pattern.xml
index b0a0a96dc64..0449e59c133 100644
--- a/res/layout-land/confirm_lock_pattern.xml
+++ b/res/layout-land/confirm_lock_pattern.xml
@@ -94,7 +94,7 @@
                     android:layout_gravity="center_vertical"/>
 
                 <TextView
-                    style="@style/TextAppearance.ConfirmDeviceCredentialsErrorText"
+                    style="@style/TextAppearance.ErrorText"
                     android:accessibilityLiveRegion="polite"
                     android:id="@+id/errorText"
                     android:layout_width="wrap_content"
diff --git a/res/layout-land/confirm_lock_pattern_normal.xml b/res/layout-land/confirm_lock_pattern_normal.xml
index 7989c5e867e..993a84e8d0f 100644
--- a/res/layout-land/confirm_lock_pattern_normal.xml
+++ b/res/layout-land/confirm_lock_pattern_normal.xml
@@ -76,7 +76,7 @@
                     android:layout_weight="1" />
 
                 <TextView
-                    style="@style/TextAppearance.ConfirmDeviceCredentialsErrorText"
+                    style="@style/TextAppearance.ErrorText"
                     android:accessibilityLiveRegion="polite"
                     android:id="@+id/errorText"
                     android:layout_width="wrap_content"
diff --git a/res/layout-land/fingerprint_enroll_enrolling.xml b/res/layout-land/fingerprint_enroll_enrolling.xml
index 7e222348d6d..e71725eb0d6 100644
--- a/res/layout-land/fingerprint_enroll_enrolling.xml
+++ b/res/layout-land/fingerprint_enroll_enrolling.xml
@@ -123,7 +123,7 @@
                 </com.google.android.setupdesign.view.FillContentLayout>
 
                 <TextView
-                    style="@style/TextAppearance.FingerprintErrorText"
+                    style="@style/TextAppearance.ErrorText"
                     android:id="@+id/error_text"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
diff --git a/res/layout/confirm_lock_password_base.xml b/res/layout/confirm_lock_password_base.xml
index 1e42fbe58d9..edc8e252708 100644
--- a/res/layout/confirm_lock_password_base.xml
+++ b/res/layout/confirm_lock_password_base.xml
@@ -79,7 +79,7 @@
                 style="@style/TextAppearance.PasswordEntry"/>
 
             <TextView
-                style="@style/TextAppearance.ConfirmDeviceCredentialsErrorText"
+                style="@style/TextAppearance.ErrorText"
                 android:accessibilityLiveRegion="polite"
                 android:id="@+id/errorText"
                 android:layout_width="wrap_content"
diff --git a/res/layout/confirm_lock_password_normal.xml b/res/layout/confirm_lock_password_normal.xml
index 4b92a4a257c..44d96e09939 100644
--- a/res/layout/confirm_lock_password_normal.xml
+++ b/res/layout/confirm_lock_password_normal.xml
@@ -58,7 +58,7 @@
 
             <TextView
                 android:id="@+id/errorText"
-                style="@style/TextAppearance.ConfirmDeviceCredentialsErrorText"
+                style="@style/TextAppearance.ErrorText"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:accessibilityLiveRegion="polite"/>
diff --git a/res/layout/confirm_lock_pattern_base.xml b/res/layout/confirm_lock_pattern_base.xml
index f841391620c..46e2516459d 100644
--- a/res/layout/confirm_lock_pattern_base.xml
+++ b/res/layout/confirm_lock_pattern_base.xml
@@ -85,7 +85,7 @@
             android:orientation="vertical">
 
             <TextView
-                style="@style/TextAppearance.ConfirmDeviceCredentialsErrorText"
+                style="@style/TextAppearance.ErrorText"
                 android:accessibilityLiveRegion="polite"
                 android:id="@+id/errorText"
                 android:layout_width="wrap_content"
diff --git a/res/layout/confirm_lock_pattern_normal_base.xml b/res/layout/confirm_lock_pattern_normal_base.xml
index acb2bbe0fb1..8cf8f874418 100644
--- a/res/layout/confirm_lock_pattern_normal_base.xml
+++ b/res/layout/confirm_lock_pattern_normal_base.xml
@@ -80,7 +80,7 @@
             </com.google.android.setupdesign.view.FillContentLayout>
 
             <TextView
-                style="@style/TextAppearance.ConfirmDeviceCredentialsErrorText"
+                style="@style/TextAppearance.ErrorText"
                 android:accessibilityLiveRegion="polite"
                 android:id="@+id/errorText"
                 android:layout_width="wrap_content"
diff --git a/res/layout/face_enroll_enrolling.xml b/res/layout/face_enroll_enrolling.xml
index 7aef9b654e7..38a26a2683e 100644
--- a/res/layout/face_enroll_enrolling.xml
+++ b/res/layout/face_enroll_enrolling.xml
@@ -57,7 +57,7 @@
             </com.android.settings.biometrics.face.FaceSquareFrameLayout>
 
             <TextView
-                style="@style/TextAppearance.FaceErrorText"
+                style="@style/TextAppearance.ErrorText"
                 android:id="@+id/error_text"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
diff --git a/res/layout/filter_spinner_item.xml b/res/layout/filter_spinner_item.xml
deleted file mode 100644
index ffdd623d5fb..00000000000
--- a/res/layout/filter_spinner_item.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2015 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<TextView
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@android:id/text1"
-    style="?android:attr/spinnerItemStyle"
-    android:maxLines="1"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:ellipsize="marquee"
-    android:textColor="?android:attr/colorForegroundInverse"
-    android:textAppearance="@style/TextAppearance.Switch"
-    android:textAlignment="inherit" />
diff --git a/res/layout/fingerprint_enroll_enrolling_base.xml b/res/layout/fingerprint_enroll_enrolling_base.xml
index 6ca3fdc6e78..4439b08c3b7 100644
--- a/res/layout/fingerprint_enroll_enrolling_base.xml
+++ b/res/layout/fingerprint_enroll_enrolling_base.xml
@@ -77,7 +77,7 @@
             </com.google.android.setupdesign.view.FillContentLayout>
 
             <TextView
-                style="@style/TextAppearance.FingerprintErrorText"
+                style="@style/TextAppearance.ErrorText"
                 android:id="@+id/error_text"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
diff --git a/res/layout/fingerprint_enroll_finish_base.xml b/res/layout/fingerprint_enroll_finish_base.xml
index 7120d90a403..1849f51aa4c 100644
--- a/res/layout/fingerprint_enroll_finish_base.xml
+++ b/res/layout/fingerprint_enroll_finish_base.xml
@@ -67,7 +67,7 @@
 
             <!-- Added to align elements with fingerprint_enroll_enrolling_base -->
             <TextView
-                style="@style/TextAppearance.FingerprintErrorText"
+                style="@style/TextAppearance.ErrorText"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_horizontal|bottom"
diff --git a/res/values/aliases.xml b/res/values/aliases.xml
index 060ba1d4dad..881d3ca5a6e 100644
--- a/res/values/aliases.xml
+++ b/res/values/aliases.xml
@@ -15,7 +15,6 @@
 -->
 
 <resources>
-     <item name="notification_app_section" type="layout">@*android:layout/preference_category_material</item>
      <item name="confirm_lock_pattern" type="layout">@layout/confirm_lock_pattern_base</item>
      <item name="confirm_lock_pattern_normal" type="layout">@layout/confirm_lock_pattern_normal_base</item>
      <item name="confirm_lock_password" type="layout">@layout/confirm_lock_password_base</item>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 15ec46d01b4..9a72ff5f8a3 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -174,23 +174,6 @@
         <item name="android:background">#ff000000</item>
     </style>
 
-    <style name="SecurityPreferenceButtonContainer"
-           parent="@android:style/Widget.Material.Light.SegmentedButton">
-        <item name="android:layout_width">match_parent</item>
-        <item name="android:layout_height">wrap_content</item>
-        <item name="android:weightSum">2</item>
-        <item name="android:dividerPadding">8dip</item>
-    </style>
-
-    <style name="SecurityPreferenceButton"
-           parent="@android:style/Widget.Material.Light.Button.Borderless">
-        <item name="android:layout_width">0dip</item>
-        <item name="android:layout_weight">1</item>
-        <item name="android:layout_height">wrap_content</item>
-        <item name="android:ellipsize">marquee</item>
-        <item name="android:singleLine">true</item>
-    </style>
-
     <style name="SetupWizardButton.Negative" parent="@style/SuwGlifButton.Secondary">
         <!-- Negative margin to offset for padding of the button itself. We want the label to be
              aligned with the text above it -->
@@ -280,17 +263,7 @@
         <item name="android:textColor">?android:attr/textColorSecondary</item>
     </style>
 
-    <style name="TextAppearance.FingerprintErrorText"
-           parent="android:TextAppearance.Material.Body1">
-        <item name="android:textColor">?android:attr/colorError</item>
-    </style>
-
-    <style name="TextAppearance.FaceErrorText"
-           parent="android:TextAppearance.Material.Body1">
-        <item name="android:textColor">?android:attr/colorError</item>
-    </style>
-
-    <style name="TextAppearance.ConfirmDeviceCredentialsErrorText"
+    <style name="TextAppearance.ErrorText"
            parent="android:TextAppearance.Material.Body1">
         <item name="android:textColor">?android:attr/colorError</item>
     </style>