diff --git a/res/drawable/ic_datetime.xml b/res/drawable/ic_datetime.xml
index ff918ace..c75bbf05 100644
--- a/res/drawable/ic_datetime.xml
+++ b/res/drawable/ic_datetime.xml
@@ -11,7 +11,7 @@
 
     <path android:pathData="M0 0h24v24H0z" />
     <path
-        android:fillColor="@color/black"
+        android:fillColor="?android:colorControlNormal"
         android:pathData="M19 3h-1V1h-2v2H8V1H6v2H5c-1.11 0-1.99 .9 -1.99 2L3 19c0 1.1 .89 2 2 2h14c1.1 0
 2-.9 2-2V5c0-1.1-.9-2-2-2zm0 16H5V8h14v11zM7 10h5v5H7z" />
 </vector>
diff --git a/res/drawable/ic_locale.xml b/res/drawable/ic_locale.xml
index 6e2cc9ba..4436e615 100644
--- a/res/drawable/ic_locale.xml
+++ b/res/drawable/ic_locale.xml
@@ -11,7 +11,7 @@
 
     <path android:pathData="M0 0h24v24H0z" />
     <path
-        android:fillColor="@color/black"
+        android:fillColor="?android:colorControlNormal"
         android:pathData="M12.87 15.07l-2.54-2.51 .03 -.03c1.74-1.94 2.98-4.17
 3.71-6.53H17V4h-7V2H8v2H1v1.99h11.17C11.5 7.92 10.44 9.75 9 11.35 8.07 10.32 7.3
 9.19 6.69 8h-2c.73 1.63 1.73 3.17 2.98 4.56l-5.09 5.02L4 19l5-5 3.11 3.11 .76
diff --git a/res/drawable/ic_location.xml b/res/drawable/ic_location.xml
index 4d4cf30d..bdee553f 100644
--- a/res/drawable/ic_location.xml
+++ b/res/drawable/ic_location.xml
@@ -10,7 +10,7 @@
     android:viewportHeight="24">
 
     <path
-        android:fillColor="@color/black"
+        android:fillColor="?android:colorControlNormal"
         android:pathData="M12 2C8.13 2 5 5.13 5 9c0 5.25 7 13 7 13s7-7.75 7-13c0-3.87-3.13-7-7-7zm0
 9.5c-1.38 0-2.5-1.12-2.5-2.5s1.12-2.5 2.5-2.5 2.5 1.12 2.5 2.5-1.12 2.5-2.5 2.5z" />
     <path android:pathData="M0 0h24v24H0z" />
diff --git a/res/drawable/ic_navigation.xml b/res/drawable/ic_navigation.xml
index c899ea2a..f702fe8d 100644
--- a/res/drawable/ic_navigation.xml
+++ b/res/drawable/ic_navigation.xml
@@ -10,6 +10,6 @@
     android:viewportHeight="24">
 
     <path
-        android:fillColor="@color/black"
+        android:fillColor="?android:colorControlNormal"
         android:pathData="M4.59,6.89C5.29,6.18 6,5.54 6.3,5.67C6.8,5.87 6.3,6.7 6,7.19C5.75,7.61 3.14,11.08 3.14,13.5C3.14,14.78 3.62,15.84 4.5,16.5C5.23,17.04 6.22,17.21 7.12,16.94C8.19,16.63 9.07,15.54 10.18,14.17C11.39,12.68 13,10.73 14.26,10.73C15.89,10.73 15.91,11.74 16,12.5C12.24,13.16 10.64,16.19 10.64,17.89C10.64,19.59 12.08,21 13.85,21C15.5,21 18.14,19.65 18.54,14.88H21V12.38H18.53C18.38,10.73 17.44,8.18 14.5,8.18C12.25,8.18 10.32,10.09 9.56,11C9,11.75 7.5,13.5 7.27,13.74C7,14.04 6.59,14.58 6.16,14.58C5.71,14.58 5.44,13.75 5.8,12.66C6.15,11.57 7.2,9.8 7.65,9.14C8.43,8 8.95,7.22 8.95,5.86C8.95,3.69 7.31,3 6.44,3C5.12,3 3.97,4 3.72,4.25C3.36,4.61 3.06,4.91 2.84,5.18L4.59,6.89M13.88,18.55C13.57,18.55 13.14,18.29 13.14,17.83C13.14,17.23 13.87,15.63 16,15.07C15.71,17.76 14.58,18.55 13.88,18.55Z" />
 </vector>
diff --git a/res/drawable/ic_restore.xml b/res/drawable/ic_restore.xml
index f552e5d2..b02b0030 100644
--- a/res/drawable/ic_restore.xml
+++ b/res/drawable/ic_restore.xml
@@ -10,6 +10,6 @@
     android:viewportHeight="24">
 
     <path
-        android:fillColor="@color/black"
+        android:fillColor="?android:colorControlNormal"
         android:pathData="M17,13L12,18L7,13H10V9H14V13M19.35,10.03C18.67,6.59 15.64,4 12,4C9.11,4 6.6,5.64 5.35,8.03C2.34,8.36 0,10.9 0,14A6,6 0 0,0 6,20H19A5,5 0 0,0 24,15C24,12.36 21.95,10.22 19.35,10.03Z" />
 </vector>
diff --git a/res/drawable/ic_sim.xml b/res/drawable/ic_sim.xml
index f635a3fe..150c740e 100644
--- a/res/drawable/ic_sim.xml
+++ b/res/drawable/ic_sim.xml
@@ -10,7 +10,7 @@
     android:viewportHeight="24">
 
     <path
-        android:fillColor="@color/black"
+        android:fillColor="?android:colorControlNormal"
         android:pathData="M19.99 4c0-1.1-.89-2-1.99-2h-8L4 8v12c0 1.1 .9 2 2 2h12.01c1.1 0 1.99-.9
 1.99-2l-.01-16zM9 19H7v-2h2v2zm8 0h-2v-2h2v2zm-8-4H7v-4h2v4zm4
 4h-2v-4h2v4zm0-6h-2v-2h2v2zm4 2h-2v-4h2v4z" />
diff --git a/res/drawable/ic_theme.xml b/res/drawable/ic_theme.xml
index 15ab416e..a070e02f 100644
--- a/res/drawable/ic_theme.xml
+++ b/res/drawable/ic_theme.xml
@@ -10,6 +10,6 @@
     android:viewportHeight="24">
 
     <path
-        android:fillColor="@color/black"
+        android:fillColor="?android:colorControlNormal"
         android:pathData="M4,2v9c0,1.65 1.35,3 3,3h2v6c0,1.1 0.9,2 2,2h2c1.1,0 2,-0.9 2,-2v-6h2c1.65,0 3,-1.35 3,-3V2C20,2 4,2 4,2zM11,20v-6h2v6H11zM18,11c0,0.55 -0.45,1 -1,1h-2H9H7c-0.55,0 -1,-0.45 -1,-1v-0.93h12V11zM18,8.07H6V4h2.81v2.15h2V4h2.38v2.15h2V4H18V8.07z" />
 </vector>
diff --git a/res/values-night/colors.xml b/res/values-night/colors.xml
index c5d724b9..49d31b0e 100644
--- a/res/values-night/colors.xml
+++ b/res/values-night/colors.xml
@@ -4,8 +4,5 @@
      SPDX-License-Identifier: Apache-2.0
 -->
 <resources>
-    <color name="page_background">@color/sud_glif_background_color_dark</color>
-    <color name="accent">?attr/colorAccent</color>
-
     <color name="divider">#40ffffff</color>
 </resources>
diff --git a/res/values-v31/colors.xml b/res/values-v31/colors.xml
deleted file mode 100644
index bb890841..00000000
--- a/res/values-v31/colors.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     SPDX-FileCopyrightText: 2021-2024 The LineageOS Project
-     SPDX-License-Identifier: Apache-2.0
--->
-<resources>
-    <!-- Partner customization -->
-    <color name="sud_dynamic_color_accent_glif_v3_light">@color/accent</color>
-</resources>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 57b71097..608835d4 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -1,30 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
      SPDX-FileCopyrightText: 2013 The CyanogenMod Project
-     SPDX-FileCopyrightText: 2017-2022 The LineageOS Project
+     SPDX-FileCopyrightText: 2017-2024 The LineageOS Project
      SPDX-License-Identifier: Apache-2.0
 -->
 <resources>
-    <color name="black">#21272b</color>
-    <color name="white">#ffffff</color>
-    <color name="page_background">#e4e7e9</color>
-
-    <color name="primary">@color/page_background</color>
-    <color name="primary_dark">#c2c5c7</color>
-    <color name="accent">@*android:color/accent_device_default_light</color>
     <color name="lineage_accent">#167C80</color>
-    <color name="primary_text">#8a000000</color>
-    <color name="secondary_text">#42000000</color>
+
     <color name="button_bar_text_enabled">#ff1e1e1e</color>
     <color name="button_bar_text_disabled">#321e1e1e</color>
-    <color name="divider">#40000000</color>
-    <color name="header_bg">@color/primary</color>
-    <color name="header_condensed_bg">@color/primary</color>
-    <color name="button_bar_background">@color/primary</color>
-    <color name="biometric_setup_text_color">#167C80</color>
 
-    <!-- Partner customization -->
-    <color name="sud_glif_background_color_light">@color/white</color>
-    <color name="sud_color_accent_glif_v3_light">@color/accent</color>
-    <color name="sud_color_accent_glif_v3_dark">@color/accent</color>
+    <color name="divider">#40000000</color>
 </resources>