diff --git a/res/color-night/accent_select_primary_text.xml b/res/color-night/accent_select_primary_text.xml
deleted file mode 100644
index 049ddf63678e695a2454ae6d4f10178b87474bdf..0000000000000000000000000000000000000000
--- a/res/color-night/accent_select_primary_text.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2022 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.
--->
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="?android:attr/textColorPrimaryInverse" />
-</selector>
\ No newline at end of file
diff --git a/res/color-night/accent_select_secondary_text.xml b/res/color-night/accent_select_secondary_text.xml
deleted file mode 100644
index 6b7b4f27dcf398cc6de8bc48111f33897bfad097..0000000000000000000000000000000000000000
--- a/res/color-night/accent_select_secondary_text.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2022 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.
--->
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="?android:attr/textColorSecondaryInverse" />
-</selector>
\ No newline at end of file
diff --git a/res/color-night/settings_two_pane_background_color.xml b/res/color-night/settings_two_pane_background_color.xml
deleted file mode 100644
index 86aa0ed1855d56e1a0f06164971c3606137f617d..0000000000000000000000000000000000000000
--- a/res/color-night/settings_two_pane_background_color.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2022 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.
--->
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="@android:color/system_neutral1_500" android:lStar="5" />
-</selector>
\ No newline at end of file
diff --git a/res/color/accent_select_background.xml b/res/color/accent_select_background.xml
index 5dab7230532b2cb6592b05e654c3ae38cf7ffffd..fbbd8da462b660ab99c38ec1212b6dfbe277e4d3 100644
--- a/res/color/accent_select_background.xml
+++ b/res/color/accent_select_background.xml
@@ -14,5 +14,5 @@
      limitations under the License.
 -->
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="@android:color/system_accent2_500" android:lStar="80" />
+    <item android:color="@*android:color/accent_device_default" android:alpha="0.20" />
 </selector>
\ No newline at end of file
diff --git a/res/color/settings_two_pane_background_color.xml b/res/color/settings_two_pane_background_color.xml
index 6cb8e70307795fa49580204af248475170581ff8..d3f0a3958d63e7470ef69611f682fb4c595261f3 100644
--- a/res/color/settings_two_pane_background_color.xml
+++ b/res/color/settings_two_pane_background_color.xml
@@ -14,5 +14,5 @@
      limitations under the License.
 -->
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="@android:color/system_neutral1_500" android:lStar="87" />
+    <item android:color="?android:attr/colorBackground" />
 </selector>
\ No newline at end of file
diff --git a/src/com/android/settings/widget/HighlightableTopLevelPreferenceAdapter.java b/src/com/android/settings/widget/HighlightableTopLevelPreferenceAdapter.java
index 15167aca1dbc9435c4b8d17e2e64e28af0c70259..13c53480054a588ed112c0b321b1a2500aaeb817 100644
--- a/src/com/android/settings/widget/HighlightableTopLevelPreferenceAdapter.java
+++ b/src/com/android/settings/widget/HighlightableTopLevelPreferenceAdapter.java
@@ -232,10 +232,6 @@ public class HighlightableTopLevelPreferenceAdapter extends PreferenceGroupAdapt
         v.setBackgroundResource(RES_HIGHLIGHTED_BACKGROUND);
         ((TextView) v.findViewById(android.R.id.title)).setTextColor(mTitleColorHighlight);
         ((TextView) v.findViewById(android.R.id.summary)).setTextColor(mSummaryColorHighlight);
-        final Drawable drawable = ((ImageView) v.findViewById(android.R.id.icon)).getDrawable();
-        if (drawable != null) {
-            drawable.setTint(mIconColorHighlight);
-        }
     }
 
     private void removeHighlightBackground(PreferenceViewHolder holder) {