diff --git a/app/src/main/res/drawable/ic_kill.xml b/app/src/main/res/drawable/ic_kill.xml
index 49a86149..4d2ca33f 100644
--- a/app/src/main/res/drawable/ic_kill.xml
+++ b/app/src/main/res/drawable/ic_kill.xml
@@ -2,7 +2,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="?attr/colorControlNormal"
+    android:tint="@color/text_color_primary"
     android:viewportWidth="960"
     android:viewportHeight="960">
     <path
diff --git a/app/src/main/res/drawable/ic_notifications.xml b/app/src/main/res/drawable/ic_notifications.xml
index cc66be38..c538ba88 100644
--- a/app/src/main/res/drawable/ic_notifications.xml
+++ b/app/src/main/res/drawable/ic_notifications.xml
@@ -2,7 +2,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="?attr/colorControlNormal"
+    android:tint="@color/text_color_primary"
     android:viewportWidth="960"
     android:viewportHeight="960">
     <path
diff --git a/app/src/main/res/drawable/ic_power_menu.xml b/app/src/main/res/drawable/ic_power_menu.xml
index 0f2e017c..9a86dfc8 100644
--- a/app/src/main/res/drawable/ic_power_menu.xml
+++ b/app/src/main/res/drawable/ic_power_menu.xml
@@ -2,7 +2,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="?attr/colorControlNormal"
+    android:tint="@color/text_color_primary"
     android:viewportWidth="960"
     android:viewportHeight="960">
     <path
diff --git a/app/src/main/res/drawable/ic_quick_settings.xml b/app/src/main/res/drawable/ic_quick_settings.xml
index 4f0ca476..a2181685 100644
--- a/app/src/main/res/drawable/ic_quick_settings.xml
+++ b/app/src/main/res/drawable/ic_quick_settings.xml
@@ -2,7 +2,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="?attr/colorControlNormal"
+    android:tint="@color/text_color_primary"
     android:viewportWidth="960"
     android:viewportHeight="960">
     <path
diff --git a/app/src/main/res/drawable/ic_screen_off.xml b/app/src/main/res/drawable/ic_screen_off.xml
index 14fc13e9..543873a2 100644
--- a/app/src/main/res/drawable/ic_screen_off.xml
+++ b/app/src/main/res/drawable/ic_screen_off.xml
@@ -2,7 +2,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="?attr/colorControlNormal"
+    android:tint="@color/text_color_primary"
     android:viewportWidth="960"
     android:viewportHeight="960">
     <path
diff --git a/app/src/main/res/drawable/ic_screenshot.xml b/app/src/main/res/drawable/ic_screenshot.xml
index 8f083404..0079afea 100644
--- a/app/src/main/res/drawable/ic_screenshot.xml
+++ b/app/src/main/res/drawable/ic_screenshot.xml
@@ -3,6 +3,7 @@
     android:name="vector"
     android:width="24.0dip"
     android:height="24.0dip"
+    android:tint="@color/text_color_primary"
     android:viewportWidth="24.0"
     android:viewportHeight="24.0">
     <path
diff --git a/app/src/main/res/drawable/ic_switch_app.xml b/app/src/main/res/drawable/ic_switch_app.xml
index d54cb72c..9baf898f 100644
--- a/app/src/main/res/drawable/ic_switch_app.xml
+++ b/app/src/main/res/drawable/ic_switch_app.xml
@@ -3,7 +3,7 @@
     android:width="24dp"
     android:height="24dp"
     android:autoMirrored="true"
-    android:tint="?attr/colorControlNormal"
+    android:tint="@color/text_color_primary"
     android:viewportWidth="960"
     android:viewportHeight="960">
     <path
diff --git a/app/src/main/res/layout/preference_list_item.xml b/app/src/main/res/layout/preference_list_item.xml
index bcce481b..98043980 100644
--- a/app/src/main/res/layout/preference_list_item.xml
+++ b/app/src/main/res/layout/preference_list_item.xml
@@ -25,9 +25,8 @@
 
         <ImageView
             android:id="@+id/image"
-            android:layout_width="52dp"
-            android:layout_height="52dp"
-            app:tint="@color/text_color_primary" />
+            android:layout_width="42dp"
+            android:layout_height="42dp" />
 
         <TextView
             android:id="@+id/text"