diff --git a/res/anim/enrollment_fingerprint_background_1_path_animation.xml b/res/anim/enrollment_fingerprint_background_1_path_animation.xml
index 76235c452d5d470fd1e286c2d12498c1e68e6221..988ccc01b89513fbf88736e3bcdd2b2f20c4118a 100644
--- a/res/anim/enrollment_fingerprint_background_1_path_animation.xml
+++ b/res/anim/enrollment_fingerprint_background_1_path_animation.xml
@@ -22,7 +22,7 @@
             android:duration="300"
             android:propertyName="fillColor"
             android:valueFrom="#000000"
-            android:valueTo="@color/color_default_accent"
+            android:valueTo="@color/color_icon_background_blue"
             android:valueType="intType"
             android:interpolator="@android:interpolator/linear_out_slow_in" />
         <objectAnimator
@@ -37,7 +37,7 @@
         <objectAnimator
             android:duration="300"
             android:propertyName="fillColor"
-            android:valueFrom="@color/color_default_accent"
+            android:valueFrom="@color/color_icon_background_blue"
             android:valueTo="#000000"
             android:valueType="intType"
             android:interpolator="@android:interpolator/fast_out_slow_in" />
diff --git a/res/anim/enrollment_fingerprint_background_2_path_animation.xml b/res/anim/enrollment_fingerprint_background_2_path_animation.xml
index 76235c452d5d470fd1e286c2d12498c1e68e6221..988ccc01b89513fbf88736e3bcdd2b2f20c4118a 100644
--- a/res/anim/enrollment_fingerprint_background_2_path_animation.xml
+++ b/res/anim/enrollment_fingerprint_background_2_path_animation.xml
@@ -22,7 +22,7 @@
             android:duration="300"
             android:propertyName="fillColor"
             android:valueFrom="#000000"
-            android:valueTo="@color/color_default_accent"
+            android:valueTo="@color/color_icon_background_blue"
             android:valueType="intType"
             android:interpolator="@android:interpolator/linear_out_slow_in" />
         <objectAnimator
@@ -37,7 +37,7 @@
         <objectAnimator
             android:duration="300"
             android:propertyName="fillColor"
-            android:valueFrom="@color/color_default_accent"
+            android:valueFrom="@color/color_icon_background_blue"
             android:valueTo="#000000"
             android:valueType="intType"
             android:interpolator="@android:interpolator/fast_out_slow_in" />
diff --git a/res/anim/enrollment_fingerprint_background_5_path_animation.xml b/res/anim/enrollment_fingerprint_background_5_path_animation.xml
index 76235c452d5d470fd1e286c2d12498c1e68e6221..988ccc01b89513fbf88736e3bcdd2b2f20c4118a 100644
--- a/res/anim/enrollment_fingerprint_background_5_path_animation.xml
+++ b/res/anim/enrollment_fingerprint_background_5_path_animation.xml
@@ -22,7 +22,7 @@
             android:duration="300"
             android:propertyName="fillColor"
             android:valueFrom="#000000"
-            android:valueTo="@color/color_default_accent"
+            android:valueTo="@color/color_icon_background_blue"
             android:valueType="intType"
             android:interpolator="@android:interpolator/linear_out_slow_in" />
         <objectAnimator
@@ -37,7 +37,7 @@
         <objectAnimator
             android:duration="300"
             android:propertyName="fillColor"
-            android:valueFrom="@color/color_default_accent"
+            android:valueFrom="@color/color_icon_background_blue"
             android:valueTo="#000000"
             android:valueType="intType"
             android:interpolator="@android:interpolator/fast_out_slow_in" />
diff --git a/res/anim/enrollment_fingerprint_background_6_path_animation.xml b/res/anim/enrollment_fingerprint_background_6_path_animation.xml
index 76235c452d5d470fd1e286c2d12498c1e68e6221..988ccc01b89513fbf88736e3bcdd2b2f20c4118a 100644
--- a/res/anim/enrollment_fingerprint_background_6_path_animation.xml
+++ b/res/anim/enrollment_fingerprint_background_6_path_animation.xml
@@ -22,7 +22,7 @@
             android:duration="300"
             android:propertyName="fillColor"
             android:valueFrom="#000000"
-            android:valueTo="@color/color_default_accent"
+            android:valueTo="@color/color_icon_background_blue"
             android:valueType="intType"
             android:interpolator="@android:interpolator/linear_out_slow_in" />
         <objectAnimator
@@ -37,7 +37,7 @@
         <objectAnimator
             android:duration="300"
             android:propertyName="fillColor"
-            android:valueFrom="@color/color_default_accent"
+            android:valueFrom="@color/color_icon_background_blue"
             android:valueTo="#000000"
             android:valueType="intType"
             android:interpolator="@android:interpolator/fast_out_slow_in" />
diff --git a/res/anim/enrollment_fingerprint_background_7_path_animation.xml b/res/anim/enrollment_fingerprint_background_7_path_animation.xml
index 76235c452d5d470fd1e286c2d12498c1e68e6221..988ccc01b89513fbf88736e3bcdd2b2f20c4118a 100644
--- a/res/anim/enrollment_fingerprint_background_7_path_animation.xml
+++ b/res/anim/enrollment_fingerprint_background_7_path_animation.xml
@@ -22,7 +22,7 @@
             android:duration="300"
             android:propertyName="fillColor"
             android:valueFrom="#000000"
-            android:valueTo="@color/color_default_accent"
+            android:valueTo="@color/color_icon_background_blue"
             android:valueType="intType"
             android:interpolator="@android:interpolator/linear_out_slow_in" />
         <objectAnimator
@@ -37,7 +37,7 @@
         <objectAnimator
             android:duration="300"
             android:propertyName="fillColor"
-            android:valueFrom="@color/color_default_accent"
+            android:valueFrom="@color/color_icon_background_blue"
             android:valueTo="#000000"
             android:valueType="intType"
             android:interpolator="@android:interpolator/fast_out_slow_in" />
diff --git a/res/color/bottom_navigation_colors.xml b/res/color/bottom_navigation_colors.xml
index 659ef506a61b94ae2bd1bc9cad0e66c926bfa755..b425c601d1a8b4089f3459962296e7c5eac89b69 100644
--- a/res/color/bottom_navigation_colors.xml
+++ b/res/color/bottom_navigation_colors.xml
@@ -18,8 +18,8 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item
         android:state_checked="true"
-        android:color="?android:attr/colorAccent" />
+        android:color="@color/color_default_accent" />
     <item
         android:state_checked="false"
-        android:color="?android:attr/textColorPrimary" />
+        android:color="@color/color_default_primary_text" />
 </selector>
\ No newline at end of file
diff --git a/res/color/lock_pattern_view_success_color.xml b/res/color/lock_pattern_view_success_color.xml
index 075e91958a472d635716934e622c0abd44d8348f..6c5a38d407d2c900dadb294603cd778d7cf06dc8 100644
--- a/res/color/lock_pattern_view_success_color.xml
+++ b/res/color/lock_pattern_view_success_color.xml
@@ -15,5 +15,5 @@
 -->
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="?android:attr/colorAccent" />
+    <item android:color="@color/color_default_accent" />
 </selector>
diff --git a/res/color/preference_highligh_color.xml b/res/color/preference_highligh_color.xml
index f8d54d470e781d9efa35b466c7705b19f7244869..0ce0e63b8fdb45c11f5ac72ddcc460e45df0f897 100644
--- a/res/color/preference_highligh_color.xml
+++ b/res/color/preference_highligh_color.xml
@@ -16,5 +16,5 @@
   -->
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:alpha="0.26" android:color="?android:attr/colorAccent" />
+    <item android:alpha="0.26" android:color="@color/color_default_accent" />
 </selector>
\ No newline at end of file
diff --git a/res/color/sliding_tab_title_text_color.xml b/res/color/sliding_tab_title_text_color.xml
index d6bfbcc039d2084c1b7587b90c20060d9d274787..02798e9f4f93410b32e08f32af7fd3db8ea6949f 100644
--- a/res/color/sliding_tab_title_text_color.xml
+++ b/res/color/sliding_tab_title_text_color.xml
@@ -17,6 +17,6 @@
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_selected="false"
-          android:color="?android:attr/textColorSecondary"/>
-    <item android:color="?android:attr/textColorPrimary"/>
+          android:color="@color/color_default_secondary_text"/>
+    <item android:color="@color/color_default_primary_text"/>
 </selector>
diff --git a/res/color/storage_wizard_button.xml b/res/color/storage_wizard_button.xml
index 38c7d523ea1756c1ea4cb602a48a38a2487684b1..e2049e51cdfd0bbea8e046b43d3b541a67763266 100644
--- a/res/color/storage_wizard_button.xml
+++ b/res/color/storage_wizard_button.xml
@@ -17,6 +17,6 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_enabled="false"
           android:alpha="?android:attr/disabledAlpha"
-          android:color="?android:attr/colorAccent" />
-    <item android:color="?android:attr/colorAccent" />
+          android:color="@color/color_default_accent" />
+    <item android:color="@color/color_default_accent" />
 </selector>
diff --git a/res/color/unlock_pattern_view_success_color.xml b/res/color/unlock_pattern_view_success_color.xml
index 075e91958a472d635716934e622c0abd44d8348f..6c5a38d407d2c900dadb294603cd778d7cf06dc8 100644
--- a/res/color/unlock_pattern_view_success_color.xml
+++ b/res/color/unlock_pattern_view_success_color.xml
@@ -15,5 +15,5 @@
 -->
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="?android:attr/colorAccent" />
+    <item android:color="@color/color_default_accent" />
 </selector>
diff --git a/res/drawable/dark_theme.xml b/res/drawable/dark_theme.xml
index 803062c5ec9c47bd0e40897b6e043bc2a7f30bc6..6734bc4e67b650f4f27d55593efdf29fa43b439e 100644
--- a/res/drawable/dark_theme.xml
+++ b/res/drawable/dark_theme.xml
@@ -20,6 +20,6 @@
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M12,22C17.52,22 22,17.52 22,12 22,6.48 17.52,2 12,2 6.48,2 2,6.48 2,12 2,17.52 6.48,22 12,22ZM12,3.915c3.889,0 8,4.005 8,8.085 0,4.08 -3.927,7.992 -7.928,7.992z"/>
 </vector>
\ No newline at end of file
diff --git a/res/drawable/drag_handle.xml b/res/drawable/drag_handle.xml
index 0704f710e645c8abc72b4c3f0ae462505bf664d4..aafd2008029eac9f335cea5ddc36ff3070c6d5ef 100644
--- a/res/drawable/drag_handle.xml
+++ b/res/drawable/drag_handle.xml
@@ -20,7 +20,7 @@
         android:viewportWidth="24"
         android:viewportHeight="24">
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/color_icon_background_blue"
         android:pathData="M20,9H4v2h16V9zM4,15h16v-2H4V15z"/>
 </vector>
 
diff --git a/res/drawable/face_enroll_introduction.xml b/res/drawable/face_enroll_introduction.xml
index 818536a79ea36b4e1443120038fe2b39dd90d60a..a571e36d396c92d12d86179747904b77a976e7a4 100644
--- a/res/drawable/face_enroll_introduction.xml
+++ b/res/drawable/face_enroll_introduction.xml
@@ -26,19 +26,19 @@
         android:fillType="evenOdd"
         android:pathData="M150,0C67.16,0,0,67.16,0,150s67.16,150,150,150 s150-67.16,150-150S232.84,0,150,0 M150,4c39,0,75.66,15.19,103.24,42.76C280.81,74.34,296,111,296,150s-15.19,75.66-42.76,103.24 C225.66,280.81,189,296,150,296s-75.66-15.19-103.24-42.76C19.19,225.66,4,189,4,150S19.19,74.34,46.76,46.76 C74.34,19.19,111,4,150,4" />
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/color_icon_background_blue"
         android:fillType="evenOdd"
         android:pathData="M220,120c0,5.52-4.48,10-10,10s-10-4.48-10-10 s4.48-10,10-10S220,114.48,220,120" />
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/color_icon_background_blue"
         android:fillType="evenOdd"
         android:pathData="M90,130c-5.52,0-10-4.48-10-10s4.48-10,10-10 s10,4.48,10,10S95.52,130,90,130" />
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/color_icon_background_blue"
         android:fillType="evenOdd"
         android:pathData="M164.2,215.88c-3.83,3.25-8.79,5.22-14.2,5.22 c-12.13,0-22-9.87-22-22c0-0.03,0-0.06,0-0.09l-8-0.03c0,0.04,0,0.08,0,0.13c0,6.24,1.9,12.03,5.16,16.83 c5.4,7.95,14.51,13.17,24.84,13.17c1.04,0,2.06-0.05,3.08-0.15c6.18-0.63,11.81-3.14,16.3-6.95L164.2,215.88z" />
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/color_icon_background_blue"
         android:fillType="evenOdd"
         android:pathData="M 153 140 L 153 166 L 137 166 L 137 174 L 161 174 L 161 140 Z" />
 </vector>
\ No newline at end of file
diff --git a/res/drawable/fallback_home_unprovisioned_background.xml b/res/drawable/fallback_home_unprovisioned_background.xml
index 0ade2aed00072bb72da9c41835f80d64969b4465..5e1733a2d40744d5a1474321409729a2b6919f4c 100644
--- a/res/drawable/fallback_home_unprovisioned_background.xml
+++ b/res/drawable/fallback_home_unprovisioned_background.xml
@@ -16,4 +16,4 @@
   -->
 
 <color xmlns:android="http://schemas.android.com/apk/res/android"
-    android:color="@color/color_default_background" />
\ No newline at end of file
+    android:color="@color/color_default_foreground" />
\ No newline at end of file
diff --git a/res/drawable/fingerprint_enroll_finish.xml b/res/drawable/fingerprint_enroll_finish.xml
index 479caee69e5a754e33d9d02f79dcde2d456c17da..a530edc405bfecd809ef773ef4e51da4302d6b24 100644
--- a/res/drawable/fingerprint_enroll_finish.xml
+++ b/res/drawable/fingerprint_enroll_finish.xml
@@ -21,80 +21,80 @@
     android:viewportHeight="228.0"
     android:viewportWidth="228.0">
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/color_icon_background_blue"
         android:pathData="M114,4c29.38,0 57.01,11.44 77.78,32.22C212.56,56.99 224,84.62 224,114s-11.44,57.01 -32.22,77.78S143.38,224 114,224s-57.01,-11.44 -77.78,-32.22C15.44,171.01 4,143.38 4,114s11.44,-57.01 32.22,-77.78C56.99,15.44 84.62,4 114,4M114,0C51.04,0 0,51.04 0,114s51.04,114 114,114s114,-51.04 114,-114S176.96,0 114,0L114,0z" />
     <path
         android:fillAlpha="0.25"
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M152.18,156.55c0.11,1.46 -0.89,2.8 -2.42,3.07c-3.32,0.64 -6.24,0.7 -7.06,0.7c-6.94,0 -13.07,-1.75 -18.08,-5.19c-8.48,-5.74 -13.61,-14.99 -13.86,-24.85c-0.01,0.08 -0.02,0.16 -0.02,0.25c0,10.15 5.19,19.72 13.88,25.61c5.02,3.44 11.14,5.19 18.08,5.19c0.82,0 3.73,-0.06 7.06,-0.7c1.97,-0.4 2.67,-1.8 2.44,-3.99C152.19,156.6 152.18,156.58 152.18,156.55z"
         android:strokeAlpha="0.25" />
     <path
         android:fillAlpha="0.25"
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M81.57,70.73c9.98,-5.48 20.94,-8.23 32.49,-8.23c11.61,0 21.29,2.45 32.49,8.23c0.41,0.23 0.88,0.35 1.34,0.35c1.05,0 2.04,-0.58 2.57,-1.63c0.32,-0.59 0.46,-2.04 0.35,-2.66c-0.02,-0.09 -0.04,-0.17 -0.07,-0.24c0.12,0.63 0.05,1.29 -0.28,1.9c-0.53,1.05 -1.52,1.63 -2.57,1.63c-0.47,0 -0.93,-0.12 -1.34,-0.35c-11.2,-5.77 -20.88,-8.22 -32.49,-8.22c-11.55,0 -22.52,2.74 -32.49,8.22c-1.4,0.76 -3.15,0.23 -3.97,-1.17c-0.36,-0.66 -0.42,-1.41 -0.25,-2.1c-0.01,0.02 -0.01,0.03 -0.02,0.04c-0.25,0.75 -0.13,2.32 0.27,3.05C78.42,70.96 80.17,71.48 81.57,70.73z"
         android:strokeAlpha="0.25" />
     <path
         android:fillAlpha="0.25"
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M166.41,97.07c0,-0.02 -0.01,-0.03 -0.01,-0.05c0.22,1.1 -0.19,2.29 -1.18,2.98c-1.34,0.93 -3.15,0.64 -4.08,-0.7c-5.25,-7.35 -11.9,-13.12 -19.77,-17.15c-16.74,-8.57 -38.15,-8.57 -54.83,0.06c-7.93,4.08 -14.58,9.92 -19.83,17.27c-0.47,0.82 -1.34,1.23 -2.27,1.23c-0.58,0 -1.17,-0.18 -1.69,-0.53c-0.9,-0.63 -1.32,-1.65 -1.22,-2.66c-0.01,0.03 -0.02,0.05 -0.02,0.1c-0.18,1.57 0.27,2.89 1.24,3.56c0.52,0.35 1.11,0.52 1.69,0.52c0.93,0 1.81,-0.41 2.27,-1.22c5.25,-7.35 11.9,-13.18 19.83,-17.27c16.68,-8.63 38.09,-8.63 54.83,-0.06c7.88,4.02 14.52,9.8 19.77,17.15c0.93,1.34 2.74,1.63 4.08,0.7C166.18,100.33 166.75,98.98 166.41,97.07z"
         android:strokeAlpha="0.25" />
     <path
         android:fillAlpha="0.25"
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M144.1,132.43c-1.63,0 -2.92,-1.28 -2.92,-2.92c0,-14.12 -12.19,-25.61 -27.18,-25.61s-27.18,11.49 -27.18,25.61c0,0.17 0.01,0.33 0.01,0.49c0.29,-13.88 12.36,-25.1 27.17,-25.1c14.99,0 27.18,11.49 27.18,25.61c0,1.63 1.28,2.92 2.92,2.92c1.63,0 2.92,-1.28 2.92,-2.92c0,-0.26 -0.01,-0.52 -0.02,-0.79C146.89,131.26 145.66,132.43 144.1,132.43z"
         android:strokeAlpha="0.25" />
     <path
         android:fillAlpha="0.25"
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M103.82,167.68c0.15,0.9 -0.11,1.85 -0.79,2.56c-0.64,0.58 -1.4,0.88 -2.16,0.88s-1.52,-0.29 -2.04,-0.88c-5.08,-5.08 -7.82,-8.34 -11.72,-15.4c-3.95,-7.05 -6.04,-15.62 -6.11,-24.83c0,0.17 -0.01,0.34 -0.01,0.51c0,9.39 2.1,18.14 6.12,25.32c3.91,7.06 6.65,10.32 11.72,15.4c0.53,0.58 1.28,0.88 2.04,0.88s1.52,-0.29 2.16,-0.88c0.69,-0.73 1.21,-1.88 0.79,-3.53C103.82,167.69 103.82,167.69 103.82,167.68z"
         android:strokeAlpha="0.25" />
     <path
         android:fillAlpha="0.25"
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M133.72,170.12c-0.29,1.34 -1.52,2.22 -2.74,2.22c-0.23,0 -0.53,-0.06 -0.76,-0.12c-9.28,-2.57 -15.34,-6.01 -21.7,-12.25c-8,-7.95 -12.47,-18.47 -12.64,-29.76c0,0.11 -0.02,0.21 -0.02,0.31c0,11.55 4.49,22.34 12.66,30.45c6.36,6.24 12.43,9.68 21.7,12.25c0.23,0.06 0.53,0.12 0.76,0.12c1.22,0 2.45,-0.88 2.74,-2.22c0.11,-0.42 0.24,-1.49 0.07,-2.13C133.84,169.35 133.82,169.74 133.72,170.12z"
         android:strokeAlpha="0.25" />
     <path
         android:fillAlpha="0.25"
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M143.93,146.61c-9.92,0 -17.97,-7.7 -17.97,-17.15c0,-6.24 -5.43,-11.32 -12.13,-11.32c-6.71,0 -12.13,5.08 -12.13,11.32c0,0.23 0.01,0.46 0.02,0.69c0.18,-6.1 5.52,-11.01 12.12,-11.01c6.71,0 12.13,5.08 12.13,11.32c0,9.45 8.05,17.15 17.97,17.15s17.97,-7.7 17.97,-17.15c0,-0.22 -0.01,-0.44 -0.02,-0.67C161.68,139.09 153.72,146.61 143.93,146.61z"
         android:strokeAlpha="0.25" />
     <path
         android:fillAlpha="0.25"
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M65.99,130.52c0,7.88 1.4,14.46 4.26,22.1c-2.8,-7.47 -4.19,-14.89 -4.25,-22.58C66,130.2 65.99,130.36 65.99,130.52z"
         android:strokeAlpha="0.25" />
     <path
         android:fillAlpha="0.25"
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M113.77,89.67c-16.57,0 -31.73,9.22 -38.56,23.51c-2.28,4.72 -3.44,10.27 -3.44,16.33c0,0.26 0,0.52 0,0.8c0.03,-5.99 1.19,-11.46 3.44,-16.13c6.82,-14.29 21.99,-23.51 38.56,-23.51c23.1,0 41.89,17.49 42.27,39.17c0,-0.11 0.02,-0.22 0.02,-0.33C156.06,107.52 137.1,89.67 113.77,89.67z"
         android:strokeAlpha="0.25" />
     <path
         android:fillAlpha="0.25"
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M73.98,154.31c-1.52,0.58 -3.21,-0.23 -3.73,-1.69c0.6,1.81 2.09,3.08 3.73,2.69c1.52,-0.53 2.85,-1.63 1.81,-4.34c-0.02,-0.04 -0.03,-0.09 -0.05,-0.13C76.15,152.28 75.41,153.81 73.98,154.31z"
         android:strokeAlpha="0.25" />
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M147.89,70.07c-0.47,0 -0.93,-0.12 -1.34,-0.35c-11.2,-5.78 -20.88,-8.23 -32.49,-8.23c-11.55,0 -22.52,2.74 -32.49,8.23c-1.4,0.76 -3.15,0.23 -3.97,-1.17c-0.76,-1.4 -0.23,-3.21 1.17,-3.97c10.85,-5.89 22.75,-8.93 35.29,-8.93c12.43,0 23.27,2.74 35.18,8.87c1.46,0.76 1.98,2.51 1.22,3.91C149.93,69.49 148.94,70.07 147.89,70.07z" />
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M64.42,100.7c-0.58,0 -1.17,-0.17 -1.69,-0.53c-1.34,-0.93 -1.63,-2.74 -0.7,-4.08c5.78,-8.17 13.12,-14.58 21.88,-19.08c18.32,-9.45 41.77,-9.51 60.14,-0.06c8.75,4.49 16.1,10.85 21.88,18.96c0.93,1.28 0.64,3.15 -0.7,4.08s-3.15,0.64 -4.08,-0.7c-5.25,-7.35 -11.9,-13.12 -19.77,-17.15c-16.74,-8.57 -38.15,-8.57 -54.83,0.06c-7.93,4.08 -14.58,9.92 -19.83,17.27C66.22,100.29 65.35,100.7 64.42,100.7z" />
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M100.87,171.11c-0.76,0 -1.52,-0.29 -2.04,-0.88c-5.08,-5.07 -7.82,-8.34 -11.72,-15.4c-4.03,-7.17 -6.12,-15.92 -6.12,-25.32c0,-17.32 14.82,-31.44 33.02,-31.44s33.02,14.12 33.02,31.44c0,1.63 -1.28,2.92 -2.92,2.92c-1.63,0 -2.92,-1.28 -2.92,-2.92c0,-14.12 -12.19,-25.61 -27.18,-25.61s-27.18,11.49 -27.18,25.61c0,8.4 1.87,16.16 5.43,22.46c3.73,6.71 6.3,9.57 10.79,14.12c1.11,1.17 1.11,2.98 0,4.14C102.39,170.82 101.63,171.11 100.87,171.11z" />
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M142.7,160.32c-6.94,0 -13.07,-1.75 -18.08,-5.19c-8.69,-5.89 -13.88,-15.46 -13.88,-25.61c0,-1.63 1.28,-2.92 2.92,-2.92s2.92,1.28 2.92,2.92c0,8.22 4.2,15.98 11.32,20.77c4.14,2.8 8.98,4.14 14.82,4.14c1.4,0 3.73,-0.18 6.07,-0.58c1.57,-0.29 3.09,0.76 3.38,2.39c0.29,1.58 -0.76,3.09 -2.39,3.38C146.43,160.26 143.52,160.32 142.7,160.32z" />
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M130.97,172.33c-0.23,0 -0.53,-0.06 -0.76,-0.12c-9.27,-2.57 -15.34,-6.01 -21.7,-12.25c-8.17,-8.11 -12.66,-18.9 -12.66,-30.45c0,-9.45 8.05,-17.15 17.97,-17.15s17.97,7.7 17.97,17.15c0,6.24 5.43,11.32 12.13,11.32c6.71,0 12.13,-5.07 12.13,-11.32c0,-21.99 -18.96,-39.84 -42.29,-39.84c-16.57,0 -31.73,9.22 -38.56,23.51c-2.28,4.73 -3.44,10.27 -3.44,16.33c0,4.55 0.41,11.73 3.91,21.06c0.58,1.52 -0.18,3.21 -1.69,3.73c-1.52,0.58 -3.21,-0.23 -3.73,-1.69c-2.86,-7.64 -4.26,-15.23 -4.26,-23.1c0,-7 1.34,-13.36 3.97,-18.9c7.76,-16.28 24.97,-26.83 43.81,-26.83c26.54,0 48.12,20.47 48.12,45.68c0,9.45 -8.05,17.15 -17.97,17.15s-17.97,-7.7 -17.97,-17.15c0,-6.24 -5.43,-11.32 -12.13,-11.32s-12.13,5.07 -12.13,11.32c0,9.98 3.85,19.31 10.91,26.31c5.54,5.48 10.85,8.52 19.07,10.79c1.58,0.41 2.45,2.04 2.04,3.56C133.42,171.46 132.2,172.33 130.97,172.33z" />
     <path
-        android:fillColor="@color/color_default_view_on_accent"
+        android:fillColor="@android:color/white"
         android:pathData="M192.86,217.88c-13.8,0 -25.02,-11.22 -25.02,-25.02s11.22,-25.02 25.02,-25.02s25.02,11.22 25.02,25.02S206.66,217.88 192.86,217.88z" />
     <path
-        android:fillColor="@color/color_default_green1"
+        android:fillColor="#32A753"
         android:pathData="M192.86,169.83c12.7,0 23.04,10.33 23.04,23.04s-10.33,23.04 -23.04,23.04s-23.04,-10.33 -23.04,-23.04S180.16,169.83 192.86,169.83M192.86,165.86c-14.91,0 -27,12.09 -27,27s12.09,27 27,27c14.91,0 27,-12.09 27,-27S207.77,165.86 192.86,165.86L192.86,165.86z" />
     <path
-        android:fillColor="@color/color_default_green1"
+        android:fillColor="#32A753"
         android:pathData="M188.45,205.22l-12.67,-12.67l2.83,-2.83l9.84,9.84l18.15,-18.15l2.83,2.83z" />
 </vector>
diff --git a/res/drawable/fingerprint_enroll_introduction.xml b/res/drawable/fingerprint_enroll_introduction.xml
index 089b61f8d8433be00ecf6d2bb18fa8f2feb4eb4e..e9a62e9ee35587c78655b555235b2613f026f02f 100644
--- a/res/drawable/fingerprint_enroll_introduction.xml
+++ b/res/drawable/fingerprint_enroll_introduction.xml
@@ -21,33 +21,33 @@
     android:viewportHeight="210.0"
     android:viewportWidth="210.0">
     <path
-        android:fillColor="@color/color_default_green1"
+        android:fillColor="#34A853"
         android:pathData="M73.79,58.17h-7V38.96c0,-15.39 9.16,-29.21 23.34,-35.21l2.73,6.45c-11.58,4.9 -19.06,16.19 -19.06,28.76V58.17z" />
     <path
-        android:fillColor="@color/color_default_green1"
+        android:fillColor="#34A853"
         android:pathData="M131.29,22.13C125.51,13.12 115.68,7.75 105,7.75c-4.21,0 -8.3,0.82 -12.15,2.45l-2.73,-6.45c4.71,-1.99 9.72,-3 14.87,-3c13.08,0 25.11,6.58 32.18,17.6L131.29,22.13z" />
     <path
-        android:fillColor="@color/color_default_green1"
+        android:fillColor="#34A853"
         android:pathData="M143.21,62.11h-7V38.96c0,-5.99 -1.7,-11.81 -4.92,-16.83l5.89,-3.78c3.94,6.15 6.03,13.27 6.03,20.6V62.11z" />
     <path
-        android:fillColor="@color/color_default_green1"
+        android:fillColor="#34A853"
         android:pathData="M136.21,62.11h7v19.4h-7z" />
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/color_icon_background_blue"
         android:pathData="M125.03,118.78c-0.28,0 -0.55,-0.07 -0.79,-0.2c-6.61,-3.37 -12.33,-4.79 -19.19,-4.79c-6.82,0 -13.3,1.6 -19.19,4.79c-0.83,0.44 -1.86,0.14 -2.34,-0.68c-0.45,-0.82 -0.14,-1.87 0.69,-2.31c6.41,-3.43 13.44,-5.2 20.84,-5.2c7.34,0 13.75,1.6 20.77,5.17c0.86,0.44 1.17,1.46 0.72,2.28C126.24,118.44 125.65,118.78 125.03,118.78z" />
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/color_icon_background_blue"
         android:pathData="M75.73,136.63c-0.34,0 -0.69,-0.1 -1,-0.31c-0.79,-0.54 -0.96,-1.6 -0.41,-2.38c3.41,-4.76 7.75,-8.5 12.92,-11.12c10.82,-5.51 24.67,-5.54 35.52,-0.03c5.17,2.62 9.51,6.32 12.92,11.05c0.55,0.75 0.38,1.84 -0.41,2.38c-0.79,0.54 -1.86,0.37 -2.41,-0.41c-3.1,-4.28 -7.03,-7.65 -11.68,-10c-9.89,-5 -22.53,-5 -32.38,0.03c-4.69,2.38 -8.61,5.78 -11.71,10.06C76.8,136.39 76.28,136.63 75.73,136.63z" />
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/color_icon_background_blue"
         android:pathData="M97.27,177.67c-0.45,0 -0.9,-0.17 -1.21,-0.51c-3,-2.96 -4.62,-4.86 -6.92,-8.98c-2.38,-4.18 -3.62,-9.28 -3.62,-14.76c0,-10.1 8.75,-18.33 19.5,-18.33s19.5,8.23 19.5,18.33c0,0.95 -0.76,1.7 -1.72,1.7s-1.72,-0.75 -1.72,-1.7c0,-8.23 -7.2,-14.93 -16.05,-14.93s-16.05,6.7 -16.05,14.93c0,4.9 1.1,9.42 3.2,13.09c2.2,3.91 3.72,5.58 6.37,8.23c0.65,0.68 0.65,1.73 0,2.41C98.16,177.5 97.71,177.67 97.27,177.67z" />
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/color_icon_background_blue"
         android:pathData="M121.97,171.38c-4.1,0 -7.72,-1.02 -10.68,-3.03c-5.13,-3.43 -8.2,-9.01 -8.2,-14.93c0,-0.95 0.76,-1.7 1.72,-1.7s1.72,0.75 1.72,1.7c0,4.79 2.48,9.32 6.68,12.1c2.45,1.63 5.31,2.41 8.75,2.41c0.83,0 2.2,-0.1 3.58,-0.34c0.93,-0.17 1.83,0.44 2,1.39c0.17,0.92 -0.45,1.8 -1.41,1.97C124.17,171.34 122.45,171.38 121.97,171.38z" />
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/color_icon_background_blue"
         android:pathData="M115.04,178.38c-0.14,0 -0.31,-0.03 -0.45,-0.07c-5.48,-1.5 -9.06,-3.5 -12.82,-7.14c-4.82,-4.73 -7.48,-11.02 -7.48,-17.75c0,-5.51 4.75,-10 10.61,-10c5.86,0 10.61,4.49 10.61,10c0,3.64 3.2,6.6 7.17,6.6s7.17,-2.96 7.17,-6.6c0,-12.82 -11.2,-23.22 -24.98,-23.22c-9.78,0 -18.74,5.37 -22.77,13.7c-1.34,2.75 -2.03,5.98 -2.03,9.52c0,2.65 0.24,6.83 2.31,12.27c0.34,0.88 -0.1,1.87 -1,2.18c-0.9,0.34 -1.89,-0.14 -2.2,-0.99c-1.69,-4.45 -2.51,-8.87 -2.51,-13.46c0,-4.08 0.79,-7.79 2.34,-11.02c4.58,-9.49 14.75,-15.64 25.87,-15.64c15.68,0 28.42,11.93 28.42,26.62c0,5.51 -4.75,10 -10.61,10c-5.86,0 -10.61,-4.49 -10.61,-10c0,-3.64 -3.2,-6.6 -7.17,-6.6s-7.17,2.96 -7.17,6.6c0,5.81 2.27,11.25 6.44,15.33c3.27,3.2 6.41,4.96 11.27,6.29c0.93,0.24 1.45,1.19 1.21,2.07C116.49,177.87 115.77,178.38 115.04,178.38z" />
     <path
-        android:fillColor="@color/color_default_primary_text"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M170.77,209.25H39.23c-7.72,0 -14,-6.28 -14,-14V93.51c0,-7.72 6.28,-14 14,-14h131.54c7.72,0 14,6.28 14,14v101.74C184.77,202.97 178.49,209.25 170.77,209.25zM39.23,83.51c-5.51,0 -10,4.49 -10,10v101.74c0,5.51 4.49,10 10,10h131.54c5.51,0 10,-4.49 10,-10V93.51c0,-5.51 -4.49,-10 -10,-10H39.23z" />
 </vector>
diff --git a/res/drawable/ic_account_circle_24dp.xml b/res/drawable/ic_account_circle_24dp.xml
index f41f57929c35e168f6f692b8b479f8644ad794f2..def8d4b80a0e6653007ddd3c7106256395c46a38 100644
--- a/res/drawable/ic_account_circle_24dp.xml
+++ b/res/drawable/ic_account_circle_24dp.xml
@@ -17,12 +17,11 @@
     android:width="32dp"
     android:height="32dp"
     android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?android:attr/colorAccent">
+    android:viewportHeight="24">
   <path
-      android:fillColor="#FF000000"
+      android:fillColor="@color/color_icon_background_blue"
       android:pathData="M12,2C6.48,2 2,6.48 2,12c0,5.52 4.48,10 10,10c5.52,0 10,-4.48 10,-10C22,6.48 17.52,2 12,2zM7.07,18.28c0.43,-0.9 3.05,-1.78 4.93,-1.78s4.51,0.88 4.93,1.78C15.57,19.36 13.86,20 12,20S8.43,19.36 7.07,18.28zM18.36,16.83c-1.43,-1.74 -4.9,-2.33 -6.36,-2.33s-4.93,0.59 -6.36,2.33C4.62,15.49 4,13.82 4,12c0,-4.41 3.59,-8 8,-8c4.41,0 8,3.59 8,8C20,13.82 19.38,15.49 18.36,16.83z"/>
   <path
-      android:fillColor="#FF000000"
+      android:fillColor="@color/color_icon_background_blue"
       android:pathData="M12,6c-1.94,0 -3.5,1.56 -3.5,3.5S10.06,13 12,13c1.94,0 3.5,-1.56 3.5,-3.5S13.94,6 12,6zM12,11c-0.83,0 -1.5,-0.67 -1.5,-1.5C10.5,8.67 11.17,8 12,8c0.83,0 1.5,0.67 1.5,1.5C13.5,10.33 12.83,11 12,11z"/>
 </vector>
diff --git a/res/drawable/ic_add_24dp.xml b/res/drawable/ic_add_24dp.xml
index 1387bf40bcf869c33352b423465b38578d5e4278..380c60597ac1dea614512b6189a38edda4318910 100644
--- a/res/drawable/ic_add_24dp.xml
+++ b/res/drawable/ic_add_24dp.xml
@@ -19,7 +19,7 @@
         android:viewportWidth="24"
         android:viewportHeight="24">
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M20,13h-7v7h-2v-7H4v-2h7V4h2v7h7V13z"/>
 </vector>
 
diff --git a/res/drawable/ic_android.xml b/res/drawable/ic_android.xml
index 71f3fed80b0a38349a6ddb291b11b62704e9f3ce..5c919c96deb17900b29bde14a512464c01a56e7a 100644
--- a/res/drawable/ic_android.xml
+++ b/res/drawable/ic_android.xml
@@ -20,5 +20,5 @@
         android:viewportHeight="24.0">
     <path
         android:pathData="M6,18c0,0.55 0.45,1 1,1h1v3.5c0,0.83 0.67,1.5 1.5,1.5s1.5,-0.67 1.5,-1.5L11,19h2v3.5c0,0.83 0.67,1.5 1.5,1.5s1.5,-0.67 1.5,-1.5L16,19h1c0.55,0 1,-0.45 1,-1L18,8L6,8v10zM3.5,8C2.67,8 2,8.67 2,9.5v7c0,0.83 0.67,1.5 1.5,1.5S5,17.33 5,16.5v-7C5,8.67 4.33,8 3.5,8zM20.5,8c-0.83,0 -1.5,0.67 -1.5,1.5v7c0,0.83 0.67,1.5 1.5,1.5s1.5,-0.67 1.5,-1.5v-7c0,-0.83 -0.67,-1.5 -1.5,-1.5zM15.53,2.16l1.3,-1.3c0.2,-0.2 0.2,-0.51 0,-0.71 -0.2,-0.2 -0.51,-0.2 -0.71,0l-1.48,1.48C13.85,1.23 12.95,1 12,1c-0.96,0 -1.86,0.23 -2.66,0.63L7.85,0.15c-0.2,-0.2 -0.51,-0.2 -0.71,0 -0.2,0.2 -0.2,0.51 0,0.71l1.31,1.31C6.97,3.26 6,5.01 6,7h12c0,-1.99 -0.97,-3.75 -2.47,-4.84zM10,5L9,5L9,4h1v1zM15,5h-1L14,4h1v1z"
-        android:fillColor="@color/color_default_accent"/>
+        android:fillColor="@color/default_icon_color"/>
 </vector>
diff --git a/res/drawable/ic_apps_filter_settings_24dp.xml b/res/drawable/ic_apps_filter_settings_24dp.xml
index 01a53a7e7e10b604b206725f7743a5173027d244..bfa2125d786305dd292b3cb8473eedc63c5bbdeb 100644
--- a/res/drawable/ic_apps_filter_settings_24dp.xml
+++ b/res/drawable/ic_apps_filter_settings_24dp.xml
@@ -20,9 +20,9 @@
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="?android:attr/colorAccent"
+        android:fillColor="@color/color_icon_background_blue"
         android:pathData="M13.85,22.25h-3.7c-0.74,0 -1.36,-0.54 -1.45,-1.27l-0.27,-1.89c-0.27,-0.14 -0.53,-0.29 -0.79,-0.46l-1.8,0.72c-0.7,0.26 -1.47,-0.03 -1.81,-0.65L2.2,15.53c-0.35,-0.66 -0.2,-1.44 0.36,-1.88l1.53,-1.19c-0.01,-0.15 -0.02,-0.3 -0.02,-0.46c0,-0.15 0.01,-0.31 0.02,-0.46l-1.52,-1.19C1.98,9.9 1.83,9.09 2.2,8.47l1.85,-3.19c0.34,-0.62 1.11,-0.9 1.79,-0.63l1.81,0.73c0.26,-0.17 0.52,-0.32 0.78,-0.46l0.27,-1.91c0.09,-0.7 0.71,-1.25 1.44,-1.25h3.7c0.74,0 1.36,0.54 1.45,1.27l0.27,1.89c0.27,0.14 0.53,0.29 0.79,0.46l1.8,-0.72c0.71,-0.26 1.48,0.03 1.82,0.65l1.84,3.18c0.36,0.66 0.2,1.44 -0.36,1.88l-1.52,1.19c0.01,0.15 0.02,0.3 0.02,0.46s-0.01,0.31 -0.02,0.46l1.52,1.19c0.56,0.45 0.72,1.23 0.37,1.86l-1.86,3.22c-0.34,0.62 -1.11,0.9 -1.8,0.63l-1.8,-0.72c-0.26,0.17 -0.52,0.32 -0.78,0.46l-0.27,1.91C15.21,21.71 14.59,22.25 13.85,22.25zM13.32,20.72c0,0.01 0,0.01 0,0.02L13.32,20.72zM10.68,20.7l0,0.02C10.69,20.72 10.69,20.71 10.68,20.7zM10.62,20.25h2.76l0.37,-2.55l0.53,-0.22c0.44,-0.18 0.88,-0.44 1.34,-0.78l0.45,-0.34l2.38,0.96l1.38,-2.4l-2.03,-1.58l0.07,-0.56c0.03,-0.26 0.06,-0.51 0.06,-0.78c0,-0.27 -0.03,-0.53 -0.06,-0.78l-0.07,-0.56l2.03,-1.58l-1.39,-2.4l-2.39,0.96l-0.45,-0.35c-0.42,-0.32 -0.87,-0.58 -1.33,-0.77L13.75,6.3l-0.37,-2.55h-2.76L10.25,6.3L9.72,6.51C9.28,6.7 8.84,6.95 8.38,7.3L7.93,7.63L5.55,6.68L4.16,9.07l2.03,1.58l-0.07,0.56C6.09,11.47 6.06,11.74 6.06,12c0,0.26 0.02,0.53 0.06,0.78l0.07,0.56l-2.03,1.58l1.38,2.4l2.39,-0.96l0.45,0.35c0.43,0.33 0.86,0.58 1.33,0.77l0.53,0.22L10.62,20.25zM18.22,17.72c0,0.01 -0.01,0.02 -0.01,0.03L18.22,17.72zM5.77,17.71l0.01,0.02C5.78,17.72 5.77,17.71 5.77,17.71zM3.93,9.47L3.93,9.47C3.93,9.47 3.93,9.47 3.93,9.47zM18.22,6.27c0,0.01 0.01,0.02 0.01,0.02L18.22,6.27zM5.79,6.25L5.78,6.27C5.78,6.27 5.79,6.26 5.79,6.25zM13.31,3.28c0,0.01 0,0.01 0,0.02L13.31,3.28zM10.69,3.26l0,0.02C10.69,3.27 10.69,3.27 10.69,3.26z"/>
     <path
-        android:fillColor="?android:attr/colorAccent"
+        android:fillColor="@color/color_icon_background_blue"
         android:pathData="M12,12m-3.5,0a3.5,3.5 0,1 1,7 0a3.5,3.5 0,1 1,-7 0"/>
 </vector>
diff --git a/res/drawable/ic_arrow_back.xml b/res/drawable/ic_arrow_back.xml
index 1f6a921f14766b74cb47ddc4f9aaa633e0c5cc9d..b8315a5a04ae696d840de9ab7a55a083e71f7fd4 100644
--- a/res/drawable/ic_arrow_back.xml
+++ b/res/drawable/ic_arrow_back.xml
@@ -20,6 +20,6 @@
     android:viewportHeight="24"
     android:autoMirrored="true">
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M20,11H7.83l5.59-5.59L12,4l-8,8l8,8l1.41-1.41L7.83,13H20V11z" />
 </vector>
diff --git a/res/drawable/ic_arrow_circle_down.xml b/res/drawable/ic_arrow_circle_down.xml
index 4193466b8465c55ba09476a5c5583ab5201824b4..ced202720a89432aa341c15ee541b50c6f6121c9 100644
--- a/res/drawable/ic_arrow_circle_down.xml
+++ b/res/drawable/ic_arrow_circle_down.xml
@@ -5,6 +5,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M12,4c4.41,0 8,3.59 8,8s-3.59,8 -8,8s-8,-3.59 -8,-8S7.59,4 12,4M12,2C6.48,2 2,6.48 2,12c0,5.52 4.48,10 10,10c5.52,0 10,-4.48 10,-10C22,6.48 17.52,2 12,2L12,2zM13,12l0,-4h-2l0,4H8l4,4l4,-4H13z"/>
 </vector>
diff --git a/res/drawable/ic_arrow_circle_up.xml b/res/drawable/ic_arrow_circle_up.xml
index a739f368048c61967134acef261d43e633b3b72d..787b80584447a71f4a2165248e0f7a6bb5d8a636 100644
--- a/res/drawable/ic_arrow_circle_up.xml
+++ b/res/drawable/ic_arrow_circle_up.xml
@@ -5,6 +5,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8s8,3.59 8,8S16.41,20 12,20M12,22c5.52,0 10,-4.48 10,-10c0,-5.52 -4.48,-10 -10,-10C6.48,2 2,6.48 2,12C2,17.52 6.48,22 12,22L12,22zM11,12l0,4h2l0,-4h3l-4,-4l-4,4H11z"/>
 </vector>
diff --git a/res/drawable/ic_arrow_down_24dp.xml b/res/drawable/ic_arrow_down_24dp.xml
index 9efd9d8cf8a4ab7daa650604749d7d291e5cc59b..3fd4b50de545903ca4afe2575319bdd4a8923bca 100644
--- a/res/drawable/ic_arrow_down_24dp.xml
+++ b/res/drawable/ic_arrow_down_24dp.xml
@@ -19,6 +19,6 @@
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M12,16.41l-6.71,-6.7l1.42,-1.42l5.29,5.3l5.29,-5.3l1.42,1.42z"/>
 </vector>
diff --git a/res/drawable/ic_attach_money_black_24dp.xml b/res/drawable/ic_attach_money_black_24dp.xml
index aef0995fea758b3e1449fc30136ec5b8f1fc82dc..cace9de8c8b43a7d962574d9ecdf11f474e19a20 100644
--- a/res/drawable/ic_attach_money_black_24dp.xml
+++ b/res/drawable/ic_attach_money_black_24dp.xml
@@ -19,6 +19,6 @@
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M11.8,10.9c-2.27,-0.59 -3,-1.2 -3,-2.15 0,-1.09 1.01,-1.85 2.7,-1.85 1.78,0 2.44,0.85 2.5,2.1h2.21c-0.07,-1.72 -1.12,-3.3 -3.21,-3.81V3h-3v2.16c-1.94,0.42 -3.5,1.68 -3.5,3.61 0,2.31 1.91,3.46 4.7,4.13 2.5,0.6 3,1.48 3,2.41 0,0.69 -0.49,1.79 -2.7,1.79 -2.06,0 -2.87,-0.92 -2.98,-2.1h-2.2c0.12,2.19 1.76,3.42 3.68,3.83V21h3v-2.15c1.95,-0.37 3.5,-1.5 3.5,-3.55 0,-2.84 -2.43,-3.81 -4.7,-4.4z"/>
 </vector>
\ No newline at end of file
diff --git a/res/drawable/ic_audio_alarm.xml b/res/drawable/ic_audio_alarm.xml
index 3bd484336c3a9f4705a7a9d7f9cb9fd3105e8425..ea678dbb32cb353cfd0d12ceb42d89223c42d217 100644
--- a/res/drawable/ic_audio_alarm.xml
+++ b/res/drawable/ic_audio_alarm.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M22,5.72l-4.6,-3.86 -1.29,1.53 4.6,3.86L22,5.72zM7.88,3.39L6.6,1.86 2,5.71l1.29,1.53 4.59,-3.85zM12.5,8L11,8v6l4.75,2.85 0.75,-1.23 -4,-2.37L12.5,8zM12,4c-4.97,0 -9,4.03 -9,9s4.02,9 9,9c4.97,0 9,-4.03 9,-9s-4.03,-9 -9,-9zM12,20c-3.87,0 -7,-3.13 -7,-7s3.13,-7 7,-7 7,3.13 7,7 -3.13,7 -7,7z"/>
 </vector>
diff --git a/res/drawable/ic_audio_alarm_mute.xml b/res/drawable/ic_audio_alarm_mute.xml
index 83fc2edca212c0f930184b2d32305896631a5f7f..ae32c3540ae6ac0c120871fb1f042ab501af0f36 100644
--- a/res/drawable/ic_audio_alarm_mute.xml
+++ b/res/drawable/ic_audio_alarm_mute.xml
@@ -5,6 +5,6 @@
     android:viewportWidth="48.0"
     android:viewportHeight="48.0">
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M24.0,12.0c7.73,0.0 14.0,6.27 14.0,14.0 0.0,1.69 -0.31,3.3 -0.86,4.8l3.04,3.04c1.16,-2.37 1.82,-5.03 1.82,-7.84 0.0,-9.94 -8.06,-18.0 -18.01,-18.0 -2.81,0.0 -5.46,0.66 -7.84,1.81l3.05,3.05c1.5,-0.55 3.11,-0.86 4.8,-0.86zm20.0,-0.56l-9.19,-7.71 -2.57,3.06 9.19,7.71 2.57,-3.06zm-38.16,-6.85l-2.55,2.54 2.66,2.66 -2.22,1.86 2.84,2.84 2.22,-1.86 1.6,1.6c-2.73,3.16 -4.39,7.27 -4.39,11.77 0.0,9.94 8.04,18.0 17.99,18.0 4.51,0.0 8.62,-1.67 11.77,-4.4l4.4,4.4 2.54,-2.55 -34.91,-34.91 -1.95,-1.95zm27.1,32.19c-2.43,2.01 -5.54,3.22 -8.94,3.22 -7.73,0.0 -14.0,-6.27 -14.0,-14.0 0.0,-3.4 1.21,-6.51 3.22,-8.94l19.72,19.72zm-16.91,-30.23l-2.84,-2.84 -1.7,1.43 2.84,2.84 1.7,-1.43z"/>
 </vector>
\ No newline at end of file
diff --git a/res/drawable/ic_auto_wifi.xml b/res/drawable/ic_auto_wifi.xml
index 441b761c9c42d22107b882b38735a419351272b3..004052c88b57d614e34fa529bd75cb4d0810b3d5 100644
--- a/res/drawable/ic_auto_wifi.xml
+++ b/res/drawable/ic_auto_wifi.xml
@@ -20,15 +20,15 @@
         android:viewportHeight="24.0">
     <path
         android:pathData="M18 10l3 0 -10 -9 -10 9 3 0 0 8 7.1 0c0 -0.3 -0.1 -0.7 -0.1 -1 0 -3.9 3.1 -7 7 -7z"
-        android:fillColor="@color/color_default_accent" />
+        android:fillColor="@color/default_icon_color" />
     <path
         android:pathData="M18 14l0 1.6 2.1 -2.1 -2.1 -2.2 0 1.6c-2.3 0 -4.2 1.9 -4.2 4.3 0 0.8 0.2 1.6 0.7 2.3l0.8 -0.8C15.1 18.3 14.9 17.8 14.9 17.2 14.8 15.4 16.2 14 18 14"
         android:strokeWidth="0.5"
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/default_icon_color"
         android:strokeMiterLimit="10" />
     <path
         android:pathData="M20.8 15.7c0.2 0.4 0.4 0.9 0.4 1.5 0 1.8 -1.4 3.2 -3.2 3.2l0 -1.6 -2.1 2.1 2.1 2.1 0 -1.6c2.3 0 4.2 -1.9 4.2 -4.2 0 -0.8 -0.2 -1.6 -0.7 -2.3l-0.7 0.8z"
         android:strokeWidth="0.5"
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/default_icon_color"
         android:strokeMiterLimit="10" />
 </vector>
\ No newline at end of file
diff --git a/res/drawable/ic_battery_charging_full.xml b/res/drawable/ic_battery_charging_full.xml
index 830853230a472c1e8704148f4cb37f4264651a99..b30138589ebbb0a1075f40ffac2b529f3f06eff3 100644
--- a/res/drawable/ic_battery_charging_full.xml
+++ b/res/drawable/ic_battery_charging_full.xml
@@ -19,9 +19,9 @@
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="#FF000000"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M16.2,22.5H7.8c-1.3,0 -2.3,-1 -2.3,-2.3V5.8c0,-1.3 1,-2.3 2.3,-2.3h0.7v-2h7v2h0.7c1.3,0 2.3,1.1 2.3,2.3v14.3C18.5,21.5 17.5,22.5 16.2,22.5zM7.8,5.5c-0.2,0 -0.3,0.2 -0.3,0.3v14.3c0,0.2 0.2,0.3 0.3,0.3h8.3c0.2,0 0.3,-0.1 0.3,-0.3V5.8c0,-0.2 -0.1,-0.3 -0.3,-0.3h-2.7v-2h-3v2H7.8z"/>
     <path
-        android:fillColor="#FF000000"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M11.17,18.42v-4.58H9.5l3.33,-6.25v4.58h1.67L11.17,18.42z"/>
 </vector>
diff --git a/res/drawable/ic_battery_circle.xml b/res/drawable/ic_battery_circle.xml
index bb913e86a96bc603a4c3f3640ed8713cb8d4ea97..3df83f5d24cf99decbb5f94c0127e334d7126e38 100644
--- a/res/drawable/ic_battery_circle.xml
+++ b/res/drawable/ic_battery_circle.xml
@@ -18,6 +18,6 @@
     android:height="24dp"
     android:viewportWidth="24.0"
     android:viewportHeight="24.0">
-    <path android:fillColor="@color/color_default_accent"
+    <path android:fillColor="@color/default_icon_color"
           android:pathData="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2z"/>
 </vector>
\ No newline at end of file
diff --git a/res/drawable/ic_battery_saver_accent_24dp.xml b/res/drawable/ic_battery_saver_accent_24dp.xml
index 31eb19301034fdde6e6b9457185bb53311289a9f..7622f146e379ddb4a3fb02633cf5df4f262187b9 100644
--- a/res/drawable/ic_battery_saver_accent_24dp.xml
+++ b/res/drawable/ic_battery_saver_accent_24dp.xml
@@ -16,4 +16,4 @@
 <com.android.settings.widget.TintDrawable
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:drawable="@drawable/ic_battery_status_bad_24dp"
-    android:tint="?android:attr/colorAccent" />
+    android:tint="@color/color_icon_background_blue" />
diff --git a/res/drawable/ic_bt_headphones_a2dp.xml b/res/drawable/ic_bt_headphones_a2dp.xml
index a91283164b51641b6fe0adc5deb07784f7e7361c..37f7903e70a0589ace3f338d547e8a708dbe94cb 100644
--- a/res/drawable/ic_bt_headphones_a2dp.xml
+++ b/res/drawable/ic_bt_headphones_a2dp.xml
@@ -5,7 +5,7 @@
     android:viewportWidth="24.0"
     android:viewportHeight="24.0">
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M12,1c-4.97,0 -9,4.03 -9,9v7c0,1.66 1.34,3 3,3h3v-8H5v-2c0,-3.87
             3.13,-7 7,-7s7,3.13 7,7v2h-4v8h3c1.66,0 3,-1.34 3,-3v-7c0,-4.97 -4.03,-9 -9,-9z"/>
 </vector>
\ No newline at end of file
diff --git a/res/drawable/ic_cancel.xml b/res/drawable/ic_cancel.xml
index 2b700a3dd46356e226ced1dbec98586019231aa5..c88347a7f2a1827efd368ab85ee51b3cda5d96df 100644
--- a/res/drawable/ic_cancel.xml
+++ b/res/drawable/ic_cancel.xml
@@ -19,9 +19,9 @@
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M12,2C6.47,2 2,6.47 2,12c0,5.53 4.47,10 10,10c5.53,0 10,-4.47 10,-10C22,6.47 17.53,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8s8,3.59 8,8S16.41,20 12,20z"/>
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M15.59,7l-3.59,3.59l-3.59,-3.59l-1.41,1.41l3.59,3.59l-3.59,3.59l1.41,1.41l3.59,-3.59l3.59,3.59l1.41,-1.41l-3.59,-3.59l3.59,-3.59z"/>
 </vector>
diff --git a/res/drawable/ic_cancel_cross.xml b/res/drawable/ic_cancel_cross.xml
index a51a484ee98344cc8cec4d1db12a4856b3a68ee3..56c420f98ba118e52b95eaee3cb5346af75f2f6a 100644
--- a/res/drawable/ic_cancel_cross.xml
+++ b/res/drawable/ic_cancel_cross.xml
@@ -19,6 +19,6 @@
     android:viewportWidth="24.0"
     android:viewportHeight="24.0">
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M15.59,7l-3.59,3.59l-3.59,-3.59l-1.41,1.41l3.59,3.59l-3.59,3.59l1.41,1.41l3.59,-3.59l3.59,3.59l1.41,-1.41l-3.59,-3.59l3.59,-3.59z"/>
 </vector>
diff --git a/res/drawable/ic_cast_24dp.xml b/res/drawable/ic_cast_24dp.xml
index 5b442585bab7ed3338686b62c152ca2423a8825c..b12780a0e24b5051db2414a8c73c8f023bf97a38 100644
--- a/res/drawable/ic_cast_24dp.xml
+++ b/res/drawable/ic_cast_24dp.xml
@@ -7,7 +7,7 @@
 
     <group>
         <path
-            android:fillColor="@color/color_default_accent"
+            android:fillColor="@color/color_icon_background_blue"
             android:pathData="M25.2477 32.155H6.75229C3.02611 32.155 0 29.1289 0 25.4027V6.90732C0 3.18114 3.02611 0.155029 6.75229 0.155029H25.2477C28.9739 0.155029 32 3.18114 32 6.90732V25.4027C32 29.1289 28.9739 32.155 25.2477 32.155Z" />
         <group>
             <path
diff --git a/res/drawable/ic_cellular_1_bar.xml b/res/drawable/ic_cellular_1_bar.xml
index a9f2d3f7f81bebfac2c75ab4fd8d8ee646613f1d..37165d5b765814f5f920c8aef895a71cc832968d 100644
--- a/res/drawable/ic_cellular_1_bar.xml
+++ b/res/drawable/ic_cellular_1_bar.xml
@@ -20,9 +20,9 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M20,7v13H7L20,7 M22,2L2,22h20V2L22,2z" />
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M 11 13 L 2 22 L 11 22 Z" />
 </vector>
\ No newline at end of file
diff --git a/res/drawable/ic_cellular_off.xml b/res/drawable/ic_cellular_off.xml
index 76dbed574d32d84aa3257e71d0c8bb56dd336a74..88bdec6608925faac14bf6d0a9bb8f50d63464ac 100644
--- a/res/drawable/ic_cellular_off.xml
+++ b/res/drawable/ic_cellular_off.xml
@@ -18,15 +18,14 @@ Copyright (C) 2014 The Android Open Source Project
         android:height="24dp"
         android:autoMirrored="true"
         android:viewportHeight="24"
-        android:viewportWidth="24"
-        android:tint="?android:attr/colorAccent">
+        android:viewportWidth="24">
     <path
-        android:fillColor="#FF000000"
+        android:fillColor="@color/color_icon_background_blue"
         android:pathData="M21.19,21.19l-2.69,-2.69l-1.41,-1.41l-1.09,-1.09l-2,-2l-4,-4l-2,-2l-5.19,-5.19l-1.42,1.41l6.61,6.61l0,2.17l2.17,0l3.83,3.83l0,1.34l-2.59,-2.58l-1.41,1.41l5,5l2.09,-2.09l2.69,2.7z"/>
     <path
-        android:fillColor="#FF000000"
+        android:fillColor="@color/color_icon_background_blue"
         android:pathData="M14,11.17l2,2l0,-2.17l-2,0z"/>
     <path
-        android:fillColor="#FF000000"
+        android:fillColor="@color/color_icon_background_blue"
         android:pathData="M10,5.83l2.59,2.58l1.41,-1.41l-5,-5l-2.09,2.09l3.09,3.08z"/>
 </vector>
diff --git a/res/drawable/ic_check_circle_green.xml b/res/drawable/ic_check_circle_green.xml
index ef3428e03b9e977f9431ba349913f36516439e62..a67a2c6ebd15f7788e5842cd34892fafc4f41d4e 100644
--- a/res/drawable/ic_check_circle_green.xml
+++ b/res/drawable/ic_check_circle_green.xml
@@ -23,6 +23,6 @@
         android:fillColor="#0F9D58"
         android:pathData="M32,5.3C17.3,5.3 5.3,17.3 5.3,32s12,26.7 26.7,26.7s26.7,-12 26.7,-26.7S46.7,5.3 32,5.3z"/>
     <path
-        android:fillColor="@color/color_default_view_on_accent"
+        android:fillColor="@android:color/white"
         android:pathData="M49.4,24.3l-20,20c-1,1 -2.7,1 -3.8,0l0,0l-11.1,-11c-1.1,-1 -1.1,-2.7 0,-3.8s2.7,-1.1 3.8,0l0,0l9.2,9.2l18.1,-18.1c1,-1 2.7,-1 3.8,0C50.4,21.6 50.4,23.3 49.4,24.3L49.4,24.3z"/>
 </vector>
diff --git a/res/drawable/ic_chevron_right_24dp.xml b/res/drawable/ic_chevron_right_24dp.xml
index 10160e76f69e28b3f0691528b160915783c0b3cc..32ee73d95ccf434309fca3f097890c37868a45f9 100644
--- a/res/drawable/ic_chevron_right_24dp.xml
+++ b/res/drawable/ic_chevron_right_24dp.xml
@@ -21,6 +21,6 @@
     android:width="24dp"
     android:viewportHeight="24.0"
     android:viewportWidth="24.0">
-    <path android:fillColor="@color/color_default_accent"
+    <path android:fillColor="@color/default_icon_color"
           android:pathData="M9.71,18.71l-1.42,-1.42l5.3,-5.29l-5.3,-5.29l1.42,-1.42l6.7,6.71z"/>
 </vector>
diff --git a/res/drawable/ic_corp_badge.xml b/res/drawable/ic_corp_badge.xml
index 028e61b3b8adf23020a5bc468d0c33f24f460fc5..c6fd14084e33585d111986886ce684cffdcf0737 100644
--- a/res/drawable/ic_corp_badge.xml
+++ b/res/drawable/ic_corp_badge.xml
@@ -5,9 +5,9 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M20,6h-4V4c0-1.1-0.9-2-2-2h-4C8.9,2,8,2.9,8,4v2H4C2.9,6,2,6.9,2,8l0,11c0,1.1,0.9,2,2,2h16c1.1,0,2-0.9,2-2V8 C22,6.9,21.1,6,20,6z M10,4h4v2h-4V4z M20,19H4V8h16V19z" />
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M 12 12 C 12.8284271247 12 13.5 12.6715728753 13.5 13.5 C 13.5 14.3284271247 12.8284271247 15 12 15 C 11.1715728753 15 10.5 14.3284271247 10.5 13.5 C 10.5 12.6715728753 11.1715728753 12 12 12 Z" />
 </vector>
\ No newline at end of file
diff --git a/res/drawable/ic_data_saver.xml b/res/drawable/ic_data_saver.xml
index feb407cfd898abb000a65b6ceeb0fe4ba495de8f..801ef387bbb303ec5bf6120aad919ff4e939278a 100644
--- a/res/drawable/ic_data_saver.xml
+++ b/res/drawable/ic_data_saver.xml
@@ -20,13 +20,13 @@
         android:viewportHeight="24"
         android:viewportWidth="24">
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M11,8l0,3l-3,0l0,2l3,0l0,3l2,0l0,-3l3,0l0,-2l-3,0l0,-3z"/>
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M13,2.05v3.03c3.39,0.49 6,3.39 6,6.92c0,0.9 -0.18,1.75 -0.48,2.54l2.6,1.53C21.68,14.83 22,13.45 22,12C22,6.82 18.05,2.55 13,2.05z"/>
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M12,19c-3.87,0 -7,-3.13 -7,-7c0,-3.53 2.61,-6.43 6,-6.92V2.05C5.94,2.55 2,6.81 2,12c0,5.52 4.47,10 9.99,10c3.31,0 6.24,-1.61 8.06,-4.09l-2.6,-1.53C16.17,17.98 14.21,19 12,19z"/>
 </vector>
 
diff --git a/res/drawable/ic_delete.xml b/res/drawable/ic_delete.xml
index e08bbf706477c749291b137582225e90fa488733..e9af39bdeb44683c314abaccecfd698bc76219eb 100644
--- a/res/drawable/ic_delete.xml
+++ b/res/drawable/ic_delete.xml
@@ -19,12 +19,12 @@ Copyright (C) 2015 The Android Open Source Project
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M15,4V3H9v1H4v2h1v13c0,1.1 0.9,2 2,2h10c1.1,0 2,-0.9 2,-2V6h1V4H15zM17,19H7V6h10V19z"/>
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M9,8h2v9h-2z"/>
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M13,8h2v9h-2z"/>
 </vector>
diff --git a/res/drawable/ic_delete_accent.xml b/res/drawable/ic_delete_accent.xml
index 2f087e8e34146604588623936233cc8f2b5ef290..6692cb23e6884b7e438254721a0648ba2051babb 100644
--- a/res/drawable/ic_delete_accent.xml
+++ b/res/drawable/ic_delete_accent.xml
@@ -16,4 +16,4 @@
 <com.android.settings.widget.TintDrawable
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:drawable="@drawable/ic_delete"
-    android:tint="?android:attr/colorAccent" />
+    android:tint="@color/color_icon_background_blue" />
diff --git a/res/drawable/ic_devices_other.xml b/res/drawable/ic_devices_other.xml
index 1d5fb2ff863982e5935eb165b088390384845d80..f2d9bad93c02550f64c13378741a014e2e406917 100644
--- a/res/drawable/ic_devices_other.xml
+++ b/res/drawable/ic_devices_other.xml
@@ -5,7 +5,7 @@
     android:viewportHeight="33">
   <path
       android:pathData="M25.3827,32H6.8873C3.1611,32 0.135,28.9739 0.135,25.2477V6.7523C0.135,3.0261 3.1611,0 6.8873,0H25.3827C29.1089,0 32.135,3.0261 32.135,6.7523V25.2477C32.135,28.9739 29.1089,32 25.3827,32Z"
-      android:fillColor="@color/color_default_accent"/>
+      android:fillColor="@color/color_icon_background_blue"/>
   <path
       android:pathData="M5.1484,7.2041C5.1484,6.7676 5.5023,6.4137 5.9388,6.4137H24.3665C24.803,6.4137 25.1569,6.7676 25.1569,7.2041V8.13C25.1569,8.5665 24.803,8.9204 24.3665,8.9204C23.93,8.9204 23.5761,8.5665 23.5761,8.13V7.9945H6.7292V19.8054H15.9431C16.3796,19.8054 16.7335,20.1592 16.7335,20.5958C16.7335,21.0323 16.3796,21.3862 15.9431,21.3862H5.9388C5.5023,21.3862 5.1484,21.0323 5.1484,20.5958V7.2041Z"
       android:fillColor="#ffffff"
diff --git a/res/drawable/ic_dialog_alert_material.xml b/res/drawable/ic_dialog_alert_material.xml
index 699eba6a10e2eb70292cd198d8ea50e18ac8fb3b..52232b3a4e36af1a2db7fab8395f8e947fa9b756 100644
--- a/res/drawable/ic_dialog_alert_material.xml
+++ b/res/drawable/ic_dialog_alert_material.xml
@@ -6,5 +6,5 @@
     android:viewportHeight="24.0">
     <path
         android:pathData="M1,21l22,0L12,2L1,21zM13,18l-2,0l0,-2l2,0L13,18zM13,14l-2,0l0,-4l2,0L13,14z"
-        android:fillColor="@color/color_default_accent"/>
+        android:fillColor="@color/default_icon_color"/>
 </vector>
\ No newline at end of file
diff --git a/res/drawable/ic_do_not_disturb_on_24dp.xml b/res/drawable/ic_do_not_disturb_on_24dp.xml
index e799afc9e0b8b82b2c216d4ab380ce73daec35e8..1d18cb2504eed46721eae17eafaa7da57a8a9bb1 100644
--- a/res/drawable/ic_do_not_disturb_on_24dp.xml
+++ b/res/drawable/ic_do_not_disturb_on_24dp.xml
@@ -19,9 +19,9 @@
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M12,2C6.48,2 2,6.48 2,12c0,5.52 4.48,10 10,10c5.52,0 10,-4.48 10,-10C22,6.48 17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8c0,-4.41 3.59,-8 8,-8c4.41,0 8,3.59 8,8C20,16.41 16.41,20 12,20z"/>
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M7,11h10v2h-10z"/>
 </vector>
diff --git a/res/drawable/ic_eject_24dp.xml b/res/drawable/ic_eject_24dp.xml
index 1a6ab14b156961fe682d7d49743c8ad7106c1e8a..9b4cc03132e7469d8273152c28a6fa4629f1dca3 100644
--- a/res/drawable/ic_eject_24dp.xml
+++ b/res/drawable/ic_eject_24dp.xml
@@ -19,6 +19,6 @@ Copyright (C) 2015 The Android Open Source Project
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M5 17h14v2H5zm7,-12L5.33 15h13.34z"/>
 </vector>
diff --git a/res/drawable/ic_event.xml b/res/drawable/ic_event.xml
index a82d75449857054e9c1b7ce0576093160504b2bb..09d8ba7af06f13fb86db8043f37bc503da8a8e99 100644
--- a/res/drawable/ic_event.xml
+++ b/res/drawable/ic_event.xml
@@ -18,7 +18,7 @@ Copyright (C) 2018 The Android Open Source Project
     <item>
         <shape android:shape="oval">
             <solid
-                android:color="?android:attr/colorAccent" />
+                android:color="@color/color_icon_background_blue" />
             <size
                 android:width="@dimen/dashboard_tile_image_size"
                 android:height="@dimen/dashboard_tile_image_size" />
diff --git a/res/drawable/ic_event_white.xml b/res/drawable/ic_event_white.xml
index 54e01067c9410350b7be3fb500244994931318e1..9869472a7a0bf72dbcf858380197f561724ff1f8 100644
--- a/res/drawable/ic_event_white.xml
+++ b/res/drawable/ic_event_white.xml
@@ -20,6 +20,6 @@ Copyright (C) 2018 The Android Open Source Project
         android:viewportHeight="24.0">
 
     <path
-        android:fillColor="@color/color_default_view_on_accent"
+        android:fillColor="@android:color/white"
         android:pathData="M17.0,12.0l-5.0,0.0l0.0,5.0l5.0,0.0l0.0,-5.0zM16.0,1.0l0.0,2.0L8.0,3.0L8.0,1.0L6.0,1.0l0.0,2.0L5.0,3.0c-1.11,0.0 -1.9,0.9 -1.99,2.0L3.0,19.0c0.0,1.0 0.89,2.0 2.0,2.0l14.0,0.0c1.1,0.0 2.0,-0.9 2.0,-2.0L21.0,5.0c0.0,-1.1 -0.9,-2.0 -2.0,-2.0l-1.0,0.0L18.0,1.0l-2.0,0.0zm3.0,18.0L5.0,19.0L5.0,8.0l14.0,0.0l0.0,11.0z"/>
 </vector>
diff --git a/res/drawable/ic_expand_less.xml b/res/drawable/ic_expand_less.xml
index fbae47236d3296a3c9e5fa9f1b643a761e817fab..8430ba92a86e6dfd85de5812e8a3c05016f9796b 100644
--- a/res/drawable/ic_expand_less.xml
+++ b/res/drawable/ic_expand_less.xml
@@ -22,7 +22,7 @@
     android:viewportHeight="24">
 
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M12.0,8.0l-6.0,6.0 1.41,1.41L12.0,10.83l4.59,4.58L18.0,14.0z"/>
 
 </vector>
diff --git a/res/drawable/ic_expand_more_inverse.xml b/res/drawable/ic_expand_more_inverse.xml
index b148d2f2231b796f73ff60a11d01bf835f2527a9..f28800127aac11860ac7aac05ea56db88a6c3c39 100644
--- a/res/drawable/ic_expand_more_inverse.xml
+++ b/res/drawable/ic_expand_more_inverse.xml
@@ -22,7 +22,7 @@
         android:viewportHeight="24">
 
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M16.59,8.59L12.0,13.17 7.41,8.59 6.0,10.0l6.0,6.0 6.0,-6.0z"/>
 
 </vector>
diff --git a/res/drawable/ic_face_enroll_introduction_detail.xml b/res/drawable/ic_face_enroll_introduction_detail.xml
index 901a8a2cb4ccf54e20a01107b4199e0cd2ab8512..05083aba1134cce846c7474c85f236ca59057372 100644
--- a/res/drawable/ic_face_enroll_introduction_detail.xml
+++ b/res/drawable/ic_face_enroll_introduction_detail.xml
@@ -25,9 +25,9 @@
     <path
         android:pathData="M0,0h24v24H0V0z" />
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M12,2L3.82,5.64v5.45c0,5.05,3.49,9.76,8.18,10.91c4.69-1.15,8.18-5.86,8.18-10.91V5.64L12,2z M18.18,11.09 c0,1.55-0.41,3.05-1.1,4.38C15.77,14.5,13.4,14,12,14s-3.77,0.5-5.08,1.47c-0.69-1.33-1.1-2.83-1.1-4.38V6.94L12,4.19l6.18,2.75 V11.09z" />
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M 12 7.5 C 13.6568542495 7.5 15 8.84314575051 15 10.5 C 15 12.1568542495 13.6568542495 13.5 12 13.5 C 10.3431457505 13.5 9 12.1568542495 9 10.5 C 9 8.84314575051 10.3431457505 7.5 12 7.5 Z" />
 </vector>
\ No newline at end of file
diff --git a/res/drawable/ic_face_enroll_introduction_people.xml b/res/drawable/ic_face_enroll_introduction_people.xml
index 4f5074d613857618774689154669035ecad6666c..2e368e8f86603968c409fc60bebc7d28b32bce50 100644
--- a/res/drawable/ic_face_enroll_introduction_people.xml
+++ b/res/drawable/ic_face_enroll_introduction_people.xml
@@ -19,7 +19,7 @@
     <aapt:attr name="android:drawable">
         <vector android:height="24dp" android:width="24dp" android:viewportHeight="24"
                 android:viewportWidth="24"
-                android:tint="@color/color_default_accent">
+                android:tint="@color/color_icon_background_blue">
             <group android:name="_R_G">
                 <group android:name="_R_G_L_0_G">
                     <path android:name="_R_G_L_0_G_D_0_P_0" android:fillColor="#000000"
diff --git a/res/drawable/ic_face_enroll_introduction_shield.xml b/res/drawable/ic_face_enroll_introduction_shield.xml
index 1554f2e0d35db7a7183d3fbe011f877e17ce4df8..ec73586149d1e53163cc2e235e47c5f06d5b925f 100644
--- a/res/drawable/ic_face_enroll_introduction_shield.xml
+++ b/res/drawable/ic_face_enroll_introduction_shield.xml
@@ -19,7 +19,7 @@
     <aapt:attr name="android:drawable">
         <vector android:height="24dp" android:width="24dp" android:viewportHeight="24"
                 android:viewportWidth="24"
-                android:tint="@color/color_default_accent">
+                android:tint="@color/color_icon_background_blue">
             <group android:name="_R_G">
                 <group android:name="_R_G_L_0_G">
                     <path android:name="_R_G_L_0_G_D_0_P_0" android:fillColor="#000000"
diff --git a/res/drawable/ic_face_enroll_introduction_visibility.xml b/res/drawable/ic_face_enroll_introduction_visibility.xml
index 25923e55b8dadf37f0094c288aff83a0e822dffd..fcf1e64ea298f0cc781d82df0d128fd74dae90bb 100644
--- a/res/drawable/ic_face_enroll_introduction_visibility.xml
+++ b/res/drawable/ic_face_enroll_introduction_visibility.xml
@@ -19,13 +19,13 @@
     <aapt:attr name="android:drawable">
         <vector android:height="24dp" android:width="24dp" android:viewportHeight="24"
                 android:viewportWidth="24"
-                android:tint="@color/color_default_accent">
+                android:tint="@color/color_icon_background_blue">
             <group android:name="_R_G">
                 <group android:name="_R_G_L_0_G">
-                    <path android:name="_R_G_L_0_G_D_0_P_0" android:fillColor="@color/color_default_accent"
+                    <path android:name="_R_G_L_0_G_D_0_P_0" android:fillColor="@color/default_icon_color"
                           android:fillAlpha="1" android:fillType="nonZero"
                           android:pathData=" M12 7 C9.52,7 7.5,9.02 7.5,11.5 C7.5,13.98 9.52,16 12,16 C14.48,16 16.5,13.98 16.5,11.5 C16.5,9.02 14.48,7 12,7c  M12 14.2 C10.51,14.2 9.3,12.99 9.3,11.5 C9.3,10.01 10.51,8.8 12,8.8 C13.49,8.8 14.7,10.01 14.7,11.5 C14.7,12.99 13.49,14.2 12,14.2c "/>
-                    <path android:name="_R_G_L_0_G_D_1_P_0" android:fillColor="@color/color_default_accent"
+                    <path android:name="_R_G_L_0_G_D_1_P_0" android:fillColor="@color/default_icon_color"
                           android:fillAlpha="1" android:fillType="nonZero"
                           android:pathData=" M12 4 C7,4 2.73,7.11 1,11.5 C2.73,15.89 7,19 12,19 C17,19 21.27,15.89 23,11.5 C21.27,7.11 17,4 12,4c  M12 17 C8.21,17 4.83,14.87 3.18,11.5 C4.83,8.13 8.21,6 12,6 C15.79,6 19.17,8.13 20.82,11.5 C19.17,14.87 15.79,17 12,17c "/>
                 </group>
diff --git a/res/drawable/ic_face_header.xml b/res/drawable/ic_face_header.xml
index 772441209634d52d248fa53740bb5d554be5e0c0..731123e3fa78c8352fab04dc7e5c20519246b152 100644
--- a/res/drawable/ic_face_header.xml
+++ b/res/drawable/ic_face_header.xml
@@ -21,10 +21,10 @@
     android:viewportWidth="24">
 
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M 12 13 C 13.1045694997 13 14 13.8954305003 14 15 C 14 16.1045694997 13.1045694997 17 12 17 C 10.8954305003 17 10 16.1045694997 10 15 C 10 13.8954305003 10.8954305003 13 12 13 Z" />
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M18.5,1C16.01,1,14,3.01,14,5.5V8H6c-1.1,0-2,0.9-2,2v10c0,1.1,0.9,2,2,2h12c1.1,0,2-0.9,2-2V10c0-1.1-0.9-2-2-2h-2V5.5 C16,4.12,17.12,3,18.5,3C19.88,3,21,4.12,21,5.5V6h2V5.5C23,3.01,20.99,1,18.5,1z M18,10v10H6V10H18z" />
     <path android:pathData="M0,0h24v24H0V0z" />
 </vector>
\ No newline at end of file
diff --git a/res/drawable/ic_feedback_24dp.xml b/res/drawable/ic_feedback_24dp.xml
index 7fa4a6278be0508375bd272a45130626b19a8b51..c4e9cb11bd12b1280674dbe340afe84546482db4 100644
--- a/res/drawable/ic_feedback_24dp.xml
+++ b/res/drawable/ic_feedback_24dp.xml
@@ -19,12 +19,12 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M20,2H4C2.9,2 2.01,2.9 2.01,4L2,22l4,-4h14c1.1,0 2,-0.9 2,-2V4C22,2.9 21.1,2 20,2zM20,16H6H5.17l-0.59,0.59L4,17.17V4h16V16z" />
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M11,12h2v2h-2z" />
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M11,6h2v4h-2z" />
 </vector>
diff --git a/res/drawable/ic_find_in_page_24px.xml b/res/drawable/ic_find_in_page_24px.xml
index 54438275b427346af8b3476b818273e936afa964..bb397b6266758f98dc850eeb134faf2ff6a2a6c3 100644
--- a/res/drawable/ic_find_in_page_24px.xml
+++ b/res/drawable/ic_find_in_page_24px.xml
@@ -21,6 +21,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
   <path
-      android:fillColor="@color/color_default_accent"
+      android:fillColor="@color/default_icon_color"
       android:pathData="M6,2C4.9,2 4.01,2.9 4.01,4L4,20c0,1.1 0.89,2 1.99,2H18c1.1,0 2,-0.9 2,-2V8l-6,-6H6zM18,17.59l-2.2,-2.2c0.44,-0.69 0.7,-1.51 0.7,-2.39c0,-2.48 -2.02,-4.5 -4.5,-4.5S7.5,10.52 7.5,13s2.02,4.5 4.5,4.5c0.88,0 1.69,-0.26 2.39,-0.7l3.2,3.2L6,20V4h7.17L18,8.83V17.59zM12,15.5c-1.38,0 -2.5,-1.12 -2.5,-2.5s1.12,-2.5 2.5,-2.5s2.5,1.12 2.5,2.5S13.38,15.5 12,15.5z"/>
 </vector>
diff --git a/res/drawable/ic_fingerprint.xml b/res/drawable/ic_fingerprint.xml
index 2d24a4d7b8eb23b5b329777247db62f0fc53f914..ef0622c874c057971885be0043f81ae159186902 100644
--- a/res/drawable/ic_fingerprint.xml
+++ b/res/drawable/ic_fingerprint.xml
@@ -6,26 +6,26 @@
     android:viewportHeight="32">
 
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/color_icon_background_blue"
         android:pathData="M25.2477 32H6.75229C3.02611 32 0 28.9739 0 25.2477V6.75229C0 3.02611 3.02611 0 6.75229 0H25.2477C28.9739 0 32 3.02611 32 6.75229V25.2477C32 28.9739 28.9739 32 25.2477 32Z" />
     <path
-        android:fillColor="@color/color_default_view_on_accent"
+        android:fillColor="@android:color/white"
         android:fillType="evenOdd"
         android:pathData="M12.4679 15.2329C13.1843 14.2754 14.3147 13.6401 15.8757 13.6401C17.5339 13.6401 18.7194 14.3627 19.4704 15.3326C20.1987 16.2734 20.5052 17.4252 20.5052 18.3373C20.5052 18.9885 20.3879 19.6171 20.0304 20.0986C19.6403 20.6239 19.0646 20.844 18.4502 20.844C18.0136 20.844 17.6598 20.4902 17.6598 20.0536C17.6598 19.6171 18.0136 19.2632 18.4502 19.2632C18.6713 19.2632 18.7279 19.2011 18.7613 19.1562C18.8271 19.0674 18.9244 18.8379 18.9244 18.3373C18.9244 17.7364 18.7115 16.9347 18.2204 16.3004C17.7519 15.6952 17.0178 15.2209 15.8757 15.2209C14.7946 15.2209 14.1408 15.6357 13.7337 16.1799C13.3018 16.7573 13.098 17.5521 13.098 18.3373C13.098 20.7474 13.7796 22.6033 14.9288 23.7928C15.9886 24.8711 17.428 25.4735 19.1502 25.4735C19.5868 25.4735 19.9406 25.8274 19.9406 26.2639C19.9406 26.7005 19.5868 27.0543 19.1502 27.0543C17.0345 27.0543 15.1776 26.3026 13.7987 24.8981L13.7966 24.896L13.7945 24.8939C12.2801 23.3282 11.5172 21.0296 11.5172 18.3373C11.5172 17.3159 11.7764 16.1573 12.4679 15.2329Z" />
     <path
-        android:fillColor="@color/color_default_view_on_accent"
+        android:fillColor="@android:color/white"
         android:fillType="evenOdd"
         android:pathData="M11.8278 14.0152C10.852 15.042 10.2527 16.5272 10.2527 18.3373C10.2527 22.0095 11.4916 24.5396 13.2452 26.1301C13.5686 26.4234 13.593 26.9233 13.2997 27.2466C13.0064 27.5699 12.5066 27.5943 12.1832 27.3011C10.0526 25.3686 8.67188 22.3885 8.67188 18.3373C8.67188 16.1728 9.39366 14.2819 10.6818 12.9262C11.9727 11.5677 13.7881 10.7946 15.8758 10.7946C20.5646 10.7946 23.3508 14.6594 23.3508 18.3373C23.3508 19.8609 22.8897 21.2019 22.0156 22.172C21.1349 23.1494 19.888 23.6895 18.4503 23.6895C16.6212 23.6895 15.3816 22.1942 14.931 20.8394C14.6997 20.1436 14.627 19.361 14.8497 18.6732C15.088 17.9373 15.6592 17.3536 16.5527 17.1974C16.9828 17.1223 17.3923 17.4099 17.4674 17.8399C17.5426 18.2699 17.2549 18.6795 16.8249 18.7546C16.5555 18.8017 16.4266 18.9349 16.3536 19.1602C16.2651 19.4336 16.2701 19.8563 16.4311 20.3406C16.7653 21.3457 17.5694 22.1087 18.4503 22.1087C19.4741 22.1087 20.2823 21.7341 20.8412 21.1138C21.4068 20.4862 21.77 19.5463 21.77 18.3373C21.77 15.3759 19.5428 12.3754 15.8758 12.3754C14.1922 12.3754 12.8008 12.9912 11.8278 14.0152Z" />
     <path
-        android:fillColor="@color/color_default_view_on_accent"
+        android:fillColor="@android:color/white"
         android:fillType="evenOdd"
         android:pathData="M6.4374 16.5546C6.87318 16.5803 7.20566 16.9543 7.18003 17.3901C7.15721 17.7779 7.13622 18.1386 7.13622 18.4954C7.13622 19.8531 7.24571 21.0907 7.46126 22.2331C7.5422 22.6621 7.26007 23.0754 6.83111 23.1564C6.40215 23.2373 5.9888 22.9552 5.90787 22.5262C5.67176 21.2748 5.55542 19.938 5.55542 18.4954C5.55542 18.0882 5.57915 17.6848 5.60133 17.3078L5.60195 17.2973C5.62758 16.8615 6.00163 16.529 6.4374 16.5546Z" />
     <path
-        android:fillColor="@color/color_default_view_on_accent"
+        android:fillColor="@android:color/white"
         android:fillType="evenOdd"
         android:pathData="M15.808 9.37191C12.1607 9.37191 9.35645 11.2721 8.04075 14.2736C7.8655 14.6734 7.39932 14.8554 6.99952 14.6802C6.59972 14.5049 6.41769 14.0387 6.59294 13.6389C8.16786 10.0461 11.5513 7.79111 15.808 7.79111C20.3525 7.79111 23.839 10.4454 25.2717 13.7296C26.3844 16.2631 26.422 17.7068 26.422 18.518C26.422 20.6581 25.7884 22.5321 24.5694 23.8807C24.2767 24.2046 23.7769 24.2298 23.453 23.9371C23.1292 23.6444 23.104 23.1446 23.3967 22.8207C24.3005 21.8207 24.8412 20.3525 24.8412 18.518C24.8412 17.8839 24.8337 16.6632 23.8239 14.3644L23.8231 14.3625C22.6359 11.6402 19.7091 9.37191 15.808 9.37191Z" />
     <path
-        android:fillColor="@color/color_default_view_on_accent"
+        android:fillColor="@android:color/white"
         android:fillType="evenOdd"
         android:pathData="M15.8081 6.0748C13.9042 6.0748 12.2161 6.53994 10.858 7.34243C10.4822 7.56451 9.99753 7.43987 9.77545 7.06406C9.55338 6.68824 9.67801 6.20355 10.0538 5.98148C11.6767 5.0225 13.647 4.494 15.8081 4.494C18.1926 4.494 20.2599 5.14578 21.9465 6.22135C22.3146 6.45606 22.4227 6.9447 22.188 7.31276C21.9533 7.68082 21.4647 7.78892 21.0966 7.55422C19.6668 6.64249 17.895 6.0748 15.8081 6.0748Z" />
 </vector>
\ No newline at end of file
diff --git a/res/drawable/ic_fingerprint_24dp.xml b/res/drawable/ic_fingerprint_24dp.xml
index d235609d6eb5809ee1d3c49822963cf7244c10c3..c6d7b7b7f06b32ba0f14058c156ce3ae623f4565 100644
--- a/res/drawable/ic_fingerprint_24dp.xml
+++ b/res/drawable/ic_fingerprint_24dp.xml
@@ -6,7 +6,7 @@
     android:viewportHeight="32">
 
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/color_icon_background_blue"
         android:pathData="M25.2477 32H6.75229C3.02611 32 0 28.9739 0 25.2477V6.75229C0 3.02611 3.02611 0 6.75229 0H25.2477C28.9739 0 32 3.02611 32 6.75229V25.2477C32 28.9739 28.9739 32 25.2477 32Z" />
     <path
         android:fillColor="#ffffff"
diff --git a/res/drawable/ic_fingerprint_header.xml b/res/drawable/ic_fingerprint_header.xml
index 2d24a4d7b8eb23b5b329777247db62f0fc53f914..ef0622c874c057971885be0043f81ae159186902 100644
--- a/res/drawable/ic_fingerprint_header.xml
+++ b/res/drawable/ic_fingerprint_header.xml
@@ -6,26 +6,26 @@
     android:viewportHeight="32">
 
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/color_icon_background_blue"
         android:pathData="M25.2477 32H6.75229C3.02611 32 0 28.9739 0 25.2477V6.75229C0 3.02611 3.02611 0 6.75229 0H25.2477C28.9739 0 32 3.02611 32 6.75229V25.2477C32 28.9739 28.9739 32 25.2477 32Z" />
     <path
-        android:fillColor="@color/color_default_view_on_accent"
+        android:fillColor="@android:color/white"
         android:fillType="evenOdd"
         android:pathData="M12.4679 15.2329C13.1843 14.2754 14.3147 13.6401 15.8757 13.6401C17.5339 13.6401 18.7194 14.3627 19.4704 15.3326C20.1987 16.2734 20.5052 17.4252 20.5052 18.3373C20.5052 18.9885 20.3879 19.6171 20.0304 20.0986C19.6403 20.6239 19.0646 20.844 18.4502 20.844C18.0136 20.844 17.6598 20.4902 17.6598 20.0536C17.6598 19.6171 18.0136 19.2632 18.4502 19.2632C18.6713 19.2632 18.7279 19.2011 18.7613 19.1562C18.8271 19.0674 18.9244 18.8379 18.9244 18.3373C18.9244 17.7364 18.7115 16.9347 18.2204 16.3004C17.7519 15.6952 17.0178 15.2209 15.8757 15.2209C14.7946 15.2209 14.1408 15.6357 13.7337 16.1799C13.3018 16.7573 13.098 17.5521 13.098 18.3373C13.098 20.7474 13.7796 22.6033 14.9288 23.7928C15.9886 24.8711 17.428 25.4735 19.1502 25.4735C19.5868 25.4735 19.9406 25.8274 19.9406 26.2639C19.9406 26.7005 19.5868 27.0543 19.1502 27.0543C17.0345 27.0543 15.1776 26.3026 13.7987 24.8981L13.7966 24.896L13.7945 24.8939C12.2801 23.3282 11.5172 21.0296 11.5172 18.3373C11.5172 17.3159 11.7764 16.1573 12.4679 15.2329Z" />
     <path
-        android:fillColor="@color/color_default_view_on_accent"
+        android:fillColor="@android:color/white"
         android:fillType="evenOdd"
         android:pathData="M11.8278 14.0152C10.852 15.042 10.2527 16.5272 10.2527 18.3373C10.2527 22.0095 11.4916 24.5396 13.2452 26.1301C13.5686 26.4234 13.593 26.9233 13.2997 27.2466C13.0064 27.5699 12.5066 27.5943 12.1832 27.3011C10.0526 25.3686 8.67188 22.3885 8.67188 18.3373C8.67188 16.1728 9.39366 14.2819 10.6818 12.9262C11.9727 11.5677 13.7881 10.7946 15.8758 10.7946C20.5646 10.7946 23.3508 14.6594 23.3508 18.3373C23.3508 19.8609 22.8897 21.2019 22.0156 22.172C21.1349 23.1494 19.888 23.6895 18.4503 23.6895C16.6212 23.6895 15.3816 22.1942 14.931 20.8394C14.6997 20.1436 14.627 19.361 14.8497 18.6732C15.088 17.9373 15.6592 17.3536 16.5527 17.1974C16.9828 17.1223 17.3923 17.4099 17.4674 17.8399C17.5426 18.2699 17.2549 18.6795 16.8249 18.7546C16.5555 18.8017 16.4266 18.9349 16.3536 19.1602C16.2651 19.4336 16.2701 19.8563 16.4311 20.3406C16.7653 21.3457 17.5694 22.1087 18.4503 22.1087C19.4741 22.1087 20.2823 21.7341 20.8412 21.1138C21.4068 20.4862 21.77 19.5463 21.77 18.3373C21.77 15.3759 19.5428 12.3754 15.8758 12.3754C14.1922 12.3754 12.8008 12.9912 11.8278 14.0152Z" />
     <path
-        android:fillColor="@color/color_default_view_on_accent"
+        android:fillColor="@android:color/white"
         android:fillType="evenOdd"
         android:pathData="M6.4374 16.5546C6.87318 16.5803 7.20566 16.9543 7.18003 17.3901C7.15721 17.7779 7.13622 18.1386 7.13622 18.4954C7.13622 19.8531 7.24571 21.0907 7.46126 22.2331C7.5422 22.6621 7.26007 23.0754 6.83111 23.1564C6.40215 23.2373 5.9888 22.9552 5.90787 22.5262C5.67176 21.2748 5.55542 19.938 5.55542 18.4954C5.55542 18.0882 5.57915 17.6848 5.60133 17.3078L5.60195 17.2973C5.62758 16.8615 6.00163 16.529 6.4374 16.5546Z" />
     <path
-        android:fillColor="@color/color_default_view_on_accent"
+        android:fillColor="@android:color/white"
         android:fillType="evenOdd"
         android:pathData="M15.808 9.37191C12.1607 9.37191 9.35645 11.2721 8.04075 14.2736C7.8655 14.6734 7.39932 14.8554 6.99952 14.6802C6.59972 14.5049 6.41769 14.0387 6.59294 13.6389C8.16786 10.0461 11.5513 7.79111 15.808 7.79111C20.3525 7.79111 23.839 10.4454 25.2717 13.7296C26.3844 16.2631 26.422 17.7068 26.422 18.518C26.422 20.6581 25.7884 22.5321 24.5694 23.8807C24.2767 24.2046 23.7769 24.2298 23.453 23.9371C23.1292 23.6444 23.104 23.1446 23.3967 22.8207C24.3005 21.8207 24.8412 20.3525 24.8412 18.518C24.8412 17.8839 24.8337 16.6632 23.8239 14.3644L23.8231 14.3625C22.6359 11.6402 19.7091 9.37191 15.808 9.37191Z" />
     <path
-        android:fillColor="@color/color_default_view_on_accent"
+        android:fillColor="@android:color/white"
         android:fillType="evenOdd"
         android:pathData="M15.8081 6.0748C13.9042 6.0748 12.2161 6.53994 10.858 7.34243C10.4822 7.56451 9.99753 7.43987 9.77545 7.06406C9.55338 6.68824 9.67801 6.20355 10.0538 5.98148C11.6767 5.0225 13.647 4.494 15.8081 4.494C18.1926 4.494 20.2599 5.14578 21.9465 6.22135C22.3146 6.45606 22.4227 6.9447 22.188 7.31276C21.9533 7.68082 21.4647 7.78892 21.0966 7.55422C19.6668 6.64249 17.895 6.0748 15.8081 6.0748Z" />
 </vector>
\ No newline at end of file
diff --git a/res/drawable/ic_fingerprint_list_icon.xml b/res/drawable/ic_fingerprint_list_icon.xml
index 646e9807aa18b0763c18552e9fa876126f631042..14856bd7e34a82f5bb2c469103f1cf5e3c4c2373 100644
--- a/res/drawable/ic_fingerprint_list_icon.xml
+++ b/res/drawable/ic_fingerprint_list_icon.xml
@@ -6,26 +6,26 @@
     android:viewportHeight="32">
 
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/color_icon_background_blue"
         android:pathData="M25.2477 32H6.75229C3.02611 32 0 28.9739 0 25.2477V6.75229C0 3.02611 3.02611 0 6.75229 0H25.2477C28.9739 0 32 3.02611 32 6.75229V25.2477C32 28.9739 28.9739 32 25.2477 32Z" />
     <path
-        android:fillColor="@color/color_default_view_on_accent"
+        android:fillColor="@android:color/white"
         android:fillType="evenOdd"
         android:pathData="M12.4679 15.2329C13.1843 14.2754 14.3147 13.6401 15.8757 13.6401C17.5339 13.6401 18.7194 14.3627 19.4704 15.3326C20.1987 16.2734 20.5052 17.4252 20.5052 18.3373C20.5052 18.9885 20.3879 19.6171 20.0304 20.0986C19.6403 20.6239 19.0646 20.844 18.4502 20.844C18.0136 20.844 17.6598 20.4902 17.6598 20.0536C17.6598 19.6171 18.0136 19.2632 18.4502 19.2632C18.6713 19.2632 18.7279 19.2011 18.7613 19.1562C18.8271 19.0674 18.9244 18.8379 18.9244 18.3373C18.9244 17.7364 18.7115 16.9347 18.2204 16.3004C17.7519 15.6952 17.0178 15.2209 15.8757 15.2209C14.7946 15.2209 14.1408 15.6357 13.7337 16.1799C13.3018 16.7573 13.098 17.5521 13.098 18.3373C13.098 20.7474 13.7796 22.6033 14.9288 23.7928C15.9886 24.8711 17.428 25.4735 19.1502 25.4735C19.5868 25.4735 19.9406 25.8274 19.9406 26.2639C19.9406 26.7005 19.5868 27.0543 19.1502 27.0543C17.0345 27.0543 15.1776 26.3026 13.7987 24.8981L13.7966 24.896L13.7945 24.8939C12.2801 23.3282 11.5172 21.0296 11.5172 18.3373C11.5172 17.3159 11.7764 16.1573 12.4679 15.2329Z" />
     <path
-        android:fillColor="@color/color_default_view_on_accent"
+        android:fillColor="@android:color/white"
         android:fillType="evenOdd"
         android:pathData="M11.8278 14.0152C10.852 15.042 10.2527 16.5272 10.2527 18.3373C10.2527 22.0095 11.4916 24.5396 13.2452 26.1301C13.5686 26.4234 13.593 26.9233 13.2997 27.2466C13.0064 27.5699 12.5066 27.5943 12.1832 27.3011C10.0526 25.3686 8.67188 22.3885 8.67188 18.3373C8.67188 16.1728 9.39366 14.2819 10.6818 12.9262C11.9727 11.5677 13.7881 10.7946 15.8758 10.7946C20.5646 10.7946 23.3508 14.6594 23.3508 18.3373C23.3508 19.8609 22.8897 21.2019 22.0156 22.172C21.1349 23.1494 19.888 23.6895 18.4503 23.6895C16.6212 23.6895 15.3816 22.1942 14.931 20.8394C14.6997 20.1436 14.627 19.361 14.8497 18.6732C15.088 17.9373 15.6592 17.3536 16.5527 17.1974C16.9828 17.1223 17.3923 17.4099 17.4674 17.8399C17.5426 18.2699 17.2549 18.6795 16.8249 18.7546C16.5555 18.8017 16.4266 18.9349 16.3536 19.1602C16.2651 19.4336 16.2701 19.8563 16.4311 20.3406C16.7653 21.3457 17.5694 22.1087 18.4503 22.1087C19.4741 22.1087 20.2823 21.7341 20.8412 21.1138C21.4068 20.4862 21.77 19.5463 21.77 18.3373C21.77 15.3759 19.5428 12.3754 15.8758 12.3754C14.1922 12.3754 12.8008 12.9912 11.8278 14.0152Z" />
     <path
-        android:fillColor="@color/color_default_view_on_accent"
+        android:fillColor="@android:color/white"
         android:fillType="evenOdd"
         android:pathData="M6.4374 16.5546C6.87318 16.5803 7.20566 16.9543 7.18003 17.3901C7.15721 17.7779 7.13622 18.1386 7.13622 18.4954C7.13622 19.8531 7.24571 21.0907 7.46126 22.2331C7.5422 22.6621 7.26007 23.0754 6.83111 23.1564C6.40215 23.2373 5.9888 22.9552 5.90787 22.5262C5.67176 21.2748 5.55542 19.938 5.55542 18.4954C5.55542 18.0882 5.57915 17.6848 5.60133 17.3078L5.60195 17.2973C5.62758 16.8615 6.00163 16.529 6.4374 16.5546Z" />
     <path
-        android:fillColor="@color/color_default_view_on_accent"
+        android:fillColor="@android:color/white"
         android:fillType="evenOdd"
         android:pathData="M15.808 9.37191C12.1607 9.37191 9.35645 11.2721 8.04075 14.2736C7.8655 14.6734 7.39932 14.8554 6.99952 14.6802C6.59972 14.5049 6.41769 14.0387 6.59294 13.6389C8.16786 10.0461 11.5513 7.79111 15.808 7.79111C20.3525 7.79111 23.839 10.4454 25.2717 13.7296C26.3844 16.2631 26.422 17.7068 26.422 18.518C26.422 20.6581 25.7884 22.5321 24.5694 23.8807C24.2767 24.2046 23.7769 24.2298 23.453 23.9371C23.1292 23.6444 23.104 23.1446 23.3967 22.8207C24.3005 21.8207 24.8412 20.3525 24.8412 18.518C24.8412 17.8839 24.8337 16.6632 23.8239 14.3644L23.8231 14.3625C22.6359 11.6402 19.7091 9.37191 15.808 9.37191Z" />
     <path
-        android:fillColor="@color/color_default_view_on_accent"
+        android:fillColor="@android:color/white"
         android:fillType="evenOdd"
         android:pathData="M15.8081 6.0748C13.9042 6.0748 12.2161 6.53994 10.858 7.34243C10.4822 7.56451 9.99753 7.43987 9.77545 7.06406C9.55338 6.68824 9.67801 6.20355 10.0538 5.98148C11.6767 5.0225 13.647 4.494 15.8081 4.494C18.1926 4.494 20.2599 5.14578 21.9465 6.22135C22.3146 6.45606 22.4227 6.9447 22.188 7.31276C21.9533 7.68082 21.4647 7.78892 21.0966 7.55422C19.6668 6.64249 17.895 6.0748 15.8081 6.0748Z" />
 </vector>
\ No newline at end of file
diff --git a/res/drawable/ic_fingerprint_success.xml b/res/drawable/ic_fingerprint_success.xml
index 14a585c4aca58d8b9da79f6d42528554c64f56e5..a9bc6de92faa1c0bb42d77a0039c951622b741e9 100644
--- a/res/drawable/ic_fingerprint_success.xml
+++ b/res/drawable/ic_fingerprint_success.xml
@@ -22,8 +22,8 @@
         android:viewportHeight="40.0">
     <path
         android:pathData="M20.0,20.0m-20.0,0.0a20.0,20.0 0.0,1.0 1.0,40.0 0.0a20.0,20.0 0.0,1.0 1.0,-40.0 0.0"
-        android:fillColor="?android:attr/colorAccent"/>
+        android:fillColor="@color/color_icon_background_blue"/>
     <path
         android:pathData="M11.2,21.41l1.63,-1.619999 4.17,4.169998 10.59,-10.589999 1.619999,1.63 -12.209999,12.209999z"
-        android:fillColor="@color/color_default_view_on_accent"/>
+        android:fillColor="@android:color/white"/>
 </vector>
diff --git a/res/drawable/ic_folder_vd_theme_24.xml b/res/drawable/ic_folder_vd_theme_24.xml
index faa67fbe3837b73f9494520a8b5d4bdf79f3e297..784b125af9a662f191bf5391ebc8a44e91904299 100644
--- a/res/drawable/ic_folder_vd_theme_24.xml
+++ b/res/drawable/ic_folder_vd_theme_24.xml
@@ -6,15 +6,15 @@
     <group>
         <clip-path android:pathData="M0.635,0h32v32h-32z M 0,0" />
         <path
-            android:fillColor="@color/color_default_accent"
+            android:fillColor="@color/color_icon_background_blue"
             android:pathData="M25.8827,32H7.3873C3.6611,32 0.635,28.9739 0.635,25.2477V6.7523C0.635,3.0261 3.6611,0 7.3873,0H25.8827C29.6089,0 32.635,3.0261 32.635,6.7523V25.2477C32.635,28.9739 29.6089,32 25.8827,32Z" />
         <group>
             <clip-path android:pathData="M5.0127,5.9111h23.2444v20.1778h-23.2444z M 0,0" />
             <path
-                android:fillColor="@color/color_default_view_on_accent"
+                android:fillColor="@android:color/white"
                 android:pathData="M24.946,7.4667C25.9016,7.4667 26.7016,8.2445 26.7016,9.2222V22.7778C26.7016,23.7334 25.9238,24.5334 24.946,24.5334H8.3238C7.3682,24.5334 6.5683,23.7556 6.5683,22.7778V9.2222C6.5683,8.2445 7.346,7.4667 8.3238,7.4667H24.946ZM24.946,5.9111H8.3238C6.5016,5.9111 5.0127,7.4 5.0127,9.2222V22.7778C5.0127,24.6 6.5016,26.0889 8.3238,26.0889H24.946C26.7682,26.0889 28.2571,24.6 28.2571,22.7778V9.2222C28.2571,7.4 26.7682,5.9111 24.946,5.9111Z" />
             <path
-                android:fillColor="@color/color_default_view_on_accent"
+                android:fillColor="@android:color/white"
                 android:pathData="M12.3683,11.1334C12.7905,11.1334 13.346,11.4889 13.6127,11.9778L13.5905,11.9556C13.9016,12.5334 14.7016,13.1112 15.3016,13.1112H24.946C25.9016,13.1112 26.7016,13.8889 26.7016,14.8667V22.7778C26.7016,23.7334 25.9238,24.5334 24.946,24.5334H8.3238C7.3682,24.5334 6.5683,23.7556 6.5683,22.7778V13.1112V12.5112C6.5683,11.7556 7.1683,11.1556 7.9238,11.1556H12.3683V11.1334ZM12.3683,9.5778H7.9238C6.3238,9.5778 5.0127,10.8889 5.0127,12.4889V13.0889V22.7556C5.0127,24.5778 6.5016,26.0667 8.3238,26.0667H24.946C26.7682,26.0667 28.2571,24.5778 28.2571,22.7556V14.8445C28.2571,13.0223 26.7682,11.5334 24.946,11.5334H15.3683C15.2349,11.4889 15.0127,11.3112 14.9683,11.2C14.946,11.1778 14.946,11.1556 14.9238,11.1334C14.3683,10.2 13.3683,9.5778 12.3683,9.5778Z" />
         </group>
     </group>
diff --git a/res/drawable/ic_font_size_16dp.xml b/res/drawable/ic_font_size_16dp.xml
index 751fef7138fa17176153c55f68cd659774b91fd3..00ab49ace8bc842697545987c36e4fae4f501cf1 100644
--- a/res/drawable/ic_font_size_16dp.xml
+++ b/res/drawable/ic_font_size_16dp.xml
@@ -19,7 +19,7 @@
     android:viewportWidth="48"
     android:viewportHeight="48">
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M33.3,36.8H14.7L10.8,48H2.1L20.2,0h7.5l18.2,48h-8.7L33.3,36.8z
 M17,30.1h13.9l-7-19.9L17,30.1z" />
 </vector>
diff --git a/res/drawable/ic_font_size_24dp.xml b/res/drawable/ic_font_size_24dp.xml
index 071429ae1c5f39f9cc3a7ab5faa708e845f80626..615b81c13135791e63fdc9b02c606373f6b8b807 100644
--- a/res/drawable/ic_font_size_24dp.xml
+++ b/res/drawable/ic_font_size_24dp.xml
@@ -19,7 +19,7 @@
     android:viewportWidth="48"
     android:viewportHeight="48">
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M33.3,36.8H14.7L10.8,48H2.1L20.2,0h7.5l18.2,48h-8.7L33.3,36.8z
 M17,30.1h13.9l-7-19.9L17,30.1z" />
 </vector>
diff --git a/res/drawable/ic_frequency_antenna.xml b/res/drawable/ic_frequency_antenna.xml
index 2e14d0f6d1dc8e82c0904d0c215302ec5cda72e7..9d9c6577b5f8663848827c9ef1f750db6745aa99 100644
--- a/res/drawable/ic_frequency_antenna.xml
+++ b/res/drawable/ic_frequency_antenna.xml
@@ -23,5 +23,5 @@
         android:pathData="M12,5c-3.9,0-7,3.1-7,7h2c0-2.8,2.2-5,5-5s5,2.2,5,5h2C19,8.1,15.9,5,12,5z M13,14.3c0.9-0.4,1.5-1.3,1.5-2.3
                 c0-1.4-1.1-2.5-2.5-2.5S9.5,10.6,9.5,12c0,1,0.6,1.9,1.5,2.3v3.3L7.6,21L9,22.4l3-3l3,3l1.4-1.4L13,17.6V14.3z M12,1
                 C5.9,1,1,5.9,1,12h2c0-5,4-9,9-9s9,4,9,9h2C23,5.9,18.1,1,12,1z"
-        android:fillColor="@color/color_default_accent" />
+        android:fillColor="@color/default_icon_color" />
 </vector>
diff --git a/res/drawable/ic_friction_lock_closed.xml b/res/drawable/ic_friction_lock_closed.xml
index a35dc9a735d6740c9758857941ee4c51a81058b1..326c88984a0d7de7f9c5257a9392c0256778ac02 100644
--- a/res/drawable/ic_friction_lock_closed.xml
+++ b/res/drawable/ic_friction_lock_closed.xml
@@ -20,6 +20,6 @@
         android:viewportWidth="24"
         android:viewportHeight="24">
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M18,8h-1V6c0,-2.76 -2.24,-5 -5,-5S7,3.24 7,6v2H6c-1.1,0 -2,0.9 -2,2v10c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2V10C20,8.9 19.1,8 18,8zM9,6c0,-1.66 1.34,-3 3,-3s3,1.34 3,3v2H9V6zM18,20H6V10h12V20zM12,17c1.1,0 2,-0.9 2,-2c0,-1.1 -0.9,-2 -2,-2c-1.1,0 -2,0.9 -2,2C10,16.1 10.9,17 12,17z"/>
 </vector>
diff --git a/res/drawable/ic_friction_money.xml b/res/drawable/ic_friction_money.xml
index fff25d00f7f96cda673a46e94c3fd144fadbf98d..1e30ee94e9583dba3c03076f9e765d14b65cce9e 100644
--- a/res/drawable/ic_friction_money.xml
+++ b/res/drawable/ic_friction_money.xml
@@ -20,7 +20,7 @@
         android:width="18dp"
         android:height="18dp">
 
-    <path android:fillColor="@color/color_default_accent"
+    <path android:fillColor="@color/default_icon_color"
           android:pathData="M9.56 8.1c-1.6-.51-2.66-.71-2.66-1.88 0-.83 .72 -1.62 2.1-1.62 1.59 0 2.1 .88
           2.1 1.94H13c0-1.79-1.17-3.09-3-3.44V1H8v2.11c-1.58 .32 -3 1.37-3 3.12 0 2.25
           1.78 2.8 4 3.52 1.88 .61 2.25 1.04 2.25 2.09 0 .9-.67 1.56-2.25 1.56-1.2
diff --git a/res/drawable/ic_gesture_play_button.xml b/res/drawable/ic_gesture_play_button.xml
index 59c511cee53d63e14314113428e397758358f4e7..b8d12acf0f0170e13a5cbd5ec71eb346b5507e2c 100644
--- a/res/drawable/ic_gesture_play_button.xml
+++ b/res/drawable/ic_gesture_play_button.xml
@@ -18,7 +18,7 @@
         android:height="24dp"
         android:viewportWidth="48.0"
         android:viewportHeight="48.0">
-    <path android:fillColor="@color/color_default_view_on_accent" android:pathData="M24,24m-19,0a19,19 0,1 1,38 0a19,19 0,1 1,-38 0"/>
-    <path android:fillColor="@color/color_default_accent" android:pathData="M20,33l12,-9l-12,-9z"/>
-    <path android:fillColor="@color/color_default_accent" android:pathData="M24,4C12.96,4 4,12.96 4,24s8.96,20 20,20s20,-8.96 20,-20S35.04,4 24,4zM24,40c-8.82,0 -16,-7.18 -16,-16S15.18,8 24,8s16,7.18 16,16S32.82,40 24,40z"/>
+    <path android:fillColor="@android:color/white" android:pathData="M24,24m-19,0a19,19 0,1 1,38 0a19,19 0,1 1,-38 0"/>
+    <path android:fillColor="@color/color_icon_background_blue" android:pathData="M20,33l12,-9l-12,-9z"/>
+    <path android:fillColor="@color/color_icon_background_blue" android:pathData="M24,4C12.96,4 4,12.96 4,24s8.96,20 20,20s20,-8.96 20,-20S35.04,4 24,4zM24,40c-8.82,0 -16,-7.18 -16,-16S15.18,8 24,8s16,7.18 16,16S32.82,40 24,40z"/>
 </vector>
diff --git a/res/drawable/ic_gray_scale_24dp.xml b/res/drawable/ic_gray_scale_24dp.xml
index 815b0752ab7682c5b82e2197589440337bb0412b..359bcc02b02d006c314c4e18ce7d5e15794c362c 100644
--- a/res/drawable/ic_gray_scale_24dp.xml
+++ b/res/drawable/ic_gray_scale_24dp.xml
@@ -19,7 +19,7 @@
         android:viewportWidth="24"
         android:viewportHeight="24">
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10s10,-4.48 10,-10S17.52,2 12,2zM11,19.93C7.06,19.44 4,16.08 4,12s3.05,-7.44 7,-7.93V19.93zM13,4.07C14.03,4.2 15,4.52 15.87,5H13V4.07zM13,7h5.24c0.25,0.31 0.48,0.65 0.68,1H13V7zM13,10h6.74c0.08,0.33 0.15,0.66 0.19,1H13V10zM13,19.93V19h2.87C15,19.48 14.03,19.8 13,19.93zM18.24,17H13v-1h5.92C18.72,16.35 18.49,16.69 18.24,17zM19.74,14H13v-1h6.93C19.89,13.34 19.82,13.67 19.74,14z"/>
 </vector>
 
diff --git a/res/drawable/ic_headset_24dp.xml b/res/drawable/ic_headset_24dp.xml
index 35f5be2832d0e34a34365d87ecbce0923ab6d7bd..8b1c03bc17564ed9ddb1af71c48b0bef8aecdc6c 100644
--- a/res/drawable/ic_headset_24dp.xml
+++ b/res/drawable/ic_headset_24dp.xml
@@ -19,6 +19,6 @@
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M19,15v3c0,0.55 -0.45,1 -1,1h-1v-4H19M7,15v4H6c-0.55,0 -1,-0.45 -1,-1v-3H7M12,2c-4.97,0 -9,4.03 -9,9v7c0,1.66 1.34,3 3,3h3v-8H5v-2c0,-3.87 3.13,-7 7,-7s7,3.13 7,7v2h-4v8h3c1.66,0 3,-1.34 3,-3v-7C21,6.03 16.97,2 12,2L12,2z"/>
 </vector>
diff --git a/res/drawable/ic_help.xml b/res/drawable/ic_help.xml
index ea676944412abccf8cb98b40ecefdb38d6da1cd9..fae4abce079bc0df30a79235cae32162a4e99250 100644
--- a/res/drawable/ic_help.xml
+++ b/res/drawable/ic_help.xml
@@ -19,6 +19,6 @@
     android:viewportWidth="24.0"
     android:viewportHeight="24.0">
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M11,18h2v-2h-2V18zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10s10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8s8,3.59 8,8S16.41,20 12,20zM12,6c-2.21,0 -4,1.79 -4,4h2c0,-1.1 0.9,-2 2,-2s2,0.9 2,2c0,2 -3,1.75 -3,5h2c0,-2.25 3,-2.5 3,-5C16,7.79 14.21,6 12,6z" />
 </vector>
diff --git a/res/drawable/ic_homepage_accessibility.xml b/res/drawable/ic_homepage_accessibility.xml
index db52edffb72430a1681a4aee0964cc8c73224816..dcc58788abdc0ccc7c8e86995942bbeecc39f3fb 100644
--- a/res/drawable/ic_homepage_accessibility.xml
+++ b/res/drawable/ic_homepage_accessibility.xml
@@ -21,7 +21,7 @@
     android:viewportHeight="32">
 
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/color_icon_background_blue"
         android:pathData="M25.2477 32H6.75229C3.02611 32 0 28.9739 0 25.2477V6.75229C0 3.02611 3.02611 0 6.75229 0H25.2477C28.9739 0 32 3.02611 32 6.75229V25.2477C32 28.9739 28.9739 32 25.2477 32Z" />
     <path
         android:fillColor="#ffffff"
diff --git a/res/drawable/ic_homepage_accounts.xml b/res/drawable/ic_homepage_accounts.xml
index cfd4daf152e3219d2e64700d657054ec308148c3..6dc3ff376fcc4f19a6ee83604922582456248438 100644
--- a/res/drawable/ic_homepage_accounts.xml
+++ b/res/drawable/ic_homepage_accounts.xml
@@ -21,7 +21,7 @@
     android:viewportHeight="32">
 
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/color_icon_background_blue"
         android:pathData="M25.2477 32H6.75229C3.02611 32 0 28.9739 0 25.2477V6.75229C0 3.02611 3.02611 0 6.75229 0H25.2477C28.9739 0 32 3.02611 32 6.75229V25.2477C32 28.9739 28.9739 32 25.2477 32Z" />
     <path
         android:fillColor="#ffffff"
diff --git a/res/drawable/ic_homepage_battery.xml b/res/drawable/ic_homepage_battery.xml
index fe063afb6a3bae2a25211a07a6323fc17125e856..6837622897bff03ae318d2091a02183ed50395ab 100644
--- a/res/drawable/ic_homepage_battery.xml
+++ b/res/drawable/ic_homepage_battery.xml
@@ -24,28 +24,28 @@
         android:fillColor="#2CCF69"
         android:pathData="M25.2477 32H6.75229C3.02611 32 0 28.9739 0 25.2477V6.75229C0 3.02611 3.02611 0 6.75229 0H25.2477C28.9739 0 32 3.02611 32 6.75229V25.2477C32 28.9739 28.9739 32 25.2477 32Z" />
     <path
-        android:fillColor="@color/color_default_view_on_accent"
+        android:fillColor="@android:color/white"
         android:fillType="evenOdd"
         android:pathData="M8.60413 7.33947C8.60413 6.90295 8.958 6.54907 9.39453 6.54907H22.6281C23.0646 6.54907 23.4185 6.90295 23.4185 7.33947V26.5124C23.4185 26.9489 23.0646 27.3028 22.6281 27.3028H9.39453C8.958 27.3028 8.60413 26.9489 8.60413 26.5124V7.33947ZM10.1849 8.12988V25.722H21.8377V8.12988H10.1849Z" />
     <path
-        android:fillColor="@color/color_default_view_on_accent"
+        android:fillColor="@android:color/white"
         android:pathData="M18.4051 5.51019H13.6176V7.33941H18.4051V5.51019Z" />
     <path
-        android:fillColor="@color/color_default_view_on_accent"
+        android:fillColor="@android:color/white"
         android:fillType="evenOdd"
         android:pathData="M12.827 5.51019C12.827 5.07366 13.1809 4.71979 13.6174 4.71979H18.405C18.8415 4.71979 19.1954 5.07366 19.1954 5.51019V7.33941C19.1954 7.77593 18.8415 8.12981 18.405 8.12981H13.6174C13.1809 8.12981 12.827 7.77593 12.827 7.33941V5.51019ZM14.4078 6.30059V6.549H17.6146V6.30059H14.4078Z" />
     <path
-        android:fillColor="@color/color_default_view_on_accent"
+        android:fillColor="@android:color/white"
         android:pathData="M19.7374 22.9442H12.2625V23.4185H19.7374V22.9442Z" />
     <path
-        android:fillColor="@color/color_default_view_on_accent"
+        android:fillColor="@android:color/white"
         android:fillType="evenOdd"
         android:pathData="M11.4722 22.1537H20.5279V24.2088H11.4722V22.1537Z" />
     <path
-        android:fillColor="@color/color_default_view_on_accent"
+        android:fillColor="@android:color/white"
         android:pathData="M19.7374 19.3761H12.2625V19.8503H19.7374V19.3761Z" />
     <path
-        android:fillColor="@color/color_default_view_on_accent"
+        android:fillColor="@android:color/white"
         android:fillType="evenOdd"
         android:pathData="M11.4722 18.5857H20.5279V20.6407H11.4722V18.5857Z" />
 </vector>
diff --git a/res/drawable/ic_homepage_connected_device.xml b/res/drawable/ic_homepage_connected_device.xml
index 1bbdd28e185b6b288f829b4613787e33347482ee..430d65abd5e01b08abda2ed3962ee8d9d7879462 100644
--- a/res/drawable/ic_homepage_connected_device.xml
+++ b/res/drawable/ic_homepage_connected_device.xml
@@ -6,7 +6,7 @@
     android:viewportHeight="32">
 
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/color_icon_background_blue"
         android:pathData="M25.2477 32H6.75229C3.02611 32 0 28.9739 0 25.2477V6.75229C0 3.02611 3.02611 0 6.75229 0H25.2477C28.9739 0 32 3.02611 32 6.75229V25.2477C32 28.9739 28.9739 32 25.2477 32Z" />
     <path
         android:fillColor="#ffffff"
diff --git a/res/drawable/ic_homepage_display.xml b/res/drawable/ic_homepage_display.xml
index ff1c18bbae2b960f65b73e0c079532f0fdafb503..a43736e8de9733e92b7c01de7e4c8cb7a634c4d3 100644
--- a/res/drawable/ic_homepage_display.xml
+++ b/res/drawable/ic_homepage_display.xml
@@ -21,7 +21,7 @@
     android:viewportHeight="32">
 
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/color_icon_background_blue"
         android:pathData="M25.2477 32H6.75229C3.02611 32 0 28.9739 0 25.2477V6.75229C0 3.02611 3.02611 0 6.75229 0H25.2477C28.9739 0 32 3.02611 32 6.75229V25.2477C32 28.9739 28.9739 32 25.2477 32Z" />
     <path
         android:fillColor="#ffffff"
diff --git a/res/drawable/ic_homepage_network.xml b/res/drawable/ic_homepage_network.xml
index ef99b3d7eaba473d667d11c62a32b3d787425482..54872ca3e0761e3e3d649c8cb29db29fdda3a540 100644
--- a/res/drawable/ic_homepage_network.xml
+++ b/res/drawable/ic_homepage_network.xml
@@ -21,17 +21,17 @@
     android:viewportHeight="32">
 
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/color_icon_background_blue"
         android:pathData="M25.2477 32H6.75229C3.02611 32 0 28.9739 0 25.2477V6.75229C0 3.02611 3.02611 0 6.75229 0H25.2477C28.9739 0 32 3.02611 32 6.75229V25.2477C32 28.9739 28.9739 32 25.2477 32Z" />
     <path
-        android:fillColor="@color/color_default_view_on_accent"
+        android:fillColor="@android:color/white"
         android:pathData="M16.0113 24.7057C17.4082 24.7057 18.5406 23.5733 18.5406 22.1764C18.5406 20.7795 17.4082 19.6471 16.0113 19.6471C14.6145 19.6471 13.4821 20.7795 13.4821 22.1764C13.4821 23.5733 14.6145 24.7057 16.0113 24.7057Z" />
     <path
-        android:fillColor="@color/color_default_view_on_accent"
+        android:fillColor="@android:color/white"
         android:fillType="evenOdd"
         android:pathData="M21.5479 18.5556C18.4932 15.4804 13.5075 15.4777 10.4277 18.5575C10.119 18.8662 9.61854 18.8662 9.30987 18.5575C9.0012 18.2488 9.0012 17.7484 9.30987 17.4397C13.0049 13.7446 18.9945 13.7419 22.6695 17.4416C22.9771 17.7513 22.9754 18.2517 22.6657 18.5594C22.356 18.867 21.8556 18.8653 21.5479 18.5556Z" />
     <path
-        android:fillColor="@color/color_default_view_on_accent"
+        android:fillColor="@android:color/white"
         android:fillType="evenOdd"
         android:pathData="M25.4804 14.6744C20.2328 9.44807 11.7669 9.4497 6.54339 14.6732C6.23472 14.9819 5.73427 14.9819 5.4256 14.6732C5.11692 14.3646 5.11692 13.8641 5.4256 13.5554C11.2677 7.71331 20.7327 7.71494 26.5959 13.5543C26.9052 13.8623 26.9062 14.3628 26.5982 14.6721C26.2901 14.9814 25.7897 14.9824 25.4804 14.6744Z" />
 </vector>
diff --git a/res/drawable/ic_homepage_privacy.xml b/res/drawable/ic_homepage_privacy.xml
index 7fc10c360bfd941adedbbece52f31d7fcf73ac94..85b5c6c58b3bd9906b7c08cd593cccef70e49a6b 100644
--- a/res/drawable/ic_homepage_privacy.xml
+++ b/res/drawable/ic_homepage_privacy.xml
@@ -4,7 +4,7 @@
     android:viewportWidth="21.637253"
     android:viewportHeight="21.637253">
   <path
-      android:fillColor="@color/color_default_accent"
+      android:fillColor="@color/color_icon_background_blue"
       android:pathData="M3.5436,-0L18.0936,-0A3.5436,3.5436 135,0 1,21.6373 3.5436L21.6373,18.0936A3.5436,3.5436 45,0 1,18.0936 21.6372L3.5436,21.6372A3.5436,3.5436 45,0 1,0 18.0936L0,3.5436A3.5436,3.5436 135,0 1,3.5436 -0z"
       android:strokeWidth="0.0902828"
       android:strokeLineCap="round"
diff --git a/res/drawable/ic_homepage_search.xml b/res/drawable/ic_homepage_search.xml
index 807ac10c3d697e0bade1aff627697ba1411d8f9f..171bd28b1e8c6f7cd6598357acb3b7bc4d0f3140 100644
--- a/res/drawable/ic_homepage_search.xml
+++ b/res/drawable/ic_homepage_search.xml
@@ -21,6 +21,6 @@
         android:viewportWidth="24"
         android:viewportHeight="24">
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M20.49,19l-5.73,-5.73C15.53,12.2 16,10.91 16,9.5C16,5.91 13.09,3 9.5,3S3,5.91 3,9.5C3,13.09 5.91,16 9.5,16c1.41,0 2.7,-0.47 3.77,-1.24L19,20.49L20.49,19zM5,9.5C5,7.01 7.01,5 9.5,5S14,7.01 14,9.5S11.99,14 9.5,14S5,11.99 5,9.5z"/>
 </vector>
diff --git a/res/drawable/ic_homepage_system_dashboard.xml b/res/drawable/ic_homepage_system_dashboard.xml
index d0e02b5e49503ec452215eee037f748a54aba523..60a1714396dd2a832ebc4ef84577e75d62d30e1c 100644
--- a/res/drawable/ic_homepage_system_dashboard.xml
+++ b/res/drawable/ic_homepage_system_dashboard.xml
@@ -21,7 +21,7 @@
     android:viewportHeight="32">
 
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/color_icon_background_blue"
         android:pathData="M25.2477 32H6.75229C3.02611 32 0 28.9739 0 25.2477V6.75229C0 3.02611 3.02611 0 6.75229 0H25.2477C28.9739 0 32 3.02611 32 6.75229V25.2477C32 28.9739 28.9739 32 25.2477 32Z" />
     <path
         android:fillColor="#ffffff"
diff --git a/res/drawable/ic_hotspot.xml b/res/drawable/ic_hotspot.xml
index 3c146b743ceb0987acf57f3c80e882c338be7b92..10dc564dd0e0442fe7f559b920360f60a8831839 100644
--- a/res/drawable/ic_hotspot.xml
+++ b/res/drawable/ic_hotspot.xml
@@ -6,27 +6,27 @@
     android:viewportHeight="32">
 
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/color_icon_background_blue"
         android:pathData="M25.2477 32H6.75229C3.02611 32 0 28.9739 0 25.2477V6.75229C0 3.02611 3.02611 0 6.75229 0H25.2477C28.9739 0 32 3.02611 32 6.75229V25.2477C32 28.9739 28.9739 32 25.2477 32Z" />
     <path
-        android:fillColor="@color/color_default_view_on_accent"
+        android:fillColor="@android:color/white"
         android:pathData="M13.4369 26.0605C14.5344 26.0605 15.4242 25.1708 15.4242 24.0732C15.4242 22.9757 14.5344 22.0859 13.4369 22.0859C12.3393 22.0859 11.4496 22.9757 11.4496 24.0732C11.4496 25.1708 12.3393 26.0605 13.4369 26.0605Z" />
     <path
-        android:fillColor="@color/color_default_view_on_accent"
+        android:fillColor="@android:color/white"
         android:fillType="evenOdd"
         android:pathData="M16.9429 21.5381C14.9933 19.5885 11.8353 19.5885 9.88568 21.5381C9.57701 21.8468 9.07655 21.8468 8.76788 21.5381C8.45921 21.2295 8.45921 20.729 8.76788 20.4203C11.3348 17.8534 15.4937 17.8534 18.0607 20.4203C18.3694 20.729 18.3694 21.2295 18.0607 21.5381C17.752 21.8468 17.2516 21.8468 16.9429 21.5381Z" />
     <path
-        android:fillColor="@color/color_default_view_on_accent"
+        android:fillColor="@android:color/white"
         android:fillType="evenOdd"
         android:pathData="M19.5625 18.9412C16.1676 15.5463 10.6836 15.5463 7.28863 18.9412C6.97996 19.2499 6.47951 19.2499 6.17083 18.9412C5.86216 18.6325 5.86216 18.1321 6.17083 17.8234C10.1831 13.8111 16.668 13.8111 20.6803 17.8234C20.989 18.1321 20.989 18.6325 20.6803 18.9412C20.3716 19.2499 19.8712 19.2499 19.5625 18.9412Z" />
     <path
-        android:fillColor="@color/color_default_view_on_accent"
+        android:fillColor="@android:color/white"
         android:fillType="evenOdd"
         android:pathData="M13.0981 6.77478C13.0981 6.33825 13.452 5.98438 13.8885 5.98438H24.2541C24.6906 5.98438 25.0445 6.33825 25.0445 6.77478V25.767C25.0445 26.2035 24.6906 26.5574 24.2541 26.5574H19.9408C19.5042 26.5574 19.1504 26.2035 19.1504 25.767C19.1504 25.3305 19.5042 24.9766 19.9408 24.9766H23.4637V7.56518H14.6789V11.1559C14.6789 11.5924 14.3251 11.9463 13.8885 11.9463C13.452 11.9463 13.0981 11.5924 13.0981 11.1559V6.77478Z" />
     <path
-        android:fillColor="@color/color_default_view_on_accent"
+        android:fillColor="@android:color/white"
         android:pathData="M25.2704 9.95898H24.4574V13.1658H25.2704V9.95898Z" />
     <path
-        android:fillColor="@color/color_default_view_on_accent"
+        android:fillColor="@android:color/white"
         android:pathData="M25.2704 14.4983H24.4574V15.921H25.2704V14.4983Z" />
 </vector>
\ No newline at end of file
diff --git a/res/drawable/ic_info.xml b/res/drawable/ic_info.xml
index e53b5588f9b262b3b2ec48e5420d77cfb614734d..35ae6f07fca6dbf38d1534b257feb3c861e062f4 100644
--- a/res/drawable/ic_info.xml
+++ b/res/drawable/ic_info.xml
@@ -5,6 +5,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm1 15h-2v-6h2v6zm0-8h-2V7h2v2z"/>
 </vector>
\ No newline at end of file
diff --git a/res/drawable/ic_info_outline_24dp.xml b/res/drawable/ic_info_outline_24dp.xml
index 8f97ce93e6e0727858470da69fb378e29a366f49..06f74ba96434a5b4ecb75c776a38286190dd0501 100644
--- a/res/drawable/ic_info_outline_24dp.xml
+++ b/res/drawable/ic_info_outline_24dp.xml
@@ -20,12 +20,12 @@
         android:viewportHeight="24"
         android:viewportWidth="24">
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M11,7h2v2h-2z"/>
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M11,11h2v6h-2z"/>
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M12,2C6.48,2 2,6.48 2,12c0,5.52 4.48,10 10,10s10,-4.48 10,-10C22,6.48 17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8c0,-4.41 3.59,-8 8,-8s8,3.59 8,8C20,16.41 16.41,20 12,20z"/>
 </vector>
diff --git a/res/drawable/ic_keyboard.xml b/res/drawable/ic_keyboard.xml
index d2ce7c5b98d8f98340edb3d96fbd87ffee14e9e9..53ea6894668e6ad2b65153fdc113a0e7a25ff03c 100644
--- a/res/drawable/ic_keyboard.xml
+++ b/res/drawable/ic_keyboard.xml
@@ -21,6 +21,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M20,5L4,5c-1.1,0 -1.99,0.9 -1.99,2L2,17c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,7c0,-1.1 -0.9,-2 -2,-2zM11,8h2v2h-2L11,8zM11,11h2v2h-2v-2zM8,8h2v2L8,10L8,8zM8,11h2v2L8,13v-2zM7,13L5,13v-2h2v2zM7,10L5,10L5,8h2v2zM16,17L8,17v-2h8v2zM16,13h-2v-2h2v2zM16,10h-2L14,8h2v2zM19,13h-2v-2h2v2zM19,10h-2L17,8h2v2z"/>
 </vector>
diff --git a/res/drawable/ic_label.xml b/res/drawable/ic_label.xml
index d1810a120c06eb087e1e15a7ad52807b9ad25439..39c27f524ad7826d0836c5ca3536c1c0051c1ea2 100644
--- a/res/drawable/ic_label.xml
+++ b/res/drawable/ic_label.xml
@@ -19,6 +19,6 @@
         android:viewportWidth="48.0"
         android:viewportHeight="48.0">
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M35.27,11.69C34.54,10.67 33.35,10.0 32.0,10.0l-22.0,0.02c-2.21,0.0 -4.0,1.77 -4.0,3.98l0.0,20.0c0.0,2.21 1.79,3.98 4.0,3.98L32.0,38.0c1.35,0.0 2.54,-0.67 3.27,-1.69L44.0,24.0l-8.73,-12.31z"/>
 </vector>
diff --git a/res/drawable/ic_lightbulb_outline_24.xml b/res/drawable/ic_lightbulb_outline_24.xml
index e079b4b5e0637b190dea1173d96a3c926f650acb..b88752367f6d4a45a6e8851efdb3a83c03eafbdf 100644
--- a/res/drawable/ic_lightbulb_outline_24.xml
+++ b/res/drawable/ic_lightbulb_outline_24.xml
@@ -21,7 +21,7 @@
     android:viewportWidth="24.0"
     android:viewportHeight="24.0">
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M9,21c0,0.55 0.45,1 1,1h4c0.55,0 1,-0.45 1,-1v-1L9,20v1zM12,2C8.14,2
             5,5.14 5,9c0,2.38 1.19,4.47 3,5.74L8,17c0,0.55 0.45,1 1,1h6c0.55,0 1,-0.45
             1,-1v-2.26c1.81,-1.27 3,-3.36 3,-5.74 0,-3.86 -3.14,-7
diff --git a/res/drawable/ic_local_phone_24_lib.xml b/res/drawable/ic_local_phone_24_lib.xml
index 25e7414b85ee8aac85549dd1e1ea1545374ce9d0..cedaec9bb3f6766c3d06beff4c20b0a2fa074a28 100644
--- a/res/drawable/ic_local_phone_24_lib.xml
+++ b/res/drawable/ic_local_phone_24_lib.xml
@@ -11,22 +11,22 @@
             android:pathData="M25.2477 32.2327H6.75229C3.02611 32.2327 0 29.2066 0 25.4804V6.98496C0 3.25878 3.02611 0.232666 6.75229 0.232666H25.2477C28.9739 0.232666 32 3.25878 32 6.98496V25.4804C32 29.2066 28.9739 32.2327 25.2477 32.2327Z" />
         <group>
             <path
-                android:fillColor="@color/color_default_view_on_accent"
+                android:fillColor="@android:color/white"
                 android:pathData="M7.66662 11.5772C6.91106 10.0661 7.53328 8.22162 9.0444 7.46606L11.7777 12.955C10.2666 13.7105 8.42217 13.0883 7.66662 11.5772Z" />
             <path
-                android:fillColor="@color/color_default_view_on_accent"
+                android:fillColor="@android:color/white"
                 android:pathData="M10.4222 14.0661C8.99996 14.0661 7.64441 13.2883 6.97774 11.9328C6.02218 10.0217 6.79996 7.71054 8.71107 6.77721C9.08885 6.57721 9.55552 6.73277 9.75552 7.13277L12.4889 12.6217C12.6888 12.9994 12.5333 13.4661 12.1333 13.6661C11.5777 13.9328 11 14.0661 10.4222 14.0661ZM8.35552 11.2217C8.62218 11.7772 9.08885 12.1772 9.66663 12.3772C9.99996 12.4883 10.3333 12.5105 10.6666 12.4883L8.75552 8.62166C8.11107 9.31054 7.91107 10.355 8.35552 11.2217Z" />
             <path
-                android:fillColor="@color/color_default_view_on_accent"
+                android:fillColor="@android:color/white"
                 android:pathData="M20.6223 24.5327C22.1334 25.2883 23.9778 24.6661 24.7334 23.155L19.2445 20.4216C18.4889 21.9327 19.1112 23.7772 20.6223 24.5327Z" />
             <path
-                android:fillColor="@color/color_default_view_on_accent"
+                android:fillColor="@android:color/white"
                 android:pathData="M21.9778 25.6217C21.4 25.6217 20.8223 25.4884 20.2667 25.2217C18.3778 24.2884 17.6001 21.955 18.5334 20.0661C18.7334 19.6884 19.2001 19.5328 19.5778 19.7106L25.0667 22.4439C25.4445 22.6439 25.6 23.1106 25.4223 23.4884C24.7556 24.8439 23.4 25.6217 21.9778 25.6217ZM20.9556 23.8439C21.8445 24.2884 22.8889 24.0884 23.5556 23.4439L19.6889 21.5328C19.6445 21.8661 19.6889 22.1995 19.8001 22.5328C20.0001 23.0884 20.4223 23.555 20.9556 23.8439Z" />
             <path
-                android:fillColor="@color/color_default_view_on_accent"
+                android:fillColor="@android:color/white"
                 android:pathData="M21.5111 25.777C18.7111 25.777 14.5111 23.0659 11.8445 20.3993C8.44448 16.9993 4.93337 11.0437 7.22226 8.75482C7.53337 8.44371 8.02226 8.44371 8.31115 8.75482C8.62226 9.06593 8.62226 9.55482 8.31115 9.84371C7.2667 10.9104 9.22226 15.577 12.9556 19.3104C14.7111 21.0659 16.8445 22.5993 18.8 23.4882C20.5111 24.2659 21.9334 24.4437 22.4223 23.9548C22.7334 23.6437 23.2223 23.6437 23.5111 23.9548C23.8223 24.2659 23.8223 24.7548 23.5111 25.0437C23.0223 25.5548 22.3111 25.777 21.5111 25.777Z" />
             <path
-                android:fillColor="@color/color_default_view_on_accent"
+                android:fillColor="@android:color/white"
                 android:pathData="M22.2 25.0883C19.4 25.0883 15.2 22.3772 12.5333 19.7105C10.6444 17.8217 9 15.5328 8.04445 13.4217C6.93334 10.955 6.88889 9.08832 7.91111 8.0661C8.22222 7.75499 8.71111 7.75499 9 8.0661C9.31111 8.37721 9.31111 8.8661 9 9.15499C8.51111 9.64388 8.68889 11.0661 9.46667 12.7772C10.3556 14.7328 11.8667 16.8439 13.6444 18.6217C15.4 20.3772 17.5333 21.9105 19.4889 22.7994C21.2 23.5772 22.6222 23.755 23.1111 23.2661C23.4222 22.955 23.9111 22.955 24.2 23.2661C24.5111 23.5772 24.5111 24.0661 24.2 24.355C23.7111 24.8661 23.0222 25.0883 22.2 25.0883Z" />
         </group>
     </group>
diff --git a/res/drawable/ic_lock_lock.xml b/res/drawable/ic_lock_lock.xml
index 9b09bc2898152aea8a3ea99b8bd56463abccf6e6..e83bf81c4546dca4dea616e3471f482c2c56cd4c 100644
--- a/res/drawable/ic_lock_lock.xml
+++ b/res/drawable/ic_lock_lock.xml
@@ -21,6 +21,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M18,8h-1L17,6c0,-2.76 -2.24,-5 -5,-5S7,3.24 7,6v2L6,8c-1.1,0 -2,0.9 -2,2v10c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L20,10c0,-1.1 -0.9,-2 -2,-2zM12,17c-1.1,0 -2,-0.9 -2,-2s0.9,-2 2,-2 2,0.9 2,2 -0.9,2 -2,2zM15.1,8L8.9,8L8.9,6c0,-1.71 1.39,-3.1 3.1,-3.1 1.71,0 3.1,1.39 3.1,3.1v2z"/>
 </vector>
diff --git a/res/drawable/ic_media_stream_off.xml b/res/drawable/ic_media_stream_off.xml
index 76e8ee1a791488c4dcab64bfcb31d6bd8a0b0f17..e83d30979cea95f6a511b341c83e0a97666ede2b 100644
--- a/res/drawable/ic_media_stream_off.xml
+++ b/res/drawable/ic_media_stream_off.xml
@@ -20,13 +20,13 @@
                 android:fillColor="#ffffff"
                 android:pathData="M23.2666 22.048C23.7777 21.6035 24.1555 21.0035 24.2444 20.3591C24.4444 18.9813 23.2888 17.8924 21.6888 17.9146C20.9777 17.9369 20.311 18.1591 19.7555 18.5369L23.2666 22.048Z" />
             <path
-                android:fillColor="@color/color_default_accent"
+                android:fillColor="@color/color_icon_background_blue"
                 android:pathData="M12.8444 18.5369C12.8444 20.1146 12.8444 21.3369 12.8666 22.7146V20.2924C12.8666 19.5813 12.8666 19.4035 12.8444 18.5369Z" />
             <path
                 android:fillColor="#ffffff"
                 android:pathData="M12.8666 23.4924C12.4444 23.4924 12.0889 23.1368 12.0889 22.7146V21.5146C12.0889 20.5813 12.0889 19.6479 12.0889 18.5368C12.0889 18.2257 12.2666 17.959 12.5555 17.8257C12.8444 17.6924 13.1555 17.759 13.4 17.959C13.5555 18.1146 13.6666 18.3146 13.6666 18.5368C13.6666 19.0257 13.6666 19.2924 13.6666 19.559V20.2924V22.7146C13.6444 23.159 13.2889 23.4924 12.8666 23.4924Z" />
             <path
-                android:fillColor="@color/color_default_accent"
+                android:fillColor="@color/color_icon_background_blue"
                 android:pathData="M23.4222 11.6257C23.4222 14.3813 23.4222 17.6924 23.4445 20.0702V15.8257C23.4222 14.6035 23.4222 13.1368 23.4222 11.6257Z" />
             <path
                 android:fillColor="#ffffff"
diff --git a/res/drawable/ic_menu_sd_card.xml b/res/drawable/ic_menu_sd_card.xml
index fca2f19284c853d4fb49055185bded0a911f5235..5af54225a1f023b8744d90480bbc3ce110b370df 100644
--- a/res/drawable/ic_menu_sd_card.xml
+++ b/res/drawable/ic_menu_sd_card.xml
@@ -5,6 +5,6 @@
     android:viewportWidth="48.0"
     android:viewportHeight="48.0">
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M36 4H20L8.04 16 8 40c0 2.2 1.8 4 4 4h24c2.2 0 4,-1.8 4,-4V8c0,-2.2,-1.8,-4,-4,-4zM24 16h-4V8h4v8zm6 0h-4V8h4v8zm6 0h-4V8h4v8z"/>
 </vector>
\ No newline at end of file
diff --git a/res/drawable/ic_mode_edit.xml b/res/drawable/ic_mode_edit.xml
index c38cba709d5df0a98eb0687f018dc44d1b786bce..996894386b0d3722ae63dd68eec1150aae4364f1 100644
--- a/res/drawable/ic_mode_edit.xml
+++ b/res/drawable/ic_mode_edit.xml
@@ -5,6 +5,6 @@
     android:viewportWidth="24.0"
     android:viewportHeight="24.0">
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M20.41,4.94l-1.35,-1.35c-0.78,-0.78 -2.05,-0.78 -2.83,0l0,0L3,16.82V21h4.18L20.41,7.77C21.2,6.99 21.2,5.72 20.41,4.94zM6.41,19.06L5,19v-1.36l9.82,-9.82l1.41,1.41L6.41,19.06z"/>
 </vector>
diff --git a/res/drawable/ic_more_24.xml b/res/drawable/ic_more_24.xml
index 5def0c25af8419bfda36cce8843b6118ea75be20..0209345c27007296da76893300f8994c49ee4827 100644
--- a/res/drawable/ic_more_24.xml
+++ b/res/drawable/ic_more_24.xml
@@ -5,6 +5,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M12,8c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM12,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM12,16c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2z"/>
 </vector>
diff --git a/res/drawable/ic_network_cell.xml b/res/drawable/ic_network_cell.xml
index 764781c1b9c7cb70f402c74671660aed51c5872a..8594582cc919a094fb234e5de9a7ba17e4552fbf 100644
--- a/res/drawable/ic_network_cell.xml
+++ b/res/drawable/ic_network_cell.xml
@@ -7,7 +7,7 @@
 
     <group>
         <path
-            android:fillColor="@color/color_default_accent"
+            android:fillColor="@color/color_icon_background_blue"
             android:pathData="M25.2477 32.1628H6.75229C3.02611 32.1628 0 29.1367 0 25.4106V6.91514C0 3.18895 3.02611 0.162842 6.75229 0.162842H25.2477C28.9739 0.162842 32 3.18895 32 6.91514V25.4106C32 29.1367 28.9739 32.1628 25.2477 32.1628Z" />
         <group>
             <path
diff --git a/res/drawable/ic_nfc.xml b/res/drawable/ic_nfc.xml
index 1dabc33427c59225bffc06c74e256cc52fe607c5..266874080d2167dffb85ecdd54673da286e08fe9 100644
--- a/res/drawable/ic_nfc.xml
+++ b/res/drawable/ic_nfc.xml
@@ -20,5 +20,5 @@
         android:viewportHeight="24.0">
     <path
         android:pathData="M20,2L4,2c-1.1,0 -2,0.9 -2,2v16c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,4c0,-1.1 -0.9,-2 -2,-2zM20,20L4,20L4,4h16v16zM18,6h-5c-1.1,0 -2,0.9 -2,2v2.28c-0.6,0.35 -1,0.98 -1,1.72 0,1.1 0.9,2 2,2s2,-0.9 2,-2c0,-0.74 -0.4,-1.38 -1,-1.72L13,8h3v8L8,16L8,8h2L10,6L6,6v12h12L18,6z"
-        android:fillColor="@color/color_default_accent"/>
+        android:fillColor="@color/default_icon_color"/>
 </vector>
diff --git a/res/drawable/ic_notification_alert.xml b/res/drawable/ic_notification_alert.xml
index 1fccfaec0b3ab0051e2e8d0d573dc7693552668c..55cf0680125c8caf29eecc4753e3d82e6d23e919 100644
--- a/res/drawable/ic_notification_alert.xml
+++ b/res/drawable/ic_notification_alert.xml
@@ -34,7 +34,7 @@ Copyright (C) 2019 The Android Open Source Project
             android:viewportWidth="24"
             android:viewportHeight="24">
             <path
-                android:fillColor="@color/color_default_view_on_accent"
+                android:fillColor="@android:color/white"
                 android:pathData="M8.98,16.65c-0.47,0 -0.91,-0.27 -1.12,-0.69l-1.93,-4.61L5.46,12.3c-0.21,0.43 -0.64,0.69 -1.12,0.69H2v-2h1.88l1,-2C5.1,8.56 5.52,8.3 6,8.3s0.9,0.26 1.12,0.69l1.73,4.14l2,-7c0.2,-0.46 0.65,-0.76 1.15,-0.76s0.95,0.3 1.15,0.76l0.04,0.12l1.96,6.88l1.7,-4.08c0.49,-0.98 1.84,-0.91 2.26,-0.06l1,2H22v2h-2.35c-0.47,0 -0.91,-0.27 -1.12,-0.7l-0.47,-0.95l-1.9,4.55c-0.25,0.5 -0.69,0.77 -1.18,0.75c-0.48,-0.01 -0.92,-0.31 -1.11,-0.76l-0.04,-0.12L12,9.37l-1.87,6.52c-0.19,0.45 -0.63,0.74 -1.11,0.76C9.01,16.65 9,16.65 8.98,16.65zM20.32,11.4L20.32,11.4C20.32,11.4 20.32,11.4 20.32,11.4z" />
         </vector>
     </item>
diff --git a/res/drawable/ic_notification_silence.xml b/res/drawable/ic_notification_silence.xml
index be1b73da81fbf02548d16131777c622b5c726cc6..87469e8b47508105a96115360a26b19525278817 100644
--- a/res/drawable/ic_notification_silence.xml
+++ b/res/drawable/ic_notification_silence.xml
@@ -34,7 +34,7 @@ Copyright (C) 2019 The Android Open Source Project
             android:viewportWidth="24"
             android:viewportHeight="24">
             <path
-                android:fillColor="@color/color_default_view_on_accent"
+                android:fillColor="@android:color/white"
                 android:pathData="M15,14.5c-1.38,0 -2.5,-1.12 -2.5,-2.5c0,-0.28 -0.22,-0.5 -0.5,-0.5s-0.5,0.22 -0.5,0.5c0,1.38 -1.12,2.5 -2.5,2.5S6.5,13.38 6.5,12c0,-0.28 -0.22,-0.5 -0.5,-0.5c-0.24,0 -0.46,0.18 -0.49,0.42C5.41,12.55 4.89,13 4.27,13H2v-2h1.71C4.1,10.11 5,9.5 6,9.5c1.38,0 2.5,1.12 2.5,2.5c0,0.28 0.22,0.5 0.5,0.5s0.5,-0.22 0.5,-0.5c0,-1.38 1.12,-2.5 2.5,-2.5s2.5,1.12 2.5,2.5c0,0.28 0.22,0.5 0.5,0.5s0.5,-0.22 0.5,-0.5c0,-1.38 1.12,-2.5 2.5,-2.5c1.02,0 1.91,0.6 2.29,1.5H22v2h-2.27c-0.62,0 -1.14,-0.45 -1.23,-1.08c-0.04,-0.24 -0.25,-0.42 -0.49,-0.42c-0.28,0 -0.5,0.22 -0.5,0.5C17.5,13.38 16.38,14.5 15,14.5z"/>
         </vector>
     </item>
diff --git a/res/drawable/ic_notifications_alert.xml b/res/drawable/ic_notifications_alert.xml
index 3dfa3bbe438e39618f2ae3ff9488845491b89058..554dc26f5e2c5e2b2b33c20247b738fe997a742d 100644
--- a/res/drawable/ic_notifications_alert.xml
+++ b/res/drawable/ic_notifications_alert.xml
@@ -19,6 +19,6 @@ Copyright (C) 2019 The Android Open Source Project
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M18 17v-6c0-3.07-1.63-5.64-4.5-6.32V4c0-0.83-0.67-1.5-1.5-1.5s-1.5 0.67 -1.5 1.5v0.68C7.64 5.36 6 7.92 6 11v6H4v2h16v-2h-2zm-2 0H8v-6c0-2.48 1.51-4.5 4-4.5s4 2.02 4 4.5v6zm-6 3h4c0 1.1-0.9 2-2 2s-2-0.9-2-2zm12-9h-2c0-2.74-1.23-5.19-3.16-6.84l1.41-1.41C20.54 4.77 22 7.71 22 11zM5.75 2.75l1.41 1.41C5.23 5.81 4 8.26 4 11H2c0-3.29 1.46-6.23 3.75-8.25z" />
 </vector>
\ No newline at end of file
diff --git a/res/drawable/ic_open_wifi_autoconnect.xml b/res/drawable/ic_open_wifi_autoconnect.xml
index 37b8d08e69a7287cd7a54206920cc67614a8b45d..d3c10c33615afa873eda673423694b3dec42bdc1 100644
--- a/res/drawable/ic_open_wifi_autoconnect.xml
+++ b/res/drawable/ic_open_wifi_autoconnect.xml
@@ -20,5 +20,5 @@
         android:viewportHeight="24.0">
     <path
         android:pathData="M12.7 10C11.9 7.7 9.7 6 7 6 3.7 6 1 8.7 1 12c0 3.3 2.7 6 6 6 2.6 0 4.8 -1.7 5.7 -4l4.3 0 0 4 4 0 0 -4 2 0 0 -4 -10.3 0zM7 16C4.8 16 3 14.2 3 12 3 9.8 4.8 8 7 8 8.1 8 9 8.4 9.6 9.1L8.5 10.2C8.3 9.9 7.8 9.5 7 9.5 5.6 9.5 4.6 10.6 4.6 12c0 1.4 1.1 2.5 2.4 2.5 1.6 0 2.1 -1.1 2.2 -1.7l-2.2 0 0 -1.4 3.8 0c0 0.2 0.1 0.4 0.1 0.6 -0.1 2.3 -1.7 4 -3.9 4z"
-        android:fillColor="@color/color_default_accent"/>
+        android:fillColor="@color/default_icon_color"/>
 </vector>
diff --git a/res/drawable/ic_open_wifi_notifications.xml b/res/drawable/ic_open_wifi_notifications.xml
index 55fbe16b3f1801dde441e2b2db397bc36d4fc484..60b16f0d04c5f27126800c26bce5bec436784578 100644
--- a/res/drawable/ic_open_wifi_notifications.xml
+++ b/res/drawable/ic_open_wifi_notifications.xml
@@ -20,17 +20,17 @@
         android:viewportHeight="24.0">
     <path
         android:pathData="M8 22.5c0.8 0 1.5 -0.7 1.5 -1.5l-3 0c0 0.8 0.7 1.5 1.5 1.5z"
-        android:fillColor="@color/color_default_accent" />
+        android:fillColor="@color/default_icon_color" />
     <path
         android:pathData="M12.5 17.8l0 -3.6C12.5 12 11.3 10.1 9.1 9.6l0 -0.5C9.1 8.5 8.6 8 8 8 7.4 8 6.9 8.5 6.9 9.1l0 0.5C4.8 10.1 3.5 12 3.5 14.2l0 3.6 -1.5 1.5 0 0.7 12 0 0 -0.7 -1.5 -1.5z"
-        android:fillColor="@color/color_default_accent" />
+        android:fillColor="@color/default_icon_color" />
     <path
         android:pathData="M10 4.6l1.1 1.1c2.8 -2.8 7.4 -2.8 10.2 0L22.4 4.6C19 1.1 13.5 1.1 10 4.6"
-        android:fillColor="@color/color_default_accent" />
+        android:fillColor="@color/default_icon_color" />
     <path
         android:pathData="M14.5 9.1L16.2 10.8 18 9.1C17 8.2 15.5 8.2 14.5 9.1"
-        android:fillColor="@color/color_default_accent" />
+        android:fillColor="@color/default_icon_color" />
     <path
         android:pathData="M12.3 6.9L13.4 8C15 6.4 17.5 6.4 19.1 8L20.2 6.9C18 4.7 14.5 4.7 12.3 6.9"
-        android:fillColor="@color/color_default_accent" />
+        android:fillColor="@color/default_icon_color" />
 </vector>
diff --git a/res/drawable/ic_pan_tool_18dp.xml b/res/drawable/ic_pan_tool_18dp.xml
index a12560ea29d1b665c65187df7203e43ae566869c..a8bb88f32da89d805aa5e3bddb011889cd110024 100644
--- a/res/drawable/ic_pan_tool_18dp.xml
+++ b/res/drawable/ic_pan_tool_18dp.xml
@@ -7,6 +7,6 @@
     <clip-path android:pathData="M0,0h48v48H0z M 0,0"/>
     <path
         android:pathData="M46,11v29c0,4.4 -3.6,8 -8,8H23.4c-2.16,0 -4.2,-0.86 -5.7,-2.38L2,29.66s2.52,-2.46 2.6,-2.5c0.44,-0.38 0.98,-0.58 1.58,-0.58 0.44,0 0.84,0.12 1.2,0.32 0.08,0.02 8.62,4.92 8.62,4.92V8c0,-1.66 1.34,-3 3,-3s3,1.34 3,3v14h2V3c0,-1.66 1.34,-3 3,-3s3,1.34 3,3v19h2V5c0,-1.66 1.34,-3 3,-3s3,1.34 3,3v17h2V11c0,-1.66 1.34,-3 3,-3s3,1.34 3,3z"
-        android:fillColor="@color/color_default_accent"/>
+        android:fillColor="@color/default_icon_color"/>
   </group>
 </vector>
diff --git a/res/drawable/ic_password.xml b/res/drawable/ic_password.xml
index 67983218713863e32c71f80892a42a8459a3a178..294e6f4fe08cb14b3569709e37075a57bdfe30bb 100644
--- a/res/drawable/ic_password.xml
+++ b/res/drawable/ic_password.xml
@@ -20,15 +20,15 @@
     android:viewportHeight="24.0"
     android:viewportWidth="24.0">
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M21.5,9.39l-1.63,0l0.81,-1.42l-0.86,-0.5l-0.82,1.42l-0.82,-1.42l-0.86,0.5l0.81,1.42l-1.63,0l0,1l1.63,0l-0.81,1.41l0.86,0.5l0.82,-1.41l0.82,1.41l0.86,-0.5l-0.81,-1.41l1.63,0z" />
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M13.68,7.97l-0.86,-0.5l-0.82,1.42l-0.82,-1.42l-0.86,0.5l0.81,1.42l-1.63,0l0,1l1.63,0l-0.81,1.41l0.86,0.5l0.82,-1.41l0.82,1.41l0.86,-0.5l-0.81,-1.41l1.63,0l0,-1l-1.63,0z" />
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M6.68,7.97l-0.86,-0.5l-0.82,1.42l-0.82,-1.42l-0.86,0.5l0.81,1.42l-1.63,0l0,1l1.63,0l-0.81,1.41l0.86,0.5l0.82,-1.41l0.82,1.41l0.86,-0.5l-0.81,-1.41l1.63,0l0,-1l-1.63,0z" />
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M21,17.89H3c-0.28,0 -0.5,-0.22 -0.5,-0.5v-1c0,-0.28 0.22,-0.5 0.5,-0.5h18c0.28,0 0.5,0.22 0.5,0.5v1C21.5,17.66 21.28,17.89 21,17.89z" />
 </vector>
diff --git a/res/drawable/ic_pattern.xml b/res/drawable/ic_pattern.xml
index fee4b01341643528622a516dbbf45aef36f0fd93..70a1a9397b945e87853f6277b33a167953c92271 100644
--- a/res/drawable/ic_pattern.xml
+++ b/res/drawable/ic_pattern.xml
@@ -20,18 +20,18 @@
     android:viewportHeight="24.0"
     android:viewportWidth="24.0">
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M4,4m-2,0a2,2 0,1 1,4 0a2,2 0,1 1,-4 0" />
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M4,12m-2,0a2,2 0,1 1,4 0a2,2 0,1 1,-4 0" />
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M12,4m-2,0a2,2 0,1 1,4 0a2,2 0,1 1,-4 0" />
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M20,12m-2,0a2,2 0,1 1,4 0a2,2 0,1 1,-4 0" />
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M20,18c-0.93,0 -1.7,0.64 -1.93,1.5h-4.14c-0.22,-0.86 -1,-1.5 -1.93,-1.5s-1.7,0.64 -1.93,1.5H5.93c-0.05,-0.18 -0.12,-0.35 -0.21,-0.51l5.28,-5.28C11.29,13.89 11.63,14 12,14c1.1,0 2,-0.9 2,-2c0,-0.37 -0.11,-0.71 -0.28,-1.01l5.28,-5.28C19.29,5.89 19.63,6 20,6c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2s-2,0.9 -2,2c0,0.37 0.11,0.71 0.28,1.01l-5.28,5.28C12.71,10.11 12.37,10 12,10c-1.1,0 -2,0.9 -2,2c0,0.37 0.11,0.71 0.28,1.01l-5.28,5.28C4.71,18.11 4.37,18 4,18c-1.1,0 -2,0.9 -2,2s0.9,2 2,2c0.93,0 1.7,-0.64 1.93,-1.5h4.14c0.22,0.86 1,1.5 1.93,1.5s1.7,-0.64 1.93,-1.5h4.14c0.22,0.86 1,1.5 1.93,1.5c1.1,0 2,-0.9 2,-2S21.1,18 20,18z" />
 </vector>
diff --git a/res/drawable/ic_phone_info.xml b/res/drawable/ic_phone_info.xml
index ada4d9f6fb604bbd66868032a9f71e54493c3b52..57f07b3f6cf897af6365f4a40398a3cc3b8c7ec5 100644
--- a/res/drawable/ic_phone_info.xml
+++ b/res/drawable/ic_phone_info.xml
@@ -4,6 +4,6 @@
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="#FFFFFF"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M17,1.01L7,1C5.9,1 5,1.9 5,3v18c0,1.1 0.9,2 2,2h10c1.1,0 2,-0.9 2,-2V3C19,1.9 18.1,1.01 17,1.01zM17,21H7v-1h10V21zM17,18H7V6h10V18zM7,4V3h10v1H7zM11,7h2v2h-2V7zM11,11h2v6h-2V11z"/>
 </vector>
diff --git a/res/drawable/ic_photo_library.xml b/res/drawable/ic_photo_library.xml
index 6217067f9cf81c32c6e1ade769818944e76970e8..358e017d2ba3dae900388cf26d242c4289e0086d 100644
--- a/res/drawable/ic_photo_library.xml
+++ b/res/drawable/ic_photo_library.xml
@@ -7,7 +7,7 @@
     <clip-path android:pathData="M0.635,0h32v32h-32z M 0,0"/>
     <path
         android:pathData="M25.8827,32H7.3873C3.6611,32 0.635,28.9739 0.635,25.2477V6.7523C0.635,3.0261 3.6611,0 7.3873,0H25.8827C29.6089,0 32.635,3.0261 32.635,6.7523V25.2477C32.635,28.9739 29.6089,32 25.8827,32Z"
-        android:fillColor="@color/color_default_accent"/>
+        android:fillColor="@color/color_icon_background_blue"/>
     <group>
       <clip-path android:pathData="M5.7573,6.9891h21.7778v18.0444h-21.7778z M 0,0"/>
       <path
diff --git a/res/drawable/ic_pin.xml b/res/drawable/ic_pin.xml
index 28ed9b4113c2b97ce9d72426ae0963a38fef4845..26a66300c3154b15a76caf1f25d643cbc36030b0 100644
--- a/res/drawable/ic_pin.xml
+++ b/res/drawable/ic_pin.xml
@@ -20,6 +20,6 @@
     android:viewportHeight="24.0"
     android:viewportWidth="24.0">
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M20,4L4,4A2,2 0,0 0,2 6L2,18a2,2 0,0 0,2 2L20,20a2,2 0,0 0,2 -2L22,6A2,2 0,0 0,20 4ZM7.1,15L5.9,15L5.9,10.2L4.7,10.2L4.7,9L7.1,9v6ZM13.2,11.4A1.2,1.2 0,0 1,12 12.6L10.8,12.6v1.2h2.4L13.2,15L9.6,15L9.6,12.6a1.2,1.2 0,0 1,1.2 -1.2L12,11.4L12,10.2L9.6,10.2L9.6,9L12,9a1.2,1.2 0,0 1,1.2 1.2v1.2ZM19.3,11.1a0.9,0.9 0,0 1,-0.9 0.9,0.9 0.9,0 0,1 0.9,0.9v0.9A1.2,1.2 0,0 1,18.1 15L15.7,15L15.7,13.8h2.4L18.1,12.6L16.9,12.6L16.9,11.4h1.2L18.1,10.2L15.7,10.2L15.7,9h2.4a1.2,1.2 0,0 1,1.2 1.2v0.9Z" />
 </vector>
diff --git a/res/drawable/ic_print.xml b/res/drawable/ic_print.xml
index 01e345625fda2d92f513e6f658ae29bc1cb0ffe4..d2d664e3c50242630b73795532f26b8963451698 100644
--- a/res/drawable/ic_print.xml
+++ b/res/drawable/ic_print.xml
@@ -6,5 +6,5 @@
     android:viewportHeight="24.0">
     <path
         android:pathData="M19,8L5,8c-1.66,0 -3,1.34 -3,3v6h4v4h12v-4h4v-6c0,-1.66 -1.34,-3 -3,-3zM16,19L8,19v-5h8v5zM19,12c-0.55,0 -1,-0.45 -1,-1s0.45,-1 1,-1 1,0.45 1,1 -0.45,1 -1,1zM18,3L6,3v4h12L18,3z"
-        android:fillColor="@color/color_default_accent"/>
+        android:fillColor="@color/default_icon_color"/>
 </vector>
\ No newline at end of file
diff --git a/res/drawable/ic_print_error.xml b/res/drawable/ic_print_error.xml
index ef4745cdce3421977183527f88b122a9ef7f7615..779679132fe7f10801a610188bb85ef76c8089d1 100644
--- a/res/drawable/ic_print_error.xml
+++ b/res/drawable/ic_print_error.xml
@@ -6,5 +6,5 @@
     android:viewportHeight="24.0">
     <path
         android:pathData="M15.73,3L8.27,3L3,8.27v7.46L8.27,21h7.46L21,15.73L21,8.27L15.73,3zM12,17.3c-0.72,0 -1.3,-0.58 -1.3,-1.3 0,-0.72 0.58,-1.3 1.3,-1.3 0.72,0 1.3,0.58 1.3,1.3 0,0.72 -0.58,1.3 -1.3,1.3zM13,13h-2L11,7h2v6z"
-        android:fillColor="@color/color_default_accent"/>
+        android:fillColor="@color/default_icon_color"/>
 </vector>
\ No newline at end of file
diff --git a/res/drawable/ic_privacy_shield_24dp.xml b/res/drawable/ic_privacy_shield_24dp.xml
index 02a1c637477eb155db36d743ee40b0b14736e7a5..2066b2366d86a5cfe31acb0107e456ced27c3b31 100644
--- a/res/drawable/ic_privacy_shield_24dp.xml
+++ b/res/drawable/ic_privacy_shield_24dp.xml
@@ -20,9 +20,9 @@
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M12,2L3.82,5.64v5.45c0,5.05 3.49,9.76 8.18,10.91c4.69,-1.15 8.18,-5.86 8.18,-10.91V5.64L12,2zM18.18,11.09c0,1.55 -0.41,3.05 -1.1,4.38C15.77,14.5 13.4,14 12,14s-3.77,0.5 -5.08,1.47c-0.69,-1.33 -1.1,-2.83 -1.1,-4.38V6.94L12,4.19l6.18,2.75V11.09z"/>
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M12,10.5m-3,0a3,3 0,1 1,6 0a3,3 0,1 1,-6 0"/>
 </vector>
diff --git a/res/drawable/ic_private_dns.xml b/res/drawable/ic_private_dns.xml
index 88e25913a87cf48e50c6640302cda26185fb0772..6a49334155b623f7e0ba2c80c0cfe4a924133c7a 100644
--- a/res/drawable/ic_private_dns.xml
+++ b/res/drawable/ic_private_dns.xml
@@ -6,7 +6,7 @@
     <group>
         <clip-path android:pathData="M0.635,0h32v32h-32z M 0,0" />
         <path
-            android:fillColor="@color/color_default_accent"
+            android:fillColor="@color/color_icon_background_blue"
             android:pathData="M25.8827,32H7.3873C3.6611,32 0.635,28.9739 0.635,25.2477V6.7523C0.635,3.0261 3.6611,0 7.3873,0H25.8827C29.6089,0 32.635,3.0261 32.635,6.7523V25.2477C32.635,28.9739 29.6089,32 25.8827,32Z" />
         <group>
             <clip-path android:pathData="M5.4573,4.9889h22.3556v22.0222h-22.3556z M 0,0" />
diff --git a/res/drawable/ic_qrcode.xml b/res/drawable/ic_qrcode.xml
new file mode 100644
index 0000000000000000000000000000000000000000..e1d8296307c73fdb0a81ea3520f92c34088b9177
--- /dev/null
+++ b/res/drawable/ic_qrcode.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright (C) 2019 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.
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@color/default_icon_color"
+        android:pathData="M3,9h6V3H3V9zM5,5h2v2H5V5zM15,3v6h6V3H15zM19,7h-2V5h2V7zM3,21h6v-6H3V21zM5,17h2v2H5V17zM13,15v2h-2v-2v-2v-2h2v2h2v-2h2v2v2H13zM17,19h4v2h-4h-2v-2v-2h2V19zM19,11h2v6h-2V11zM7,11h2v2H7V11zM11,19h2v2h-2V19zM5,13H3v-2h2V13zM13,9h-2V3h2V9z"/>
+</vector>
\ No newline at end of file
diff --git a/res/drawable/ic_qrcode_24dp.xml b/res/drawable/ic_qrcode_24dp.xml
index 3691db74831db875fc9fe7eaacd52e9ff6ee9a9f..2b44ffa9f96d7a098713f6c7eff08738b7671455 100644
--- a/res/drawable/ic_qrcode_24dp.xml
+++ b/res/drawable/ic_qrcode_24dp.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
   <path
-      android:fillColor="@color/color_default_accent"
+      android:fillColor="@color/default_icon_color"
       android:pathData="M3,9h6V3H3V9zM5,5h2v2H5V5zM15,3v6h6V3H15zM19,7h-2V5h2V7zM3,21h6v-6H3V21zM5,17h2v2H5V17zM13,15v2h-2v-2v-2v-2h2v2h2v-2h2v2v2H13zM17,19h4v2h-4h-2v-2v-2h2V19zM19,11h2v6h-2V11zM7,11h2v2H7V11zM11,19h2v2h-2V19zM5,13H3v-2h2V13zM13,9h-2V3h2V9z"/>
 </vector>
diff --git a/res/drawable/ic_radio_button_checked_black_24dp.xml b/res/drawable/ic_radio_button_checked_black_24dp.xml
index 27b7c61dc51bbdf5252048352870bee4881f0df9..1ed0ca54894f4117b0f69fea097759f98553c1c5 100644
--- a/res/drawable/ic_radio_button_checked_black_24dp.xml
+++ b/res/drawable/ic_radio_button_checked_black_24dp.xml
@@ -19,6 +19,6 @@
     android:viewportWidth="24.0"
     android:viewportHeight="24.0">
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M12,7c-2.76,0 -5,2.24 -5,5s2.24,5 5,5 5,-2.24 5,-5 -2.24,-5 -5,-5zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.42,0 -8,-3.58 -8,-8s3.58,-8 8,-8 8,3.58 8,8 -3.58,8 -8,8z" />
 </vector>
diff --git a/res/drawable/ic_radio_button_unchecked_black_24dp.xml b/res/drawable/ic_radio_button_unchecked_black_24dp.xml
index fd289428bbe6265615c8c7f12e735f2562bfde1d..8c7f92c7335e509acb9a4f8139a57fc3fb0b643e 100644
--- a/res/drawable/ic_radio_button_unchecked_black_24dp.xml
+++ b/res/drawable/ic_radio_button_unchecked_black_24dp.xml
@@ -19,6 +19,6 @@
     android:viewportWidth="24.0"
     android:viewportHeight="24.0">
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.42,0 -8,-3.58 -8,-8s3.58,-8 8,-8 8,3.58 8,8 -3.58,8 -8,8z" />
 </vector>
diff --git a/res/drawable/ic_remove_24dp.xml b/res/drawable/ic_remove_24dp.xml
index 82443fe5022c0c5aecdea4d90ac9d4226cf4f5da..28049129f414ff7a1fb41778b09560db10a2be52 100644
--- a/res/drawable/ic_remove_24dp.xml
+++ b/res/drawable/ic_remove_24dp.xml
@@ -19,6 +19,6 @@
         android:viewportWidth="48"
         android:viewportHeight="48">
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M38 26H10v-4h28v4z"/>
 </vector>
diff --git a/res/drawable/ic_restore.xml b/res/drawable/ic_restore.xml
index e79c406c7d1b870857c54be713b128e594fe83bf..622ab78c240e5204df8a1d8a4f1e6e0331ae3bb3 100644
--- a/res/drawable/ic_restore.xml
+++ b/res/drawable/ic_restore.xml
@@ -6,7 +6,7 @@
     <group>
         <clip-path android:pathData="M0.635,0h32v32h-32z M 0,0" />
         <path
-            android:fillColor="@color/color_default_accent"
+            android:fillColor="@color/color_icon_background_blue"
             android:pathData="M25.8827,32H7.3873C3.6611,32 0.635,28.9739 0.635,25.2477V6.7523C0.635,3.0261 3.6611,0 7.3873,0H25.8827C29.6089,0 32.635,3.0261 32.635,6.7523V25.2477C32.635,28.9739 29.6089,32 25.8827,32Z" />
         <group>
             <clip-path android:pathData="M6.2129,5.5778h20.8444v20.8444h-20.8444z M 0,0" />
diff --git a/res/drawable/ic_scan_24dp.xml b/res/drawable/ic_scan_24dp.xml
index 3739e1e5da4a514fa5d7f5279f91b89338c02b26..481df6d02331c8a1f60648c27e26518d844dded3 100644
--- a/res/drawable/ic_scan_24dp.xml
+++ b/res/drawable/ic_scan_24dp.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
   <path
-      android:fillColor="@color/color_default_accent"
+      android:fillColor="@color/default_icon_color"
       android:pathData="M3,9h6V3H3V9zM5,5h2v2H5V5zM15,3v6h6V3H15zM19,7h-2V5h2V7zM3,21h6v-6H3V21zM5,17h2v2H5V17zM17,15h4v2h-4v4h-2v-4h-4v-2h4v-4h2V15zM7,11h2v2H7V11zM5,13H3v-2h2V13zM13,9h-2V3h2V9z"/>
 </vector>
diff --git a/res/drawable/ic_sd_card.xml b/res/drawable/ic_sd_card.xml
index 0f4c18c5c71df36542f62d2750c33b89ada2e92a..2ff754ddae94d6a4ac29fd9c6cb6783ad2ea6c86 100644
--- a/res/drawable/ic_sd_card.xml
+++ b/res/drawable/ic_sd_card.xml
@@ -6,7 +6,7 @@
     <group>
         <clip-path android:pathData="M0.635,0h32v32h-32z M 0,0" />
         <path
-            android:fillColor="@color/color_default_accent"
+            android:fillColor="@color/color_icon_background_blue"
             android:pathData="M25.8827,32H7.3873C3.6611,32 0.635,28.9739 0.635,25.2477V6.7523C0.635,3.0261 3.6611,0 7.3873,0H25.8827C29.6089,0 32.635,3.0261 32.635,6.7523V25.2477C32.635,28.9739 29.6089,32 25.8827,32Z" />
         <group>
             <clip-path android:pathData="M8.0684,4.7445h17.1333v22.5111h-17.1333z M 0,0" />
diff --git a/res/drawable/ic_search.xml b/res/drawable/ic_search.xml
new file mode 100644
index 0000000000000000000000000000000000000000..d05bf423449a424fa9e83041e8d0a2dc7a8cca1a
--- /dev/null
+++ b/res/drawable/ic_search.xml
@@ -0,0 +1,24 @@
+<!--
+    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.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="@color/default_icon_color"
+        android:pathData="M20.49,19l-5.73,-5.73C15.53,12.2 16,10.91 16,9.5C16,5.91 13.09,3 9.5,3S3,5.91 3,9.5C3,13.09 5.91,16 9.5,16c1.41,0 2.7,-0.47 3.77,-1.24L19,20.49L20.49,19zM5,9.5C5,7.01 7.01,5 9.5,5S14,7.01 14,9.5S11.99,14 9.5,14S5,11.99 5,9.5z"/>
+</vector>
diff --git a/res/drawable/ic_security_lock_24dp.xml b/res/drawable/ic_security_lock_24dp.xml
index e30c161bd443282f524182dd2b79b0a8e6637b83..15835b2ee43d7a64c109bacddb7f4354d2206eb9 100644
--- a/res/drawable/ic_security_lock_24dp.xml
+++ b/res/drawable/ic_security_lock_24dp.xml
@@ -21,5 +21,5 @@
         android:height="24dp">
     <path
         android:pathData="M18 8h-1V6c0-2.76-2.24-5-5-5S7 3.24 7 6v2H6c-1.1 0-2 .9-2 2v10c0 1.1.9 2 2 2h12c1.1 0 2-.9 2-2V10c0-1.1-.9-2-2-2zm-6 9c-1.1 0-2-.9-2-2s.9-2 2-2 2 .9 2 2-.9 2-2 2zm3.1-9H8.9V6c0-1.71 1.39-3.1 3.1-3.1 1.71 0 3.1 1.39 3.1 3.1v2z"
-        android:fillColor="@color/color_default_accent" />
+        android:fillColor="@color/default_icon_color" />
 </vector>
diff --git a/res/drawable/ic_settings_24dp.xml b/res/drawable/ic_settings_24dp.xml
index e0dbb26846a618fcf222f18b452673a67764ebeb..cdf47d5322d784d166b9cec733e9ff4d14c90728 100644
--- a/res/drawable/ic_settings_24dp.xml
+++ b/res/drawable/ic_settings_24dp.xml
@@ -7,15 +7,15 @@
     <clip-path android:pathData="M0.635,0h32v32h-32z M 0,0"/>
     <path
         android:pathData="M25.8827,32H7.3873C3.6611,32 0.635,28.9739 0.635,25.2477V6.7523C0.635,3.0261 3.6611,0 7.3873,0H25.8827C29.6089,0 32.635,3.0261 32.635,6.7523V25.2477C32.635,28.9739 29.6089,32 25.8827,32Z"
-        android:fillColor="@color/color_default_accent"/>
+        android:fillColor="@color/color_icon_background_blue"/>
     <group>
       <clip-path android:pathData="M5.1462,4.5889h22.9778v22.8222h-22.9778z M 0,0"/>
       <path
           android:pathData="M14.9685,6.1444L18.6796,6.1666L18.9018,8.3889C20.1462,8.7444 21.3018,9.4111 22.2351,10.3444L24.2573,9.5L26.0573,12.6111L24.3018,13.9444C24.6573,15.3222 24.6351,16.7444 24.2573,18.0778L26.0351,19.4555L24.0796,22.6111L22.0129,21.7222C21.5685,22.1222 21.1018,22.5 20.5462,22.8111C19.9685,23.1444 19.3462,23.4111 18.724,23.5889L18.4796,25.8111L14.7685,25.8555L14.5018,23.6333C13.2129,23.2778 12.0351,22.6111 11.0573,21.6555L9.0351,22.5L7.2351,19.3889L8.9907,18.0555C8.6351,16.7 8.6573,15.3222 9.0129,14.0111L7.2351,12.6778L9.124,9.4778L11.2129,10.3222C11.6573,9.9 12.1685,9.5 12.7462,9.1889C13.3685,8.8333 14.0129,8.5667 14.6573,8.3889L14.9685,6.1444ZM13.6351,4.5889L13.4351,5.9L13.2351,7.1666C12.7907,7.3444 12.3462,7.5444 11.924,7.7889C11.5685,7.9889 11.2129,8.2333 10.8796,8.4778L9.6796,7.9889L8.4351,7.4778L7.7462,8.6333L5.8573,11.8778L5.1462,13.0778L6.2573,13.9222L7.2573,14.6555C7.124,15.5666 7.124,16.5 7.2573,17.4111L6.2796,18.1444L5.1907,18.9666L5.8796,20.1444L7.6796,23.2555L8.3685,24.4333L9.6351,23.9L10.7685,23.4333C11.4796,23.9889 12.2573,24.4333 13.0796,24.7666L13.2351,26.0111L13.3907,27.3889L14.7907,27.3666L18.5018,27.3222L19.8351,27.3L20.0129,25.9666L20.1907,24.7C20.5907,24.5444 20.9907,24.3444 21.3685,24.1222C21.7018,23.9444 22.0129,23.7222 22.324,23.5L23.524,24.0111L24.7462,24.5444L25.4573,23.4111L27.4129,20.2555L28.1462,19.0778L27.0351,18.2333L26.0351,17.4555C26.1907,16.5 26.1907,15.5444 26.0573,14.5889L27.0351,13.8555L28.124,13.0333L27.4351,11.8555L25.6351,8.7444L24.924,7.5444L23.6573,8.0778L22.524,8.5444C21.8573,8.0333 21.124,7.5889 20.3462,7.2555L20.2129,6.0111L20.0796,4.6333H18.6796L14.9685,4.5889H13.6351Z"
-          android:fillColor="@color/color_default_view_on_accent"/>
+          android:fillColor="@android:color/white"/>
       <path
           android:pathData="M16.6353,19.1C18.3535,19.1 19.7464,17.7071 19.7464,15.9889C19.7464,14.2706 18.3535,12.8777 16.6353,12.8777C14.9171,12.8777 13.5242,14.2706 13.5242,15.9889C13.5242,17.7071 14.9171,19.1 16.6353,19.1Z"
-          android:fillColor="@color/color_default_view_on_accent"/>
+          android:fillColor="@android:color/white"/>
     </group>
   </group>
 </vector>
diff --git a/res/drawable/ic_settings_accent.xml b/res/drawable/ic_settings_accent.xml
index a3d917d691219dd5774fd936276b8d1c82ae516e..b719d3ab0956d133d97f48afa8f0f1b128985e58 100644
--- a/res/drawable/ic_settings_accent.xml
+++ b/res/drawable/ic_settings_accent.xml
@@ -20,9 +20,9 @@
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M13.85,22.25h-3.7c-0.74,0 -1.36,-0.54 -1.45,-1.27l-0.27,-1.89c-0.27,-0.14 -0.53,-0.29 -0.79,-0.46l-1.8,0.72c-0.7,0.26 -1.47,-0.03 -1.81,-0.65L2.2,15.53c-0.35,-0.66 -0.2,-1.44 0.36,-1.88l1.53,-1.19c-0.01,-0.15 -0.02,-0.3 -0.02,-0.46c0,-0.15 0.01,-0.31 0.02,-0.46l-1.52,-1.19C1.98,9.9 1.83,9.09 2.2,8.47l1.85,-3.19c0.34,-0.62 1.11,-0.9 1.79,-0.63l1.81,0.73c0.26,-0.17 0.52,-0.32 0.78,-0.46l0.27,-1.91c0.09,-0.7 0.71,-1.25 1.44,-1.25h3.7c0.74,0 1.36,0.54 1.45,1.27l0.27,1.89c0.27,0.14 0.53,0.29 0.79,0.46l1.8,-0.72c0.71,-0.26 1.48,0.03 1.82,0.65l1.84,3.18c0.36,0.66 0.2,1.44 -0.36,1.88l-1.52,1.19c0.01,0.15 0.02,0.3 0.02,0.46s-0.01,0.31 -0.02,0.46l1.52,1.19c0.56,0.45 0.72,1.23 0.37,1.86l-1.86,3.22c-0.34,0.62 -1.11,0.9 -1.8,0.63l-1.8,-0.72c-0.26,0.17 -0.52,0.32 -0.78,0.46l-0.27,1.91C15.21,21.71 14.59,22.25 13.85,22.25zM13.32,20.72c0,0.01 0,0.01 0,0.02L13.32,20.72zM10.68,20.7l0,0.02C10.69,20.72 10.69,20.71 10.68,20.7zM10.62,20.25h2.76l0.37,-2.55l0.53,-0.22c0.44,-0.18 0.88,-0.44 1.34,-0.78l0.45,-0.34l2.38,0.96l1.38,-2.4l-2.03,-1.58l0.07,-0.56c0.03,-0.26 0.06,-0.51 0.06,-0.78c0,-0.27 -0.03,-0.53 -0.06,-0.78l-0.07,-0.56l2.03,-1.58l-1.39,-2.4l-2.39,0.96l-0.45,-0.35c-0.42,-0.32 -0.87,-0.58 -1.33,-0.77L13.75,6.3l-0.37,-2.55h-2.76L10.25,6.3L9.72,6.51C9.28,6.7 8.84,6.95 8.38,7.3L7.93,7.63L5.55,6.68L4.16,9.07l2.03,1.58l-0.07,0.56C6.09,11.47 6.06,11.74 6.06,12c0,0.26 0.02,0.53 0.06,0.78l0.07,0.56l-2.03,1.58l1.38,2.4l2.39,-0.96l0.45,0.35c0.43,0.33 0.86,0.58 1.33,0.77l0.53,0.22L10.62,20.25zM18.22,17.72c0,0.01 -0.01,0.02 -0.01,0.03L18.22,17.72zM5.77,17.71l0.01,0.02C5.78,17.72 5.77,17.71 5.77,17.71zM3.93,9.47L3.93,9.47C3.93,9.47 3.93,9.47 3.93,9.47zM18.22,6.27c0,0.01 0.01,0.02 0.01,0.02L18.22,6.27zM5.79,6.25L5.78,6.27C5.78,6.27 5.79,6.26 5.79,6.25zM13.31,3.28c0,0.01 0,0.01 0,0.02L13.31,3.28zM10.69,3.26l0,0.02C10.69,3.27 10.69,3.27 10.69,3.26z"/>
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M12,12m-3.5,0a3.5,3.5 0,1 1,7 0a3.5,3.5 0,1 1,-7 0"/>
 </vector>
diff --git a/res/drawable/ic_settings_accessibility.xml b/res/drawable/ic_settings_accessibility.xml
index 1bdd6a44eb3b070bfbcc2e6c7911ac0fb47c020a..eed402641d8ca8283d92ed1ab8491f58e1961971 100644
--- a/res/drawable/ic_settings_accessibility.xml
+++ b/res/drawable/ic_settings_accessibility.xml
@@ -5,7 +5,7 @@
     android:viewportHeight="32">
 
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/color_icon_background_blue"
         android:pathData="M25.2477 32H6.75229C3.02611 32 0 28.9739 0 25.2477V6.75229C0 3.02611 3.02611 0 6.75229 0H25.2477C28.9739 0 32 3.02611 32 6.75229V25.2477C32 28.9739 28.9739 32 25.2477 32Z" />
     <path
         android:fillColor="#ffffff"
diff --git a/res/drawable/ic_settings_accounts.xml b/res/drawable/ic_settings_accounts.xml
index 59730321077f70ce0c966b5a49db64dc51f42f6e..d3cab03ea901482d07b3d3d8ea67f4451c528dbc 100644
--- a/res/drawable/ic_settings_accounts.xml
+++ b/res/drawable/ic_settings_accounts.xml
@@ -7,7 +7,7 @@
     android:viewportHeight="32">
 
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/color_icon_background_blue"
         android:pathData="M25.2477 32H6.75229C3.02611 32 0 28.9739 0 25.2477V6.75229C0 3.02611 3.02611 0 6.75229 0H25.2477C28.9739 0 32 3.02611 32 6.75229V25.2477C32 28.9739 28.9739 32 25.2477 32Z" />
     <path
         android:fillColor="#ffffff"
diff --git a/res/drawable/ic_settings_adaptive_sleep.xml b/res/drawable/ic_settings_adaptive_sleep.xml
index 4e018e1e4045e0e5c5919d7e21325fce68a228d7..77c34aaa6cf5acebafa3aa2206a3f180877da3bb 100644
--- a/res/drawable/ic_settings_adaptive_sleep.xml
+++ b/res/drawable/ic_settings_adaptive_sleep.xml
@@ -20,7 +20,7 @@
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/color_icon_background_blue"
         android:pathData="M10.67,21H7v-1h3.13c-0.27-0.63-0.46-1.3-0.56-2H7V6h10v3.5c0.69,0,1.36,0.1,2,0.28V3 c0-1.1-0.9-1.99-2-1.99L7,1C5.9,1,5,1.9,5,3v18c0,1.1,0.9,2,2,2h5.52C11.79,22.45,11.16,21.77,10.67,21z M7,3h10v1H7V3z" />
     <path
         android:fillColor="#FA903E"
diff --git a/res/drawable/ic_settings_all.xml b/res/drawable/ic_settings_all.xml
index 38d5099d7d58431582297b2eb97c2610f32f3355..a830f564680752bdfb8ca884af2cad3bc3f25eb2 100644
--- a/res/drawable/ic_settings_all.xml
+++ b/res/drawable/ic_settings_all.xml
@@ -21,6 +21,6 @@
     android:viewportHeight="24">
   <path
       android:pathData="M3,12L3,3h9,9v9,9L12,21 3,21ZM19,12L19,5L12,5 5,5v7,7h7,7zM7,16c0,-0.55 0.45,-1 1,-1 0.55,0 1,0.45 1,1 0,0.55 -0.45,1 -1,1 -0.55,0 -1,-0.45 -1,-1zM11,16c0,-0.55 1.35,-1 3,-1 1.65,0 3,0.45 3,1 0,0.55 -1.35,1 -3,1 -1.65,0 -3,-0.45 -3,-1zM7,12c0,-0.55 0.45,-1 1,-1 0.55,0 1,0.45 1,1 0,0.55 -0.45,1 -1,1 -0.55,0 -1,-0.45 -1,-1zM11,12c0,-0.55 1.35,-1 3,-1 1.65,0 3,0.45 3,1 0,0.55 -1.35,1 -3,1 -1.65,0 -3,-0.45 -3,-1zM7,8C7,7.45 7.45,7 8,7 8.55,7 9,7.45 9,8 9,8.55 8.55,9 8,9 7.45,9 7,8.55 7,8ZM11,8c0,-0.55 1.35,-1 3,-1 1.65,0 3,0.45 3,1 0,0.55 -1.35,1 -3,1 -1.65,0 -3,-0.45 -3,-1z"
-      android:fillColor="@color/color_default_accent"/>
+      android:fillColor="@color/default_icon_color"/>
 </vector>
 
diff --git a/res/drawable/ic_settings_aod.xml b/res/drawable/ic_settings_aod.xml
index 35c60033ad188bf3a5788e44e41d8bd54acc7f80..d72fa9d6bfd962a8ecb9223ba65c455c353babb4 100644
--- a/res/drawable/ic_settings_aod.xml
+++ b/res/drawable/ic_settings_aod.xml
@@ -21,13 +21,13 @@
         android:viewportHeight="24">
 
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M17,1.01L7,1C5.9,1,5,1.9,5,3v18c0,1.1,0.9,2,2,2h10c1.1,0,2-0.9,2-2V3C19,1.9,18.1,1.01,17,1.01z M17,21H7l0-1h10V21z M17,18H7V6h10V18z M17,4H7V3h10V4z" />
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M 8 10 H 16 V 11.5 H 8 V 10 Z" />
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M 9 13 H 15 V 14.5 H 9 V 13 Z" />
     <path
         android:pathData="M 0 0 H 24 V 24 H 0 V 0 Z" />
diff --git a/res/drawable/ic_settings_backup.xml b/res/drawable/ic_settings_backup.xml
index 8eaf64f00cef23e643c9cceca058acdb717534e7..67ee1b2b55adb5dcdabef7606ee3b18f87ff8060 100644
--- a/res/drawable/ic_settings_backup.xml
+++ b/res/drawable/ic_settings_backup.xml
@@ -19,6 +19,6 @@
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M17.92,10.02C17.45,7.18 14.97,5 12,5C9.82,5 7.83,6.18 6.78,8.06C4.09,8.41 2,10.74 2,13.5C2,16.53 4.47,19 7.5,19h10c2.48,0 4.5,-2.02 4.5,-4.5C22,12.16 20.21,10.23 17.92,10.02zM17.5,17h-10C5.57,17 4,15.43 4,13.5c0,-1.89 1.54,-3.46 3.44,-3.49L8.08,10l0.26,-0.59C8.97,7.94 10.41,7 12,7c2.21,0 4,1.79 4,4v1h1.5c1.38,0 2.5,1.12 2.5,2.5S18.88,17 17.5,17zM9.91,14.41L8.5,13l2.79,-2.79L12,9.5l0.71,0.71L15.5,13l-1.41,1.41L13,13.33V16h-2v-2.67L9.91,14.41z"/>
 </vector>
diff --git a/res/drawable/ic_settings_backup_restore.xml b/res/drawable/ic_settings_backup_restore.xml
index d69149f20df2e31cd58ef30e862ba44e9b0e8f58..8fa76854f004bd11cd9393d550bd9a45ec14b71b 100644
--- a/res/drawable/ic_settings_backup_restore.xml
+++ b/res/drawable/ic_settings_backup_restore.xml
@@ -20,5 +20,5 @@
         android:viewportHeight="24.0">
     <path
         android:pathData="M14,12c0,-1.1 -0.9,-2 -2,-2s-2,0.9 -2,2 0.9,2 2,2 2,-0.9 2,-2zM12,3c-4.97,0 -9,4.03 -9,9L0,12l4,4 4,-4L5,12c0,-3.87 3.13,-7 7,-7s7,3.13 7,7 -3.13,7 -7,7c-1.51,0 -2.91,-0.49 -4.06,-1.3l-1.42,1.44C8.04,20.3 9.94,21 12,21c4.97,0 9,-4.03 9,-9s-4.03,-9 -9,-9z"
-        android:fillColor="@color/color_default_accent"/>
+        android:fillColor="@color/default_icon_color"/>
 </vector>
diff --git a/res/drawable/ic_settings_battery.xml b/res/drawable/ic_settings_battery.xml
index a19de30c8128d181267db204cdd877ccd6ef4c1c..c1b022484ac3a6c0436f91544992091e1a4e5a79 100644
--- a/res/drawable/ic_settings_battery.xml
+++ b/res/drawable/ic_settings_battery.xml
@@ -24,28 +24,28 @@
         android:fillColor="#2CCF69"
         android:pathData="M25.2477 32H6.75229C3.02611 32 0 28.9739 0 25.2477V6.75229C0 3.02611 3.02611 0 6.75229 0H25.2477C28.9739 0 32 3.02611 32 6.75229V25.2477C32 28.9739 28.9739 32 25.2477 32Z" />
     <path
-        android:fillColor="@color/color_default_view_on_accent"
+        android:fillColor="@android:color/white"
         android:fillType="evenOdd"
         android:pathData="M8.60413 7.33947C8.60413 6.90295 8.958 6.54907 9.39453 6.54907H22.6281C23.0646 6.54907 23.4185 6.90295 23.4185 7.33947V26.5124C23.4185 26.9489 23.0646 27.3028 22.6281 27.3028H9.39453C8.958 27.3028 8.60413 26.9489 8.60413 26.5124V7.33947ZM10.1849 8.12988V25.722H21.8377V8.12988H10.1849Z" />
     <path
-        android:fillColor="@color/color_default_view_on_accent"
+        android:fillColor="@android:color/white"
         android:pathData="M18.4051 5.51019H13.6176V7.33941H18.4051V5.51019Z" />
     <path
-        android:fillColor="@color/color_default_view_on_accent"
+        android:fillColor="@android:color/white"
         android:fillType="evenOdd"
         android:pathData="M12.827 5.51019C12.827 5.07366 13.1809 4.71979 13.6174 4.71979H18.405C18.8415 4.71979 19.1954 5.07366 19.1954 5.51019V7.33941C19.1954 7.77593 18.8415 8.12981 18.405 8.12981H13.6174C13.1809 8.12981 12.827 7.77593 12.827 7.33941V5.51019ZM14.4078 6.30059V6.549H17.6146V6.30059H14.4078Z" />
     <path
-        android:fillColor="@color/color_default_view_on_accent"
+        android:fillColor="@android:color/white"
         android:pathData="M19.7374 22.9442H12.2625V23.4185H19.7374V22.9442Z" />
     <path
-        android:fillColor="@color/color_default_view_on_accent"
+        android:fillColor="@android:color/white"
         android:fillType="evenOdd"
         android:pathData="M11.4722 22.1537H20.5279V24.2088H11.4722V22.1537Z" />
     <path
-        android:fillColor="@color/color_default_view_on_accent"
+        android:fillColor="@android:color/white"
         android:pathData="M19.7374 19.3761H12.2625V19.8503H19.7374V19.3761Z" />
     <path
-        android:fillColor="@color/color_default_view_on_accent"
+        android:fillColor="@android:color/white"
         android:fillType="evenOdd"
         android:pathData="M11.4722 18.5857H20.5279V20.6407H11.4722V18.5857Z" />
 </vector>
diff --git a/res/drawable/ic_settings_battery_white.xml b/res/drawable/ic_settings_battery_white.xml
index 621f37dc1d4b80862d55ae0355141fc8388ac59a..bca27fad40589589949745dcf92f06fadddab9df 100644
--- a/res/drawable/ic_settings_battery_white.xml
+++ b/res/drawable/ic_settings_battery_white.xml
@@ -19,6 +19,6 @@
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="@color/color_default_view_on_accent"
+        android:fillColor="@android:color/white"
         android:pathData="M15.67,4H14V2h-4v2H8.33C7.6,4 7,4.6 7,5.33v15.33C7,21.4 7.6,22 8.33,22h7.33c0.74,0 1.34,-0.6 1.34,-1.33V5.33C17,4.6 16.4,4 15.67,4z"/>
 </vector>
diff --git a/res/drawable/ic_settings_bluetooth.xml b/res/drawable/ic_settings_bluetooth.xml
index 80fb602a8e1ebf6f55a4324cd366fec133a018e7..1d5dd0968dd788b1a2ddfc19ecdb4c6ab7c8b7c1 100644
--- a/res/drawable/ic_settings_bluetooth.xml
+++ b/res/drawable/ic_settings_bluetooth.xml
@@ -5,6 +5,6 @@
     android:viewportWidth="24.0"
     android:viewportHeight="24.0">
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M17.71,7.71L12,2h-1v7.59L6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 11,14.41L11,22h1l5.71,-5.71 -4.3,-4.29 4.3,-4.29zM13,5.83l1.88,1.88L13,9.59L13,5.83zM14.88,16.29L13,18.17v-3.76l1.88,1.88z"/>
 </vector>
\ No newline at end of file
diff --git a/res/drawable/ic_settings_camera.xml b/res/drawable/ic_settings_camera.xml
index d89005547343620011cd5ba455bcff4166e7119c..2dcbab7b4e15c67330bd499ed561cea401bbc09f 100644
--- a/res/drawable/ic_settings_camera.xml
+++ b/res/drawable/ic_settings_camera.xml
@@ -22,7 +22,7 @@
     android:viewportHeight="48"
     android:autoMirrored="true">
 
-    <path android:fillColor="@color/color_default_accent"
+    <path android:fillColor="@color/default_icon_color"
           android:pathData="M18.8 21l9.53-16.51C26.94 4.18 25.49 4 24 4c-4.8 0-9.19 1.69-12.64
                             4.51l7.33 12.69.11-.2zm24.28-3c-1.84-5.85-6.3-10.52-11.99-12.68L23.77
                             18h19.31zm.52 2H28.62l.58 1 9.53 16.5C41.99 33.94 44 29.21 44
diff --git a/res/drawable/ic_settings_close.xml b/res/drawable/ic_settings_close.xml
index 077e55f8af6a1ac7757b92f8d676cdf36c370a4d..572369d1b9ec3c8db32713d12d638887e697b685 100644
--- a/res/drawable/ic_settings_close.xml
+++ b/res/drawable/ic_settings_close.xml
@@ -20,6 +20,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
   <path
-      android:fillColor="@color/color_default_accent"
+      android:fillColor="@color/default_icon_color"
       android:pathData="M19,6.41L17.59,5L12,10.59L6.41,5L5,6.41L10.59,12L5,17.59L6.41,19L12,13.41L17.59,19L19,17.59L13.41,12L19,6.41z"/>
 </vector>
diff --git a/res/drawable/ic_settings_cog.xml b/res/drawable/ic_settings_cog.xml
new file mode 100644
index 0000000000000000000000000000000000000000..4c28e1022dad5f71a94a761731dc94db192935fa
--- /dev/null
+++ b/res/drawable/ic_settings_cog.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2016 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.
+-->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="@color/default_icon_color"
+        android:pathData="M13.85,22.25h-3.7c-0.74,0 -1.36,-0.54 -1.45,-1.27l-0.27,-1.89c-0.27,-0.14 -0.53,-0.29 -0.79,-0.46l-1.8,0.72c-0.7,0.26 -1.47,-0.03 -1.81,-0.65L2.2,15.53c-0.35,-0.66 -0.2,-1.44 0.36,-1.88l1.53,-1.19c-0.01,-0.15 -0.02,-0.3 -0.02,-0.46c0,-0.15 0.01,-0.31 0.02,-0.46l-1.52,-1.19C1.98,9.9 1.83,9.09 2.2,8.47l1.85,-3.19c0.34,-0.62 1.11,-0.9 1.79,-0.63l1.81,0.73c0.26,-0.17 0.52,-0.32 0.78,-0.46l0.27,-1.91c0.09,-0.7 0.71,-1.25 1.44,-1.25h3.7c0.74,0 1.36,0.54 1.45,1.27l0.27,1.89c0.27,0.14 0.53,0.29 0.79,0.46l1.8,-0.72c0.71,-0.26 1.48,0.03 1.82,0.65l1.84,3.18c0.36,0.66 0.2,1.44 -0.36,1.88l-1.52,1.19c0.01,0.15 0.02,0.3 0.02,0.46s-0.01,0.31 -0.02,0.46l1.52,1.19c0.56,0.45 0.72,1.23 0.37,1.86l-1.86,3.22c-0.34,0.62 -1.11,0.9 -1.8,0.63l-1.8,-0.72c-0.26,0.17 -0.52,0.32 -0.78,0.46l-0.27,1.91C15.21,21.71 14.59,22.25 13.85,22.25zM13.32,20.72c0,0.01 0,0.01 0,0.02L13.32,20.72zM10.68,20.7l0,0.02C10.69,20.72 10.69,20.71 10.68,20.7zM10.62,20.25h2.76l0.37,-2.55l0.53,-0.22c0.44,-0.18 0.88,-0.44 1.34,-0.78l0.45,-0.34l2.38,0.96l1.38,-2.4l-2.03,-1.58l0.07,-0.56c0.03,-0.26 0.06,-0.51 0.06,-0.78c0,-0.27 -0.03,-0.53 -0.06,-0.78l-0.07,-0.56l2.03,-1.58l-1.39,-2.4l-2.39,0.96l-0.45,-0.35c-0.42,-0.32 -0.87,-0.58 -1.33,-0.77L13.75,6.3l-0.37,-2.55h-2.76L10.25,6.3L9.72,6.51C9.28,6.7 8.84,6.95 8.38,7.3L7.93,7.63L5.55,6.68L4.16,9.07l2.03,1.58l-0.07,0.56C6.09,11.47 6.06,11.74 6.06,12c0,0.26 0.02,0.53 0.06,0.78l0.07,0.56l-2.03,1.58l1.38,2.4l2.39,-0.96l0.45,0.35c0.43,0.33 0.86,0.58 1.33,0.77l0.53,0.22L10.62,20.25zM18.22,17.72c0,0.01 -0.01,0.02 -0.01,0.03L18.22,17.72zM5.77,17.71l0.01,0.02C5.78,17.72 5.77,17.71 5.77,17.71zM3.93,9.47L3.93,9.47C3.93,9.47 3.93,9.47 3.93,9.47zM18.22,6.27c0,0.01 0.01,0.02 0.01,0.02L18.22,6.27zM5.79,6.25L5.78,6.27C5.78,6.27 5.79,6.26 5.79,6.25zM13.31,3.28c0,0.01 0,0.01 0,0.02L13.31,3.28zM10.69,3.26l0,0.02C10.69,3.27 10.69,3.27 10.69,3.26z"/>
+    <path
+        android:fillColor="@color/default_icon_color"
+        android:pathData="M12,12m-3.5,0a3.5,3.5 0,1 1,7 0a3.5,3.5 0,1 1,-7 0"/>
+</vector>
diff --git a/res/drawable/ic_settings_data_usage.xml b/res/drawable/ic_settings_data_usage.xml
index fd550ee87a95334b8f595688378de5260d3afc7e..0128355addaad8ba1eae2907aee73f114874ef44 100644
--- a/res/drawable/ic_settings_data_usage.xml
+++ b/res/drawable/ic_settings_data_usage.xml
@@ -9,19 +9,19 @@
         android:fillColor="#E83A52"
         android:pathData="M25.2477 32H6.75229C3.02611 32 0 28.9739 0 25.2477V6.75229C0 3.02611 3.02611 0 6.75229 0H25.2477C28.9739 0 32 3.02611 32 6.75229V25.2477C32 28.9739 28.9739 32 25.2477 32Z" />
     <path
-        android:fillColor="@color/color_default_view_on_accent"
+        android:fillColor="@android:color/white"
         android:fillType="evenOdd"
         android:pathData="M11.1571 5.6909C11.3671 5.69119 11.5683 5.77503 11.7164 5.92392L15.8717 10.1018C16.1795 10.4113 16.1781 10.9117 15.8686 11.2196C15.5591 11.5274 15.0587 11.526 14.7508 11.2165L11.1545 7.60062L7.53705 11.218C7.22837 11.5267 6.72792 11.5267 6.41925 11.218C6.11058 10.9094 6.11058 10.4089 6.41925 10.1002L10.5971 5.92241C10.7456 5.77391 10.9471 5.69062 11.1571 5.6909Z" />
     <path
-        android:fillColor="@color/color_default_view_on_accent"
+        android:fillColor="@android:color/white"
         android:fillType="evenOdd"
         android:pathData="M11.156 5.6909C11.5925 5.6909 11.9464 6.04478 11.9464 6.48131V25.5187C11.9464 25.9552 11.5925 26.3091 11.156 26.3091C10.7195 26.3091 10.3656 25.9552 10.3656 25.5187V6.48131C10.3656 6.04478 10.7195 5.6909 11.156 5.6909Z" />
     <path
-        android:fillColor="@color/color_default_view_on_accent"
+        android:fillColor="@android:color/white"
         android:fillType="evenOdd"
         android:pathData="M16.1299 20.7819C16.4386 20.4733 16.9391 20.4733 17.2477 20.7819L20.8652 24.3994L24.4615 20.7835C24.7694 20.474 25.2698 20.4726 25.5793 20.7804C25.8888 21.0883 25.8902 21.5887 25.5823 21.8982L21.4271 26.0761C21.279 26.225 21.0777 26.3088 20.8678 26.3091C20.6578 26.3094 20.4563 26.2261 20.3078 26.0776L16.1299 21.8997C15.8213 21.5911 15.8213 21.0906 16.1299 20.7819Z" />
     <path
-        android:fillColor="@color/color_default_view_on_accent"
+        android:fillColor="@android:color/white"
         android:fillType="evenOdd"
         android:pathData="M20.8667 5.6909C21.3032 5.6909 21.6571 6.04478 21.6571 6.48131V25.5187C21.6571 25.9552 21.3032 26.3091 20.8667 26.3091C20.4302 26.3091 20.0763 25.9552 20.0763 25.5187V6.48131C20.0763 6.04478 20.4302 5.6909 20.8667 5.6909Z" />
 </vector>
\ No newline at end of file
diff --git a/res/drawable/ic_settings_delete.xml b/res/drawable/ic_settings_delete.xml
index 8d5a5ff019cb5c06218c15a3a3fd8952e76b5b90..ac079ffebda9ae90f2cfe5fbf5a336a94f278a28 100644
--- a/res/drawable/ic_settings_delete.xml
+++ b/res/drawable/ic_settings_delete.xml
@@ -20,12 +20,12 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
   <path
-      android:fillColor="@color/color_default_accent"
+      android:fillColor="@color/default_icon_color"
       android:pathData="M15,4V3H9v1H4v2h1v13c0,1.1 0.9,2 2,2h10c1.1,0 2,-0.9 2,-2V6h1V4H15zM17,19H7V6h10V19z"/>
   <path
-      android:fillColor="@color/color_default_accent"
+      android:fillColor="@color/default_icon_color"
       android:pathData="M9,8h2v9h-2z"/>
   <path
-      android:fillColor="@color/color_default_accent"
+      android:fillColor="@color/default_icon_color"
       android:pathData="M13,8h2v9h-2z"/>
 </vector>
diff --git a/res/drawable/ic_settings_disable.xml b/res/drawable/ic_settings_disable.xml
index f5ed2ca86f63c4115feefd9718c6b56847879988..bafccaffb73592f3b8ec9a82eccc6908665fad8a 100644
--- a/res/drawable/ic_settings_disable.xml
+++ b/res/drawable/ic_settings_disable.xml
@@ -20,6 +20,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M12,2c-1.78,0 -3.44,0.46 -4.89,1.28l1.48,1.48C9.63,4.28 10.78,4 12,4c4.41,0 8,3.59 8,8c0,1.22 -0.28,2.37 -0.76,3.41l1.48,1.48C21.54,15.44 22,13.78 22,12C22,6.48 17.52,2 12,2zM18.12,17.13L6.87,5.87L3.31,2.31L1.89,3.72l2.19,2.19C2.77,7.59 2,9.71 2,12c0,5.52 4.48,10 10,10c2.29,0 4.41,-0.77 6.09,-2.08l2.19,2.19l1.41,-1.41L18.12,17.13zM12,20c-4.41,0 -8,-3.59 -8,-8c0,-1.74 0.56,-3.35 1.51,-4.66l11.15,11.15C15.35,19.44 13.74,20 12,20zM8.59,4.76L7.11,3.28"/>
 </vector>
diff --git a/res/drawable/ic_settings_display.xml b/res/drawable/ic_settings_display.xml
index 267021a74ddde55ebb6a880768ba4dcc1fbc6f1d..024af9a899e9e858797a2f7fcce8ca6731fd4523 100644
--- a/res/drawable/ic_settings_display.xml
+++ b/res/drawable/ic_settings_display.xml
@@ -21,7 +21,7 @@
     android:viewportHeight="32">
 
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/color_icon_background_blue"
         android:pathData="M25.2477 32H6.75229C3.02611 32 0 28.9739 0 25.2477V6.75229C0 3.02611 3.02611 0 6.75229 0H25.2477C28.9739 0 32 3.02611 32 6.75229V25.2477C32 28.9739 28.9739 32 25.2477 32Z" />
     <path
         android:fillColor="#ffffff"
diff --git a/res/drawable/ic_settings_display_white.xml b/res/drawable/ic_settings_display_white.xml
index 6731b58097c7e7119e3f2d367b80519b497bc846..e42f4a39e7959e9a0df0e32726d7da49309b6bd7 100644
--- a/res/drawable/ic_settings_display_white.xml
+++ b/res/drawable/ic_settings_display_white.xml
@@ -19,6 +19,6 @@
     android:viewportWidth="24.0"
     android:viewportHeight="24.0">
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@android:color/white"
         android:pathData="M20,8.69V4h-4.69L12,0.69L8.69,4H4v4.69L0.69,12L4,15.31V20h4.69L12,23.31L15.31,20H20v-4.69L23.31,12L20,8.69zM18,14.48V18h-3.52L12,20.48L9.52,18H6v-3.52L3.52,12L6,9.52V6h3.52L12,3.52L14.48,6H18v3.52L20.48,12L18,14.48zM12,17c2.76,0 5,-2.24 5,-5s-2.24,-5 -5,-5V17z" />
 </vector>
diff --git a/res/drawable/ic_settings_enable.xml b/res/drawable/ic_settings_enable.xml
index ea698e864dd3a873551c0d4be771e11d4af92656..27fa79b9f271fbad5d4bdeb5c2bc894073c24d99 100644
--- a/res/drawable/ic_settings_enable.xml
+++ b/res/drawable/ic_settings_enable.xml
@@ -20,6 +20,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
   <path
-      android:fillColor="@color/color_default_accent"
+      android:fillColor="@color/default_icon_color"
       android:pathData="M15.59,10.09L13,12.67V2h-2v10.67l-2.59,-2.58L7,11.5l5,5l5,-5L15.59,10.09zM15,2.46v2.13c2.93,1.19 5,4.06 5,7.41c0,4.41 -3.59,8 -8,8s-8,-3.59 -8,-8c0,-3.35 2.07,-6.22 5,-7.41V2.46C4.94,3.74 2,7.53 2,12c0,5.52 4.48,10 10,10s10,-4.48 10,-10C22,7.53 19.06,3.74 15,2.46z"/>
 </vector>
diff --git a/res/drawable/ic_settings_force_stop.xml b/res/drawable/ic_settings_force_stop.xml
index 2fc9b5eced0ced70f08f3cc074ebccf51e857d4e..b0c36df6d764c80e6d77bdec58dcf36aeae70b25 100644
--- a/res/drawable/ic_settings_force_stop.xml
+++ b/res/drawable/ic_settings_force_stop.xml
@@ -20,12 +20,12 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
   <path
-      android:fillColor="@color/color_default_accent"
+      android:fillColor="@color/default_icon_color"
       android:pathData="M12,5.99L19.53,19H4.47L12,5.99M12,2L1,21h22L12,2L12,2z"/>
   <path
-      android:fillColor="@color/color_default_accent"
+      android:fillColor="@color/default_icon_color"
       android:pathData="M13,16l-2,0l0,2l2,0l0,-2z"/>
   <path
-      android:fillColor="@color/color_default_accent"
+      android:fillColor="@color/default_icon_color"
       android:pathData="M13,10l-2,0l0,4l2,0l0,-4z"/>
 </vector>
diff --git a/res/drawable/ic_settings_gestures.xml b/res/drawable/ic_settings_gestures.xml
index 753dfd44a756f757368ca6e6d71e576a60710997..00ff7859f23f4571da95ad690b33f07e918b5d73 100644
--- a/res/drawable/ic_settings_gestures.xml
+++ b/res/drawable/ic_settings_gestures.xml
@@ -6,14 +6,14 @@
     android:viewportHeight="32">
 
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/color_icon_background_blue"
         android:pathData="M25.2477 32H6.75229C3.02611 32 0 28.9739 0 25.2477V6.75229C0 3.02611 3.02611 0 6.75229 0H25.2477C28.9739 0 32 3.02611 32 6.75229V25.2477C32 28.9739 28.9739 32 25.2477 32Z" />
     <path
-        android:fillColor="@color/color_default_view_on_accent"
+        android:fillColor="@android:color/white"
         android:fillType="evenOdd"
         android:pathData="M12.127 11.3141C12.127 9.92797 13.3634 8.84713 14.752 9.01647C14.7584 9.01726 14.7649 9.01812 14.7713 9.01907C15.9524 9.19277 16.7791 10.2482 16.7791 11.3819V14.1489C17.0136 14.0681 17.2644 14.0241 17.5243 14.0241C18.1095 14.0241 18.6485 14.2471 19.0599 14.6117C19.4714 14.2471 20.0104 14.0241 20.5956 14.0241C21.1807 14.0241 21.7197 14.2471 22.1312 14.6117C22.5427 14.2471 23.0817 14.0241 23.6669 14.0241C24.939 14.0241 25.9929 15.078 25.9929 16.3501V17.2083C25.9929 18.2467 25.6681 20.4592 25.3616 22.3377C25.2055 23.2938 25.0496 24.1897 24.9327 24.8475C24.8743 25.1766 24.8256 25.4462 24.7916 25.6342C24.7744 25.7286 24.7613 25.8011 24.7522 25.8513C24.7494 25.8669 24.7471 25.8798 24.7452 25.8901C24.7441 25.8965 24.7431 25.9019 24.7423 25.9063L24.7423 25.9066C24.6858 26.2877 24.3573 26.5802 23.9604 26.5802C23.5239 26.5802 23.17 26.2263 23.17 25.7898C23.1705 25.7628 23.1728 25.7234 23.174 25.7109C23.1747 25.7036 23.1761 25.6917 23.1767 25.687C23.1774 25.6817 23.1781 25.677 23.1786 25.6735C23.179 25.671 23.1793 25.6691 23.1794 25.668C23.1805 25.6613 23.1814 25.6555 23.1819 25.6525C23.1831 25.6457 23.1844 25.638 23.1857 25.6309C23.1883 25.6161 23.192 25.5954 23.1966 25.5702C23.2019 25.5407 23.2087 25.5032 23.2168 25.4585C23.2226 25.4266 23.2291 25.3911 23.2361 25.3524C23.2699 25.1654 23.3183 24.8977 23.3763 24.5711C23.4923 23.9177 23.6469 23.0295 23.8014 22.0831C24.1159 20.1563 24.4121 18.0893 24.4121 17.2083V16.3501C24.4121 15.9511 24.0659 15.6049 23.6669 15.6049C23.2678 15.6049 22.9216 15.9511 22.9216 16.3501C22.9216 16.7866 22.5678 17.1405 22.1312 17.1405C21.6947 17.1405 21.3408 16.7866 21.3408 16.3501C21.3408 15.9511 20.9946 15.6049 20.5956 15.6049C20.1965 15.6049 19.8504 15.9511 19.8504 16.3501C19.8504 16.7866 19.4965 17.1405 19.0599 17.1405C18.6234 17.1405 18.2695 16.7866 18.2695 16.3501C18.2695 15.9511 17.9234 15.6049 17.5243 15.6049C17.1253 15.6049 16.7791 15.9511 16.7791 16.3501C16.7791 16.7866 16.4252 17.1405 15.9887 17.1405C15.5521 17.1405 15.1983 16.7866 15.1983 16.3501V11.3819C15.1983 10.9835 14.9011 10.6413 14.5507 10.5845C14.0918 10.5344 13.7078 10.8966 13.7078 11.3141V19.6246C13.7078 19.9358 13.5253 20.2179 13.2415 20.3455C12.9577 20.4731 12.6255 20.4223 12.3928 20.2158L9.21231 17.3937C8.93044 17.1886 8.68733 17.1221 8.49114 17.1207C8.29062 17.1193 8.07761 17.1854 7.85932 17.3435C7.54873 17.5866 7.4805 18.0269 7.71191 18.3661L8.62818 19.4127C9.19381 20.0588 9.9482 20.9205 10.7033 21.7828C11.4584 22.6452 12.2142 23.5083 12.7826 24.1571C13.0668 24.4815 13.3041 24.7523 13.471 24.9427C13.5545 25.0379 13.6202 25.1128 13.6654 25.1642C13.7045 25.2087 13.718 25.2239 13.7179 25.2241C13.7177 25.2242 13.7113 25.2174 13.7021 25.2083C14.0108 25.517 14.0108 26.0174 13.7021 26.3261C13.3935 26.6348 12.893 26.6348 12.5843 26.3261C12.5622 26.304 12.5172 26.2526 12.4892 26.2206C12.4849 26.2157 12.481 26.2113 12.4777 26.2075C12.4321 26.1555 12.3659 26.0802 12.2824 25.9849C12.1152 25.7942 11.8777 25.5232 11.5935 25.1987C11.025 24.5498 10.2691 23.6866 9.51399 22.8242C8.75885 21.9618 8.00443 21.1001 7.43879 20.454L6.49635 19.3775C6.49631 19.3775 6.49628 19.3774 7.091 18.8568L6.49635 19.3775C6.48137 19.3604 6.46707 19.3426 6.45362 19.3242C5.71248 18.3136 5.87177 16.8753 6.90367 16.0842C6.90813 16.0807 6.91263 16.0774 6.91716 16.074C7.3738 15.7392 7.9148 15.5358 8.50243 15.54C9.09109 15.5442 9.66399 15.7562 10.1849 16.1469C10.2022 16.1599 10.219 16.1736 10.2352 16.188L12.127 17.8666V11.3141Z" />
     <path
-        android:fillColor="@color/color_default_view_on_accent"
+        android:fillColor="@android:color/white"
         android:fillType="evenOdd"
         android:pathData="M8.89758 11.0882C8.89758 7.96434 11.4194 5.4425 14.5433 5.4425C17.6672 5.4425 20.189 7.96434 20.189 11.0882C20.189 11.5248 19.8352 11.8786 19.3986 11.8786C18.9621 11.8786 18.6082 11.5248 18.6082 11.0882C18.6082 8.83739 16.7942 7.02331 14.5433 7.02331C12.2925 7.02331 10.4784 8.83739 10.4784 11.0882C10.4784 11.5248 10.1245 11.8786 9.68799 11.8786C9.25146 11.8786 8.89758 11.5248 8.89758 11.0882Z" />
 </vector>
\ No newline at end of file
diff --git a/res/drawable/ic_settings_home.xml b/res/drawable/ic_settings_home.xml
index 60b2ebd6fa27061ccddc996c2ba36708bb8097c7..0afa64bb119074f4fc219f29e7666f4781c067be 100644
--- a/res/drawable/ic_settings_home.xml
+++ b/res/drawable/ic_settings_home.xml
@@ -18,6 +18,6 @@
         android:height="24dp"
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
-    <path android:fillColor="@color/color_default_accent"
+    <path android:fillColor="@color/default_icon_color"
           android:pathData="M10 20v-6h4v6h5v-8h3L12 3 2 12h3v8z" />
 </vector>
diff --git a/res/drawable/ic_settings_install.xml b/res/drawable/ic_settings_install.xml
index c96449b94ffc24e8d94ec502e48c3a247af15db3..80a6efaa63f6646288f70e1c2bbbe32fe3108dc5 100644
--- a/res/drawable/ic_settings_install.xml
+++ b/res/drawable/ic_settings_install.xml
@@ -20,9 +20,9 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
   <path
-      android:fillColor="@color/color_default_accent"
+      android:fillColor="@color/default_icon_color"
       android:pathData="M18,15v3H6v-3H4v3c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2v-3H18z"/>
   <path
-      android:fillColor="@color/color_default_accent"
+      android:fillColor="@color/default_icon_color"
       android:pathData="M17,11.5l-1.41,-1.41l-2.59,2.58l0,-8.67l-2,0l0,8.67l-2.59,-2.58l-1.41,1.41l5,5z"/>
 </vector>
diff --git a/res/drawable/ic_settings_language.xml b/res/drawable/ic_settings_language.xml
index 690c1639eed0fe90f66f44dc0343086c8f2c09d1..5f90b07d1cfb65acff83dda52343a53808d136ff 100644
--- a/res/drawable/ic_settings_language.xml
+++ b/res/drawable/ic_settings_language.xml
@@ -6,7 +6,7 @@
     android:viewportHeight="32">
 
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/color_icon_background_blue"
         android:pathData="M25.2477 32H6.75229C3.02611 32 0 28.9739 0 25.2477V6.75229C0 3.02611 3.02611 0 6.75229 0H25.2477C28.9739 0 32 3.02611 32 6.75229V25.2477C32 28.9739 28.9739 32 25.2477 32Z" />
     <path
         android:fillColor="#ffffff"
diff --git a/res/drawable/ic_settings_location.xml b/res/drawable/ic_settings_location.xml
index 0dbb3f8de590fa5d9f0813d1c0c7d0ae2fdf41bb..4bbb27ad0528b720bd2e7019ddbce259d1084784 100644
--- a/res/drawable/ic_settings_location.xml
+++ b/res/drawable/ic_settings_location.xml
@@ -9,10 +9,10 @@
       android:fillColor="#E83A52"
       android:pathData="M25.2477 32H6.75229C3.02611 32 0 28.9739 0 25.2477V6.75229C0 3.02611 3.02611 0 6.75229 0H25.2477C28.9739 0 32 3.02611 32 6.75229V25.2477C32 28.9739 28.9739 32 25.2477 32Z" />
   <path
-      android:fillColor="@color/color_default_view_on_accent"
+      android:fillColor="@android:color/white"
       android:fillType="evenOdd"
       android:pathData="M19.3888 7.49189C17.9614 6.6073 16.4265 6.34523 14.7625 6.66991L14.7532 6.67166C12.8778 7.01448 11.437 8.01029 10.3984 9.61808C9.50892 11.0139 9.18786 12.5373 9.43109 14.1792L9.43211 14.1862C9.53334 14.9151 9.75893 15.6425 10.0424 16.3839L10.043 16.3856C10.6927 18.0964 11.6086 19.7149 12.6323 21.295L12.6325 21.2954C13.6022 22.794 14.6851 24.232 15.8402 25.6323C15.8893 25.6861 15.9385 25.7407 15.9877 25.796L16.5303 25.1516C17.7357 23.6557 18.8849 22.1068 19.8751 20.4785L19.8791 20.4719C20.8996 18.8302 21.7629 17.182 22.2992 15.3806C22.6159 14.3032 22.7484 13.256 22.5715 12.2142L22.5713 12.213C22.2242 10.151 21.1797 8.57054 19.3974 7.49712L19.3888 7.49189ZM16.7214 27.3789L16.7213 27.3791L16.7211 27.3794L16.721 27.3797L16.7209 27.3799L16.7207 27.3802L16.7206 27.3805L16.7205 27.3807L16.7203 27.381L16.7202 27.3813L16.7201 27.3815L16.7199 27.3818L16.7198 27.3821L16.7197 27.3823L16.7195 27.3826L16.7194 27.3828L16.7193 27.3831L16.7191 27.3834L16.7187 27.3842L16.7186 27.3844L16.7185 27.3847L16.7182 27.3852C16.5998 27.6221 16.3706 27.7839 16.1078 27.8162C15.845 27.8486 15.5835 27.7472 15.4111 27.5461C15.3711 27.4994 15.3318 27.4536 15.2933 27.4085C15.0661 27.143 14.8635 26.9062 14.6608 26.6851C14.6515 26.675 14.6426 26.6647 14.6339 26.6542C13.4451 25.214 12.3193 23.7212 11.3053 22.1542C10.2516 20.5278 9.27074 18.8044 8.56552 16.9476C8.26237 16.1547 7.9916 15.3028 7.86683 14.4073C7.56917 12.3927 7.97054 10.4854 9.06677 8.76627L9.06915 8.76255C10.3331 6.80463 12.1423 5.54316 14.4644 5.11746C16.5006 4.7212 18.4404 5.04579 20.2173 6.14554C22.407 7.46592 23.7097 9.45261 24.1301 11.9507C24.3594 13.3019 24.1758 14.6025 23.8154 15.8278L23.8147 15.8303C23.2222 17.821 22.2798 19.604 21.2237 21.3032C20.1834 23.0136 18.9867 24.623 17.7558 26.1502C17.7522 26.1546 17.7486 26.159 17.745 26.1633L16.7214 27.3789Z" />
   <path
-      android:fillColor="@color/color_default_view_on_accent"
+      android:fillColor="@android:color/white"
       android:pathData="M18.6535 13.1659C18.6535 11.698 17.4566 10.4785 15.921 10.5237C14.4757 10.5688 13.324 11.7657 13.324 13.1885C13.3466 14.6563 14.5886 15.9436 16.1468 15.8307C17.5696 15.7403 18.6761 14.566 18.6535 13.1659Z" />
 </vector>
\ No newline at end of file
diff --git a/res/drawable/ic_settings_memory.xml b/res/drawable/ic_settings_memory.xml
index 799e371112a4dc4760f6c17da364686b9e1f7b56..eeee0483df82d7ae4442f4bc2a1e51d2bae2a952 100644
--- a/res/drawable/ic_settings_memory.xml
+++ b/res/drawable/ic_settings_memory.xml
@@ -6,46 +6,46 @@
     android:viewportHeight="32">
 
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/color_icon_background_blue"
         android:pathData="M25.2477 32H6.75229C3.02611 32 0 28.9739 0 25.2477V6.75229C0 3.02611 3.02611 0 6.75229 0H25.2477C28.9739 0 32 3.02611 32 6.75229V25.2477C32 28.9739 28.9739 32 25.2477 32Z" />
     <path
-        android:fillColor="@color/color_default_view_on_accent"
+        android:fillColor="@android:color/white"
         android:fillType="evenOdd"
         android:pathData="M7.76843 8.85248C7.76843 8.41595 8.12231 8.06207 8.55883 8.06207H23.4184C23.8549 8.06207 24.2088 8.41595 24.2088 8.85248V23.712C24.2088 24.1486 23.8549 24.5024 23.4184 24.5024H8.55883C8.12231 24.5024 7.76843 24.1486 7.76843 23.712V8.85248ZM9.34924 9.64288V22.9216H22.628V9.64288H9.34924Z" />
     <path
-        android:fillColor="@color/color_default_view_on_accent"
+        android:fillColor="@android:color/white"
         android:fillType="evenOdd"
         android:pathData="M13.4821 14.5434C13.4821 14.1069 13.8359 13.753 14.2725 13.753H17.7502C18.1868 13.753 18.5406 14.1069 18.5406 14.5434V18.0212C18.5406 18.4577 18.1868 18.8116 17.7502 18.8116H14.2725C13.8359 18.8116 13.4821 18.4577 13.4821 18.0212V14.5434ZM15.0629 15.3338V17.2308H16.9598V15.3338H15.0629Z" />
     <path
-        android:fillColor="@color/color_default_view_on_accent"
+        android:fillColor="@android:color/white"
         android:fillType="evenOdd"
         android:pathData="M17.7502 5.87158C18.1868 5.87158 18.5406 6.22546 18.5406 6.66198V8.85253C18.5406 9.28906 18.1868 9.64293 17.7502 9.64293C17.3137 9.64293 16.9598 9.28906 16.9598 8.85253V6.66198C16.9598 6.22546 17.3137 5.87158 17.7502 5.87158Z" />
     <path
-        android:fillColor="@color/color_default_view_on_accent"
+        android:fillColor="@android:color/white"
         android:fillType="evenOdd"
         android:pathData="M14.2725 5.87158C14.709 5.87158 15.0629 6.22546 15.0629 6.66198V8.85253C15.0629 9.28906 14.709 9.64293 14.2725 9.64293C13.8359 9.64293 13.4821 9.28906 13.4821 8.85253V6.66198C13.4821 6.22546 13.8359 5.87158 14.2725 5.87158Z" />
     <path
-        android:fillColor="@color/color_default_view_on_accent"
+        android:fillColor="@android:color/white"
         android:fillType="evenOdd"
         android:pathData="M17.7502 22.9443C18.1868 22.9443 18.5406 23.2981 18.5406 23.7347V25.9478C18.5406 26.3843 18.1868 26.7382 17.7502 26.7382C17.3137 26.7382 16.9598 26.3843 16.9598 25.9478V23.7347C16.9598 23.2981 17.3137 22.9443 17.7502 22.9443Z" />
     <path
-        android:fillColor="@color/color_default_view_on_accent"
+        android:fillColor="@android:color/white"
         android:fillType="evenOdd"
         android:pathData="M14.2725 22.9443C14.709 22.9443 15.0629 23.2981 15.0629 23.7347V25.9478C15.0629 26.3843 14.709 26.7382 14.2725 26.7382C13.8359 26.7382 13.4821 26.3843 13.4821 25.9478V23.7347C13.4821 23.2981 13.8359 22.9443 14.2725 22.9443Z" />
     <path
-        android:fillColor="@color/color_default_view_on_accent"
+        android:fillColor="@android:color/white"
         android:fillType="evenOdd"
         android:pathData="M22.6506 18.0438C22.6506 17.6072 23.0045 17.2534 23.441 17.2534H25.6542C26.0907 17.2534 26.4446 17.6072 26.4446 18.0438C26.4446 18.4803 26.0907 18.8342 25.6542 18.8342H23.441C23.0045 18.8342 22.6506 18.4803 22.6506 18.0438Z" />
     <path
-        android:fillColor="@color/color_default_view_on_accent"
+        android:fillColor="@android:color/white"
         android:fillType="evenOdd"
         android:pathData="M22.6506 14.5434C22.6506 14.1069 23.0045 13.753 23.441 13.753H25.6542C26.0907 13.753 26.4446 14.1069 26.4446 14.5434C26.4446 14.9799 26.0907 15.3338 25.6542 15.3338H23.441C23.0045 15.3338 22.6506 14.9799 22.6506 14.5434Z" />
     <path
-        android:fillColor="@color/color_default_view_on_accent"
+        android:fillColor="@android:color/white"
         android:fillType="evenOdd"
         android:pathData="M5.578 18.0438C5.578 17.6072 5.93188 17.2534 6.36841 17.2534H8.55895C8.99548 17.2534 9.34935 17.6072 9.34935 18.0438C9.34935 18.4803 8.99548 18.8342 8.55895 18.8342H6.36841C5.93188 18.8342 5.578 18.4803 5.578 18.0438Z" />
     <path
-        android:fillColor="@color/color_default_view_on_accent"
+        android:fillColor="@android:color/white"
         android:fillType="evenOdd"
         android:pathData="M5.578 14.5434C5.578 14.1069 5.93188 13.753 6.36841 13.753H8.55895C8.99548 13.753 9.34935 14.1069 9.34935 14.5434C9.34935 14.9799 8.99548 15.3338 8.55895 15.3338H6.36841C5.93188 15.3338 5.578 14.9799 5.578 14.5434Z" />
 </vector>
\ No newline at end of file
diff --git a/res/drawable/ic_settings_multiuser.xml b/res/drawable/ic_settings_multiuser.xml
index 949491ef80dd7224cd3e4ec9a7c70222f4e8374c..a45e8f6cbd5d52bbc345eeda1ed5f01ef11b2c21 100644
--- a/res/drawable/ic_settings_multiuser.xml
+++ b/res/drawable/ic_settings_multiuser.xml
@@ -6,14 +6,14 @@
     android:viewportHeight="32">
 
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/color_icon_background_blue"
         android:pathData="M25.2477 32H6.75229C3.02611 32 0 28.9739 0 25.2477V6.75229C0 3.02611 3.02611 0 6.75229 0H25.2477C28.9739 0 32 3.02611 32 6.75229V25.2477C32 28.9739 28.9739 32 25.2477 32Z" />
     <path
-        android:fillColor="@color/color_default_view_on_accent"
+        android:fillColor="@android:color/white"
         android:fillType="evenOdd"
         android:pathData="M16.0112 7.13622C13.6165 7.13622 11.6753 9.07748 11.6753 11.4721C11.6753 13.8668 13.6165 15.8081 16.0112 15.8081C18.4059 15.8081 20.3471 13.8668 20.3471 11.4721C20.3471 9.07748 18.4059 7.13622 16.0112 7.13622ZM10.0945 11.4721C10.0945 8.20443 12.7435 5.55542 16.0112 5.55542C19.2789 5.55542 21.9279 8.20443 21.9279 11.4721C21.9279 14.7399 19.2789 17.3889 16.0112 17.3889C12.7435 17.3889 10.0945 14.7399 10.0945 11.4721Z" />
     <path
-        android:fillColor="@color/color_default_view_on_accent"
+        android:fillColor="@android:color/white"
         android:fillType="evenOdd"
         android:pathData="M15.9808 17.9534H16.0414C16.9734 17.9534 17.9269 17.9533 18.807 18.0684C19.7037 18.1856 20.5879 18.4287 21.3577 18.9598C22.9442 20.0543 23.7346 22.1344 23.7346 25.6767C23.7346 26.1133 23.3807 26.4671 22.9441 26.4671C22.5076 26.4671 22.1537 26.1133 22.1537 25.6767C22.1537 22.2861 21.3859 20.8997 20.46 20.261C19.9737 19.9255 19.3632 19.7353 18.6021 19.6358C17.834 19.5354 16.9779 19.5342 16.0112 19.5342C15.0388 19.5342 14.1799 19.5354 13.4106 19.6359C12.6485 19.7353 12.0391 19.9255 11.5546 20.2605C10.6318 20.8986 9.86865 22.2842 9.86865 25.6767C9.86865 26.1133 9.51477 26.4671 9.07824 26.4671C8.64172 26.4671 8.28784 26.1133 8.28784 25.6767C8.28784 22.1363 9.07166 20.0554 10.6555 18.9603C11.4243 18.4287 12.3083 18.1855 13.206 18.0683C14.0871 17.9533 15.0434 17.9534 15.9808 17.9534Z" />
 </vector>
\ No newline at end of file
diff --git a/res/drawable/ic_settings_nfc_payment.xml b/res/drawable/ic_settings_nfc_payment.xml
index 92b8b99c630fdaf95d27655a17761ffa03dd730f..2656571748673a9519ab38667ea188d57254e205 100644
--- a/res/drawable/ic_settings_nfc_payment.xml
+++ b/res/drawable/ic_settings_nfc_payment.xml
@@ -17,6 +17,6 @@
 
 <bitmap xmlns:android="http://schemas.android.com/apk/res/android"
     android:src="@drawable/ic_settings_nfc_payment_am_alpha"
-    android:tint="@color/color_default_accent"
+    android:tint="@color/color_icon_background_blue"
     android:autoMirrored="true" />
 
diff --git a/res/drawable/ic_settings_night_display.xml b/res/drawable/ic_settings_night_display.xml
index f730a07ba9b77a3fa315ed07284f59ccecb07f76..c4013b060bdb6df732802317d62a251de55ac127 100644
--- a/res/drawable/ic_settings_night_display.xml
+++ b/res/drawable/ic_settings_night_display.xml
@@ -19,6 +19,6 @@
         android:viewportHeight="24"
         android:viewportWidth="24">
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M6.28,4.81c0,0.16 0.01,0.32 0.02,0.48c0.38,6.58 5.83,12.03 12.41,12.41c0.16,0.01 0.32,0.02 0.47,0.02c-1.58,1.2 -3.53,1.88 -5.56,1.88c-0.46,0 -0.93,-0.03 -1.4,-0.1c-3.96,-0.58 -7.13,-3.75 -7.71,-7.71C4.13,9.24 4.8,6.75 6.28,4.81M8.27,0.6c-0.08,0 -0.17,0.02 -0.25,0.07c-3.8,2.2 -6.2,6.56 -5.49,11.4c0.7,4.82 4.59,8.7 9.4,9.4c0.57,0.08 1.13,0.12 1.69,0.12c4.15,0 7.78,-2.26 9.72,-5.62c0.2,-0.35 -0.07,-0.76 -0.44,-0.76c-0.05,0 -0.1,0.01 -0.15,0.02c-1.03,0.31 -2.12,0.48 -3.25,0.48c-0.22,0 -0.44,-0.01 -0.67,-0.02C13.23,15.38 8.62,10.77 8.29,5.17C8.21,3.81 8.38,2.49 8.75,1.26C8.86,0.91 8.59,0.6 8.27,0.6L8.27,0.6z"/>
 </vector>
diff --git a/res/drawable/ic_settings_open.xml b/res/drawable/ic_settings_open.xml
index e7198de9b436e1f99086af3d7205ef6c971aa92f..dd14c01d8e34c8928914957d99a45cfef6504a1a 100644
--- a/res/drawable/ic_settings_open.xml
+++ b/res/drawable/ic_settings_open.xml
@@ -20,6 +20,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
   <path
-      android:fillColor="@color/color_default_accent"
+      android:fillColor="@color/default_icon_color"
       android:pathData="M19,19H5V5h7V3H5C3.89,3 3,3.9 3,5v14c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2v-7h-2V19zM14,3v2h3.59l-9.83,9.83l1.41,1.41L19,6.41V10h2V3H14z"/>
 </vector>
diff --git a/res/drawable/ic_settings_personal.xml b/res/drawable/ic_settings_personal.xml
index d092ffa4f41a07f0ccb1f876063b362de424b8a6..fa9da6e958e63625653bd5e47a4cc024dbca69b1 100644
--- a/res/drawable/ic_settings_personal.xml
+++ b/res/drawable/ic_settings_personal.xml
@@ -20,9 +20,9 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
   <path
-      android:fillColor="@color/color_default_accent"
+      android:fillColor="@color/default_icon_color"
       android:pathData="M13.85,22.24h-3.7c-0.74,0 -1.36,-0.54 -1.45,-1.27l-0.27,-1.89c-0.27,-0.14 -0.53,-0.29 -0.79,-0.46l-1.8,0.72c-0.7,0.26 -1.47,-0.03 -1.81,-0.65L2.2,15.52c-0.35,-0.66 -0.2,-1.44 0.36,-1.88l1.53,-1.19c-0.01,-0.15 -0.02,-0.3 -0.02,-0.46c0,-0.15 0.01,-0.31 0.02,-0.46l-1.52,-1.19C1.98,9.89 1.83,9.09 2.2,8.47l1.85,-3.19c0.34,-0.62 1.11,-0.9 1.79,-0.63l1.81,0.73C7.91,5.2 8.17,5.05 8.43,4.91L8.7,3.01c0.09,-0.7 0.71,-1.25 1.44,-1.25h3.7c0.74,0 1.36,0.54 1.45,1.27l0.27,1.89c0.27,0.14 0.53,0.29 0.79,0.46l1.8,-0.72c0.71,-0.26 1.48,0.03 1.82,0.65l1.84,3.18c0.36,0.66 0.2,1.44 -0.36,1.88l-1.52,1.19c0.01,0.15 0.02,0.3 0.02,0.46s-0.01,0.31 -0.02,0.46l1.52,1.19c0.56,0.45 0.72,1.23 0.37,1.86l-1.86,3.22c-0.34,0.62 -1.11,0.9 -1.8,0.63l-1.8,-0.72c-0.26,0.17 -0.52,0.32 -0.78,0.46l-0.27,1.91C15.21,21.7 14.59,22.24 13.85,22.24zM13.32,20.72c0,0.01 0,0.01 0,0.02V20.72zM10.68,20.69v0.02C10.69,20.72 10.69,20.7 10.68,20.69zM10.62,20.24h2.76l0.37,-2.55l0.53,-0.22c0.44,-0.18 0.88,-0.44 1.34,-0.78l0.45,-0.34l2.38,0.96l1.38,-2.4l-2.03,-1.58l0.07,-0.56c0.03,-0.26 0.06,-0.51 0.06,-0.78c0,-0.27 -0.03,-0.53 -0.06,-0.78l-0.07,-0.56l2.03,-1.58l-1.39,-2.4l-2.39,0.96L15.6,7.28c-0.42,-0.32 -0.87,-0.58 -1.33,-0.77L13.75,6.3l-0.37,-2.55h-2.76L10.25,6.3L9.72,6.51C9.28,6.69 8.84,6.94 8.38,7.3L7.93,7.62L5.55,6.67L4.16,9.06l2.03,1.58L6.12,11.2c-0.03,0.26 -0.06,0.53 -0.06,0.79s0.02,0.53 0.06,0.78l0.07,0.56l-2.03,1.58l1.38,2.4l2.39,-0.96l0.45,0.35c0.43,0.33 0.86,0.58 1.33,0.77l0.53,0.22L10.62,20.24zM18.22,17.72c0,0.01 -0.01,0.02 -0.01,0.03L18.22,17.72zM5.77,17.7l0.01,0.02C5.78,17.72 5.77,17.7 5.77,17.7zM3.93,9.47L3.93,9.47L3.93,9.47zM18.22,6.26c0,0.01 0.01,0.02 0.01,0.02L18.22,6.26zM5.79,6.24L5.78,6.26C5.78,6.26 5.79,6.26 5.79,6.24zM13.31,3.27c0,0.01 0,0.01 0,0.02V3.27zM10.69,3.25v0.02C10.69,3.26 10.69,3.26 10.69,3.25z"/>
   <path
-      android:fillColor="@color/color_default_accent"
+      android:fillColor="@color/default_icon_color"
       android:pathData="M13.56,10.44l-1.56,-3.44l-1.56,3.44l-3.44,1.56l3.44,1.56l1.56,3.44l1.56,-3.44l3.44,-1.56z"/>
 </vector>
diff --git a/res/drawable/ic_settings_phone_idle.xml b/res/drawable/ic_settings_phone_idle.xml
index 9a1e8e095c7a0558df4cb1e6b5448dd6ad3626dc..6bad242d245ce0a0a473db9fbcd7cd0bbf555773 100644
--- a/res/drawable/ic_settings_phone_idle.xml
+++ b/res/drawable/ic_settings_phone_idle.xml
@@ -20,5 +20,5 @@
     android:viewportHeight="48">
   <path
       android:pathData="M14,48h4v-4h-4v4zM22,48h4v-4h-4v4zM26,4h-4v20h4L26,4zM33.13,8.87l-2.89,2.89C33.69,13.87 36,17.66 36,22c0,6.63 -5.37,12 -12,12s-12,-5.37 -12,-12c0,-4.34 2.31,-8.13 5.76,-10.24l-2.89,-2.89C10.72,11.76 8,16.56 8,22c0,8.84 7.16,16 16,16s16,-7.16 16,-16c0,-5.44 -2.72,-10.24 -6.87,-13.13zM30,48h4v-4h-4v4z"
-      android:fillColor="@color/color_default_accent"/>
+      android:fillColor="@color/default_icon_color"/>
 </vector>
diff --git a/res/drawable/ic_settings_print.xml b/res/drawable/ic_settings_print.xml
index 3551e6210aa5854c2fa954a302235bd564d79cb3..001c3c6b03ad451a3cf11c592c4376a1b6ed7a30 100644
--- a/res/drawable/ic_settings_print.xml
+++ b/res/drawable/ic_settings_print.xml
@@ -6,7 +6,7 @@
     android:viewportHeight="32">
 
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/color_icon_background_blue"
         android:pathData="M25.2477 32H6.75229C3.02611 32 0 28.9739 0 25.2477V6.75229C0 3.02611 3.02611 0 6.75229 0H25.2477C28.9739 0 32 3.02611 32 6.75229V25.2477C32 28.9739 28.9739 32 25.2477 32Z" />
     <path
         android:fillColor="#ffffff"
diff --git a/res/drawable/ic_settings_privacy.xml b/res/drawable/ic_settings_privacy.xml
index 3eebb8e65acc5d5ff7d504a07cf8769748654744..bb6dc8594cd27036dad29201e08e4be818f22685 100644
--- a/res/drawable/ic_settings_privacy.xml
+++ b/res/drawable/ic_settings_privacy.xml
@@ -4,13 +4,13 @@
     android:viewportWidth="21.637253"
     android:viewportHeight="21.637253">
   <path
-      android:fillColor="@color/color_default_accent"
+      android:fillColor="@color/color_icon_background_blue"
       android:pathData="M3.5436,-0L18.0936,-0A3.5436,3.5436 135,0 1,21.6373 3.5436L21.6373,18.0936A3.5436,3.5436 45,0 1,18.0936 21.6372L3.5436,21.6372A3.5436,3.5436 45,0 1,0 18.0936L0,3.5436A3.5436,3.5436 135,0 1,3.5436 -0z"
       android:strokeWidth="0.0902828"
       android:strokeLineCap="round"
       android:strokeLineJoin="round" />
   <path
-      android:fillColor="@color/color_default_view_on_accent"
+      android:fillColor="@android:color/white"
       android:fillType="nonZero"
       android:pathData="m10.7762,7.2513c-1.9678,0 -3.7517,0.3429 -5.0885,0.933 -0.6684,0.295 -1.2297,0.6507 -1.6427,1.0818 -0.4131,0.4311 -0.6811,0.9644 -0.6811,1.5397 0,0.5753 0.2681,1.1029 0.6811,1.534 0.413,0.4311 0.9743,0.7868 1.6427,1.0818 1.3368,0.5901 3.1206,0.9387 5.0885,0.9387 1.9678,0 3.7517,-0.3486 5.0885,-0.9387 0.6684,-0.2951 1.2297,-0.6507 1.6427,-1.0818 0.413,-0.4311 0.6811,-0.9587 0.6811,-1.534 -0,-0.5753 -0.2681,-1.1086 -0.6811,-1.5397 -0.4131,-0.4311 -0.9743,-0.7868 -1.6427,-1.0818 -1.3368,-0.5901 -3.1207,-0.933 -5.0885,-0.933zM10.7762,8.2587c1.8476,0 3.5185,0.3392 4.6821,0.8528 0.5818,0.2567 1.0361,0.5542 1.3222,0.8529 0.2861,0.2986 0.4007,0.5746 0.4007,0.8414 -0,0.2667 -0.1145,0.5371 -0.4007,0.8357 -0.2861,0.2986 -0.7404,0.6018 -1.3222,0.8586 -1.1636,0.5136 -2.8345,0.8472 -4.6821,0.8472 -1.8476,0 -3.5186,-0.3335 -4.6821,-0.8472 -0.5818,-0.2567 -1.0304,-0.56 -1.3165,-0.8586 -0.2861,-0.2986 -0.4064,-0.5689 -0.4064,-0.8357 0,-0.2667 0.1203,-0.5428 0.4064,-0.8414 0.2861,-0.2986 0.7347,-0.5961 1.3165,-0.8529 1.1636,-0.5136 2.8345,-0.8528 4.6821,-0.8528z"
       android:strokeWidth="0.117367"
@@ -18,7 +18,7 @@
       android:strokeLineCap="round"
       android:strokeLineJoin="round" />
   <path
-      android:fillColor="@color/color_default_view_on_accent"
+      android:fillColor="@android:color/white"
       android:fillType="nonZero"
       android:pathData="m10.7762,7.9496c-1.5719,0 -2.8562,1.2843 -2.8562,2.8562 0,1.5719 1.2843,2.8562 2.8562,2.8562 1.5719,0 2.8562,-1.2843 2.8562,-2.8562 0,-1.5719 -1.2843,-2.8562 -2.8562,-2.8562zM10.7762,8.957c1.0271,0 1.8488,0.8217 1.8488,1.8488 0,1.0271 -0.8217,1.8488 -1.8488,1.8488 -1.0271,0 -1.8488,-0.8217 -1.8488,-1.8488 0,-1.0271 0.8217,-1.8488 1.8488,-1.8488z"
       android:strokeWidth="0.117367"
diff --git a/res/drawable/ic_settings_security.xml b/res/drawable/ic_settings_security.xml
index 1b71fe81ec1a3d9f792ec745c863eff726587257..f1f4d9374478a1953d814ec2a6f6d68c7eadea4d 100644
--- a/res/drawable/ic_settings_security.xml
+++ b/res/drawable/ic_settings_security.xml
@@ -25,11 +25,11 @@
         android:fillColor="#E83A52"
         android:pathData="M25.2477 32H6.75229C3.02611 32 0 28.9739 0 25.2477V6.75229C0 3.02611 3.02611 0 6.75229 0H25.2477C28.9739 0 32 3.02611 32 6.75229V25.2477C32 28.9739 28.9739 32 25.2477 32Z" />
     <path
-        android:fillColor="@color/color_default_view_on_accent"
+        android:fillColor="@android:color/white"
         android:fillType="evenOdd"
         android:pathData="M9.28161 15.7178C9.12022 15.7178 8.98803 15.8488 8.98803 16.0113V24.2541C8.98803 24.4155 9.11908 24.5477 9.28161 24.5477H22.7184C22.881 24.5477 23.012 24.4155 23.012 24.2541V16.0113C23.012 15.85 22.881 15.7178 22.7184 15.7178H9.28161ZM7.40723 16.0113C7.40723 14.9544 8.26869 14.137 9.28161 14.137H22.7184C23.7754 14.137 24.5928 14.9984 24.5928 16.0113V24.2541C24.5928 25.267 23.7754 26.1285 22.7184 26.1285H9.28161C8.22466 26.1285 7.40723 25.267 7.40723 24.2541V16.0113Z" />
     <path
-        android:fillColor="@color/color_default_view_on_accent"
+        android:fillColor="@android:color/white"
         android:fillType="evenOdd"
         android:pathData="M15.9887 7.47497C13.7379 7.47497 11.9012 9.31164 11.9012 11.5625V14.9048C11.9012 15.3413 11.5474 15.6952 11.1108 15.6952C10.6743 15.6952 10.3204 15.3413 10.3204 14.9048V11.5625C10.3204 8.43858 12.8649 5.89417 15.9887 5.89417C19.1126 5.89417 21.6571 8.43858 21.6571 11.5625V14.9048C21.6571 15.3413 21.3032 15.6952 20.8667 15.6952C20.4301 15.6952 20.0763 15.3413 20.0763 14.9048V11.5625C20.0763 9.31164 18.2396 7.47497 15.9887 7.47497Z" />
 </vector>
diff --git a/res/drawable/ic_settings_security_white.xml b/res/drawable/ic_settings_security_white.xml
index 05b1c6596ef4e4328dad5ea0d1c54d5a76d0a38c..25546337bac29ee7d93ee0a77a3883410d7f4a85 100644
--- a/res/drawable/ic_settings_security_white.xml
+++ b/res/drawable/ic_settings_security_white.xml
@@ -19,9 +19,9 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@android:color/white"
         android:pathData="M12,15m-2,0a2,2 0,1 1,4 0a2,2 0,1 1,-4 0" />
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@android:color/white"
         android:pathData="M18.5,1C16.01,1 14,3.01 14,5.5V8H6c-1.1,0 -2,0.9 -2,2v10c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2V10c0,-1.1 -0.9,-2 -2,-2h-2V5.5C16,4.12 17.12,3 18.5,3C19.88,3 21,4.12 21,5.5V6h2V5.5C23,3.01 20.99,1 18.5,1zM18,10v10H6V10H18z" />
 </vector>
\ No newline at end of file
diff --git a/res/drawable/ic_settings_sign_in.xml b/res/drawable/ic_settings_sign_in.xml
index 1d3312433ce353c93d9ca60167c4aa4e43ecf6a1..0baaa1d550df64d609665dc5c0bbf83ab3e7e12a 100644
--- a/res/drawable/ic_settings_sign_in.xml
+++ b/res/drawable/ic_settings_sign_in.xml
@@ -19,6 +19,6 @@
     android:viewportWidth="24.0"
     android:viewportHeight="24.0">
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M11,7L9.6,8.4l2.6,2.6H2v2h10.2l-2.6,2.6L11,17l5-5L11,7z M20,19h-8v2h8c1.1,0,2-0.9,2-2V5c0-1.1-0.9-2-2-2h-8v2h8V19z" />
 </vector>
diff --git a/res/drawable/ic_settings_storage.xml b/res/drawable/ic_settings_storage.xml
index f7aba8f8aebbc44074b3a65074a52dc82014ec8f..a94b52893dc14a082fa832145e9635c839a7aceb 100644
--- a/res/drawable/ic_settings_storage.xml
+++ b/res/drawable/ic_settings_storage.xml
@@ -21,7 +21,7 @@
     android:viewportHeight="32">
 
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/color_icon_background_blue"
         android:pathData="M25.2477 32H6.75229C3.02611 32 0 28.9739 0 25.2477V6.75229C0 3.02611 3.02611 0 6.75229 0H25.2477C28.9739 0 32 3.02611 32 6.75229V25.2477C32 28.9739 28.9739 32 25.2477 32Z" />
     <path
         android:fillColor="#ffffff"
diff --git a/res/drawable/ic_settings_sync.xml b/res/drawable/ic_settings_sync.xml
index 1a9378f8c0d5de0166d0a0a662b26bbe3234cb17..d11972281cda1daf48b1f18063fac4f822cb3efb 100644
--- a/res/drawable/ic_settings_sync.xml
+++ b/res/drawable/ic_settings_sync.xml
@@ -19,6 +19,6 @@
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M12.0,4.0L12.0,1.0L8.0,5.0l4.0,4.0L12.0,6.0c3.31,0.0 6.0,2.69 6.0,6.0 0.0,1.01 -0.25,1.97 -0.7,2.8l1.46,1.46C19.54,15.03 20.0,13.57 20.0,12.0c0.0,-4.42 -3.58,-8.0 -8.0,-8.0zm0.0,14.0c-3.31,0.0 -6.0,-2.69 -6.0,-6.0 0.0,-1.0 0.25,-1.9 0.7,-2.8L5.24,7.74C4.46,8.97 4.0,10.43 4.0,12.0c0.0,4.42 3.58,8.0 8.0,8.0l0.0,3.0l4.0,-4.0 -4.0,-4.0l0.0,3.0z"/>
 </vector>
diff --git a/res/drawable/ic_settings_system_dashboard_white.xml b/res/drawable/ic_settings_system_dashboard_white.xml
index 17a2417878a07aaf7c888bf360d7a87845cc029a..084e76a145bc3c5dc4575bbde856dd98226ea554 100644
--- a/res/drawable/ic_settings_system_dashboard_white.xml
+++ b/res/drawable/ic_settings_system_dashboard_white.xml
@@ -19,12 +19,12 @@
     android:viewportWidth="24.0"
     android:viewportHeight="24.0">
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@android:color/white"
         android:pathData="M11,7h2v2h-2z" />
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@android:color/white"
         android:pathData="M11,11h2v6h-2z" />
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@android:color/white"
         android:pathData="M12,2C6.48,2 2,6.48 2,12c0,5.52 4.48,10 10,10s10,-4.48 10,-10C22,6.48 17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8c0,-4.41 3.59,-8 8,-8s8,3.59 8,8C20,16.41 16.41,20 12,20z" />
 </vector>
diff --git a/res/drawable/ic_settings_voice_calls.xml b/res/drawable/ic_settings_voice_calls.xml
index d13100fa78b4391521367d10dc912eff5cea3ffe..14b8d8ea186ea9893561e49f1336519a369e3b2b 100644
--- a/res/drawable/ic_settings_voice_calls.xml
+++ b/res/drawable/ic_settings_voice_calls.xml
@@ -20,5 +20,5 @@
     android:viewportHeight="48">
   <path
       android:pathData="M40,31c-2.49,0 -4.89,-0.4 -7.14,-1.14 -0.69,-0.22 -1.48,-0.06 -2.03,0.49l-4.4,4.41c-5.67,-2.88 -10.29,-7.51 -13.18,-13.17l4.4,-4.41c0.55,-0.55 0.71,-1.34 0.49,-2.03C17.4,12.9 17,10.49 17,8c0,-1.11 -0.89,-2 -2,-2L8,6c-1.11,0 -2,0.89 -2,2 0,18.78 15.22,34 34,34 1.11,0 2,-0.89 2,-2v-7c0,-1.11 -0.89,-2 -2,-2zM38,24h4c0,-9.94 -8.06,-18 -18,-18v4c7.73,0 14,6.27 14,14zM30,24h4c0,-5.52 -4.48,-10 -10,-10v4c3.31,0 6,2.69 6,6z"
-      android:fillColor="@color/color_default_accent"/>
+      android:fillColor="@color/default_icon_color"/>
 </vector>
diff --git a/res/drawable/ic_settings_wireless.xml b/res/drawable/ic_settings_wireless.xml
index 5cabb3e73b2a242f4c7dcf66fcd239b6bd7120ea..f49a426893a0c937a84470dd5cfb9f0845f2526e 100644
--- a/res/drawable/ic_settings_wireless.xml
+++ b/res/drawable/ic_settings_wireless.xml
@@ -21,7 +21,7 @@
     android:viewportHeight="32">
 
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/color_icon_background_blue"
         android:pathData="M25.2477 32H6.75229C3.02611 32 0 28.9739 0 25.2477V6.75229C0 3.02611 3.02611 0 6.75229 0H25.2477C28.9739 0 32 3.02611 32 6.75229V25.2477C32 28.9739 28.9739 32 25.2477 32Z" />
     <path
         android:fillColor="#ffffff"
diff --git a/res/drawable/ic_shortcut_battery.xml b/res/drawable/ic_shortcut_battery.xml
index 43f10525f8e31cd4593d1ebb7477706e7496819d..0a0da08aedd5262f09287b42c05df1042b740201 100644
--- a/res/drawable/ic_shortcut_battery.xml
+++ b/res/drawable/ic_shortcut_battery.xml
@@ -24,7 +24,7 @@
           android:viewportHeight="78.0">
             <group android:translateX="13.0" android:translateY="13.0">
                 <path
-                    android:fillColor="@color/color_default_accent"
+                    android:fillColor="@color/default_icon_color"
                     android:pathData="M29.67,18H28v-2h-4v2h-1.67C21.6,18,21,18.6,21,19.33v15.33C21,35.4,21.6,36,22.33,36h7.33
                             C30.4,36,31,35.4,31,34.67V19.33C31,18.6,30.4,18,29.67,18z"/>
             </group>
diff --git a/res/drawable/ic_shortcut_data_usage.xml b/res/drawable/ic_shortcut_data_usage.xml
index 878b262dec3710782532ff77f9a56e6be32ff1ca..2141accbfed369ce725c42e6d9a454e032f86c4b 100644
--- a/res/drawable/ic_shortcut_data_usage.xml
+++ b/res/drawable/ic_shortcut_data_usage.xml
@@ -24,7 +24,7 @@
           android:viewportHeight="78.0">
             <group android:translateX="13.0" android:translateY="13.0">
                 <path
-                    android:fillColor="@color/color_default_accent"
+                    android:fillColor="@color/default_icon_color"
                     android:pathData="M27,16.05v3.03c3.39,0.49,6,3.39,6,6.92c0,0.9-0.18,1.75-0.48,2.54l2.6,1.53C35.68,28.83,36,27.45,36,26
                             C36,20.82,32.05,16.55,27,16.05z M26,33c-3.87,0-7-3.13-7-7c0-3.53,2.61-6.43,6-6.92v-3.03c-5.06,0.5-9,4.76-9,9.95
                             c0,5.52,4.47,10,9.99,10c3.31,0,6.24-1.61,8.06-4.09l-2.6-1.53C30.17,31.98,28.21,33,26,33z"/>
diff --git a/res/drawable/ic_shortcut_wireless.xml b/res/drawable/ic_shortcut_wireless.xml
index 70822e89409723f9ebcc8da9b4d1c0582c945af6..8adc007b1cbbdc9a154ff926579a365f3d09e8fe 100644
--- a/res/drawable/ic_shortcut_wireless.xml
+++ b/res/drawable/ic_shortcut_wireless.xml
@@ -24,7 +24,7 @@
             android:viewportHeight="78.0">
             <group android:translateX="13.0" android:translateY="13.0">
                 <path
-                    android:fillColor="@color/color_default_accent"
+                    android:fillColor="@color/default_icon_color"
                     android:pathData="M26.01,35.49L37.64,21c-0.45-0.34-4.93-4-11.64-4c-6.72,0-11.19,3.66-11.64,4l11.63,14.49L26,35.5L26.01,35.49z"/>
             </group>
         </vector>
diff --git a/res/drawable/ic_signal_flashlight.xml b/res/drawable/ic_signal_flashlight.xml
index 833c5229d4fc398548ec878a3ae551354d3a36f2..eb170cd1d97f6ea49b9618ff010079c7fbf47727 100644
--- a/res/drawable/ic_signal_flashlight.xml
+++ b/res/drawable/ic_signal_flashlight.xml
@@ -20,9 +20,9 @@
     android:viewportWidth="24.0"
     android:viewportHeight="24.0">
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M18,2H6v6l2,3v11h8V11l2,-3L18,2zM16,4l0,1H8V4H16zM14,10.4V20h-4v-9.61l-2,-3V7h8l0,0.39L14,10.4z"/>
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M12,14m-1.5,0a1.5,1.5 0,1 1,3 0a1.5,1.5 0,1 1,-3 0"/>
 </vector>
diff --git a/res/drawable/ic_signal_location.xml b/res/drawable/ic_signal_location.xml
index 903152b4db93a06a83865854840b473b43d12e85..d8c5d05c6caa97365bd42b52d6fcb60650cfcfcc 100644
--- a/res/drawable/ic_signal_location.xml
+++ b/res/drawable/ic_signal_location.xml
@@ -5,9 +5,9 @@
     android:viewportWidth="24.0"
     android:viewportHeight="24.0">
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M12,2C8.13,2 5,5.13 5,9c0,5.25 7,13 7,13s7,-7.75 7,-13C19,5.13 15.87,2 12,2zM7,9c0,-2.76 2.24,-5 5,-5s5,2.24 5,5c0,2.88 -2.88,7.19 -5,9.88C9.92,16.21 7,11.85 7,9z"/>
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M12,9m-2.5,0a2.5,2.5 0,1 1,5 0a2.5,2.5 0,1 1,-5 0"/>
 </vector>
\ No newline at end of file
diff --git a/res/drawable/ic_signal_strength_4g.xml b/res/drawable/ic_signal_strength_4g.xml
index 837ae3d2870ae82c73969e15863f7e876f5c2cef..73151125f47adb55f452fcaa6a88817995ad0459 100644
--- a/res/drawable/ic_signal_strength_4g.xml
+++ b/res/drawable/ic_signal_strength_4g.xml
@@ -19,9 +19,9 @@ Copyright (C) 2014 The Android Open Source Project
     android:viewportWidth="13.0"
     android:viewportHeight="24.0">
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M4.600000,7.800000l0.700000,0.000000l0.000000,1.300000L4.600000,9.100000L4.600000,11.000000L3.000000,11.000000L3.000000,9.200000L0.100000,9.200000L0.000000,8.100000L3.000000,2.500000l1.700000,0.000000L4.700000,7.800000zM1.600000,7.800000L3.000000,7.800000l0.000000,-3.000000L2.900000,5.000000L1.600000,7.800000z"/>
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M11.900000,9.900000c-0.200000,0.400000 -0.600000,0.700000 -1.000000,0.900000s-1.000000,0.400000 -1.800000,0.400000c-0.900000,0.000000 -1.700000,-0.300000 -2.200000,-0.800000S6.100000,9.000000 6.100000,7.900000L6.100000,5.600000c0.000000,-1.100000 0.300000,-1.900000 0.800000,-2.400000S8.100000,2.400000 9.000000,2.400000c1.000000,0.000000 1.700000,0.200000 2.100000,0.700000s0.700000,1.200000 0.700000,2.100000l-1.600000,0.000000c0.000000,-0.500000 -0.100000,-0.900000 -0.200000,-1.100000S9.500000,3.700000 9.000000,3.700000c-0.400000,0.000000 -0.700000,0.200000 -0.900000,0.500000S7.700000,5.000000 7.700000,5.600000l0.000000,2.300000c0.000000,0.700000 0.100000,1.100000 0.300000,1.400000s0.600000,0.500000 1.000000,0.500000c0.300000,0.000000 0.600000,0.000000 0.700000,-0.100000s0.300000,-0.200000 0.400000,-0.300000L10.099999,7.800000L9.000000,7.800000L9.000000,6.600000l2.900000,0.000000L11.900000,9.900000z"/>
 </vector>
\ No newline at end of file
diff --git a/res/drawable/ic_signal_workmode_enable.xml b/res/drawable/ic_signal_workmode_enable.xml
index 0fa3b37d07d259cffa564799db80cef99162be3e..06d511470fb1831374d20b6ad85d18a9d0c713c2 100644
--- a/res/drawable/ic_signal_workmode_enable.xml
+++ b/res/drawable/ic_signal_workmode_enable.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="42.0"
     android:viewportHeight="42.0">
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M40.25,38.04l-2.56,-2.56L12.62,10.41L5.69,3.48l-2.2,2.2l4.73,4.72H7.09c-1.94,0 -3.48,1.56 -3.48,3.5L3.59,33.16c0,1.94 1.56,3.5 3.5,3.5h27.37l3.59,3.59L40.25,38.04zM38.5,13.91c0.09,-1.94 -1.47,-3.5 -3.41,-3.41h-7V6.91c0,-1.94 -1.56,-3.5 -3.5,-3.41h-7c-1.94,-0.09 -3.5,1.47 -3.5,3.41v0.56l24.41,24.5V13.91zM24.59,10.5H17.5V6.91h7.09V10.5z" />
 </vector>
diff --git a/res/drawable/ic_sim_alert.xml b/res/drawable/ic_sim_alert.xml
index 627fe5584e128d16cb0142df263bd736bd51c163..1fe136f986fab706c7627439706f0c6b402c3a64 100644
--- a/res/drawable/ic_sim_alert.xml
+++ b/res/drawable/ic_sim_alert.xml
@@ -20,7 +20,7 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/default_icon_color"
         android:pathData="m4.8578,21.8264c-0.2247,-0.137 -0.5206,-0.4329 -0.6575,-0.6575 -0.2399,-0.3935 -0.2491,-0.6433 -0.2495,-6.7995l-0.0005,-6.391 2.9757,-2.9776 2.9757,-2.9776 4.3876,0.0005c4.1571,0.0004 4.4091,0.0135 4.7961,0.2495 0.2247,0.137 0.5206,0.4329 0.6575,0.6575 0.2422,0.3972 0.2491,0.6479 0.2491,9.1192 0,8.4712 -0.007,8.7219 -0.2491,9.1191 -0.137,0.2247 -0.4329,0.5206 -0.6575,0.6575 -0.3942,0.2403 -0.6436,0.2491 -7.1138,0.2491 -6.4703,0 -6.7197,-0.009 -7.1138,-0.2491zM12.9743,16.0604v-1.0027h-1.0027,-1.0027v1.0027,1.0027h1.0027,1.0027zM12.9743,10.5457L12.9743,8.039h-1.0027,-1.0027v2.5067,2.5067h1.0027,1.0027z"
         android:strokeWidth="0.12533334" />
 </vector>
diff --git a/res/drawable/ic_sim_sd.xml b/res/drawable/ic_sim_sd.xml
index e7e33778888a50e85c75ecb5b4f30e43846623a8..47676171b008c7b21f9ac5ee3f8f6c12a5f2ca43 100644
--- a/res/drawable/ic_sim_sd.xml
+++ b/res/drawable/ic_sim_sd.xml
@@ -21,6 +21,6 @@
   <path
       android:pathData="M0 0h24v24H0z" />
   <path
-      android:fillColor="@color/color_default_accent"
+      android:fillColor="@color/default_icon_color"
       android:pathData="M18 2h-8L4.02 8 4 20c0 1.1 0.9 2 2 2h12c1.1 0 2-0.9 2-2V4c0-1.1-0.9-2-2-2zm-6 6h-2V4h2v4zm3 0h-2V4h2v4zm3 0h-2V4h2v4z" />
 </vector>
\ No newline at end of file
diff --git a/res/drawable/ic_skip.xml b/res/drawable/ic_skip.xml
index df9881d3f5214d291fb54d1b80135fbd2a57a290..73df047cc01b6176308fe4bfaa231ed86fba8e65 100644
--- a/res/drawable/ic_skip.xml
+++ b/res/drawable/ic_skip.xml
@@ -21,6 +21,6 @@
         android:viewportHeight="24"
         android:autoMirrored="true">
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M18.4,10.6C16.55,8.99 14.15,8 11.5,8c-4.65,0 -8.58,3.03 -9.96,7.22L3.9,16c1.05,-3.19 4.05,-5.5 7.6,-5.5 1.95,0 3.73,0.72 5.12,1.88L13,16h9V7l-3.6,3.6z"/>
 </vector>
diff --git a/res/drawable/ic_storage.xml b/res/drawable/ic_storage.xml
index 616b45c2a477a5783369ffa7b83ec7a93b4065ab..4a9729398896e0e70068173e54192f23b420a169 100644
--- a/res/drawable/ic_storage.xml
+++ b/res/drawable/ic_storage.xml
@@ -19,6 +19,6 @@
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M3,20h18v-4H3V20zM5,17h2v2H5V17zM3,4v4h18V4H3zM7,7H5V5h2V7zM3,14h18v-4H3V14zM5,11h2v2H5V11z"/>
 </vector>
diff --git a/res/drawable/ic_storage_white.xml b/res/drawable/ic_storage_white.xml
index 2ac7c3953abd6ecc1c55e0c0ac9e98fba37e11ff..3f0f7dd4205ed222a883fbb686592d21f50a9a5c 100644
--- a/res/drawable/ic_storage_white.xml
+++ b/res/drawable/ic_storage_white.xml
@@ -19,6 +19,6 @@
     android:viewportWidth="24.0"
     android:viewportHeight="24.0">
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@android:color/white"
         android:pathData="M3,20h18v-4H3V20zM5,17h2v2H5V17zM3,4v4h18V4H3zM7,7H5V5h2V7zM3,14h18v-4H3V14zM5,11h2v2H5V11z" />
 </vector>
diff --git a/res/drawable/ic_storage_wizard_external.xml b/res/drawable/ic_storage_wizard_external.xml
index 301297cd3393be89bbb1bb12f44046e2bec6bc99..d2609ce971a84563abcfa2240aa1475bf123e372 100644
--- a/res/drawable/ic_storage_wizard_external.xml
+++ b/res/drawable/ic_storage_wizard_external.xml
@@ -22,13 +22,13 @@
         android:pathData="M64,64m-64,0a64,64 0,1 1,128 0a64,64 0,1 1,-128 0"
         android:strokeColor="#00000000"
         android:fillType="evenOdd"
-        android:fillColor="@color/color_default_view_on_accent"
+        android:fillColor="@android:color/white"
         android:strokeWidth="1"/>
     <path
         android:pathData="M18.98,95C17.88,95 17,94.12 17,93.03L17,34.97C17,33.88 17.88,33 18.98,33L47.02,33C48.12,33 49,33.88 49,34.97L49,93.03C49,94.12 48.12,95 47.02,95L18.98,95Z"
         android:strokeColor="#00000000"
         android:fillType="evenOdd"
-        android:fillColor="@color/color_default_view_on_accent"
+        android:fillColor="@android:color/white"
         android:strokeWidth="1"/>
     <path
         android:pathData="M18.98,96C17.33,96 16,94.68 16,93.03L16,34.97C16,33.32 17.33,32 18.98,32L47.02,32C48.67,32 50,33.32 50,34.97L50,93.03C50,94.68 48.67,96 47.02,96L18.98,96Z"
@@ -70,19 +70,19 @@
         android:pathData="M94,33L119.52,33C119.9,33 120.26,33.23 120.42,33.58C125.14,43.7 127.67,51.84 128,58C128.33,64.11 127.47,72.18 125.4,82.2L125.4,82.2C125.3,82.67 124.9,83 124.42,83L94,83C93.45,83 93,82.55 93,82L93,34C93,33.45 93.45,33 94,33C94,33 94,33 94,33Z"
         android:strokeColor="#00000000"
         android:fillType="evenOdd"
-        android:fillColor="@color/color_default_view_on_accent"
+        android:fillColor="@android:color/white"
         android:strokeWidth="1"/>
     <path
         android:pathData="M73.63,41L68.13,41L64.01,45.2L64,53.6C64,54.37 64.62,55 65.38,55L73.63,55C74.38,55 75,54.37 75,53.6L75,42.4C75,41.63 74.38,41 73.63,41ZM69.5,45.2L68.13,45.2L68.13,42.4L69.5,42.4L69.5,45.2ZM71.56,45.2L70.19,45.2L70.19,42.4L71.56,42.4L71.56,45.2ZM73.63,45.2L72.25,45.2L72.25,42.4L73.63,42.4L73.63,45.2Z"
         android:strokeColor="#00000000"
         android:fillType="nonZero"
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/color_icon_background_blue"
         android:strokeWidth="1"/>
     <path
         android:pathData="M63.99,69L60,73L63.99,77L63.99,74L71,74L71,72L63.99,72L63.99,69ZM78,67L74.01,63L74.01,66L67,66L67,68L74.01,68L74.01,71L78,67Z"
         android:strokeColor="#00000000"
         android:fillType="nonZero"
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/color_icon_background_blue"
         android:strokeWidth="1"/>
     <path
         android:pathData="M64,126.08C98.29,126.08 126.08,98.29 126.08,64C126.08,29.71 98.29,1.92 64,1.92C29.71,1.92 1.92,29.71 1.92,64C1.92,98.29 29.71,126.08 64,126.08ZM64,128C28.65,128 0,99.35 0,64C0,28.65 28.65,0 64,0C99.35,0 128,28.65 128,64C128,99.35 99.35,128 64,128Z"
diff --git a/res/drawable/ic_storage_wizard_internal.xml b/res/drawable/ic_storage_wizard_internal.xml
index 675851014a5c73564df96c74e70fc22f150a0ea4..5f6bf43e6d1c3c1be19a72f19e3e103fa2fd063f 100644
--- a/res/drawable/ic_storage_wizard_internal.xml
+++ b/res/drawable/ic_storage_wizard_internal.xml
@@ -28,19 +28,19 @@
         android:pathData="M65,62L68,62L68,64L65,64L65,67L63,67L63,64L60,64L60,62L63,62L63,59L65,59L65,62Z"
         android:strokeColor="#00000000"
         android:fillType="evenOdd"
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/color_icon_background_blue"
         android:strokeWidth="1"/>
     <path
         android:pathData="M81.63,56L76.13,56L72.01,60.2L72,68.6C72,69.37 72.62,70 73.38,70L81.63,70C82.38,70 83,69.37 83,68.6L83,57.4C83,56.63 82.38,56 81.63,56ZM77.5,60.2L76.13,60.2L76.13,57.4L77.5,57.4L77.5,60.2ZM79.56,60.2L78.19,60.2L78.19,57.4L79.56,57.4L79.56,60.2ZM81.63,60.2L80.25,60.2L80.25,57.4L81.63,57.4L81.63,60.2Z"
         android:strokeColor="#00000000"
         android:fillType="nonZero"
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/color_icon_background_blue"
         android:strokeWidth="1"/>
     <path
         android:pathData="M39,77L87,77A4,4 0,0 1,91 81L91,81A4,4 0,0 1,87 85L39,85A4,4 0,0 1,35 81L35,81A4,4 0,0 1,39 77z"
         android:strokeColor="#00000000"
         android:fillType="evenOdd"
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/color_icon_background_blue"
         android:strokeWidth="1"/>
     <path
         android:pathData="M32,77h31v8h-31z"
diff --git a/res/drawable/ic_suggested_notifications.xml b/res/drawable/ic_suggested_notifications.xml
index ebef374d63434626304b3733a918e61aa0f0781a..e681c2599aeb3fee69511900a6bd71f3db6ccf19 100644
--- a/res/drawable/ic_suggested_notifications.xml
+++ b/res/drawable/ic_suggested_notifications.xml
@@ -19,9 +19,9 @@
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M18,17v-6c0,-3.07 -1.63,-5.64 -4.5,-6.32V4c0,-0.83 -0.67,-1.5 -1.5,-1.5S10.5,3.17 10.5,4v0.68C7.64,5.36 6,7.92 6,11v6H4v2h10h0.38H20v-2H18zM16,17H8v-6c0,-2.48 1.51,-4.5 4,-4.5s4,2.02 4,4.5V17z"/>
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M12,22c1.1,0 2,-0.9 2,-2h-4C10,21.1 10.9,22 12,22z"/>
 </vector>
diff --git a/res/drawable/ic_suggestion_close_button.xml b/res/drawable/ic_suggestion_close_button.xml
index 5662c7c64386129dc0e63733b00ea310d4d0be54..760311edff7c584631f1a059bf55740db5fd41bf 100644
--- a/res/drawable/ic_suggestion_close_button.xml
+++ b/res/drawable/ic_suggestion_close_button.xml
@@ -21,6 +21,6 @@
         android:viewportHeight="24.0">
 
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M18.3,5.71a0.996,0.996 0,0 0,-1.41 0L12,10.59 7.11,5.7A0.996,0.996 0,1 0,5.7 7.11L10.59,12 5.7,16.89a0.996,0.996 0,1 0,1.41 1.41L12,13.41l4.89,4.89a0.996,0.996 0,1 0,1.41 -1.41L13.41,12l4.89,-4.89c0.38,-0.38 0.38,-1.02 0,-1.4z"/>
 </vector>
diff --git a/res/drawable/ic_suggestion_dnd.xml b/res/drawable/ic_suggestion_dnd.xml
index 50113539711939ffebb67e19682d02708201863f..9991c1256a81f737094de9bb83e32cdf14b62f9d 100644
--- a/res/drawable/ic_suggestion_dnd.xml
+++ b/res/drawable/ic_suggestion_dnd.xml
@@ -19,9 +19,9 @@
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M12,2C6.48,2 2,6.48 2,12c0,5.52 4.48,10 10,10c5.52,0 10,-4.48 10,-10C22,6.48 17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8c0,-4.41 3.59,-8 8,-8c4.41,0 8,3.59 8,8C20,16.41 16.41,20 12,20z"/>
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M7,11h10v2h-10z"/>
 </vector>
diff --git a/res/drawable/ic_suggestion_fingerprint.xml b/res/drawable/ic_suggestion_fingerprint.xml
index 0947f76472e78af218fa60023284e16e9c4c679e..dc80cfd5ddb5dd29e6cf524b07972d16937de7a4 100644
--- a/res/drawable/ic_suggestion_fingerprint.xml
+++ b/res/drawable/ic_suggestion_fingerprint.xml
@@ -21,19 +21,19 @@
         android:viewportWidth="32.0"
         android:viewportHeight="32.0">
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M23.7,5.9c-0.1,0.0 -0.2,0.0 -0.3,-0.1C21.0,4.5 18.6,3.9 16.0,3.9c-2.5,0.0 -4.6,0.6 -6.9,1.9C8.8,6.0 8.3,5.9 8.1,5.5C7.9,5.2 8.0,4.7 8.4,4.5c2.5,-1.4 4.9,-2.1 7.7,-2.1c2.8,0.0 5.4,0.7 8.0,2.1c0.4,0.2 0.5,0.6 0.3,1.0C24.2,5.7 24.0,5.9 23.7,5.9z"/>
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M5.3,13.2c-0.1,0.0 -0.3,0.0 -0.4,-0.1c-0.3,-0.2 -0.4,-0.7 -0.2,-1.0c1.3,-1.9 2.9,-3.4 4.9,-4.5c4.1,-2.2 9.3,-2.2 13.4,0.0c1.9,1.1 3.6,2.5 4.9,4.4c0.2,0.3 0.1,0.8 -0.2,1.0c-0.3,0.2 -0.8,0.1 -1.0,-0.2c-1.2,-1.7 -2.6,-3.0 -4.3,-4.0c-3.7,-2.0 -8.3,-2.0 -12.0,0.0c-1.7,0.9 -3.2,2.3 -4.3,4.0C5.7,13.1 5.5,13.2 5.3,13.2z"/>
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M13.3,29.6c-0.2,0.0 -0.4,-0.1 -0.5,-0.2c-1.1,-1.2 -1.7,-2.0 -2.6,-3.6c-0.9,-1.7 -1.4,-3.7 -1.4,-5.9c0.0,-4.1 3.3,-7.4 7.4,-7.4c4.1,0.0 7.4,3.3 7.4,7.4c0.0,0.4 -0.3,0.7 -0.7,0.7s-0.7,-0.3 -0.7,-0.7c0.0,-3.3 -2.7,-5.9 -5.9,-5.9c-3.3,0.0 -5.9,2.7 -5.9,5.9c0.0,2.0 0.4,3.8 1.2,5.2c0.8,1.6 1.4,2.2 2.4,3.3c0.3,0.3 0.3,0.8 0.0,1.0C13.7,29.5 13.5,29.6 13.3,29.6z"/>
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M22.6,27.1c-1.6,0.0 -2.9,-0.4 -4.1,-1.2c-1.9,-1.4 -3.1,-3.6 -3.1,-6.0c0.0,-0.4 0.3,-0.7 0.7,-0.7s0.7,0.3 0.7,0.7c0.0,1.9 0.9,3.7 2.5,4.8c0.9,0.6 1.9,1.0 3.2,1.0c0.3,0.0 0.8,0.0 1.3,-0.1c0.4,-0.1 0.8,0.2 0.8,0.6c0.1,0.4 -0.2,0.8 -0.6,0.8C23.4,27.1 22.8,27.1 22.6,27.1z"/>
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M20.0,29.9c-0.1,0.0 -0.1,0.0 -0.2,0.0c-2.1,-0.6 -3.4,-1.4 -4.8,-2.9c-1.8,-1.9 -2.8,-4.4 -2.8,-7.1c0.0,-2.2 1.8,-4.1 4.1,-4.1c2.2,0.0 4.1,1.8 4.1,4.1c0.0,1.4 1.2,2.6 2.6,2.6c1.4,0.0 2.6,-1.2 2.6,-2.6c0.0,-5.1 -4.2,-9.3 -9.3,-9.3c-3.6,0.0 -6.9,2.1 -8.4,5.4C7.3,17.1 7.0,18.4 7.0,19.8c0.0,1.1 0.1,2.7 0.9,4.9c0.1,0.4 -0.1,0.8 -0.4,0.9c-0.4,0.1 -0.8,-0.1 -0.9,-0.4c-0.6,-1.8 -0.9,-3.6 -0.9,-5.4c0.0,-1.6 0.3,-3.1 0.9,-4.4c1.7,-3.8 5.6,-6.3 9.8,-6.3c5.9,0.0 10.7,4.8 10.7,10.7c0.0,2.2 -1.8,4.1 -4.1,4.1s-4.0,-1.8 -4.0,-4.1c0.0,-1.4 -1.2,-2.6 -2.6,-2.6c-1.4,0.0 -2.6,1.2 -2.6,2.6c0.0,2.3 0.9,4.5 2.4,6.1c1.2,1.3 2.4,2.0 4.2,2.5c0.4,0.1 0.6,0.5 0.5,0.9C20.6,29.7 20.3,29.9 20.0,29.9z"/>
 </vector>
 
diff --git a/res/drawable/ic_suggestion_night_display.xml b/res/drawable/ic_suggestion_night_display.xml
index 43162058dd182077b997b7e3ae7d21e46c8972f9..f3221c7cfdea0ad6e80fea09913e1887dcd7e149 100644
--- a/res/drawable/ic_suggestion_night_display.xml
+++ b/res/drawable/ic_suggestion_night_display.xml
@@ -19,6 +19,6 @@
         android:viewportHeight="24"
         android:viewportWidth="24">
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M6.28,4.81c0,0.16 0.01,0.32 0.02,0.48c0.38,6.58 5.83,12.03 12.41,12.41c0.16,0.01 0.32,0.02 0.47,0.02c-1.58,1.2 -3.53,1.88 -5.56,1.88c-0.46,0 -0.93,-0.03 -1.4,-0.1c-3.96,-0.58 -7.13,-3.75 -7.71,-7.71C4.13,9.24 4.8,6.75 6.28,4.81M8.27,0.6c-0.08,0 -0.17,0.02 -0.25,0.07c-3.8,2.2 -6.2,6.56 -5.49,11.4c0.7,4.82 4.59,8.7 9.4,9.4c0.57,0.08 1.13,0.12 1.69,0.12c4.15,0 7.78,-2.26 9.72,-5.62c0.2,-0.35 -0.07,-0.76 -0.44,-0.76c-0.05,0 -0.1,0.01 -0.15,0.02c-1.03,0.31 -2.12,0.48 -3.25,0.48c-0.22,0 -0.44,-0.01 -0.67,-0.02C13.23,15.38 8.62,10.77 8.29,5.17C8.21,3.81 8.38,2.49 8.75,1.26C8.86,0.91 8.59,0.6 8.27,0.6L8.27,0.6z"/>
 </vector>
diff --git a/res/drawable/ic_suggestion_security.xml b/res/drawable/ic_suggestion_security.xml
index 720519381c669ddc1c87d84ebaee456046fcec78..9d87b338ac53173c15c7a8239e281693ca08fe6d 100644
--- a/res/drawable/ic_suggestion_security.xml
+++ b/res/drawable/ic_suggestion_security.xml
@@ -19,9 +19,9 @@
         android:viewportHeight="24"
         android:viewportWidth="24">
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M12,15m-2,0a2,2 0,1 1,4 0a2,2 0,1 1,-4 0"/>
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M18.5,1C16.01,1 14,3.01 14,5.5V8H6c-1.1,0 -2,0.9 -2,2v10c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2V10c0,-1.1 -0.9,-2 -2,-2h-2V5.5C16,4.12 17.12,3 18.5,3C19.88,3 21,4.12 21,5.5V6h2V5.5C23,3.01 20.99,1 18.5,1zM18,10v10H6V10H18z"/>
 </vector>
\ No newline at end of file
diff --git a/res/drawable/ic_suggestion_wireless.xml b/res/drawable/ic_suggestion_wireless.xml
index 18ee359f4424ce8eb09070518645e99b93c329f2..9ae0e4e4f27d69b5be2766f53c56ba108b811811 100644
--- a/res/drawable/ic_suggestion_wireless.xml
+++ b/res/drawable/ic_suggestion_wireless.xml
@@ -19,6 +19,6 @@
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M1,9l2,2c4.97,-4.97 13.03,-4.97 18,0l2,-2C16.93,2.93 7.08,2.93 1,9zM9,17l3,3l3,-3C13.35,15.34 10.66,15.34 9,17zM5,13l2,2c2.76,-2.76 7.24,-2.76 10,0l2,-2C15.14,9.14 8.87,9.14 5,13z"/>
 </vector>
diff --git a/res/drawable/ic_supervisor.xml b/res/drawable/ic_supervisor.xml
index 24a0ccbf8b9a1e642d6386be99fcd05e247238aa..60fc60be8d46bcb7f006eb865e07e207502ca3a7 100644
--- a/res/drawable/ic_supervisor.xml
+++ b/res/drawable/ic_supervisor.xml
@@ -5,6 +5,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M16.5,12c1.38,0 2.49,-1.12 2.49,-2.5S17.88,7 16.5,7C15.12,7 14,8.12 14,9.5s1.12,2.5 2.5,2.5zM9,11c1.66,0 2.99,-1.34 2.99,-3S10.66,5 9,5C7.34,5 6,6.34 6,8s1.34,3 3,3zM16.5,14c-1.83,0 -5.5,0.92 -5.5,2.75L11,19h11v-2.25c0,-1.83 -3.67,-2.75 -5.5,-2.75zM9,13c-2.33,0 -7,1.17 -7,3.5L2,19h7v-2.25c0,-0.85 0.33,-2.34 2.37,-3.47C10.5,13.1 9.66,13 9,13z"/>
 </vector>
\ No newline at end of file
diff --git a/res/drawable/ic_support_24dp.xml b/res/drawable/ic_support_24dp.xml
index 4e1235e3e5603a3b0414f0714edb734acdcbdbf8..da605deca8905b6fe3799dc4c99cc27d90ed8c41 100644
--- a/res/drawable/ic_support_24dp.xml
+++ b/res/drawable/ic_support_24dp.xml
@@ -22,7 +22,7 @@
     android:viewportWidth="24.0"
     android:viewportHeight="24.0">
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M20,19.59V8l-6,-6H6c-1.1,0 -1.99,0.9 -1.99,2L4,20c0,1.1 0.89,2
         1.99,2H18c0.45,0 0.85,-0.15 1.19,-0.4l-4.43,-4.43c-0.8,0.52 -1.74,0.83 -2.76,0.83 -2.76,0
          -5,-2.24 -5,-5s2.24,-5 5,-5 5,2.24 5,5c0,1.02 -0.31,1.96 -0.83,2.75L20,19.59zM9,13c0,1.66
diff --git a/res/drawable/ic_swap_horiz.xml b/res/drawable/ic_swap_horiz.xml
index 2115613387bd965c0dacfeba152baefcc5bf1b02..38ae353bc570381d72fa6e488e132de081ca23ed 100644
--- a/res/drawable/ic_swap_horiz.xml
+++ b/res/drawable/ic_swap_horiz.xml
@@ -19,6 +19,6 @@
     android:viewportWidth="24.0"
     android:viewportHeight="24.0">
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M6.99,11L3,15l3.99,4v-3H14v-2H6.99v-3zM21,9l-3.99,-4v3H10v2h7.01v3L21,9z" />
 </vector>
diff --git a/res/drawable/ic_sync.xml b/res/drawable/ic_sync.xml
index 6f7771aa988eb867a26085ccf13367b9dbe63560..b87b92fd0ed43dd8a4c6d365c966632715e0efc6 100644
--- a/res/drawable/ic_sync.xml
+++ b/res/drawable/ic_sync.xml
@@ -19,9 +19,9 @@
         android:viewportWidth="24"
         android:viewportHeight="24">
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M17.26,6H19V4h-6v0.07V10h2V6.81c1.79,1.04 3,2.97 3,5.19c0,2.97 -2.17,5.43 -5,5.91v2.02c3.95,-0.49 7,-3.85 7,-7.93C20,9.6 18.93,7.46 17.26,6z"/>
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M4,12c0,2.4 1.07,4.54 2.74,6H5v2h6v-0.07V14H9v3.19C7.21,16.15 6,14.22 6,12c0,-2.97 2.17,-5.43 5,-5.91V4.07C7.05,4.56 4,7.92 4,12z"/>
 </vector>
diff --git a/res/drawable/ic_sync_problem_24dp.xml b/res/drawable/ic_sync_problem_24dp.xml
index 900fe404eb55112ab3a6fbc952974837c41bc450..67d73172c5438e403b10e94975fda73d75d0805e 100644
--- a/res/drawable/ic_sync_problem_24dp.xml
+++ b/res/drawable/ic_sync_problem_24dp.xml
@@ -20,6 +20,6 @@
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M11 4.07v2.02C8.17 6.57 6 9.03 6 12c0 2.22 1.21 4.15 3 5.19V14h2v6H5v-2h1.74C5.07 16.54 4 14.4 4 12c0-4.08 3.05-7.44 7-7.93zm8.51 10.67c0.3 0.52 0.49 1.11 0.49 1.76 0 1.93-1.57 3.5-3.5 3.5-0.65 0-1.25-0.19-1.77-0.49-0.65-0.38-1.17-0.96-1.46-1.67-0.17-0.41-0.27-0.87-0.27-1.34 0-1.93 1.57-3.5 3.5-3.5 0.48 0 0.93 0.1 1.35 0.27 0.09-0.41 0.15 -0.83 0.15 -1.27 0-2.22-1.21-4.15-3-5.19V10h-2V4h6v2h-1.74C18.93 7.46 20 9.6 20 12c0 0.96-0.18 1.89-0.49 2.74zM17 18h-1v1h1v-1zm0-4h-1v3h1v-3z" />
 </vector>
diff --git a/res/drawable/ic_theme.xml b/res/drawable/ic_theme.xml
index 8e97607e2dcde07c4d8e89276f5a6de65e8b63a4..6f69847b2558529b7bc5e0d929a815fd77301f44 100644
--- a/res/drawable/ic_theme.xml
+++ b/res/drawable/ic_theme.xml
@@ -20,6 +20,6 @@
         android:viewportWidth="24"
         android:viewportHeight="24">
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/default_icon_color"
         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/drawable/ic_timelapse.xml b/res/drawable/ic_timelapse.xml
index ba97bae8c907384c8562c830e27a84f01c7563eb..20ed27287263b99f983fffd1a30a0c41f33b1f8a 100644
--- a/res/drawable/ic_timelapse.xml
+++ b/res/drawable/ic_timelapse.xml
@@ -18,7 +18,7 @@ Copyright (C) 2018 The Android Open Source Project
     <item>
         <shape android:shape="oval">
             <solid
-                android:color="?android:attr/colorAccent" />
+                android:color="@color/color_icon_background_blue" />
             <size
                 android:width="@dimen/dashboard_tile_image_size"
                 android:height="@dimen/dashboard_tile_image_size" />
diff --git a/res/drawable/ic_timelapse_white.xml b/res/drawable/ic_timelapse_white.xml
index f4cb2b00799757074c91a4a7dd547b456acac398..b45e858c62bbb2a68620777ff6d3a6854c8aeece 100644
--- a/res/drawable/ic_timelapse_white.xml
+++ b/res/drawable/ic_timelapse_white.xml
@@ -20,6 +20,6 @@ Copyright (C) 2018 The Android Open Source Project
         android:viewportHeight="24.0">
 
     <path
-        android:fillColor="#FFFFFF"
+        android:fillColor="@android:color/white"
         android:pathData="M16.24,7.76C15.07,6.59 13.54,6.0 12.0,6.0l0.0,6.0l-4.24,4.24c2.34,2.34 6.14,2.34 8.49,0.0 2.34,-2.34 2.34,-6.14 -0.01,-8.48zM12.0,2.0C6.48,2.0 2.0,6.48 2.0,12.0s4.48,10.0 10.0,10.0 10.0,-4.48 10.0,-10.0S17.52,2.0 12.0,2.0zm0.0,18.0c-4.42,0.0 -8.0,-3.58 -8.0,-8.0s3.58,-8.0 8.0,-8.0 8.0,3.58 8.0,8.0 -3.58,8.0 -8.0,8.0z"/>
 </vector>
diff --git a/res/drawable/ic_translate_24dp.xml b/res/drawable/ic_translate_24dp.xml
index 690c1639eed0fe90f66f44dc0343086c8f2c09d1..5f90b07d1cfb65acff83dda52343a53808d136ff 100644
--- a/res/drawable/ic_translate_24dp.xml
+++ b/res/drawable/ic_translate_24dp.xml
@@ -6,7 +6,7 @@
     android:viewportHeight="32">
 
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/color_icon_background_blue"
         android:pathData="M25.2477 32H6.75229C3.02611 32 0 28.9739 0 25.2477V6.75229C0 3.02611 3.02611 0 6.75229 0H25.2477C28.9739 0 32 3.02611 32 6.75229V25.2477C32 28.9739 28.9739 32 25.2477 32Z" />
     <path
         android:fillColor="#ffffff"
diff --git a/res/drawable/ic_visibility_18dp.xml b/res/drawable/ic_visibility_18dp.xml
index 4dd8be85d2aa12ddd69795c88267ed9ff955c092..790f9b1368813fea0016b25017e60faecc66e895 100644
--- a/res/drawable/ic_visibility_18dp.xml
+++ b/res/drawable/ic_visibility_18dp.xml
@@ -5,5 +5,5 @@
     android:viewportHeight="48">
   <path
       android:pathData="M24,9C14,9 5.46,15.22 2,24c3.46,8.78 12,15 22,15 10.01,0 18.54,-6.22 22,-15 -3.46,-8.78 -11.99,-15 -22,-15zM24,34c-5.52,0 -10,-4.48 -10,-10s4.48,-10 10,-10 10,4.48 10,10 -4.48,10 -10,10zM24,18c-3.31,0 -6,2.69 -6,6s2.69,6 6,6 6,-2.69 6,-6 -2.69,-6 -6,-6z"
-      android:fillColor="@color/color_default_accent"/>
+      android:fillColor="@color/default_icon_color"/>
 </vector>
diff --git a/res/drawable/ic_volume_ringer_vibrate.xml b/res/drawable/ic_volume_ringer_vibrate.xml
index 4256c3ffb15f984d22ad839f5df1626318224ae6..4153cb758ca0bf4bbaac9858874ef86b574105d8 100644
--- a/res/drawable/ic_volume_ringer_vibrate.xml
+++ b/res/drawable/ic_volume_ringer_vibrate.xml
@@ -7,23 +7,23 @@
 
     <group>
         <path
-            android:fillColor="@color/color_default_accent"
+            android:fillColor="@color/color_icon_background_blue"
             android:pathData="M25.2477 32.3103H6.75229C3.02611 32.3103 0 29.2842 0 25.558V7.0626C0 3.33641 3.02611 0.310303 6.75229 0.310303H25.2477C28.9739 0.310303 32 3.33641 32 7.0626V25.558C32 29.2842 28.9739 32.3103 25.2477 32.3103Z" />
         <group>
             <path
-                android:fillColor="@color/color_default_view_on_accent"
+                android:fillColor="@android:color/white"
                 android:pathData="M20.4334 25.2104H11.5667C11.1445 25.2104 10.7889 24.8548 10.7889 24.4326V8.18818C10.7889 7.76596 11.1445 7.4104 11.5667 7.4104H20.4334C20.8556 7.4104 21.2112 7.76596 21.2112 8.18818V24.4326C21.2112 24.8548 20.8556 25.2104 20.4334 25.2104ZM12.3445 23.6548H19.6556V8.96596H12.3445V23.6548Z" />
             <path
-                android:fillColor="@color/color_default_view_on_accent"
+                android:fillColor="@android:color/white"
                 android:pathData="M8.41108 20.2549C7.98886 20.2549 7.6333 19.8993 7.6333 19.4771V13.1437C7.6333 12.7215 7.98886 12.366 8.41108 12.366C8.8333 12.366 9.18886 12.7215 9.18886 13.1437V19.4771C9.18886 19.8993 8.85552 20.2549 8.41108 20.2549Z" />
             <path
-                android:fillColor="@color/color_default_view_on_accent"
+                android:fillColor="@android:color/white"
                 android:pathData="M5.29999 18.2993C4.87777 18.2993 4.52222 17.966 4.52222 17.5215V15.0771C4.52222 14.6549 4.87777 14.2993 5.29999 14.2993C5.72222 14.2993 6.07777 14.6549 6.07777 15.0993V17.5438C6.07777 17.966 5.72222 18.2993 5.29999 18.2993Z" />
             <path
-                android:fillColor="@color/color_default_view_on_accent"
+                android:fillColor="@android:color/white"
                 android:pathData="M23.5888 20.2549C23.1666 20.2549 22.811 19.8993 22.811 19.4771V13.1437C22.811 12.7215 23.1666 12.366 23.5888 12.366C24.011 12.366 24.3666 12.7215 24.3666 13.1437V19.4771C24.3666 19.8993 24.011 20.2549 23.5888 20.2549Z" />
             <path
-                android:fillColor="@color/color_default_view_on_accent"
+                android:fillColor="@android:color/white"
                 android:pathData="M26.6999 18.2993C26.2777 18.2993 25.9221 17.9438 25.9221 17.5215V15.0771C25.9221 14.6549 26.2777 14.2993 26.6999 14.2993C27.1221 14.2993 27.4777 14.6549 27.4777 15.0771V17.5215C27.4777 17.966 27.1221 18.2993 26.6999 18.2993Z" />
         </group>
     </group>
diff --git a/res/drawable/ic_volume_up_24dp.xml b/res/drawable/ic_volume_up_24dp.xml
index 7f6dcaa958d6350edd813ab18c78c7e77c89d05f..0216826bce82c8cfcc12ae7ea4ebc5f9e46fb2ea 100644
--- a/res/drawable/ic_volume_up_24dp.xml
+++ b/res/drawable/ic_volume_up_24dp.xml
@@ -20,12 +20,12 @@
     android:viewportWidth="24.0"
     android:viewportHeight="24.0">
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M3,9v6h4l5,5V4L7,9H3zM10,8.83v6.34L7.83,13H5v-2h2.83L10,8.83z" />
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M16.5,12c0,-1.77 -1.02,-3.29 -2.5,-4.03v8.05C15.48,15.29 16.5,13.77 16.5,12z" />
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M14,3.23v2.06c2.89,0.86 5,3.54 5,6.71c0,3.17 -2.11,5.85 -5,6.71v2.06c4.01,-0.91 7,-4.49 7,-8.77C21,7.72 18.01,4.14 14,3.23z" />
 </vector>
diff --git a/res/drawable/ic_wallpaper.xml b/res/drawable/ic_wallpaper.xml
index e08f8544754c333d34b3e8e35df5ab7edd24960c..8a6faa230187b7dad313e3a5228f57e7002209a9 100644
--- a/res/drawable/ic_wallpaper.xml
+++ b/res/drawable/ic_wallpaper.xml
@@ -19,6 +19,6 @@
         android:viewportWidth="24"
         android:viewportHeight="24">
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M9,12.71l2.14,2.58l3,-3.87L18,16.57H6L9,12.71zM5,5h6V3H5C3.9,3 3,3.9 3,5v6h2V5zM19,19h-6v2h6c1.1,0 2,-0.9 2,-2v-6h-2V19zM5,19v-6H3v6c0,1.1 0.9,2 2,2h6v-2H5zM19,5v6h2V5c0,-1.1 -0.9,-2 -2,-2h-6v2H19zM16,9c0.55,0 1,-0.45 1,-1s-0.45,-1 -1,-1c-0.55,0 -1,0.45 -1,1S15.45,9 16,9z"/>
 </vector>
diff --git a/res/drawable/ic_warning_24dp.xml b/res/drawable/ic_warning_24dp.xml
index 94efde512c02f4485785de0abd67dc49ad5c47c2..d31c2d36372b5acb2acf263ec9ad6d1f434dfebe 100644
--- a/res/drawable/ic_warning_24dp.xml
+++ b/res/drawable/ic_warning_24dp.xml
@@ -19,12 +19,12 @@ Copyright (C) 2018 The Android Open Source Project
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M12,5.99L19.53,19H4.47L12,5.99M12,2L1,21h22L12,2L12,2z"/>
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M13,16l-2,0l0,2l2,0l0,-2z"/>
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M13,10l-2,0l0,4l2,0l0,-4z"/>
 </vector>
diff --git a/res/drawable/ic_wifi_privacy_24dp.xml b/res/drawable/ic_wifi_privacy_24dp.xml
index deb91342816694baec20c535b30dcb3ba530bf84..dba9ab32b08c40cf6fce6634e232262087df0c3d 100644
--- a/res/drawable/ic_wifi_privacy_24dp.xml
+++ b/res/drawable/ic_wifi_privacy_24dp.xml
@@ -20,12 +20,12 @@
         android:width="24dp"
         android:height="24dp">
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M21.25,16.5v-0.66c0,-1.13 -1.03,-2.09 -2.25,-2.09s-2.25,0.96 -2.25,2.09v0.66H16V22h6v-5.5H21.25zM19.75,16.5h-1.5v-0.66c0,-0.29 0.38,-0.59 0.75,-0.59s0.75,0.3 0.75,0.59V16.5z"/>
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M12,17c-3.79,0 -7.17,-2.13 -8.82,-5.5C4.83,8.13 8.21,6 12,6s7.17,2.13 8.82,5.5H23C21.27,7.11 17,4 12,4S2.73,7.11 1,11.5C2.73,15.89 7,19 12,19c0.68,0 1.35,-0.06 2,-0.17v-2.05C13.35,16.91 12.69,17 12,17z"/>
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M16.43,12.23c0.04,-0.24 0.07,-0.48 0.07,-0.73C16.5,9.02 14.48,7 12,7s-4.5,2.02 -4.5,4.5S9.52,16 12,16c0.77,0 1.48,-0.21 2.12,-0.55C14.41,14.08 15.27,12.93 16.43,12.23zM12,14.2c-1.49,0 -2.7,-1.21 -2.7,-2.7s1.21,-2.7 2.7,-2.7s2.7,1.21 2.7,2.7S13.49,14.2 12,14.2z"/>
 </vector>
diff --git a/res/drawable/ic_wifi_signal_0.xml b/res/drawable/ic_wifi_signal_0.xml
index a0c2eb503a09c3d9e92e8c1f259d25ff767a3e39..5680558e437a74e2b7fc05a07e0610a741a92180 100644
--- a/res/drawable/ic_wifi_signal_0.xml
+++ b/res/drawable/ic_wifi_signal_0.xml
@@ -7,22 +7,22 @@
 
   <group>
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/default_icon_color"
         android:fillAlpha="0.2"
         android:fillType="evenOdd"
         android:pathData="M16.2935 27.2857C18.0292 27.2857 19.4363 25.8786 19.4363 24.1429C19.4363 22.4071 18.0292 21 16.2935 21C14.5577 21 13.1506 22.4071 13.1506 24.1429C13.1506 25.8786 14.5577 27.2857 16.2935 27.2857Z" />
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/default_icon_color"
         android:fillType="evenOdd"
         android:fillAlpha="0.2"
         android:pathData="M22.3007 20.3643C19.1483 17.2119 14.0101 17.2119 10.8577 20.3643C10.4672 20.7548 9.83405 20.7548 9.44353 20.3643C9.053 19.9737 9.053 19.3406 9.44353 18.95C13.3769 15.0167 19.7815 15.0167 23.7149 18.95C24.1054 19.3406 24.1054 19.9737 23.7149 20.3643C23.3244 20.7548 22.6912 20.7548 22.3007 20.3643Z" />
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/default_icon_color"
         android:fillType="evenOdd"
         android:fillAlpha="0.2"
         android:pathData="M26.5007 16.0785C21.0617 10.6395 12.2676 10.642 6.85948 16.0768C6.46991 16.4683 5.83675 16.4698 5.44527 16.0803C5.05378 15.6907 5.05223 15.0575 5.44179 14.6661C11.6337 8.44368 21.6967 8.44619 27.9149 14.6643C28.3054 15.0548 28.3054 15.688 27.9149 16.0785C27.5244 16.4691 26.8912 16.4691 26.5007 16.0785Z" />
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/default_icon_color"
         android:fillAlpha="0.2"
         android:fillType="evenOdd"
         android:strokeAlpha="0.2"
diff --git a/res/drawable/ic_wifi_signal_1.xml b/res/drawable/ic_wifi_signal_1.xml
index 46aba21157ceb9c17af44fca7919960574feb445..8afeeef7af72d1a1180eff51d540d9bd1c2a4464 100644
--- a/res/drawable/ic_wifi_signal_1.xml
+++ b/res/drawable/ic_wifi_signal_1.xml
@@ -7,20 +7,20 @@
 
     <group>
         <path
-            android:fillColor="@color/color_default_accent"
+            android:fillColor="@color/default_icon_color"
             android:pathData="M16.2935 27.2857C18.0292 27.2857 19.4363 25.8786 19.4363 24.1429C19.4363 22.4071 18.0292 21 16.2935 21C14.5577 21 13.1506 22.4071 13.1506 24.1429C13.1506 25.8786 14.5577 27.2857 16.2935 27.2857Z" />
         <path
-            android:fillColor="@color/color_default_accent"
+            android:fillColor="@color/default_icon_color"
             android:fillType="evenOdd"
             android:fillAlpha="0.2"
             android:pathData="M22.3007 20.3643C19.1483 17.2119 14.0101 17.2119 10.8577 20.3643C10.4672 20.7548 9.83405 20.7548 9.44353 20.3643C9.053 19.9737 9.053 19.3406 9.44353 18.95C13.3769 15.0167 19.7815 15.0167 23.7149 18.95C24.1054 19.3406 24.1054 19.9737 23.7149 20.3643C23.3244 20.7548 22.6912 20.7548 22.3007 20.3643Z" />
         <path
-            android:fillColor="@color/color_default_accent"
+            android:fillColor="@color/default_icon_color"
             android:fillType="evenOdd"
             android:fillAlpha="0.2"
             android:pathData="M26.5007 16.0785C21.0617 10.6395 12.2676 10.642 6.85948 16.0768C6.46991 16.4683 5.83675 16.4698 5.44527 16.0803C5.05378 15.6907 5.05223 15.0575 5.44179 14.6661C11.6337 8.44368 21.6967 8.44619 27.9149 14.6643C28.3054 15.0548 28.3054 15.688 27.9149 16.0785C27.5244 16.4691 26.8912 16.4691 26.5007 16.0785Z" />
         <path
-            android:fillColor="@color/color_default_accent"
+            android:fillColor="@color/default_icon_color"
             android:fillAlpha="0.2"
             android:fillType="evenOdd"
             android:strokeAlpha="0.2"
diff --git a/res/drawable/ic_wifi_signal_2.xml b/res/drawable/ic_wifi_signal_2.xml
index 0fee7d2f05b8304fa614d461717ea46636f85104..06ad4cc160745bd36bf4c6584e7716b8919a0d2d 100644
--- a/res/drawable/ic_wifi_signal_2.xml
+++ b/res/drawable/ic_wifi_signal_2.xml
@@ -7,19 +7,19 @@
 
     <group>
         <path
-            android:fillColor="@color/color_default_accent"
+            android:fillColor="@color/default_icon_color"
             android:pathData="M16.2935 27.2857C18.0292 27.2857 19.4363 25.8786 19.4363 24.1429C19.4363 22.4071 18.0292 21 16.2935 21C14.5577 21 13.1506 22.4071 13.1506 24.1429C13.1506 25.8786 14.5577 27.2857 16.2935 27.2857Z" />
         <path
-            android:fillColor="@color/color_default_accent"
+            android:fillColor="@color/default_icon_color"
             android:fillType="evenOdd"
             android:pathData="M22.3007 20.3643C19.1483 17.2119 14.0101 17.2119 10.8577 20.3643C10.4672 20.7548 9.83405 20.7548 9.44353 20.3643C9.053 19.9737 9.053 19.3406 9.44353 18.95C13.3769 15.0167 19.7815 15.0167 23.7149 18.95C24.1054 19.3406 24.1054 19.9737 23.7149 20.3643C23.3244 20.7548 22.6912 20.7548 22.3007 20.3643Z" />
         <path
-            android:fillColor="@color/color_default_accent"
+            android:fillColor="@color/default_icon_color"
             android:fillType="evenOdd"
             android:fillAlpha="0.2"
             android:pathData="M26.5007 16.0785C21.0617 10.6395 12.2676 10.642 6.85948 16.0768C6.46991 16.4683 5.83675 16.4698 5.44527 16.0803C5.05378 15.6907 5.05223 15.0575 5.44179 14.6661C11.6337 8.44368 21.6967 8.44619 27.9149 14.6643C28.3054 15.0548 28.3054 15.688 27.9149 16.0785C27.5244 16.4691 26.8912 16.4691 26.5007 16.0785Z" />
         <path
-            android:fillColor="@color/color_default_accent"
+            android:fillColor="@color/default_icon_color"
             android:fillAlpha="0.2"
             android:fillType="evenOdd"
             android:strokeAlpha="0.2"
diff --git a/res/drawable/ic_wifi_signal_3.xml b/res/drawable/ic_wifi_signal_3.xml
index 55a051241bb3c8e853c9466bffad36dbd5e59eed..134422be1def6bdd7dc9cb06e0ee8ba0815564ef 100644
--- a/res/drawable/ic_wifi_signal_3.xml
+++ b/res/drawable/ic_wifi_signal_3.xml
@@ -7,18 +7,18 @@
 
     <group>
         <path
-            android:fillColor="@color/color_default_accent"
+            android:fillColor="@color/default_icon_color"
             android:pathData="M16.2935 27.2857C18.0292 27.2857 19.4363 25.8786 19.4363 24.1429C19.4363 22.4071 18.0292 21 16.2935 21C14.5577 21 13.1506 22.4071 13.1506 24.1429C13.1506 25.8786 14.5577 27.2857 16.2935 27.2857Z" />
         <path
-            android:fillColor="@color/color_default_accent"
+            android:fillColor="@color/default_icon_color"
             android:fillType="evenOdd"
             android:pathData="M22.3007 20.3643C19.1483 17.2119 14.0101 17.2119 10.8577 20.3643C10.4672 20.7548 9.83405 20.7548 9.44353 20.3643C9.053 19.9737 9.053 19.3406 9.44353 18.95C13.3769 15.0167 19.7815 15.0167 23.7149 18.95C24.1054 19.3406 24.1054 19.9737 23.7149 20.3643C23.3244 20.7548 22.6912 20.7548 22.3007 20.3643Z" />
         <path
-            android:fillColor="@color/color_default_accent"
+            android:fillColor="@color/default_icon_color"
             android:fillType="evenOdd"
             android:pathData="M26.5007 16.0785C21.0617 10.6395 12.2676 10.642 6.85948 16.0768C6.46991 16.4683 5.83675 16.4698 5.44527 16.0803C5.05378 15.6907 5.05223 15.0575 5.44179 14.6661C11.6337 8.44368 21.6967 8.44619 27.9149 14.6643C28.3054 15.0548 28.3054 15.688 27.9149 16.0785C27.5244 16.4691 26.8912 16.4691 26.5007 16.0785Z" />
         <path
-            android:fillColor="@color/color_default_accent"
+            android:fillColor="@color/default_icon_color"
             android:fillAlpha="0.2"
             android:fillType="evenOdd"
             android:strokeAlpha="0.2"
diff --git a/res/drawable/ic_wifi_signal_4.xml b/res/drawable/ic_wifi_signal_4.xml
index 1f8684df3949c7870a9820517148e3931db398f3..80f9052009b2108d46842f6488c93f9599aaedc8 100644
--- a/res/drawable/ic_wifi_signal_4.xml
+++ b/res/drawable/ic_wifi_signal_4.xml
@@ -7,18 +7,18 @@
 
     <group>
         <path
-            android:fillColor="@color/color_default_accent"
+            android:fillColor="@color/default_icon_color"
             android:pathData="M16.4825 27.2857C18.2182 27.2857 19.6253 25.8786 19.6253 24.1429C19.6253 22.4071 18.2182 21 16.4825 21C14.7467 21 13.3396 22.4071 13.3396 24.1429C13.3396 25.8786 14.7467 27.2857 16.4825 27.2857Z" />
         <path
-            android:fillColor="@color/color_default_accent"
+            android:fillColor="@color/default_icon_color"
             android:fillType="evenOdd"
             android:pathData="M22.4896 20.3643C19.3373 17.2119 14.199 17.2119 11.0467 20.3643C10.6562 20.7548 10.023 20.7548 9.63249 20.3643C9.24197 19.9737 9.24197 19.3406 9.63249 18.95C13.5659 15.0167 19.9705 15.0167 23.9039 18.95C24.2944 19.3406 24.2944 19.9737 23.9039 20.3643C23.5133 20.7548 22.8802 20.7548 22.4896 20.3643Z" />
         <path
-            android:fillColor="@color/color_default_accent"
+            android:fillColor="@color/default_icon_color"
             android:fillType="evenOdd"
             android:pathData="M26.6896 16.0785C21.2506 10.6395 12.4566 10.642 7.04844 16.0768C6.65888 16.4683 6.02571 16.4698 5.63423 16.0803C5.24275 15.6907 5.24119 15.0575 5.63076 14.6661C11.8226 8.44368 21.8857 8.44619 28.1038 14.6643C28.4944 15.0548 28.4944 15.688 28.1038 16.0785C27.7133 16.4691 27.0802 16.4691 26.6896 16.0785Z" />
         <path
-            android:fillColor="@color/color_default_accent"
+            android:fillColor="@color/default_icon_color"
             android:fillType="evenOdd"
             android:pathData="M30.7741 11.7487C23.137 4.08446 10.714 4.08265 3.04671 11.75C2.65618 12.1405 2.02302 12.1405 1.63249 11.75C1.24197 11.3594 1.24197 10.7263 1.63249 10.3357C10.0795 1.88878 23.7707 1.88697 32.1908 10.337C32.5806 10.7282 32.5795 11.3614 32.1883 11.7512C31.7971 12.141 31.1639 12.1399 30.7741 11.7487Z" />
     </group>
diff --git a/res/drawable/ic_wifi_signal_lock.xml b/res/drawable/ic_wifi_signal_lock.xml
index 430139904a09bbf9eee1b7c08e65c6c74b85290e..2f58964f6f0de5211ee28bd673f114690e913207 100644
--- a/res/drawable/ic_wifi_signal_lock.xml
+++ b/res/drawable/ic_wifi_signal_lock.xml
@@ -7,13 +7,13 @@
 
     <group>
         <path
-            android:fillColor="@color/color_default_accent"
+            android:fillColor="@color/default_icon_color"
             android:pathData="M31.1684 24.4571H24.3684V29H31.1684V24.4571Z" />
         <path
-            android:fillColor="@color/color_default_accent"
+            android:fillColor="@color/default_icon_color"
             android:pathData="M31.197 30H24.397C23.8541 30 23.397 29.5429 23.397 29V24.4571C23.397 23.9143 23.8541 23.4571 24.397 23.4571H31.197C31.7398 23.4571 32.197 23.9143 32.197 24.4571V29C32.197 29.5714 31.7398 30 31.197 30ZM25.3684 28H30.1684V25.4571H25.3684V28Z" />
         <path
-            android:fillColor="@color/color_default_accent"
+            android:fillColor="@color/default_icon_color"
             android:pathData="M29.9111 25.4571C29.3683 25.4571 28.9111 25 28.9111 24.4571V22.1429C28.9111 21.5143 28.3969 21 27.7683 21C27.1397 21 26.6255 21.5143 26.6255 22.1429V24.4571C26.6255 25 26.1683 25.4571 25.6255 25.4571C25.0826 25.4571 24.6255 25 24.6255 24.4571V22.1429C24.6255 20.4286 26.0255 19 27.7683 19C29.5111 19 30.9111 20.4 30.9111 22.1429V24.4571C30.9111 25.0286 30.454 25.4571 29.9111 25.4571Z" />
     </group>
 </vector>
\ No newline at end of file
diff --git a/res/drawable/ic_wifi_tethering.xml b/res/drawable/ic_wifi_tethering.xml
index a375e5c44a53d2088c0ba00465d1d21ba9aa1896..c55f72616140fee224863f9f7d7b84d405a27173 100644
--- a/res/drawable/ic_wifi_tethering.xml
+++ b/res/drawable/ic_wifi_tethering.xml
@@ -6,13 +6,13 @@
     android:viewportHeight="32">
 
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/color_icon_background_blue"
         android:pathData="M25.2477 32H6.75229C3.02611 32 0 28.9739 0 25.2477V6.75229C0 3.02611 3.02611 0 6.75229 0H25.2477C28.9739 0 32 3.02611 32 6.75229V25.2477C32 28.9739 28.9739 32 25.2477 32Z" />
     <path
-        android:fillColor="@color/color_default_view_on_accent"
+        android:fillColor="@android:color/white"
         android:pathData="M13.4369 26.0605C14.5344 26.0605 15.4242 25.1708 15.4242 24.0732C15.4242 22.9757 14.5344 22.0859 13.4369 22.0859C12.3393 22.0859 11.4496 22.9757 11.4496 24.0732C11.4496 25.1708 12.3393 26.0605 13.4369 26.0605Z" />
     <path
-        android:fillColor="@color/color_default_view_on_accent"
+        android:fillColor="@android:color/white"
         android:fillType="evenOdd"
         android:pathData="M16.9429 21.5381C14.9933 19.5885 11.8353 19.5885 9.88568 21.5381C9.57701 21.8468 9.07655 21.8468 8.76788 21.5381C8.45921 21.2295 8.45921 20.729 8.76788 20.4203C11.3348 17.8534 15.4937 17.8534 18.0607 20.4203C18.3694 20.729 18.3694 21.2295 18.0607 21.5381C17.752 21.8468 17.2516 21.8468 16.9429 21.5381Z" />
     <path
diff --git a/res/drawable/signal_strength_1x.xml b/res/drawable/signal_strength_1x.xml
index 2c191f26cac3819c590500a2f282795e93a5505e..40f578f7f13b2dbeefb9ba3820ed05477649e847 100644
--- a/res/drawable/signal_strength_1x.xml
+++ b/res/drawable/signal_strength_1x.xml
@@ -20,9 +20,9 @@
     android:viewportWidth="12.0"
     android:viewportHeight="24.0">
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M3.500000,11.000000L1.800000,11.000000L1.800000,4.400000L0.200000,5.100000L0.200000,3.700000l3.100000,-1.300000l0.200000,0.000000L3.500000,11.000000z"/>
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M8.600000,5.500000l1.200000,-3.000000l1.900000,0.000000L9.700000,6.700000l2.200000,4.300000L9.900000,11.000000L8.700000,7.900000L7.400000,11.000000L5.500000,11.000000l2.100000,-4.300000L5.600000,2.500000l1.900000,0.000000L8.600000,5.500000z"/>
 </vector>
\ No newline at end of file
diff --git a/res/drawable/signal_strength_3g.xml b/res/drawable/signal_strength_3g.xml
index 7a951f7e55b72371e61067aee37a42e8d5562f82..2f70f56dbaa8adddca66583b7e442601e46ff42d 100644
--- a/res/drawable/signal_strength_3g.xml
+++ b/res/drawable/signal_strength_3g.xml
@@ -20,9 +20,9 @@
     android:viewportWidth="13.0"
     android:viewportHeight="24.0">
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M2.000000,6.000000l0.800000,0.000000c0.300000,0.000000 0.500000,-0.100000 0.700000,-0.300000s0.200000,-0.500000 0.200000,-0.900000c0.000000,-0.300000 -0.100000,-0.600000 -0.200000,-0.800000S3.200000,3.700000 2.900000,3.700000C2.700000,3.700000 2.500000,3.800000 2.300000,4.000000S2.100000,4.400000 2.100000,4.700000L0.500000,4.700000C0.500000,4.000000 0.700000,3.400000 1.100000,3.000000s1.000000,-0.600000 1.700000,-0.600000c0.800000,0.000000 1.400000,0.200000 1.900000,0.600000s0.700000,1.000000 0.700000,1.800000c0.000000,0.400000 -0.100000,0.700000 -0.300000,1.100000S4.600000,6.500000 4.300000,6.600000C4.700000,6.800000 5.000000,7.100000 5.200000,7.400000s0.300000,0.700000 0.300000,1.200000c0.000000,0.800000 -0.200000,1.400000 -0.700000,1.800000s-1.100000,0.700000 -1.900000,0.700000c-0.700000,0.000000 -1.300000,-0.200000 -1.800000,-0.600000s-0.700000,-1.000000 -0.700000,-1.800000L2.000000,8.700000C2.000000,9.000000 2.100000,9.300000 2.300000,9.500000s0.400000,0.300000 0.600000,0.300000c0.300000,0.000000 0.500000,-0.100000 0.700000,-0.300000S3.900000,9.000000 3.900000,8.600000c0.000000,-0.500000 -0.100000,-0.800000 -0.300000,-1.000000S3.200000,7.300000 2.800000,7.300000L2.000000,7.300000L2.000000,6.000000z"/>
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M12.500000,9.900000c-0.200000,0.400000 -0.600000,0.700000 -1.000000,0.900000s-1.000000,0.400000 -1.800000,0.400000c-0.900000,0.000000 -1.700000,-0.300000 -2.200000,-0.800000S6.700000,9.000000 6.700000,7.900000L6.700000,5.600000c0.000000,-1.100000 0.300000,-1.900000 0.800000,-2.400000s1.200000,-0.800000 2.100000,-0.800000c1.000000,0.000000 1.700000,0.200000 2.100000,0.700000s0.700000,1.200000 0.700000,2.100000l-1.600000,0.000000c0.000000,-0.500000 -0.100000,-0.900000 -0.200000,-1.100000s-0.500000,-0.300000 -0.900000,-0.300000c-0.400000,0.000000 -0.700000,0.200000 -0.900000,0.500000S8.400000,5.000000 8.400000,5.600000l0.000000,2.300000c0.000000,0.700000 0.100000,1.100000 0.300000,1.400000s0.600000,0.500000 1.000000,0.500000c0.300000,0.000000 0.600000,0.000000 0.700000,-0.100000s0.300000,-0.200000 0.400000,-0.300000L10.799999,7.800000L9.600000,7.800000L9.600000,6.600000l2.900000,0.000000L12.500000,9.900000z"/>
 </vector>
\ No newline at end of file
diff --git a/res/drawable/signal_strength_g.xml b/res/drawable/signal_strength_g.xml
index ebff17f208e1ffaeb90049f558e86073bf8ad525..7fa0b7ae266e17217a72256d1fbae133e1c7aaba 100644
--- a/res/drawable/signal_strength_g.xml
+++ b/res/drawable/signal_strength_g.xml
@@ -20,6 +20,6 @@
     android:viewportWidth="7.0"
     android:viewportHeight="24.0">
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M6.500000,9.900000c-0.200000,0.400000 -0.600000,0.700000 -1.000000,0.900000s-1.000000,0.400000 -1.800000,0.400000c-0.900000,0.000000 -1.700000,-0.300000 -2.200000,-0.800000S0.700000,9.000000 0.700000,7.900000L0.700000,5.600000c0.000000,-1.100000 0.300000,-1.900000 0.800000,-2.400000s1.200000,-0.800000 2.100000,-0.800000c1.000000,0.000000 1.700000,0.200000 2.100000,0.700000s0.700000,1.200000 0.700000,2.100000L4.700000,5.200000c0.000000,-0.500000 -0.100000,-0.900000 -0.200000,-1.100000S4.000000,3.700000 3.600000,3.700000c-0.400000,0.000000 -0.700000,0.200000 -0.900000,0.500000S2.300000,5.000000 2.300000,5.600000l0.000000,2.300000c0.000000,0.700000 0.100000,1.100000 0.300000,1.400000s0.600000,0.500000 1.000000,0.500000c0.300000,0.000000 0.600000,0.000000 0.700000,-0.100000s0.300000,-0.200000 0.400000,-0.300000L4.700000,7.800000L3.500000,7.800000L3.500000,6.600000l2.900000,0.000000L6.400000,9.900000z"/>
 </vector>
\ No newline at end of file
diff --git a/res/drawable/signal_strength_lte.xml b/res/drawable/signal_strength_lte.xml
index e056709a851e5c2473a99ac5b08725b6fa688bd4..d1bbbb0b069ec961170688ad4f97ff0a0af1325f 100644
--- a/res/drawable/signal_strength_lte.xml
+++ b/res/drawable/signal_strength_lte.xml
@@ -20,12 +20,12 @@
     android:viewportWidth="13.0"
     android:viewportHeight="24.0">
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M2.000000,9.700000l2.000000,0.000000L4.000000,11.000000L0.300000,11.000000L0.300000,2.500000L2.000000,2.500000L2.000000,9.700000z"/>
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M8.300000,3.800000L7.000000,3.800000L7.000000,11.000000L5.300000,11.000000L5.300000,3.800000L4.000000,3.800000L4.000000,2.500000l4.300000,0.000000L8.300000,3.800000z"/>
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M12.400000,7.300000l-1.700000,0.000000l0.000000,2.400000l2.100000,0.000000L12.799999,11.000000L9.000000,11.000000L9.000000,2.500000l3.700000,0.000000l0.000000,1.300000l-2.100000,0.000000l0.000000,2.100000l1.700000,0.000000L12.300000,7.300000z"/>
 </vector>
\ No newline at end of file
diff --git a/res/drawable/thumb.xml b/res/drawable/thumb.xml
index 42fbd8cc115e5cbd3c97f4a0f59d42a60240947a..53dafb0ff812bca7757967f9598c0fbdf8ad7165 100644
--- a/res/drawable/thumb.xml
+++ b/res/drawable/thumb.xml
@@ -27,6 +27,6 @@
         android:paddingLeft="8dp"
         android:paddingRight="8dp" />
 
-    <solid android:color="?android:attr/colorControlNormal" />
+    <solid android:color="@color/color_default_accent" />
 
 </shape>
\ No newline at end of file
diff --git a/res/drawable/tile_icon_animation_speed.xml b/res/drawable/tile_icon_animation_speed.xml
index d0c2aa45c42f9fc2c79078d01f877a3174ced5cd..05acb14e870acc30ffe3de4e1e7cd97252853b30 100644
--- a/res/drawable/tile_icon_animation_speed.xml
+++ b/res/drawable/tile_icon_animation_speed.xml
@@ -19,6 +19,6 @@ Copyright (C) 2017 The Android Open Source Project
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M4,2C2.89,2 2,2.89 2,4V14H4V4H14V2H4M8,6C6.89,6 6,6.89 6,8V18H8V8H18V6H8M12,10C10.89,10 10,10.89 10,12V20C10,21.11 10.89,22 12,22H20C21.11,22 22,21.11 22,20V12C22,10.89 21.11,10 20,10H12Z" />
 </vector>
diff --git a/res/drawable/tile_icon_force_rtl.xml b/res/drawable/tile_icon_force_rtl.xml
index 907db9efb79ddb1db3e7a2e4895536e2f07bade3..4054b2ececbceea368ab3f3776b19c9e8bc80503 100644
--- a/res/drawable/tile_icon_force_rtl.xml
+++ b/res/drawable/tile_icon_force_rtl.xml
@@ -19,42 +19,48 @@ Copyright (C) 2017 The Android Open Source Project
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M7,12L12,7V10H16V14H12V17L7,12" />
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/default_icon_color"
+        android:fillAlpha="0.5"
         android:pathData="M0.0,6.0h1.0v12.0h-1.0z"/>
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/default_icon_color"
+        android:fillAlpha="0.5"
         android:pathData="M6.0,0.0h12.0v1.0h-12.0z"/>
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/default_icon_color"
+        android:fillAlpha="0.5"
         android:pathData="M23.0,6.0h1.0v12.0h-1.0z"/>
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/default_icon_color"
+        android:fillAlpha="0.5"
         android:pathData="M6.0,23.0h12.0v1.0h-12.0z"/>
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M1.0,23.0l0.0,-5.0l-1.0,0.0l0.0,6.0l6.0,0.0l0.0,-1.0z"/>
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M1.0,1.0l5.0,0.0l0.0,-1.0l-6.0,0.0l0.0,6.0l1.0,0.0z"/>
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M18.0,0.0l0.0,1.0l5.0,0.0l0.0,5.0l1.0,0.0l0.0,-6.0z"/>
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M23.0,23.0l-5.0,0.0l0.0,1.0l6.0,0.0l0.0,-6.0l-1.0,0.0z"/>
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/default_icon_color"
+        android:fillAlpha="0.5"
         android:pathData="M9.5,4h5.0v1.0h-5.0z"/>
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/default_icon_color"
+        android:fillAlpha="0.5"
         android:pathData="M9.5,19h5.0v1.0h-5.0z"/>
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M4.5,5.0l5.0,0.0l0.0,-1.0l-6.0,0.0l0.0,10.0l0.0,6.0l6.0,0.0l0.0,-1.0l-5.0,0.0z"/>
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M14.5,4.0l0.0,1.0l5.0,0.0l0.0,14l-5.0,0.0l0.0,1.0l6.0,0.0l0.0,-16z"/>
 </vector>
diff --git a/res/drawable/tile_icon_graphics.xml b/res/drawable/tile_icon_graphics.xml
index b0521e431a6cac0208c302b79a90150ef89883af..6b6bb1bbf9b16a88c90ae90630b654459c3e7e02 100644
--- a/res/drawable/tile_icon_graphics.xml
+++ b/res/drawable/tile_icon_graphics.xml
@@ -19,34 +19,34 @@ Copyright (C) 2015 The Android Open Source Project
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M23,1v22H1V1H23 M24,0H0v24h24V0L24,0z"/>
     <path
-        android:strokeColor="@color/color_default_accent"
+        android:strokeColor="@color/default_icon_color"
         android:strokeWidth="0.667"
         android:pathData="M5,19L1,23"/>
     <path
-        android:strokeColor="@color/color_default_accent"
+        android:strokeColor="@color/default_icon_color"
         android:strokeWidth="0.667"
         android:pathData="M1,1L5,5"/>
     <path
-        android:strokeColor="@color/color_default_accent"
+        android:strokeColor="@color/default_icon_color"
         android:strokeWidth="0.667"
         android:pathData="M19,5L23,1"/>
     <path
-        android:strokeColor="@color/color_default_accent"
+        android:strokeColor="@color/default_icon_color"
         android:strokeWidth="0.667"
         android:pathData="M19,19L23,23"/>
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M14,3.8l-4,0l-0.2,-0.8l4.4,0z"/>
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M18.8,5.2v13.5H5.2V5.2H18.8 M19.5,4.5h-15v15h15V4.5L19.5,4.5z"/>
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M6.5,9.5h5v11h-5z"/>
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M12.5,16.5h5v5h-5z"/>
 </vector>
\ No newline at end of file
diff --git a/res/drawable/tile_icon_sensors_off.xml b/res/drawable/tile_icon_sensors_off.xml
index accb1670d1047076234219a7ff56b1d334b78ed6..11855c523d0ee24230db20bf3558ac0499df74a4 100644
--- a/res/drawable/tile_icon_sensors_off.xml
+++ b/res/drawable/tile_icon_sensors_off.xml
@@ -22,7 +22,7 @@
     <path
         android:pathData="M21.966,2 L2,22"
         android:strokeLineCap="round"
-        android:strokeColor="@color/color_default_accent"
+        android:strokeColor="@color/default_icon_color"
         android:fillColor="@android:color/transparent"
         android:strokeWidth="1.6521436"
         android:strokeLineJoin="miter"
@@ -30,7 +30,7 @@
     <path
         android:pathData="M0.752,12L4.496,12l2.496,-6.25 2.496,12.5 2.496,-15 2.496,12.5 2.496,-7.5 1.248,3.75h4.992"
         android:strokeLineCap="round"
-        android:strokeColor="@color/color_default_accent"
+        android:strokeColor="@color/default_icon_color"
         android:fillColor="@android:color/transparent"
         android:strokeWidth="1.25090861"
         android:strokeLineJoin="round"
diff --git a/res/drawable/tile_icon_show_layout.xml b/res/drawable/tile_icon_show_layout.xml
index 70fe35f4b9548b69b0c686fabd052774a10a39cb..6644201992baeac15cf16bc7287b0bc25cf2d982 100644
--- a/res/drawable/tile_icon_show_layout.xml
+++ b/res/drawable/tile_icon_show_layout.xml
@@ -19,45 +19,48 @@ Copyright (C) 2015 The Android Open Source Project
     android:viewportWidth="24.0"
     android:viewportHeight="24.0">
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M12,7.2c-3.2,0 -5.9,2 -7,4.8c1.1,2.8 3.8,4.8 7,4.8s5.9,-2 7,-4.8C17.9,9.2 15.2,7.2 12,7.2zM12,15.2c-1.8,0 -3.2,-1.4 -3.2,-3.2s1.4,-3.2 3.2,-3.2s3.2,1.4 3.2,3.2S13.8,15.2 12,15.2zM12,10.1c-1.1,0 -1.9,0.9 -1.9,1.9s0.9,1.9 1.9,1.9s1.9,-0.9 1.9,-1.9S13.1,10.1 12,10.1z" />
     <path
-        android:fillAlpha="0.7"
-        android:fillColor="@color/color_default_accent"
+        android:fillAlpha="0.5"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M0.0,6.0h1.0v12.0h-1.0z" />
     <path
-        android:fillColor="@color/color_default_gray1"
+        android:fillColor="@color/default_icon_color"
+        android:fillAlpha="0.5"
         android:pathData="M6.0,0.0h12.0v1.0h-12.0z" />
     <path
-        android:fillColor="@color/color_default_gray1"
+        android:fillColor="@color/default_icon_color"
+        android:fillAlpha="0.5"
         android:pathData="M23.0,6.0h1.0v12.0h-1.0z" />
     <path
-        android:fillColor="@color/color_default_gray1"
+        android:fillColor="@color/default_icon_color"
+        android:fillAlpha="0.5"
         android:pathData="M6.0,23.0h12.0v1.0h-12.0z" />
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M1.0,23.0l0.0,-5.0l-1.0,0.0l0.0,6.0l6.0,0.0l0.0,-1.0z" />
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M1.0,1.0l5.0,0.0l0.0,-1.0l-6.0,0.0l0.0,6.0l1.0,0.0z" />
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M18.0,0.0l0.0,1.0l5.0,0.0l0.0,5.0l1.0,0.0l0.0,-6.0z" />
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M23.0,23.0l-5.0,0.0l0.0,1.0l6.0,0.0l0.0,-6.0l-1.0,0.0z" />
     <path
-        android:fillAlpha="0.7"
-        android:fillColor="@color/color_default_accent"
+        android:fillAlpha="0.5"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M9.5,6.0h5.0v1.0h-5.0z" />
     <path
-        android:fillAlpha="0.7"
-        android:fillColor="@color/color_default_accent"
+        android:fillAlpha="0.5"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M9.5,17.0h5.0v1.0h-5.0z" />
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M4.5,7.0l5.0,0.0l0.0,-1.0l-6.0,0.0l0.0,6.0l0.0,6.0l6.0,0.0l0.0,-1.0l-5.0,0.0l0.0,-5.0z" />
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M14.5,6.0l0.0,1.0l5.0,0.0l0.0,5.0l0.0,5.0l-5.0,0.0l0.0,1.0l6.0,0.0l0.0,-6.0l0.0,-6.0z" />
 </vector>
\ No newline at end of file
diff --git a/res/drawable/tile_icon_winscope_trace.xml b/res/drawable/tile_icon_winscope_trace.xml
index d97d31a5eeb4539af973d03aacf47acc40e51096..0df01871442ce68c0c77505c2c0757b8a1455765 100644
--- a/res/drawable/tile_icon_winscope_trace.xml
+++ b/res/drawable/tile_icon_winscope_trace.xml
@@ -20,9 +20,9 @@
         android:viewportHeight="24.0">
     <path
         android:pathData="M17.115,1.535L9.984,1.535C9.38,1.535 8.887,2.029 8.887,2.632L8.887,5.923L7.241,5.923C6.638,5.923 6.144,6.417 6.144,7.021l0,5.486c0,0.603 0.494,1.097 1.097,1.097l7.131,0c0.603,0 1.097,-0.494 1.097,-1.097l0,-3.291l1.646,0c0.603,0 1.097,-0.494 1.097,-1.097L18.212,2.632C18.212,2.029 17.718,1.535 17.115,1.535ZM14.372,12.506L7.241,12.506l0,-4.388l7.131,0zM17.115,8.118L15.469,8.118L15.469,7.021C15.469,6.417 14.976,5.923 14.372,5.923L9.984,5.923L9.984,3.729l7.131,0z"
-        android:fillColor="@color/color_default_accent"/>
+        android:fillColor="@color/default_icon_color"/>
     <path
         android:pathData="m20.27,15.235c0,0.82 -0.671,1.491 -1.491,1.491 -0.134,0 -0.261,-0.015 -0.38,-0.052l-2.654,2.646C15.782,19.439 15.797,19.573 15.797,19.708c0,0.82 -0.671,1.491 -1.491,1.491 -0.82,0 -1.491,-0.671 -1.491,-1.491 0,-0.134 0.015,-0.268 0.052,-0.388L10.966,17.419C10.847,17.456 10.713,17.471 10.579,17.471 10.444,17.471 10.31,17.456 10.191,17.419L6.799,20.818C6.836,20.938 6.851,21.064 6.851,21.199 6.851,22.019 6.18,22.689 5.36,22.689 4.54,22.689 3.869,22.019 3.869,21.199c0,-0.82 0.671,-1.491 1.491,-1.491 0.134,0 0.261,0.015 0.38,0.052L9.14,16.368C9.103,16.249 9.088,16.114 9.088,15.98 9.088,15.16 9.759,14.489 10.579,14.489c0.82,0 1.491,0.671 1.491,1.491 0,0.134 -0.015,0.268 -0.052,0.388l1.901,1.901C14.038,18.232 14.172,18.217 14.306,18.217c0.134,0 0.268,0.015 0.388,0.052L17.34,15.615C17.303,15.496 17.288,15.369 17.288,15.235c0,-0.82 0.671,-1.491 1.491,-1.491 0.82,0 1.491,0.671 1.491,1.491z"
-        android:fillColor="@color/color_default_accent"/>
+        android:fillColor="@color/default_icon_color"/>
 </vector>
 
diff --git a/res/drawable/wifi_dpp_success.xml b/res/drawable/wifi_dpp_success.xml
index d8ed51407efe4cad164afbb2b33b773c78e0526c..aa8924876eb213edbda00d6ae4f4d9af85a15e19 100644
--- a/res/drawable/wifi_dpp_success.xml
+++ b/res/drawable/wifi_dpp_success.xml
@@ -11,7 +11,7 @@
       android:fillColor="#E8EAED"/>
   <path
       android:pathData="M187.83,180.61c-0.34,1.9 -1.24,3.71 -2.7,5.17l-8.35,8.35c-3.85,3.83 -10.06,3.83 -13.91,0c-3.83,-3.84 -3.83,-10.06 0,-13.91l6.77,-6.77C175.32,176.56 181.42,178.99 187.83,180.61z"
-      android:fillColor="@color/color_default_accent"/>
+      android:fillColor="@color/color_icon_background_blue"/>
   <path
       android:pathData="M290,77c0,5.04 -2.67,9.46 -6.67,11.93c-1.94,-9.23 -5.52,-17.87 -10.42,-25.59C273.9,63.12 274.94,63 276,63C283.73,63 290,69.27 290,77z"
       android:fillColor="#FBBC04"/>
diff --git a/res/layout-land/confirm_lock_password.xml b/res/layout-land/confirm_lock_password.xml
index 544dd269d844db83c7ce2ebf9a2b2cfc68fd8505..d6b2228a818567ad34dee2c05bfd027ffa4fd8a5 100644
--- a/res/layout-land/confirm_lock_password.xml
+++ b/res/layout-land/confirm_lock_password.xml
@@ -35,7 +35,7 @@
             android:layout_marginTop="12dp"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:textColor="?android:attr/colorAccent"/>
+            android:textColor="@color/color_default_accent"/>
 
         <TextView
             style="@*android:style/TextAppearance.DeviceDefault.Body1"
diff --git a/res/layout-land/confirm_lock_pattern.xml b/res/layout-land/confirm_lock_pattern.xml
index 6ca9be4e29d2e66b48ddb7eb36ed7b99b2109940..8cb0330d7e3b5f5e07379b89a8ad72d50b5da026 100644
--- a/res/layout-land/confirm_lock_pattern.xml
+++ b/res/layout-land/confirm_lock_pattern.xml
@@ -43,7 +43,7 @@
                 android:layout_marginEnd="32dp"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:textColor="?android:attr/colorAccent"/>
+                android:textColor="@color/color_default_accent"/>
 
             <TextView
                 style="@*android:style/TextAppearance.DeviceDefault.Body1"
diff --git a/res/layout-sw300dp-land/font_size_activity.xml b/res/layout-sw300dp-land/font_size_activity.xml
index 666470424ae077333c72e79d78c9e0d960336cf5..58b3557d49e00fbb5c87a7a95e1e8f22968f9170 100644
--- a/res/layout-sw300dp-land/font_size_activity.xml
+++ b/res/layout-sw300dp-land/font_size_activity.xml
@@ -77,8 +77,6 @@
                     android:layout_alignParentStart="true"
                     android:background="?android:attr/selectableItemBackgroundBorderless"
                     android:src="@drawable/ic_font_size_16dp"
-                    android:tint="?android:attr/textColorPrimary"
-                    android:tintMode="src_in"
                     android:scaleType="center"
                     android:focusable="true"
                     android:contentDescription="@string/font_size_make_smaller_desc" />
@@ -90,8 +88,6 @@
                     android:layout_alignParentEnd="true"
                     android:background="?android:attr/selectableItemBackgroundBorderless"
                     android:src="@drawable/ic_font_size_24dp"
-                    android:tint="?android:attr/textColorPrimary"
-                    android:tintMode="src_in"
                     android:scaleType="center"
                     android:focusable="true"
                     android:contentDescription="@string/font_size_make_larger_desc" />
diff --git a/res/layout-sw300dp-land/screen_zoom_activity.xml b/res/layout-sw300dp-land/screen_zoom_activity.xml
index 0f1c000b0002fa98ab0bfacdc86afe478ad32e1a..9b15ddbef96f7c12eb97d15c5ea989a3a5fb6664 100644
--- a/res/layout-sw300dp-land/screen_zoom_activity.xml
+++ b/res/layout-sw300dp-land/screen_zoom_activity.xml
@@ -79,8 +79,6 @@
                     android:layout_alignParentStart="true"
                     android:background="?android:attr/selectableItemBackgroundBorderless"
                     android:src="@drawable/ic_remove_24dp"
-                    android:tint="?android:attr/textColorPrimary"
-                    android:tintMode="src_in"
                     android:scaleType="center"
                     android:focusable="true"
                     android:contentDescription="@string/screen_zoom_make_smaller_desc" />
@@ -92,8 +90,6 @@
                     android:layout_alignParentEnd="true"
                     android:background="?android:attr/selectableItemBackgroundBorderless"
                     android:src="@drawable/ic_add_24dp"
-                    android:tint="?android:attr/textColorPrimary"
-                    android:tintMode="src_in"
                     android:scaleType="center"
                     android:focusable="true"
                     android:contentDescription="@string/screen_zoom_make_larger_desc" />
diff --git a/res/layout/admin_disabled_other_options_footer.xml b/res/layout/admin_disabled_other_options_footer.xml
index 31327bbfe7268144231538d200d10b0a9671086d..22e25a9a8363161c6a18465512247e4f1e1a04e3 100644
--- a/res/layout/admin_disabled_other_options_footer.xml
+++ b/res/layout/admin_disabled_other_options_footer.xml
@@ -30,7 +30,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/admin_more_details"
-            android:textColor="?android:attr/colorAccent"
+            android:textColor="@color/color_default_accent"
             android:clickable="true"
             android:background="?android:attr/selectableItemBackground" />
 </LinearLayout>
\ No newline at end of file
diff --git a/res/layout/admin_support_details_dialog.xml b/res/layout/admin_support_details_dialog.xml
index 66eaf0de62b400682c861e07ad4e70e8f0ea1f76..79b8e90fef053204f298f6b9ef34cf804511158a 100644
--- a/res/layout/admin_support_details_dialog.xml
+++ b/res/layout/admin_support_details_dialog.xml
@@ -52,7 +52,7 @@
                       android:text="@string/default_admin_support_msg"
                       android:maxLength="200"
                       android:autoLink="email|phone|web"
-                      android:textColor="?android:attr/textColorSecondary"/>
+                      android:textColor="@color/color_default_secondary_text"/>
         </LinearLayout>
     </ScrollView>
 </LinearLayout>
diff --git a/res/layout/apn_preference_layout.xml b/res/layout/apn_preference_layout.xml
index fa98d88e2fc60cd771dee34093f862db1c39abc5..fb145949b2d40504cb3b6b026d49fa848b4d1826 100644
--- a/res/layout/apn_preference_layout.xml
+++ b/res/layout/apn_preference_layout.xml
@@ -47,7 +47,7 @@
             android:layout_below="@android:id/title"
             android:layout_alignStart="@android:id/title"
             android:textAppearance="?android:attr/textAppearanceListItemSecondary"
-            android:textColor="?android:attr/textColorSecondary"
+            android:textColor="@color/color_default_secondary_text"
             android:maxLines="2" />
 
     </RelativeLayout>
diff --git a/res/layout/battery_active_view.xml b/res/layout/battery_active_view.xml
index bdc03289636e07bfaa271477facdd0346dc4da77..c385e88217c514151ef013f592c9ea8a2421b12e 100644
--- a/res/layout/battery_active_view.xml
+++ b/res/layout/battery_active_view.xml
@@ -28,7 +28,7 @@
         android:layout_height="wrap_content"
         android:textAlignment="viewStart"
         android:textAppearance="?android:attr/textAppearanceMedium"
-        android:textColor="?android:attr/textColorSecondary" />
+        android:textColor="@color/color_default_secondary_text" />
 
     <com.android.settings.fuelgauge.BatteryActiveView
         android:id="@+id/battery_active"
diff --git a/res/layout/battery_header.xml b/res/layout/battery_header.xml
index 26a38b912257ec7210b11daf0f3e3afef589a478..a446355f5ffa26f84718a46a9efea4ac69eb024f 100644
--- a/res/layout/battery_header.xml
+++ b/res/layout/battery_header.xml
@@ -46,8 +46,8 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="8dp"
             android:minLines="3"
-            android:textAppearance="@android:style/TextAppearance.DeviceDefault.Small"/>
-            android:textColor="?android:attr/textColorPrimary"/>
+            android:textAppearance="@android:style/TextAppearance.DeviceDefault.Small"
+            android:textColor="@color/color_default_primary_text"/>
 
     </LinearLayout>
 
diff --git a/res/layout/battery_history_detail.xml b/res/layout/battery_history_detail.xml
index ff838019682ab11f7b1f37e633fba7b4007b2cdf..6f42576b90a5ea942886165d7648aa672d292f02 100644
--- a/res/layout/battery_history_detail.xml
+++ b/res/layout/battery_history_detail.xml
@@ -39,7 +39,7 @@
                 android:layout_height="wrap_content"
                 android:textAppearance="?android:attr/textAppearanceLarge"
                 android:textSize="36sp"
-                android:textColor="?android:attr/colorAccent"/>
+                android:textColor="@color/color_default_accent"/>
 
             <TextView
                 android:id="@+id/estimation"
@@ -47,16 +47,16 @@
                 android:layout_height="wrap_content"
                 android:paddingBottom="8dp"
                 android:textAppearance="?android:attr/textAppearanceMedium"
-                android:textColor="?android:attr/textColorSecondary"/>
+                android:textColor="@color/color_default_secondary_text"/>
 
             <com.android.settings.widget.UsageView
                 android:id="@+id/battery_usage"
                 android:layout_width="match_parent"
                 android:layout_height="141dp"
                 settings:sideLabels="@array/battery_labels"
-                android:colorAccent="?android:attr/colorAccent"
+                android:colorAccent="@color/color_default_accent"
                 android:gravity="end"
-                settings:textColor="?android:attr/textColorSecondary"/>
+                settings:textColor="@color/color_default_secondary_text"/>
         </LinearLayout>
 
         <View
diff --git a/res/layout/battery_usage_graph.xml b/res/layout/battery_usage_graph.xml
index 93001c3f02af1f28c2b448b2eea41f440039ffa2..bbcadb1d734e0eb6915e0da901482f9a20958ed9 100644
--- a/res/layout/battery_usage_graph.xml
+++ b/res/layout/battery_usage_graph.xml
@@ -31,7 +31,7 @@
         android:fontFamily="@*android:string/config_headlineFontFamily"
         android:textAppearance="?android:attr/textAppearanceLarge"
         android:textSize="36sp"
-        android:textColor="?android:attr/colorAccent" />
+        android:textColor="@color/color_default_accent" />
 
     <com.android.settings.widget.UsageView
         android:id="@+id/battery_usage"
@@ -39,9 +39,9 @@
         android:layout_height="141dp"
         android:layout_marginBottom="16dp"
         settings:sideLabels="@array/battery_labels"
-        android:colorAccent="?android:attr/colorAccent"
+        android:colorAccent="@color/color_default_accent"
         android:gravity="end"
-        settings:textColor="?android:attr/textColorSecondary" />
+        settings:textColor="@color/color_default_secondary_text" />
 
     <TextView
         android:id="@+id/bottom_summary"
diff --git a/res/layout/bluetooth_pin_entry.xml b/res/layout/bluetooth_pin_entry.xml
index 0c6861c2c4ec6ed87e2623be282cc9effad566c5..c161dcd00f787c2142dd0ef55c3e115930ac6acb 100644
--- a/res/layout/bluetooth_pin_entry.xml
+++ b/res/layout/bluetooth_pin_entry.xml
@@ -61,7 +61,7 @@
             android:gravity="center"
             android:paddingStart="@dimen/bluetooth_checkbox_padding"
             android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Body1"
-            android:textColor="?android:attr/textColorSecondary"/>
+            android:textColor="@color/color_default_secondary_text"/>
 
         <TextView
             android:id="@+id/message_below_pin"
@@ -72,7 +72,7 @@
             android:layout_marginBottom="12dp"
             android:gravity="center_vertical"
             android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Subhead"
-            android:textColor="?android:attr/textColorSecondary"/>
+            android:textColor="@color/color_default_secondary_text"/>
 
         <CheckBox
             android:id="@+id/phonebook_sharing_message_entry_pin"
@@ -85,7 +85,7 @@
             android:paddingStart="@dimen/bluetooth_checkbox_padding"
             android:text="@string/bluetooth_pairing_shares_phonebook"
             android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Body1"
-            android:textColor="?android:attr/textColorSecondary"/>
+            android:textColor="@color/color_default_secondary_text"/>
 
     </LinearLayout>
 
diff --git a/res/layout/bugreport_options_dialog.xml b/res/layout/bugreport_options_dialog.xml
index fd00bc646f2196042ed1692ae73dddcd78a8d4dd..26d5ba7394195787a0ce67b758d21d11a75317ae 100644
--- a/res/layout/bugreport_options_dialog.xml
+++ b/res/layout/bugreport_options_dialog.xml
@@ -49,7 +49,7 @@
             android:paddingEnd="?android:attr/dialogPreferredPadding"
             android:text="@*android:string/bugreport_option_interactive_summary"
             android:textAppearance="?android:attr/textAppearanceListItemSecondary"
-            android:textColor="?android:attr/textColorSecondary" />
+            android:textColor="@color/color_default_secondary_text" />
 
         <CheckedTextView
             android:id="@+id/bugreport_option_full_title"
@@ -76,7 +76,7 @@
             android:paddingEnd="?android:attr/dialogPreferredPadding"
             android:text="@*android:string/bugreport_option_full_summary"
             android:textAppearance="?android:attr/textAppearanceListItemSecondary"
-            android:textColor="?android:attr/textColorSecondary" />
+            android:textColor="@color/color_default_secondary_text" />
 
     </RelativeLayout>
 </ScrollView>
diff --git a/res/layout/conditional_card_full_tile.xml b/res/layout/conditional_card_full_tile.xml
index 81889fb3efc85b1e20fd5e12a6012141f9fcd4f3..9f62659e5b0224d6b9f58d2b6294e59a9a0d1c7e 100644
--- a/res/layout/conditional_card_full_tile.xml
+++ b/res/layout/conditional_card_full_tile.xml
@@ -42,7 +42,7 @@
                 android:id="@android:id/icon"
                 android:layout_width="@dimen/contextual_card_icon_size"
                 android:layout_height="@dimen/contextual_card_icon_size"
-                android:tint="?android:attr/colorAccent"/>
+                android:tint="@color/color_default_accent"/>
 
             <LinearLayout
                 android:layout_width="0dp"
diff --git a/res/layout/conditional_card_half_tile.xml b/res/layout/conditional_card_half_tile.xml
index 9bbaf8641c0c92a3798ad0b8bb6b6edf04c50714..58ef4fb29d87d69e75ab9a64477882bdadfe4670 100644
--- a/res/layout/conditional_card_half_tile.xml
+++ b/res/layout/conditional_card_half_tile.xml
@@ -40,7 +40,7 @@
                 android:layout_width="@dimen/contextual_card_icon_size"
                 android:layout_height="@dimen/contextual_card_icon_size"
                 android:layout_marginStart="@dimen/contextual_card_icon_padding_start"
-                android:tint="?android:attr/colorAccent"/>
+                android:tint="@color/color_default_accent"/>
 
             <TextView
                 android:id="@android:id/title"
diff --git a/res/layout/conditional_card_header_icon.xml b/res/layout/conditional_card_header_icon.xml
index c8886a8adda4162f942a8db6ca67c3303f7c7b5b..1a559142c131df2ff27a037ba5d3c2b1f8614d16 100644
--- a/res/layout/conditional_card_header_icon.xml
+++ b/res/layout/conditional_card_header_icon.xml
@@ -20,4 +20,4 @@
            android:layout_width="@dimen/contextual_condition_header_icon_width_height"
            android:layout_height="@dimen/contextual_condition_header_icon_width_height"
            android:layout_marginEnd="@dimen/contextual_condition_header_icon_margin_end"
-           android:tint="?android:attr/colorAccent"/>
\ No newline at end of file
+           android:tint="@color/color_default_accent"/>
\ No newline at end of file
diff --git a/res/layout/confirm_lock_password_base.xml b/res/layout/confirm_lock_password_base.xml
index ed25e747174a4b0777f3bc802683f57b55ed4f6d..5d167c823a3526bb365473666863e0dddf3f1b5f 100644
--- a/res/layout/confirm_lock_password_base.xml
+++ b/res/layout/confirm_lock_password_base.xml
@@ -38,7 +38,7 @@
             android:layout_marginTop="?attr/confirmDeviceCredentialsTopMargin"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:textColor="?android:attr/colorAccent"/>
+            android:textColor="@color/color_default_accent"/>
 
         <TextView
             style="@*android:style/TextAppearance.DeviceDefault.Body1"
diff --git a/res/layout/confirm_lock_pattern_base.xml b/res/layout/confirm_lock_pattern_base.xml
index b02f9c06858e60f122d827e296a763a17793610b..d534d6a051afdad8cc282be4fc6cf00dcf6dbdd5 100644
--- a/res/layout/confirm_lock_pattern_base.xml
+++ b/res/layout/confirm_lock_pattern_base.xml
@@ -47,7 +47,7 @@
                     android:layout_marginTop="?attr/confirmDeviceCredentialsTopMargin"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:textColor="?android:attr/colorAccent"/>
+                    android:textColor="@color/color_default_accent"/>
 
                 <TextView
                     style="@*android:style/TextAppearance.DeviceDefault.Body1"
diff --git a/res/layout/data_usage_detail.xml b/res/layout/data_usage_detail.xml
index 8079fe19d63eac058b8ef05aa5cce248f2a9b29e..17240cd07e1cde9e5da70468598a0be3331b351f 100644
--- a/res/layout/data_usage_detail.xml
+++ b/res/layout/data_usage_detail.xml
@@ -65,14 +65,14 @@
                     android:ellipsize="marquee"
                     android:text="@string/data_usage_label_foreground"
                     android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Body1"
-                    android:textColor="?android:attr/textColorSecondary"
+                    android:textColor="@color/color_default_secondary_text"
                     android:textAlignment="viewStart" />
                 <TextView
                     android:id="@+id/app_foreground"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Body1"
-                    android:textColor="?android:attr/textColorSecondary"
+                    android:textColor="@color/color_default_secondary_text"
                     android:textAlignment="viewEnd" />
             </LinearLayout>
 
@@ -88,14 +88,14 @@
                     android:ellipsize="marquee"
                     android:text="@string/data_usage_label_background"
                     android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Body1"
-                    android:textColor="?android:attr/textColorSecondary"
+                    android:textColor="@color/color_default_secondary_text"
                     android:textAlignment="viewStart" />
                 <TextView
                     android:id="@+id/app_background"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Body1"
-                    android:textColor="?android:attr/textColorSecondary"
+                    android:textColor="@color/color_default_secondary_text"
                     android:textAlignment="viewEnd" />
             </LinearLayout>
 
diff --git a/res/layout/data_usage_graph.xml b/res/layout/data_usage_graph.xml
index ef16341b7c1f9ec0a7de9725a4836650309f9f2d..4d41317ce9135056199782ac5a1c034cc739193f 100644
--- a/res/layout/data_usage_graph.xml
+++ b/res/layout/data_usage_graph.xml
@@ -27,8 +27,8 @@
         android:layout_width="match_parent"
         android:layout_height="@dimen/data_usage_chart_height"
         settings:sideLabels="@array/battery_labels"
-        android:colorAccent="?android:attr/colorAccent"
+        android:colorAccent="@color/color_default_accent"
         android:gravity="end"
-        settings:textColor="?android:attr/textColorSecondary" />
+        settings:textColor="@color/color_default_secondary_text" />
 
 </LinearLayout>
diff --git a/res/layout/data_usage_summary_preference.xml b/res/layout/data_usage_summary_preference.xml
index 0369908c0a3d8f438948266a8b076042e7fe6ca8..a91bad81f7e595a4f801dd4f4f05404fe0aa682e 100644
--- a/res/layout/data_usage_summary_preference.xml
+++ b/res/layout/data_usage_summary_preference.xml
@@ -31,7 +31,7 @@
         android:id="@+id/usage_title"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:textColor="?android:attr/textColorPrimary"
+        android:textColor="@color/color_default_primary_text"
         android:text="@string/data_usage_title" />
 
     <com.android.settings.datausage.MeasurableLinearLayout
@@ -47,7 +47,7 @@
             android:fontFamily="@*android:string/config_headlineFontFamily"
             android:textAppearance="?android:attr/textAppearanceMedium"
             android:textSize="16sp"
-            android:textColor="?android:attr/colorAccent" />
+            android:textColor="@color/color_default_accent" />
 
         <Space
             android:layout_width="0dp"
@@ -81,7 +81,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:textAppearance="?android:attr/textAppearanceListItemSecondary"
-            android:textColor="?android:attr/textColorSecondary" />
+            android:textColor="@color/color_default_secondary_text" />
 
         <Space
             android:layout_width="0dp"
@@ -92,7 +92,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:textAppearance="?android:attr/textAppearanceListItemSecondary"
-            android:textColor="?android:attr/textColorSecondary" />
+            android:textColor="@color/color_default_secondary_text" />
 
     </LinearLayout>
 
@@ -106,7 +106,7 @@
             android:id="@+id/data_limits"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:textColor="?android:attr/textColorSecondary" />
+            android:textColor="@color/color_default_secondary_text" />
 
         <TextView
             android:id="@+id/cycle_left_time"
diff --git a/res/layout/dialog_back_gesture_sensitivity.xml b/res/layout/dialog_back_gesture_sensitivity.xml
index 3b4b20e118cec2c38bb842488a28a4fba8deae72..e85d3e4e9e80efd649c625bd5fecbc12f56f68ca 100644
--- a/res/layout/dialog_back_gesture_sensitivity.xml
+++ b/res/layout/dialog_back_gesture_sensitivity.xml
@@ -30,7 +30,7 @@
         android:layout_weight="1"
         android:layout_marginBottom="2dp"
         android:layout_marginStart="12dp"
-        android:textColor="?android:attr/textColorPrimary"
+        android:textColor="@color/color_default_primary_text"
         android:text="@string/back_sensitivity_title" />
 
     <TextView
@@ -93,7 +93,7 @@
         android:layout_weight="1"
         android:layout_marginBottom="2dp"
         android:layout_marginStart="12dp"
-        android:textColor="?android:attr/textColorPrimary"
+        android:textColor="@color/color_default_primary_text"
         android:text="@string/back_exclusion_title" />
 
     <TextView
@@ -155,7 +155,7 @@
         android:layout_weight="1"
         android:layout_marginBottom="2dp"
         android:layout_marginStart="12dp"
-        android:textColor="?android:attr/textColorPrimary"
+        android:textColor="@color/color_default_primary_text"
         android:text="@string/show_navbar_hint_title" />
 
     <Switch
@@ -166,6 +166,6 @@
         android:layout_weight="1"
         android:layout_marginBottom="2dp"
         android:layout_marginStart="12dp"
-        android:textColor="?android:attr/textColorSecondary"
+        android:textColor="@color/color_default_secondary_text"
         android:text="@string/show_navbar_hint_summary"/>
 </LinearLayout>
\ No newline at end of file
diff --git a/res/layout/dialog_mobile_network_color_picker_item.xml b/res/layout/dialog_mobile_network_color_picker_item.xml
index b6f40929ef46a15dd7ded1ff7f9f6a572f17aef3..2ac348e89855f27ab11d777b1cadab66ec9b21db 100644
--- a/res/layout/dialog_mobile_network_color_picker_item.xml
+++ b/res/layout/dialog_mobile_network_color_picker_item.xml
@@ -36,6 +36,6 @@
         android:paddingTop="@dimen/sim_label_padding"
         android:paddingBottom="@dimen/sim_label_padding"
         android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Subhead"
-        android:textColor="?android:attr/textColorPrimary"/>
+        android:textColor="@color/color_default_primary_text"/>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/res/layout/dialog_mobile_network_rename.xml b/res/layout/dialog_mobile_network_rename.xml
index 921ab8602e5676a5edec5200aa8997c5ea805790..c54f4a6c45f8ed7531fec4525317564646257464 100644
--- a/res/layout/dialog_mobile_network_rename.xml
+++ b/res/layout/dialog_mobile_network_rename.xml
@@ -36,7 +36,7 @@
                 android:layout_height="wrap_content"
                 android:paddingTop="@dimen/sim_label_padding"
                 android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Subhead"
-                android:textColor="?android:attr/textColorPrimary"
+                android:textColor="@color/color_default_primary_text"
                 android:text="@string/mobile_network_sim_name_label"/>
 
             <EditText
@@ -54,7 +54,7 @@
                 android:layout_height="wrap_content"
                 android:paddingTop="@dimen/sim_label_padding"
                 android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Subhead"
-                android:textColor="?android:attr/textColorPrimary"
+                android:textColor="@color/color_default_primary_text"
                 android:text="@string/mobile_network_sim_color_label"/>
 
         </LinearLayout>
@@ -79,7 +79,7 @@
                 android:layout_height="wrap_content"
                 android:paddingTop="@dimen/sim_label_padding"
                 android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Subhead"
-                android:textColor="?android:attr/textColorPrimary"
+                android:textColor="@color/color_default_primary_text"
                 android:text="@string/status_operator"/>
 
             <TextView
@@ -94,7 +94,7 @@
                 android:layout_height="wrap_content"
                 android:paddingTop="@dimen/sim_label_padding"
                 android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Subhead"
-                android:textColor="?android:attr/textColorPrimary"
+                android:textColor="@color/color_default_primary_text"
                 android:text="@string/status_number_sim_status"/>
 
             <TextView
diff --git a/res/layout/empty_print_state.xml b/res/layout/empty_print_state.xml
index f60bf9e048fbd7beacc3e48e250f8327ffd84bc4..f3876773ea8d21c22882165178c55804ef9fa053 100644
--- a/res/layout/empty_print_state.xml
+++ b/res/layout/empty_print_state.xml
@@ -38,14 +38,14 @@
         android:layout_marginBottom="16dp"
         android:gravity="center"
         android:textAppearance="?android:attr/textAppearanceLarge"
-        android:textColor="?android:attr/textColorSecondary" />
+        android:textColor="@color/color_default_secondary_text" />
 
     <Button
         android:id="@+id/add_new_service"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         style="?android:attr/borderlessButtonStyle"
-        android:textColor="?android:attr/textColorSecondary"
+        android:textColor="@color/color_default_secondary_text"
         android:text="@string/print_menu_item_add_service"
         android:visibility="gone" />
 
diff --git a/res/layout/empty_printers_list_service_enabled.xml b/res/layout/empty_printers_list_service_enabled.xml
index c42cb86d8aa14972668ee646d3938f6247bc4c97..235eef0572b5961f13c7b385d9a17a03eb698912 100644
--- a/res/layout/empty_printers_list_service_enabled.xml
+++ b/res/layout/empty_printers_list_service_enabled.xml
@@ -37,7 +37,7 @@
         android:layout_marginBottom="16dp"
         android:gravity="center"
         android:textAppearance="?android:attr/textAppearanceLarge"
-        android:textColor="?android:attr/textColorSecondary"
+        android:textColor="@color/color_default_secondary_text"
         android:text="@string/print_searching_for_printers"/>
 
     <ProgressBar
diff --git a/res/layout/fallback_home_finishing_boot.xml b/res/layout/fallback_home_finishing_boot.xml
index 333eb5e4fa1ff7c528ba59135574f85bd6a8b9e4..e3cf141e852b7dcad1ad9ed116679a6592c6b8ed 100644
--- a/res/layout/fallback_home_finishing_boot.xml
+++ b/res/layout/fallback_home_finishing_boot.xml
@@ -34,7 +34,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:textSize="20sp"
-            android:textColor="?android:attr/textColorPrimary"
+            android:textColor="@color/color_default_primary_text"
             android:text="@*android:string/android_start_title"/>
 
         <ProgressBar
@@ -42,7 +42,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="12.75dp"
-            android:colorControlActivated="?android:attr/textColorPrimary"
+            android:colorControlActivated="@color/color_default_primary_text"
             android:indeterminate="true"/>
 
     </LinearLayout>
diff --git a/res/layout/font_size_activity.xml b/res/layout/font_size_activity.xml
index 3e84336b7638d67c2aa9440c131cbfc3cc174de1..0961374b247008385546516113ed66cfffe4b2a7 100644
--- a/res/layout/font_size_activity.xml
+++ b/res/layout/font_size_activity.xml
@@ -63,8 +63,6 @@
                     android:layout_height="48dp"
                     android:background="?android:attr/selectableItemBackgroundBorderless"
                     android:src="@drawable/ic_font_size_16dp"
-                    android:tint="?android:attr/textColorPrimary"
-                    android:tintMode="src_in"
                     android:scaleType="center"
                     android:focusable="true"
                     android:contentDescription="@string/font_size_make_smaller_desc" />
@@ -82,8 +80,6 @@
                     android:layout_height="48dp"
                     android:background="?android:attr/selectableItemBackgroundBorderless"
                     android:src="@drawable/ic_font_size_24dp"
-                    android:tint="?android:attr/textColorPrimary"
-                    android:tintMode="src_in"
                     android:scaleType="center"
                     android:focusable="true"
                     android:contentDescription="@string/font_size_make_larger_desc" />
diff --git a/res/layout/horizontal_preference.xml b/res/layout/horizontal_preference.xml
index 9358cff21b68104863e704193cfbb6257fbc210f..c461a9e55eb15e9e918ceaee54c6de5fe504d15a 100644
--- a/res/layout/horizontal_preference.xml
+++ b/res/layout/horizontal_preference.xml
@@ -35,7 +35,7 @@
     <TextView
         android:id="@android:id/summary"
         android:textAppearance="?android:attr/textAppearanceListItemSecondary"
-        android:textColor="?android:attr/textColorSecondary"
+        android:textColor="@color/color_default_secondary_text"
         android:layout_height="wrap_content"
         android:layout_width="wrap_content"
         android:layout_weight="1"
diff --git a/res/layout/locale_drag_cell.xml b/res/layout/locale_drag_cell.xml
index db9454a21cd9878628eabc947ef64327cd40c898..54d2dbf093c9f2e025ac6718749a619067c36ec1 100644
--- a/res/layout/locale_drag_cell.xml
+++ b/res/layout/locale_drag_cell.xml
@@ -43,7 +43,7 @@
         style="@style/LanguageCheckboxAndLabel"
         android:layout_width="wrap_content"
         tools:text="22"
-        android:textColor="?android:attr/colorAccent"
+        android:textColor="@color/color_default_accent"
         android:minWidth="24sp"
         android:gravity="center_vertical|center_horizontal"
         android:layout_alignTop="@id/checkbox"
diff --git a/res/layout/lockscreen_remote_input.xml b/res/layout/lockscreen_remote_input.xml
index 59523a3d8fe8b70a3f502555374facd56287f8c7..a13c144b3b6d3a59beaf442aab247b7821d60249 100644
--- a/res/layout/lockscreen_remote_input.xml
+++ b/res/layout/lockscreen_remote_input.xml
@@ -38,7 +38,7 @@
             android:id="@+id/restricted_lock_icon_remote_input"
             android:layout_width="@*android:dimen/config_restrictedIconSize"
             android:layout_height="@*android:dimen/config_restrictedIconSize"
-            android:tint="?android:attr/colorAccent"
+            android:tint="@color/color_default_accent"
             android:src="@drawable/ic_info"
             android:layout_marginEnd="?android:attr/dialogPreferredPadding"
             android:layout_gravity="center_vertical"
diff --git a/res/layout/nfc_payment_empty.xml b/res/layout/nfc_payment_empty.xml
index 74c15bcf65f76db92b77b6a90e2461446f5ea3ca..cc8f528b05d8f91e34a43e93cf7a480cb3881e45 100644
--- a/res/layout/nfc_payment_empty.xml
+++ b/res/layout/nfc_payment_empty.xml
@@ -32,7 +32,7 @@
             android:layout_height="wrap_content"
             android:gravity="center"
             android:textAppearance="?android:attr/textAppearanceLarge"
-            android:textColor="?android:attr/textColorSecondary"
+            android:textColor="@color/color_default_secondary_text"
             android:paddingTop="36dp"
             android:text="@string/nfc_payment_no_apps"/>
 </LinearLayout>
diff --git a/res/layout/notification_app.xml b/res/layout/notification_app.xml
index 54060c1a91ea05182bdf8a4980a78eaa97e24dad..06cdee35d60666f92def6ccecb31d1afa1d8ea82 100644
--- a/res/layout/notification_app.xml
+++ b/res/layout/notification_app.xml
@@ -49,7 +49,7 @@
         android:ellipsize="end"
         android:singleLine="true"
         android:textAlignment="viewStart"
-        android:textColor="?android:attr/textColorSecondary"
+        android:textColor="@color/color_default_secondary_text"
         android:textAppearance="?android:attr/textAppearanceSmall" />
 
     <View
diff --git a/res/layout/notification_log_row.xml b/res/layout/notification_log_row.xml
index e76835e76d21e04f86d518b724dea57e151b7f23..a25118a0464190e5f771e44ffa2ffc4f3fb08a08 100644
--- a/res/layout/notification_log_row.xml
+++ b/res/layout/notification_log_row.xml
@@ -40,7 +40,7 @@
             android:layout_marginEnd="8dp"
             android:contentDescription="@null"
             android:adjustViewBounds="true"
-            android:tint="?android:attr/textColorPrimary"
+            android:tint="@color/color_default_primary_text"
             android:maxHeight="@*android:dimen/status_bar_icon_size"
             android:maxWidth="@*android:dimen/status_bar_icon_size"
             android:scaleType="fitCenter" />
@@ -54,7 +54,7 @@
             android:layout_toEndOf="@id/icon"
             android:ellipsize="end"
             android:singleLine="true"
-            android:textColor="?android:attr/textColorPrimary"
+            android:textColor="@color/color_default_primary_text"
             android:textAppearance="?android:attr/textAppearanceSmall"
             android:textStyle="bold"
             android:textAlignment="viewStart"
@@ -70,7 +70,7 @@
             android:layout_centerVertical="true"
             android:ellipsize="end"
             android:singleLine="true"
-            android:textColor="?android:attr/textColorPrimary"
+            android:textColor="@color/color_default_primary_text"
             android:textAppearance="?android:attr/textAppearanceSmall"
             android:textAlignment="viewEnd"
             />
@@ -103,7 +103,7 @@
             android:layout_gravity="left|center_vertical"
             android:ellipsize="end"
             android:singleLine="true"
-            android:textColor="?android:attr/textColorPrimary"
+            android:textColor="@color/color_default_primary_text"
             android:textAppearance="?android:attr/textAppearanceSmall"
             android:textAlignment="viewStart"
             />
@@ -118,7 +118,7 @@
             android:layout_marginStart="30dp"
             android:layout_marginBottom="6dp"
             android:singleLine="false"
-            android:textColor="?android:attr/textColorPrimary"
+            android:textColor="@color/color_default_primary_text"
             android:textSize="10sp"
             android:fontFamily="monospace"
             android:textAlignment="viewStart"
diff --git a/res/layout/panel_layout.xml b/res/layout/panel_layout.xml
index abe8f416ba19cb61818e316bdab3c1e637cdc826..c494434965837fc7b17ba63a08e0361a79e52c11 100644
--- a/res/layout/panel_layout.xml
+++ b/res/layout/panel_layout.xml
@@ -34,7 +34,7 @@
             android:gravity="center"
             android:paddingBottom="24dp"
             android:paddingTop="18dp"
-            android:textColor="?android:attr/textColorPrimary"
+            android:textColor="@color/color_default_primary_text"
             android:textSize="20sp"/>
 
         <include layout="@layout/horizontal_divider"/>
diff --git a/res/layout/preference.xml b/res/layout/preference.xml
index 195671b5655568dfd9b03995909da96f033baa8c..24b963e22c7226e0c3caba6dee75351b7dbf60bf 100644
--- a/res/layout/preference.xml
+++ b/res/layout/preference.xml
@@ -36,7 +36,7 @@
             android:layout_height="wrap_content"
             android:singleLine="true"
             android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Subhead"
-            android:textColor="?android:attr/textColorPrimary"
+            android:textColor="@color/color_default_primary_text"
             android:ellipsize="marquee"
             android:fadingEdge="horizontal" />
 
@@ -49,7 +49,7 @@
             android:visibility="gone"
             android:textAlignment="viewStart"
             android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Body1"
-            android:textColor="?android:attr/textColorSecondary"
+            android:textColor="@color/color_default_secondary_text"
             android:maxLines="10" />
 
     </RelativeLayout>
diff --git a/res/layout/preference_app_restrictions.xml b/res/layout/preference_app_restrictions.xml
index 698f1edab66071203be04ef48fe44960d5ed6dc5..384d2c6525898ab2490779d9379ae08d18ff752b 100644
--- a/res/layout/preference_app_restrictions.xml
+++ b/res/layout/preference_app_restrictions.xml
@@ -72,7 +72,7 @@
                 android:visibility="gone"
                 android:textAppearance="?android:attr/textAppearanceSmall"
                 android:textSize="13sp"
-                android:textColor="?android:attr/textColorSecondary"
+                android:textColor="@color/color_default_secondary_text"
                 android:focusable="false"
                 android:maxLines="4" />
         </RelativeLayout>
@@ -83,7 +83,7 @@
         android:layout_height="fill_parent"
         android:paddingStart="12dip"
         android:paddingEnd="12dp"
-        android:src="@drawable/ic_settings_accent"
+        android:src="@drawable/ic_settings_cog"
         android:contentDescription="@string/apps_with_restrictions_settings_button"
         android:layout_gravity="center"
         android:clickable="true"
diff --git a/res/layout/preference_balance_slider.xml b/res/layout/preference_balance_slider.xml
index 32010c36026f18b58f33d0d5e3693e790c5a2cc4..2cb293031012c1e262b2be5a122c21ebd6cf1b11 100644
--- a/res/layout/preference_balance_slider.xml
+++ b/res/layout/preference_balance_slider.xml
@@ -58,7 +58,7 @@
                 android:layout_weight="1"
                 android:singleLine="true"
                 android:textAppearance="@*android:style/TextAppearance.Material.Subhead"
-                android:textColor="?android:attr/textColorPrimary"
+                android:textColor="@color/color_default_primary_text"
                 android:ellipsize="marquee"
                 android:fadingEdge="horizontal"/>
             <LinearLayout
diff --git a/res/layout/preference_increasing_ring.xml b/res/layout/preference_increasing_ring.xml
index 11795a2eaeea8298681ffaa70d7babb9c4dbec1b..6dee6da0cad96ec22345d9450b372a4f8a0aa7a3 100644
--- a/res/layout/preference_increasing_ring.xml
+++ b/res/layout/preference_increasing_ring.xml
@@ -66,7 +66,7 @@
             android:paddingStart="18dp"
             android:text="@string/increasing_ring_min_volume_title"
             android:textAppearance="?android:attr/textAppearanceSmall"
-            android:textColor="?android:attr/textColorSecondary"
+            android:textColor="@color/color_default_secondary_text"
             android:singleLine="true" />
 
         <SeekBar android:id="@+id/start_volume"
@@ -84,7 +84,7 @@
             android:paddingStart="18dp"
             android:text="@string/increasing_ring_ramp_up_time_title"
             android:textAppearance="?android:attr/textAppearanceSmall"
-            android:textColor="?android:attr/textColorSecondary"
+            android:textColor="@color/color_default_secondary_text"
             android:singleLine="true" />
 
         <TextView android:id="@+id/ramp_up_time_value"
@@ -96,7 +96,7 @@
             android:layout_alignParentEnd="true"
             android:gravity="end"
             android:textAppearance="?android:attr/textAppearanceSmall"
-            android:textColor="?android:attr/textColorSecondary"
+            android:textColor="@color/color_default_secondary_text"
             android:singleLine="true" />
 
         <SeekBar android:id="@+id/ramp_up_time"
@@ -112,7 +112,7 @@
             android:layout_below="@id/ramp_up_time"
             android:layout_alignStart="@android:id/title"
             android:textAppearance="?android:attr/textAppearanceSmall"
-            android:textColor="?android:attr/textColorSecondary"
+            android:textColor="@color/color_default_secondary_text"
             android:maxLines="4" />
 
     </RelativeLayout>
diff --git a/res/layout/preference_multiline_title.xml b/res/layout/preference_multiline_title.xml
index ae93eadd976a64e6884b455f904a58e94d2ea03a..d713b9811592e3700d1817645a27b8bc59fbd858 100644
--- a/res/layout/preference_multiline_title.xml
+++ b/res/layout/preference_multiline_title.xml
@@ -35,7 +35,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Subhead"
-            android:textColor="?android:attr/textColorPrimary"
+            android:textColor="@color/color_default_primary_text"
             android:ellipsize="marquee"
             android:fadingEdge="horizontal" />
 
@@ -48,7 +48,7 @@
             android:visibility="gone"
             android:textAlignment="viewStart"
             android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Body1"
-            android:textColor="?android:attr/textColorSecondary"
+            android:textColor="@color/color_default_secondary_text"
             android:maxLines="10" />
 
     </RelativeLayout>
diff --git a/res/layout/preference_progress_category.xml b/res/layout/preference_progress_category.xml
index 91a0312f5e1284195e5244ed0edb16315fee3899..0dfddc8920255a97abf1fb82511913b0aa075a85 100644
--- a/res/layout/preference_progress_category.xml
+++ b/res/layout/preference_progress_category.xml
@@ -47,7 +47,7 @@
         android:layout_weight="1"
         android:layout_gravity="start|center"
         android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Body2"
-        android:textColor="?android:attr/colorAccent"/>
+        android:textColor="@color/color_default_accent"/>
 
     <ProgressBar
         android:id="@+id/scanning_progress"
diff --git a/res/layout/preference_radio.xml b/res/layout/preference_radio.xml
index cd486caa6da086980f526784c2a3c8345408a0be..45e2814eb7e406787fe4ed5130e5eb60b7d49cc5 100644
--- a/res/layout/preference_radio.xml
+++ b/res/layout/preference_radio.xml
@@ -79,7 +79,7 @@
                       android:layout_weight="1"
                       android:textAppearance="@style/TextAppearance.Small"
                       android:textAlignment="viewStart"
-                      android:textColor="?android:attr/textColorSecondary" />
+                      android:textColor="@color/color_default_secondary_text" />
 
             <TextView android:id="@+id/appendix"
                       android:layout_width="0dp"
@@ -87,7 +87,7 @@
                       android:layout_weight="1"
                       android:textAppearance="@style/TextAppearance.Small"
                       android:textAlignment="viewEnd"
-                      android:textColor="?android:attr/textColorSecondary"
+                      android:textColor="@color/color_default_secondary_text"
                       android:maxLines="1"
                       android:ellipsize="end" />
         </LinearLayout>
diff --git a/res/layout/preference_radio_with_extra_widget.xml b/res/layout/preference_radio_with_extra_widget.xml
index 00c428f273e39cd4e81b68bf3a9f444ca7c46383..02e2694e09ef5347166106ebd817ffa900d0eea5 100644
--- a/res/layout/preference_radio_with_extra_widget.xml
+++ b/res/layout/preference_radio_with_extra_widget.xml
@@ -75,7 +75,7 @@
                   android:layout_weight="1"
                   android:textAppearance="@style/TextAppearance.Small"
                   android:textAlignment="viewStart"
-                  android:textColor="?android:attr/textColorSecondary" />
+                  android:textColor="@color/color_default_secondary_text" />
     </LinearLayout>
     <LinearLayout
         android:id="@+id/radio_extra_widget_container"
diff --git a/res/layout/preference_single_target.xml b/res/layout/preference_single_target.xml
index b4a9de01636e7a43ccb00e255556f50e5bd0885c..f45421349574721fc5cf47ef22aaa5757f42665b 100644
--- a/res/layout/preference_single_target.xml
+++ b/res/layout/preference_single_target.xml
@@ -75,7 +75,7 @@
                 android:layout_below="@android:id/title"
                 android:layout_alignStart="@android:id/title"
                 android:textAppearance="?android:attr/textAppearanceListItemSecondary"
-                android:textColor="?android:attr/textColorSecondary"
+                android:textColor="@color/color_default_secondary_text"
                 android:maxLines="10" />
 
         </RelativeLayout>
diff --git a/res/layout/preference_two_target_radio.xml b/res/layout/preference_two_target_radio.xml
index f454c87ac6220939ccc10c722bda16e35bf13702..fbe49acb6f1a30cf8d5f670efb19e11cc57e62cb 100644
--- a/res/layout/preference_two_target_radio.xml
+++ b/res/layout/preference_two_target_radio.xml
@@ -71,7 +71,7 @@
                 android:layout_below="@android:id/title"
                 android:layout_alignStart="@android:id/title"
                 android:textAppearance="?android:attr/textAppearanceListItemSecondary"
-                android:textColor="?android:attr/textColorSecondary"
+                android:textColor="@color/color_default_secondary_text"
                 android:maxLines="10" />
 
         </RelativeLayout>
diff --git a/res/layout/preference_volume_slider.xml b/res/layout/preference_volume_slider.xml
index 34c732d08bf969cfcd417bd32d9cdf267466b7ea..d7e53b6cc7d175c9332eec256cda07e73c5abc87 100644
--- a/res/layout/preference_volume_slider.xml
+++ b/res/layout/preference_volume_slider.xml
@@ -59,7 +59,7 @@
                 android:paddingStart="12dp"
                 android:singleLine="true"
                 android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Subhead"
-                android:textColor="?android:attr/textColorPrimary"
+                android:textColor="@color/color_default_primary_text"
                 android:ellipsize="marquee"
                 android:fadingEdge="horizontal"/>
             <!-- Preference should place its actual preference widget here. -->
@@ -95,7 +95,7 @@
                 android:ellipsize="end"
                 android:visibility="gone"
                 android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Body1"
-                android:textColor="?android:attr/textColorSecondary"/>
+                android:textColor="@color/color_default_secondary_text"/>
 
         </LinearLayout>
     </LinearLayout>
diff --git a/res/layout/preference_widget_add.xml b/res/layout/preference_widget_add.xml
index 9942bb2a5444e90d038a00f8346be55bdf11e88f..0ca4abf5a5fce21b7908dcf5134a6569c17af2e8 100644
--- a/res/layout/preference_widget_add.xml
+++ b/res/layout/preference_widget_add.xml
@@ -27,6 +27,5 @@
     android:background="?android:attr/selectableItemBackground"
     android:scaleType="center"
     android:src="@drawable/ic_add_24dp"
-    android:tint="?android:attr/colorAccent"
     android:contentDescription="@string/add" />
 
diff --git a/res/layout/preference_widget_gear.xml b/res/layout/preference_widget_gear.xml
index 11870acace9bddeb8060c7681c6a9091fc94dcaf..5fc7a2028d3b550eb09dd98238eca14f43534338 100644
--- a/res/layout/preference_widget_gear.xml
+++ b/res/layout/preference_widget_gear.xml
@@ -25,6 +25,6 @@
     android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
     android:background="?android:attr/selectableItemBackground"
     android:scaleType="center"
-    android:src="@drawable/ic_settings_accent"
+    android:src="@drawable/ic_settings_cog"
     android:contentDescription="@string/settings_button" />
 
diff --git a/res/layout/preference_widget_gear_no_bg.xml b/res/layout/preference_widget_gear_no_bg.xml
index 6a26fc8a9793782094fede40e48768fa6b47edbf..b76114e2781eba19d3a25a37fc2c46cd3c6fd1f4 100644
--- a/res/layout/preference_widget_gear_no_bg.xml
+++ b/res/layout/preference_widget_gear_no_bg.xml
@@ -22,6 +22,6 @@
     android:layout_height="match_parent"
     android:layout_gravity="center"
     android:scaleType="center"
-    android:src="@drawable/ic_settings_accent"
+    android:src="@drawable/ic_settings_cog"
     android:contentDescription="@string/settings_button" />
 
diff --git a/res/layout/preference_widget_gear_optional_background.xml b/res/layout/preference_widget_gear_optional_background.xml
index 0c826df177bd9c13dbb4c1498c0c8cec804e79a5..c43dd8dc6834908b78d074d9b253bc40b47916a5 100644
--- a/res/layout/preference_widget_gear_optional_background.xml
+++ b/res/layout/preference_widget_gear_optional_background.xml
@@ -25,7 +25,7 @@
         android:layout_height="match_parent"
         android:layout_gravity="center"
         android:scaleType="center"
-        android:src="@drawable/ic_settings_accent"
+        android:src="@drawable/ic_settings_cog"
         android:contentDescription="@string/settings_button" />
     <!-- Additional overdraw background to stop parent's material ripple -->
     <FrameLayout
@@ -42,7 +42,7 @@
             android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
             android:background="?android:attr/selectableItemBackground"
             android:scaleType="center"
-            android:src="@drawable/ic_settings_accent"
+            android:src="@drawable/ic_settings_cog"
             android:contentDescription="@string/settings_button" />
     </FrameLayout>
 </FrameLayout>
diff --git a/res/layout/preference_widget_seekbar_settings.xml b/res/layout/preference_widget_seekbar_settings.xml
index 9893a1bdf22c0a7dc38806c8ab88231f68b7c305..ace6fc13eb0eda0c6021eacfc95f4864951fcb1f 100644
--- a/res/layout/preference_widget_seekbar_settings.xml
+++ b/res/layout/preference_widget_seekbar_settings.xml
@@ -36,7 +36,7 @@
         android:paddingEnd="8dp"
         android:singleLine="true"
         android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Subhead"
-        android:textColor="?android:attr/textColorPrimary" />
+        android:textColor="@color/color_default_primary_text" />
 
     <TextView
         android:id="@android:id/summary"
@@ -48,7 +48,7 @@
         android:paddingStart="56dp"
         android:paddingEnd="8dp"
         android:textAppearance="?android:attr/textAppearanceListItemSecondary"
-        android:textColor="?android:attr/textColorSecondary" />
+        android:textColor="@color/color_default_secondary_text" />
 
     <com.android.settings.widget.DefaultIndicatorSeekBar
         android:id="@*android:id/seekbar"
diff --git a/res/layout/preference_widget_summary.xml b/res/layout/preference_widget_summary.xml
index fae50273053a183fccabd67dcd025a244e7bb907..b88760139f55d187ea4611e29329df7b0d644f88 100644
--- a/res/layout/preference_widget_summary.xml
+++ b/res/layout/preference_widget_summary.xml
@@ -22,4 +22,4 @@
     android:gravity="center_vertical|end"
     android:textAlignment="viewEnd"
     android:textAppearance="?android:attr/textAppearanceSmall"
-    android:textColor="?android:attr/textColorSecondary" />
+    android:textColor="@color/color_default_secondary_text" />
diff --git a/res/layout/print_job_summary.xml b/res/layout/print_job_summary.xml
index 5e29a9c37b95914a58b8f512aedc522f64df236f..710831bb8e9b62f1e7aa4e366d3ae019061914d0 100644
--- a/res/layout/print_job_summary.xml
+++ b/res/layout/print_job_summary.xml
@@ -37,7 +37,7 @@
         android:layout_marginTop="6dip"
         android:layout_marginBottom="6dip"
         android:textAppearance="?android:attr/textAppearanceSmall"
-        android:textColor="?android:attr/textColorSecondary">
+        android:textColor="@color/color_default_secondary_text">
     </TextView>
 
 </LinearLayout>
diff --git a/res/layout/printer_dropdown_item.xml b/res/layout/printer_dropdown_item.xml
index 2e793b3cdb481a7a9fffd27bce2b386325c15c3c..83f9100e1eb70e925dd8d257d42ac637987db709 100644
--- a/res/layout/printer_dropdown_item.xml
+++ b/res/layout/printer_dropdown_item.xml
@@ -56,7 +56,7 @@
             android:layout_height="wrap_content"
             android:layout_below="@id/title"
             android:textAppearance="?android:attr/textAppearanceListItemSecondary"
-            android:textColor="?android:attr/textColorSecondary"
+            android:textColor="@color/color_default_secondary_text"
             android:singleLine="true"
             android:ellipsize="end"
             android:visibility="gone"
diff --git a/res/layout/radio_with_summary.xml b/res/layout/radio_with_summary.xml
index 5b89591a4649da269a2e176aae12e35f1662aed4..b0874c36107eb89b2cff93963717e7bed36023de 100644
--- a/res/layout/radio_with_summary.xml
+++ b/res/layout/radio_with_summary.xml
@@ -42,7 +42,7 @@
         android:paddingBottom="8dp"
         android:paddingStart="52dp"
         android:textAppearance="?android:attr/textAppearanceListItemSecondary"
-        android:textColor="?android:attr/textColorSecondary"
+        android:textColor="@color/color_default_secondary_text"
         android:maxLines="10" />
 
 </com.android.settings.CheckableLinearLayout>
diff --git a/res/layout/restricted_dialog_singlechoice.xml b/res/layout/restricted_dialog_singlechoice.xml
index c378a5d1df4af2e9f591b22f9d0a177b32df7a86..d498e9fc68ea38d24fac99567d57c49c18f1e03a 100644
--- a/res/layout/restricted_dialog_singlechoice.xml
+++ b/res/layout/restricted_dialog_singlechoice.xml
@@ -39,7 +39,7 @@
             android:id="@+id/restricted_lock_icon"
             android:layout_width="@*android:dimen/config_restrictedIconSize"
             android:layout_height="@*android:dimen/config_restrictedIconSize"
-            android:tint="?android:attr/colorAccent"
+            android:tint="@color/color_default_accent"
             android:src="@drawable/ic_info"
             android:layout_marginLeft="@dimen/restricted_icon_padding"
             android:baselineAlignBottom="true"
diff --git a/res/layout/restricted_popup_menu_item.xml b/res/layout/restricted_popup_menu_item.xml
index 2c700f7d6925b996381e4a2b09adfada63b02abe..da6327587ca415a197021f5e580f29b5e2110f57 100644
--- a/res/layout/restricted_popup_menu_item.xml
+++ b/res/layout/restricted_popup_menu_item.xml
@@ -37,7 +37,7 @@
         android:layout_width="@*android:dimen/config_restrictedIconSize"
         android:layout_height="@*android:dimen/config_restrictedIconSize"
         android:scaleType="centerInside"
-        android:tint="?android:attr/colorAccent"
+        android:tint="@color/color_default_accent"
         android:src="@drawable/ic_info"
         android:layout_alignParentRight="true"
         android:visibility="gone" />
diff --git a/res/layout/restricted_preference_user_delete_widget.xml b/res/layout/restricted_preference_user_delete_widget.xml
index 71f1dd7c8bfab82edad9417be0be1a6afa6fbbe4..e5a5d08ea96f2fc9b4502b1aca6b7d4b22720341 100644
--- a/res/layout/restricted_preference_user_delete_widget.xml
+++ b/res/layout/restricted_preference_user_delete_widget.xml
@@ -35,7 +35,7 @@
             android:layout_height="fill_parent"
             android:paddingStart="16dip"
             android:paddingEnd="16dip"
-            android:src="@drawable/ic_settings_accent"
+            android:src="@drawable/ic_settings_cog"
             android:contentDescription="@string/settings_label"
             android:layout_gravity="center"
             android:background="?android:attr/selectableItemBackground" />
diff --git a/res/layout/restricted_radio_with_summary.xml b/res/layout/restricted_radio_with_summary.xml
index 283331bbe3b15eb6df78bc83782afc3aaefe9923..bca999a669b02c81c73d790afd4b77e3ac422521 100644
--- a/res/layout/restricted_radio_with_summary.xml
+++ b/res/layout/restricted_radio_with_summary.xml
@@ -44,7 +44,7 @@
             android:layout_width="@*android:dimen/config_restrictedIconSize"
             android:layout_height="match_parent"
             android:scaleType="centerInside"
-            android:tint="?android:attr/colorAccent"
+            android:tint="@color/color_default_accent"
             android:src="@drawable/ic_info"
             android:layout_marginLeft="@dimen/restricted_icon_padding"
             android:visibility="gone" />
@@ -57,7 +57,7 @@
         android:paddingBottom="8dp"
         android:paddingStart="52dp"
         android:textAppearance="?android:attr/textAppearanceListItemSecondary"
-        android:textColor="?android:attr/textColorSecondary"
+        android:textColor="@color/color_default_secondary_text"
         android:maxLines="10" />
 
 </com.android.settings.CheckableLinearLayout>
diff --git a/res/layout/running_processes_header.xml b/res/layout/running_processes_header.xml
index b2db025fe9d329dd3b5d23c188cce9f41037cf7e..9f0536bcde56c53b0cdb3778d12abec22a112e48 100644
--- a/res/layout/running_processes_header.xml
+++ b/res/layout/running_processes_header.xml
@@ -31,7 +31,7 @@
         android:singleLine="true"
         android:ellipsize="marquee"
         android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Body2"
-        android:textColor="?android:attr/textColorPrimary"
+        android:textColor="@color/color_default_primary_text"
         android:textAlignment="viewStart"
         android:gravity="left|center_vertical"
         android:text="@string/running_processes_header_title" />
@@ -64,7 +64,7 @@
                 android:id="@+id/systemSizePrefix"
                 android:text="@string/running_processes_header_system_prefix"
                 android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Body1"
-                android:textColor="?android:attr/textColorSecondary"
+                android:textColor="@color/color_default_secondary_text"
                 android:layout_height="wrap_content"
                 android:layout_width="wrap_content"
                 android:layout_marginLeft="16dp"
@@ -82,7 +82,7 @@
             <TextView
                 android:id="@+id/systemSize"
                 android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Body1"
-                android:textColor="?android:attr/textColorSecondary"
+                android:textColor="@color/color_default_secondary_text"
                 android:layout_height="wrap_content"
                 android:layout_width="wrap_content"
                 android:maxLines="1" />
@@ -98,7 +98,7 @@
             android:layout_height="16dp"
             android:layout_gravity="center"
             android:scaleType="centerInside"
-            android:src="?android:attr/colorAccent"
+            android:src="@color/color_default_accent"
             android:contentDescription="@null" />
         <LinearLayout
             android:layout_width="match_parent"
@@ -109,7 +109,7 @@
                 android:id="@+id/appsSizePrefix"
                 android:text="@string/running_processes_header_apps_prefix"
                 android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Body1"
-                android:textColor="?android:attr/textColorSecondary"
+                android:textColor="@color/color_default_secondary_text"
                 android:layout_height="wrap_content"
                 android:layout_width="wrap_content"
                 android:layout_marginLeft="16dp"
@@ -127,7 +127,7 @@
             <TextView
                 android:id="@+id/appsSize"
                 android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Body1"
-                android:textColor="?android:attr/textColorSecondary"
+                android:textColor="@color/color_default_secondary_text"
                 android:layout_height="wrap_content"
                 android:layout_width="wrap_content"
                 android:maxLines="1" />
@@ -154,7 +154,7 @@
                 android:id="@+id/freeSizePrefix"
                 android:text="@string/running_processes_header_free_prefix"
                 android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Body1"
-                android:textColor="?android:attr/textColorSecondary"
+                android:textColor="@color/color_default_secondary_text"
                 android:layout_height="wrap_content"
                 android:layout_width="wrap_content"
                 android:layout_marginLeft="16dp"
@@ -172,7 +172,7 @@
             <TextView
                 android:id="@+id/freeSize"
                 android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Body1"
-                android:textColor="?android:attr/textColorSecondary"
+                android:textColor="@color/color_default_secondary_text"
                 android:layout_height="wrap_content"
                 android:layout_width="wrap_content"
                 android:maxLines="1" />
@@ -187,7 +187,7 @@
         android:singleLine="true"
         android:ellipsize="marquee"
         android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Body2"
-        android:textColor="?android:attr/textColorPrimary"
+        android:textColor="@color/color_default_primary_text"
         android:textAlignment="viewStart"
         android:gravity="left|center_vertical"
         android:text="@string/running_processes_header_footer" />
diff --git a/res/layout/running_processes_item.xml b/res/layout/running_processes_item.xml
index 45121ebaa385eb0e348d9834f5ca09cb75dba412..81b6a5be0c5be365b0bad107812e345229ff9c42 100644
--- a/res/layout/running_processes_item.xml
+++ b/res/layout/running_processes_item.xml
@@ -57,7 +57,7 @@
             android:layout_height="wrap_content"
             android:layout_marginStart="8dip"
             android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Body1"
-            android:textColor="?android:attr/textColorSecondary" />
+            android:textColor="@color/color_default_secondary_text" />
 
     </LinearLayout>
 
@@ -71,7 +71,7 @@
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Body1"
-            android:textColor="?android:attr/textColorSecondary"
+            android:textColor="@color/color_default_secondary_text"
             android:textAlignment="viewStart" />
 
         <TextView
@@ -80,7 +80,7 @@
             android:layout_height="wrap_content"
             android:layout_marginStart="8dip"
             android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Body1"
-            android:textColor="?android:attr/textColorSecondary" />
+            android:textColor="@color/color_default_secondary_text" />
 
     </LinearLayout>
 
diff --git a/res/layout/screen_zoom_activity.xml b/res/layout/screen_zoom_activity.xml
index 4cfa7b6ae9806db97137caea00d2e55184fc6770..87661fde3164677d1ee8b096d5e131e7a100fa68 100644
--- a/res/layout/screen_zoom_activity.xml
+++ b/res/layout/screen_zoom_activity.xml
@@ -62,8 +62,6 @@
                     android:layout_height="48dp"
                     android:background="?android:attr/selectableItemBackgroundBorderless"
                     android:src="@drawable/ic_remove_24dp"
-                    android:tint="?android:attr/textColorPrimary"
-                    android:tintMode="src_in"
                     android:scaleType="center"
                     android:focusable="true"
                     android:contentDescription="@string/screen_zoom_make_smaller_desc" />
@@ -81,8 +79,6 @@
                     android:layout_height="48dp"
                     android:background="?android:attr/selectableItemBackgroundBorderless"
                     android:src="@drawable/ic_add_24dp"
-                    android:tint="?android:attr/textColorPrimary"
-                    android:tintMode="src_in"
                     android:scaleType="center"
                     android:focusable="true"
                     android:contentDescription="@string/screen_zoom_make_larger_desc" />
diff --git a/res/layout/screen_zoom_preview_settings.xml b/res/layout/screen_zoom_preview_settings.xml
index 3401fcf19710fccdadfe9d3ba6684d143e9947d0..0a4514bcf9eedc76094b531054f544e27ad41b9a 100644
--- a/res/layout/screen_zoom_preview_settings.xml
+++ b/res/layout/screen_zoom_preview_settings.xml
@@ -43,7 +43,7 @@
                     android:layout_width="48dp"
                     android:layout_height="48dp"
                     android:src="@drawable/ic_settings_wireless"
-                    android:tint="?android:attr/colorAccent"
+                    android:tint="@color/color_default_accent"
                     android:scaleType="center" />
 
                 <LinearLayout
@@ -58,7 +58,7 @@
                         android:layout_height="wrap_content"
                         android:text="@string/wifi_settings"
                         android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Subhead"
-                        android:textColor="?android:attr/textColorPrimary" />
+                        android:textColor="@color/color_default_primary_text" />
 
 
                     <TextView
@@ -66,7 +66,7 @@
                         android:layout_height="wrap_content"
                         android:text="@string/wifi_display_status_not_available"
                         android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Body1"
-                        android:textColor="?android:attr/textColorSecondary" />
+                        android:textColor="@color/color_default_secondary_text" />
                 </LinearLayout>
             </LinearLayout>
 
@@ -82,7 +82,7 @@
                     android:layout_width="48dp"
                     android:layout_height="48dp"
                     android:src="@drawable/ic_settings_data_usage"
-                    android:tint="?android:attr/colorAccent"
+                    android:tint="@color/color_default_accent"
                     android:scaleType="center" />
 
                 <LinearLayout
@@ -97,14 +97,14 @@
                         android:layout_height="wrap_content"
                         android:text="@string/data_usage_summary_title"
                         android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Subhead"
-                        android:textColor="?android:attr/textColorPrimary" />
+                        android:textColor="@color/color_default_primary_text" />
 
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="@string/no_data_usage"
                         android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Body1"
-                        android:textColor="?android:attr/textColorSecondary" />
+                        android:textColor="@color/color_default_secondary_text" />
                 </LinearLayout>
             </LinearLayout>
 
@@ -120,7 +120,7 @@
                     android:layout_width="48dp"
                     android:layout_height="48dp"
                     android:src="@drawable/ic_settings_display"
-                    android:tint="?android:attr/colorAccent"
+                    android:tint="@color/color_default_accent"
                     android:scaleType="center" />
 
                 <LinearLayout
@@ -135,14 +135,14 @@
                         android:layout_height="wrap_content"
                         android:text="@string/display_settings_title"
                         android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Subhead"
-                        android:textColor="?android:attr/textColorPrimary" />
+                        android:textColor="@color/color_default_primary_text" />
 
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="@string/display_summary_example"
                         android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Body1"
-                        android:textColor="?android:attr/textColorSecondary" />
+                        android:textColor="@color/color_default_secondary_text" />
                 </LinearLayout>
             </LinearLayout>
 
@@ -158,7 +158,7 @@
                     android:layout_width="48dp"
                     android:layout_height="48dp"
                     android:src="@drawable/ic_settings_sound"
-                    android:tint="?android:attr/colorAccent"
+                    android:tint="@color/color_default_accent"
                     android:scaleType="center" />
 
                 <LinearLayout
@@ -173,14 +173,14 @@
                         android:layout_height="wrap_content"
                         android:text="@string/sound_settings"
                         android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Subhead"
-                        android:textColor="?android:attr/textColorPrimary" />
+                        android:textColor="@color/color_default_primary_text" />
 
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="@string/sound_settings_example_summary"
                         android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Body1"
-                        android:textColor="?android:attr/textColorSecondary" />
+                        android:textColor="@color/color_default_secondary_text" />
                 </LinearLayout>
             </LinearLayout>
 
@@ -196,7 +196,7 @@
                     android:layout_width="48dp"
                     android:layout_height="48dp"
                     android:src="@drawable/ic_settings_applications"
-                    android:tint="?android:attr/colorAccent"
+                    android:tint="@color/color_default_accent"
                     android:scaleType="center" />
 
                 <LinearLayout
@@ -211,14 +211,14 @@
                         android:layout_height="wrap_content"
                         android:text="@string/applications_settings"
                         android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Subhead"
-                        android:textColor="?android:attr/textColorPrimary" />
+                        android:textColor="@color/color_default_primary_text" />
 
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="@string/apps_summary_example"
                         android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Body1"
-                        android:textColor="?android:attr/textColorSecondary" />
+                        android:textColor="@color/color_default_secondary_text" />
                 </LinearLayout>
             </LinearLayout>
         </LinearLayout>
diff --git a/res/layout/search_bar.xml b/res/layout/search_bar.xml
index 420c965a19b466c52cc3f6bec1299122b05d3244..69a5e2827a08ecb0c567819f6f8c27fd9d869bf6 100644
--- a/res/layout/search_bar.xml
+++ b/res/layout/search_bar.xml
@@ -30,7 +30,7 @@
         android:layout_marginStart="-2dp"
         android:background="@drawable/search_bar_selected_background"
         android:contentInsetStartWithNavigation="@dimen/search_bar_content_inset"
-        android:navigationIcon="@drawable/ic_homepage_search">
+        android:navigationIcon="@drawable/ic_search">
         <TextView
             android:id="@+id/search_action_bar_title"
             style="@style/TextAppearance.SearchBar"
diff --git a/res/layout/select_account_list_item.xml b/res/layout/select_account_list_item.xml
index 3587e55b0b6fe8e787836d64e5c83f47f0ed7bac..b0d7528452662454655029834c35505c96e0a505 100644
--- a/res/layout/select_account_list_item.xml
+++ b/res/layout/select_account_list_item.xml
@@ -51,7 +51,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_below="@id/title"
-            android:textColor="?android:attr/textColorSecondary"
+            android:textColor="@color/color_default_secondary_text"
             android:layout_alignStart="@id/title" />
     </LinearLayout>
 </LinearLayout>
diff --git a/res/layout/settings_summary_preference.xml b/res/layout/settings_summary_preference.xml
index e76190fd2189fe8290879387edad83d27557f405..d222bfed704681275c0a8876c3210c1897ddac7f 100644
--- a/res/layout/settings_summary_preference.xml
+++ b/res/layout/settings_summary_preference.xml
@@ -30,7 +30,7 @@
         android:layout_marginBottom="5dp"
         android:fontFamily="@*android:string/config_headlineFontFamily"
         android:paddingTop="0dp"
-        android:textColor="?android:attr/colorAccent"
+        android:textColor="@color/color_default_accent"
         android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Display1"
         />
 
@@ -38,7 +38,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:textAppearance="?android:attr/textAppearanceListItemSecondary"
-        android:textColor="?android:attr/textColorSecondary"
+        android:textColor="@color/color_default_secondary_text"
         android:paddingBottom="5dp"
         android:maxLines="10" />
 
@@ -60,7 +60,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:textAppearance="?android:attr/textAppearanceListItemSecondary"
-            android:textColor="?android:attr/textColorSecondary" />
+            android:textColor="@color/color_default_secondary_text" />
 
         <Space
             android:layout_width="0dp"
@@ -71,7 +71,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:textAppearance="?android:attr/textAppearanceListItemSecondary"
-            android:textColor="?android:attr/textColorSecondary" />
+            android:textColor="@color/color_default_secondary_text" />
 
     </LinearLayout>
 
diff --git a/res/layout/sliding_tab_indicator_view.xml b/res/layout/sliding_tab_indicator_view.xml
index b594c8b2dcf4ae651bd8fe0b3e658c6bfb730c43..3a62c0c8469ffb744f86d8f62e7edf50db45a804 100644
--- a/res/layout/sliding_tab_indicator_view.xml
+++ b/res/layout/sliding_tab_indicator_view.xml
@@ -19,5 +19,5 @@
     android:id="@+id/sliding_tab_selected_indicator"
     android:layout_width="wrap_content"
     android:layout_height="@dimen/pager_tabs_selected_indicator_height"
-    android:background="?android:attr/colorAccent"
+    android:background="@color/color_default_accent"
     android:theme="@*android:style/ThemeOverlay.DeviceDefault.Accent" />
diff --git a/res/layout/spinner_dropdown_restricted_item.xml b/res/layout/spinner_dropdown_restricted_item.xml
index 2faeb7e79806f858b8af67df394a6baf1aa171e5..e7de8442857af56e148c8f5f7b94bd19984b82a1 100644
--- a/res/layout/spinner_dropdown_restricted_item.xml
+++ b/res/layout/spinner_dropdown_restricted_item.xml
@@ -28,7 +28,7 @@
     <ImageView android:id="@+id/restricted_icon"
             android:layout_width="@*android:dimen/config_restrictedIconSize"
             android:layout_height="@*android:dimen/config_restrictedIconSize"
-            android:tint="?android:attr/colorAccent"
+            android:tint="@color/color_default_accent"
             android:src="@drawable/ic_info"
             android:baselineAlignBottom="true"
             android:layout_marginEnd="@dimen/restricted_icon_padding"
diff --git a/res/layout/storage_internal_forget.xml b/res/layout/storage_internal_forget.xml
index a2b646e2ca33ab01ea61c438f0119102e5e0cfac..fcd1d106a902b50795b018221854c9009523e832 100644
--- a/res/layout/storage_internal_forget.xml
+++ b/res/layout/storage_internal_forget.xml
@@ -34,7 +34,7 @@
             android:paddingEnd="@dimen/sud_layout_margin_sides"
             android:lineSpacingExtra="@dimen/sud_description_line_spacing_extra"
             android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Body1"
-            android:textColor="?android:attr/textColorPrimary" />
+            android:textColor="@color/color_default_primary_text" />
     </ScrollView>
 
     <FrameLayout
diff --git a/res/layout/storage_internal_format.xml b/res/layout/storage_internal_format.xml
index 08434b0beedcb1ecbaf06994cf398d0f4b41cec6..e85132c3f7825cd3f574109c883407d66a83b560 100644
--- a/res/layout/storage_internal_format.xml
+++ b/res/layout/storage_internal_format.xml
@@ -34,7 +34,7 @@
             android:paddingEnd="@dimen/sud_layout_margin_sides"
             android:lineSpacingExtra="@dimen/sud_description_line_spacing_extra"
             android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Body1"
-            android:textColor="?android:attr/textColorPrimary" />
+            android:textColor="@color/color_default_primary_text" />
     </ScrollView>
 
     <FrameLayout
diff --git a/res/layout/storage_internal_unmount.xml b/res/layout/storage_internal_unmount.xml
index 2ae489c21c8ba0ba3ee4f6207c6e14fc9ecca493..878d21264984a9612d077d7210c85334ac9960ed 100644
--- a/res/layout/storage_internal_unmount.xml
+++ b/res/layout/storage_internal_unmount.xml
@@ -34,7 +34,7 @@
             android:paddingEnd="@dimen/sud_layout_margin_sides"
             android:lineSpacingExtra="@dimen/sud_description_line_spacing_extra"
             android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Body1"
-            android:textColor="?android:attr/textColorPrimary" />
+            android:textColor="@color/color_default_primary_text" />
     </ScrollView>
 
     <FrameLayout
diff --git a/res/layout/storage_item.xml b/res/layout/storage_item.xml
index cefb399ec2b4620a426cfbf9b34bc8eab22705b4..00be61953f2319e194a863e054f682d79dec2d5a 100644
--- a/res/layout/storage_item.xml
+++ b/res/layout/storage_item.xml
@@ -72,7 +72,7 @@
                 android:layout_height="wrap_content"
                 android:textAlignment="viewStart"
                 android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Body1"
-                android:textColor="?android:attr/textColorSecondary"
+                android:textColor="@color/color_default_secondary_text"
                 android:maxLines="10"
                 android:layout_alignParentEnd="true"/>
 
diff --git a/res/layout/storage_summary.xml b/res/layout/storage_summary.xml
index ce03b546a424f4c0137fe4886febb02d5cadd820..3327b438f68f96d6f306cd09e3db97cff4fd43ef 100644
--- a/res/layout/storage_summary.xml
+++ b/res/layout/storage_summary.xml
@@ -36,7 +36,7 @@
         android:singleLine="true"
         android:textAlignment="viewStart"
         android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Subhead"
-        android:textColor="?android:attr/colorAccent"
+        android:textColor="@color/color_default_accent"
         android:textSize="36sp"/>
 
     <TextView
diff --git a/res/layout/storage_volume.xml b/res/layout/storage_volume.xml
index ca368b9488dc344a8b45f8e4333a2298cd0ee68d..023bb4c4a944e246d5ee70b729260f67fa372fb0 100644
--- a/res/layout/storage_volume.xml
+++ b/res/layout/storage_volume.xml
@@ -61,7 +61,7 @@
             android:layout_below="@android:id/title"
             android:layout_alignStart="@android:id/title"
             android:textAppearance="?android:attr/textAppearanceListItemSecondary"
-            android:textColor="?android:attr/textColorSecondary"
+            android:textColor="@color/color_default_secondary_text"
             android:maxLines="10" />
 
         <ProgressBar
diff --git a/res/layout/storage_wizard_checklist.xml b/res/layout/storage_wizard_checklist.xml
index 842cbdb2d36c80ee5e0538ba868270ef7c94e424..c2dad22fdca6e9061a557e2134a2f43b0eba7ed4 100644
--- a/res/layout/storage_wizard_checklist.xml
+++ b/res/layout/storage_wizard_checklist.xml
@@ -23,7 +23,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/sud_description_margin_top"
-        android:textColor="?android:attr/textColorPrimary"
+        android:textColor="@color/color_default_primary_text"
         android:text="@string/storage_wizard_migrate_v2_checklist" />
     <TextView
         android:id="@+id/storage_wizard_migrate_v2_checklist_media"
@@ -31,27 +31,24 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/sud_description_margin_top"
         android:layout_marginBottom="@dimen/sud_description_margin_bottom"
-        android:textColor="?android:attr/textColorPrimary"
+        android:textColor="@color/color_default_primary_text"
         android:text="@string/storage_wizard_migrate_v2_checklist_media"
         android:drawableStart="@drawable/ic_sd_card"
-        android:drawableTint="?android:attr/textColorSecondary"
         android:drawablePadding="@dimen/sud_description_margin_bottom" />
     <TextView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="@dimen/sud_description_margin_bottom"
-        android:textColor="?android:attr/textColorPrimary"
+        android:textColor="@color/color_default_primary_text"
         android:text="@string/storage_wizard_migrate_v2_checklist_apps"
         android:drawableStart="@drawable/ic_apps_alt"
-        android:drawableTint="?android:attr/textColorSecondary"
         android:drawablePadding="@dimen/sud_description_margin_bottom" />
     <TextView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="@dimen/sud_description_margin_bottom"
-        android:textColor="?android:attr/textColorPrimary"
+        android:textColor="@color/color_default_primary_text"
         android:text="@string/storage_wizard_migrate_v2_checklist_battery"
         android:drawableStart="@drawable/ic_battery_charging_full"
-        android:drawableTint="?android:attr/textColorSecondary"
         android:drawablePadding="@dimen/sud_description_margin_bottom" />
 </LinearLayout>
diff --git a/res/layout/storage_wizard_generic.xml b/res/layout/storage_wizard_generic.xml
index e7881d3be87ed008777ffe1462c57dfdfa923be9..55f504acc19c82faae57ea5beb22fdf22aa38424 100644
--- a/res/layout/storage_wizard_generic.xml
+++ b/res/layout/storage_wizard_generic.xml
@@ -32,7 +32,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/sud_description_margin_top"
             android:lineSpacingExtra="@dimen/sud_description_line_spacing_extra"
-            android:textColor="?android:attr/textColorPrimary" />
+            android:textColor="@color/color_default_primary_text" />
 
         <FrameLayout
             android:id="@+id/storage_wizard_aux"
diff --git a/res/layout/storage_wizard_init.xml b/res/layout/storage_wizard_init.xml
index 8d9870f1cec19dbc8d87c2b872eeff3fa1911e19..1c6b6d488ae6b37248744d9b605a70888922f455 100644
--- a/res/layout/storage_wizard_init.xml
+++ b/res/layout/storage_wizard_init.xml
@@ -53,7 +53,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginBottom="@dimen/sud_description_margin_bottom"
-                    android:textColor="?android:attr/textColorSecondary"
+                    android:textColor="@color/color_default_secondary_text"
                     android:text="@string/storage_wizard_init_v2_internal_summary" />
                 <Button
                     android:id="@+id/storage_wizard_init_internal"
@@ -75,22 +75,22 @@
                 android:layout_width="0dp"
                 android:layout_height="1dp"
                 android:layout_weight="1"
-                android:background="@android:color/black"
-                android:backgroundTint="?android:attr/textColorTertiary" />
+                android:background="@color/color_default_primary_text"
+                android:backgroundTint="@color/color_default_secondary_text" />
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="8dp"
                 android:layout_marginEnd="8dp"
                 android:text="@string/storage_wizard_init_v2_or"
-                android:textColor="?android:attr/textColorTertiary"
+                android:textColor="@color/color_default_secondary_text"
                 android:textAllCaps="true" />
             <View
                 android:layout_width="0dp"
                 android:layout_height="1dp"
                 android:layout_weight="1"
                 android:background="@android:color/black"
-                android:backgroundTint="?android:attr/textColorTertiary" />
+                android:backgroundTint="@color/color_default_secondary_text" />
         </LinearLayout>
 
         <LinearLayout
@@ -120,7 +120,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginBottom="@dimen/sud_description_margin_bottom"
-                    android:textColor="?android:attr/textColorSecondary"
+                    android:textColor="@color/color_default_secondary_text"
                     android:text="@string/storage_wizard_init_v2_external_summary" />
                 <Button
                     android:id="@+id/storage_wizard_init_external"
diff --git a/res/layout/storage_wizard_progress.xml b/res/layout/storage_wizard_progress.xml
index 577ec3cbfc8a7f64b9ea3dde0be062d006846ecc..e7bb15ebc9af0914248242de539680508a4ecad3 100644
--- a/res/layout/storage_wizard_progress.xml
+++ b/res/layout/storage_wizard_progress.xml
@@ -38,7 +38,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:lineSpacingExtra="@dimen/sud_description_line_spacing_extra"
-            android:textColor="?android:attr/textColorSecondary" />
+            android:textColor="@color/color_default_secondary_text" />
 
         <TextView
             android:id="@+id/storage_wizard_body"
@@ -46,7 +46,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/sud_description_margin_top"
             android:lineSpacingExtra="@dimen/sud_description_line_spacing_extra"
-            android:textColor="?android:attr/textColorPrimary"
+            android:textColor="@color/color_default_primary_text"
             android:visibility="gone" />
 
         <FrameLayout
diff --git a/res/layout/switch_bar.xml b/res/layout/switch_bar.xml
index c0867dd3bfbe2d80a2d2df924da23a9ec04b0704..830c22489ae666ce166fcae29ad15a85792ce045 100644
--- a/res/layout/switch_bar.xml
+++ b/res/layout/switch_bar.xml
@@ -35,7 +35,7 @@
         android:id="@+id/restricted_icon"
         android:layout_width="@dimen/restricted_icon_size"
         android:layout_height="@dimen/restricted_icon_size"
-        android:tint="?android:attr/colorAccent"
+        android:tint="@color/color_default_accent"
         android:theme="@android:style/Theme.Material"
         android:layout_gravity="center_vertical"
         android:layout_marginEnd="@dimen/restricted_icon_margin_end"
diff --git a/res/layout/tall_preference_category.xml b/res/layout/tall_preference_category.xml
index 7eefdab9ffed7c2b971f3228346a9277e8d006e7..25aff1cf3c5821baece4db241b7efd4a4664fe80 100644
--- a/res/layout/tall_preference_category.xml
+++ b/res/layout/tall_preference_category.xml
@@ -22,7 +22,7 @@
     android:layout_height="wrap_content"
     android:layout_marginBottom="16dip"
     android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Body2"
-    android:textColor="?android:attr/colorAccent"
+    android:textColor="@color/color_default_accent"
     android:paddingStart="?android:attr/listPreferredItemPaddingStart"
     android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
     android:paddingBottom="8dp"
diff --git a/res/layout/time_zone_list_item.xml b/res/layout/time_zone_list_item.xml
index 471c9d85a505dd8740a70a589b26a0df38e7c033..3689c1a7a395e98d62fc270f3efcddcbb6cc12fc 100644
--- a/res/layout/time_zone_list_item.xml
+++ b/res/layout/time_zone_list_item.xml
@@ -42,7 +42,7 @@
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:textAppearance="?android:attr/textAppearanceListItemSecondary"
-            android:textColor="?android:attr/textColorSecondary" />
+            android:textColor="@color/color_default_secondary_text" />
 
         <TextView
             android:id="@+id/tz_item_time"
@@ -50,7 +50,7 @@
             android:layout_height="wrap_content"
             android:textAlignment="viewEnd"
             android:textAppearance="?android:attr/textAppearanceListItemSecondary"
-            android:textColor="?android:attr/textColorSecondary" />
+            android:textColor="@color/color_default_secondary_text" />
     </LinearLayout>
 
     <TextView
@@ -58,5 +58,5 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:textAppearance="?android:attr/textAppearanceListItemSecondary"
-        android:textColor="?android:attr/textColorSecondary" />
+        android:textColor="@color/color_default_secondary_text" />
 </LinearLayout>
\ No newline at end of file
diff --git a/res/layout/time_zone_search_header.xml b/res/layout/time_zone_search_header.xml
index 0c867f560581d077242c2d9a7626bc8f50ca75de..a2acd2fa415c49a4ca1fd3d6cb78aa10e6deafb0 100644
--- a/res/layout/time_zone_search_header.xml
+++ b/res/layout/time_zone_search_header.xml
@@ -24,5 +24,5 @@ instead of an ImageView -->
           android:layout_marginBottom="16dp"
           android:layout_marginTop="16dp"
           android:textAppearance="@style/TextAppearance.CategoryTitle"
-          android:textColor="?android:attr/colorAccent"
+          android:textColor="@color/color_default_accent"
           android:paddingStart="@dimen/preference_no_icon_padding_start"/>
diff --git a/res/layout/time_zone_search_item.xml b/res/layout/time_zone_search_item.xml
index 8d059a8a205f6f84b33fac4041c6243e86c6b0d6..a874249d85f119fc63df3da6f44d1a0723f454f1 100644
--- a/res/layout/time_zone_search_item.xml
+++ b/res/layout/time_zone_search_item.xml
@@ -47,7 +47,7 @@ instead of an ImageView -->
             android:singleLine="true"
             android:contentDescription=""
             android:textAppearance="?android:attr/textAppearanceLarge"
-            android:textColor="?android:attr/textColorPrimary"
+            android:textColor="@color/color_default_primary_text"
             android:importantForAccessibility="no"/>
     </LinearLayout>
 
@@ -78,7 +78,7 @@ instead of an ImageView -->
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:textAppearance="?android:attr/textAppearanceSmall"
-                android:textColor="?android:attr/textColorSecondary"
+                android:textColor="@color/color_default_secondary_text"
                 android:layout_alignParentEnd="true"/>
 
             <!-- Use layout_alignParentStart and layout_toStartOf to make the TextView multi-lines
@@ -88,7 +88,7 @@ instead of an ImageView -->
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:textAppearance="?android:attr/textAppearanceSmall"
-                android:textColor="?android:attr/textColorSecondary"
+                android:textColor="@color/color_default_secondary_text"
                 android:maxLines="10"
                 android:layout_alignParentStart="true"
                 android:layout_toStartOf="@+id/current_time"/>
diff --git a/res/layout/trust_agent_item.xml b/res/layout/trust_agent_item.xml
index 3555775e08671c360664119e903d9f3f17b3317c..b83cdc2b6e05f3069369b3217fea34afdd31eee1 100644
--- a/res/layout/trust_agent_item.xml
+++ b/res/layout/trust_agent_item.xml
@@ -69,7 +69,7 @@
                     android:visibility="gone"
                     android:textAppearance="?android:attr/textAppearanceSmall"
                     android:textSize="13sp"
-                    android:textColor="?android:attr/textColorSecondary"
+                    android:textColor="@color/color_default_secondary_text"
                     android:focusable="false"
                     android:maxLines="4"/>
 
diff --git a/res/layout/trusted_credential.xml b/res/layout/trusted_credential.xml
index acef60bb5ecbf901e97d85d7e4fd5896cdecf8b7..4bf7a55dbcae9b7fadd075304dad5e0c8f8869e3 100644
--- a/res/layout/trusted_credential.xml
+++ b/res/layout/trusted_credential.xml
@@ -44,7 +44,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:textAppearance="?android:attr/textAppearanceSmall"
-            android:textColor="?android:attr/textColorSecondary"
+            android:textColor="@color/color_default_secondary_text"
             android:textAlignment="viewStart"/>
     </LinearLayout>
 
diff --git a/res/layout/two_line_list_item.xml b/res/layout/two_line_list_item.xml
index 0567bbc23b35b9fb2d84984fc21da474bfe16011..83312ba8a5c2d97da8ac79e26d4396944e0c01d1 100644
--- a/res/layout/two_line_list_item.xml
+++ b/res/layout/two_line_list_item.xml
@@ -37,6 +37,6 @@
         android:layout_below="@id/title"
         android:layout_alignStart="@id/title"
         android:textAppearance="?android:attr/textAppearanceSmall"
-        android:textColor="?android:attr/textColorSecondary"
+        android:textColor="@color/color_default_secondary_text"
         android:maxLines="4" />
 </RelativeLayout>
diff --git a/res/layout/user_credential.xml b/res/layout/user_credential.xml
index f441bdac825604d34e86065aff0827b8a8978c31..425879420a3a4713081c0856e0994fe024807bbf 100644
--- a/res/layout/user_credential.xml
+++ b/res/layout/user_credential.xml
@@ -30,7 +30,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:textAppearance="?android:attr/textAppearanceSmall"
-        android:textColor="?android:attr/textColorSecondary" />
+        android:textColor="@color/color_default_secondary_text" />
 
     <LinearLayout
         android:id="@+id/contents"
@@ -45,7 +45,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:textAppearance="?android:attr/textAppearanceSmall"
-            android:textColor="?android:attr/textColorSecondary"/>
+            android:textColor="@color/color_default_secondary_text"/>
 
         <TextView
             android:id="@+id/contents_userkey"
diff --git a/res/layout/user_dictionary_item.xml b/res/layout/user_dictionary_item.xml
index 9ccebe7d6b4ffcfd36c86889efb40e9cb1d9d8d1..6cf5e433ebcbef40644cf9ab7993ba2aca5c59b6 100644
--- a/res/layout/user_dictionary_item.xml
+++ b/res/layout/user_dictionary_item.xml
@@ -44,7 +44,7 @@
               android:layout_below="@android:id/text1"
               android:layout_alignStart="@android:id/text1"
               android:textAppearance="?android:attr/textAppearanceSmall"
-              android:textColor="?android:attr/textColorSecondary"
+              android:textColor="@color/color_default_secondary_text"
               android:maxLines="1" />
 
   </RelativeLayout>
diff --git a/res/layout/user_info_header.xml b/res/layout/user_info_header.xml
index 5135e0e2d27e6a823e3c40c889858f858cc83909..3de4d6cc4b8406a8e411f8502a8005badf216c23 100644
--- a/res/layout/user_info_header.xml
+++ b/res/layout/user_info_header.xml
@@ -72,7 +72,7 @@
                 android:paddingBottom="3dip"
                 android:textAppearance="?android:attr/textAppearanceSmall"
                 android:textSize="13sp"
-                android:textColor="?android:attr/textColorSecondary"
+                android:textColor="@color/color_default_secondary_text"
                 android:focusable="false"
                 android:text="@string/user_summary_restricted_profile"
                 android:maxLines="4" />
diff --git a/res/layout/wfc_simple_disclaimer_item.xml b/res/layout/wfc_simple_disclaimer_item.xml
index ee43182a84173898f38e0223726e28fa2b7fa107..d76f0388addc6876c83cd95e54f21305d2b8fc03 100644
--- a/res/layout/wfc_simple_disclaimer_item.xml
+++ b/res/layout/wfc_simple_disclaimer_item.xml
@@ -31,6 +31,6 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:textAppearance="@android:style/TextAppearance.Material.Body1"
-        android:textColor="?android:attr/textColorSecondary"
+        android:textColor="@color/color_default_secondary_text"
         android:layout_below="@id/disclaimer_title" />
 </RelativeLayout>
\ No newline at end of file
diff --git a/res/layout/widget_text_views.xml b/res/layout/widget_text_views.xml
index 9f0506e3e8c905bb9fbdaa49cdde86ee5883950c..ffbd169a26fa61a5ccf52aac92843bf15c6bcf98 100644
--- a/res/layout/widget_text_views.xml
+++ b/res/layout/widget_text_views.xml
@@ -27,7 +27,7 @@
         android:layout_weight="1"
         android:layout_gravity="fill_horizontal|top"
         android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Body1"
-        android:textColor="?android:attr/textColorSecondary"
+        android:textColor="@color/color_default_secondary_text"
         android:textAlignment="viewStart"
         android:singleLine="true"
         android:ellipsize="marquee"
@@ -41,7 +41,7 @@
         android:layout_marginStart="8dip"
         android:layout_gravity="fill_horizontal|top"
         android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Body1"
-        android:textColor="?android:attr/textColorSecondary"
+        android:textColor="@color/color_default_secondary_text"
         android:textAlignment="viewEnd"
         android:singleLine="true"
         android:ellipsize="marquee"
diff --git a/res/layout/wifi_display_preference.xml b/res/layout/wifi_display_preference.xml
index 4532441bb8e16906f9f684c74914a70b8a28dd03..0f7b1b41ee35f0deb44aad1e708522caa3800a17 100644
--- a/res/layout/wifi_display_preference.xml
+++ b/res/layout/wifi_display_preference.xml
@@ -37,7 +37,7 @@
         android:layout_gravity="center_vertical"
         android:padding="8dip"
         android:background="?android:attr/selectableItemBackground"
-        android:src="@drawable/ic_settings_accent"
+        android:src="@drawable/ic_settings_cog"
         android:contentDescription="@string/wifi_display_details" />
 
 </LinearLayout>
diff --git a/res/layout/wifi_dpp_qrcode_generator_fragment.xml b/res/layout/wifi_dpp_qrcode_generator_fragment.xml
index 31bf7cc4a0e0cfee412ef3f789e4811e92bd38eb..7f31e698ed2f812db299ba14de46a8524d72197e 100644
--- a/res/layout/wifi_dpp_qrcode_generator_fragment.xml
+++ b/res/layout/wifi_dpp_qrcode_generator_fragment.xml
@@ -47,7 +47,7 @@
                 android:layout_marginTop="16dp"
                 android:textAlignment="center"
                 android:textAppearance="@android:style/TextAppearance.Material.Body1"
-                android:textColor="?android:attr/textColorSecondary"/>
+                android:textColor="@color/color_default_secondary_text"/>
         </LinearLayout>
 
     </ScrollView>
diff --git a/res/layout/zen_rule_type.xml b/res/layout/zen_rule_type.xml
index bd50273a610f36696d275f3b15e499893042a8db..dbecb575919656dc1d86cf4f3075c40f3ae9526f 100644
--- a/res/layout/zen_rule_type.xml
+++ b/res/layout/zen_rule_type.xml
@@ -51,7 +51,7 @@
                   android:layout_below="@id/title"
                   android:layout_alignStart="@id/title"
                   android:textSize="14sp"
-                  android:textColor="?android:attr/textColorSecondary"
+                  android:textColor="@color/color_default_secondary_text"
                   android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Subhead"
                   android:maxLines="2"
                   android:visibility="gone" />
diff --git a/res/menu/time_zone_base_search_menu.xml b/res/menu/time_zone_base_search_menu.xml
index 39261e17d04d06c937d9a427ca753b52e89058c1..36aa61201469fc6a9fb2c6cef6a3f28526cb5a99 100644
--- a/res/menu/time_zone_base_search_menu.xml
+++ b/res/menu/time_zone_base_search_menu.xml
@@ -19,7 +19,7 @@
     <item
         android:id="@+id/time_zone_search_menu"
         android:title="@string/search_settings"
-        android:icon="@drawable/ic_homepage_search"
+        android:icon="@drawable/ic_search"
         android:showAsAction="always|collapseActionView"
         android:actionViewClass="android.widget.SearchView" />
 
diff --git a/res/values-night/colors.xml b/res/values-night/colors.xml
new file mode 100644
index 0000000000000000000000000000000000000000..ae0bd30c2f3feb9fa68842554ad72445cbbd1a30
--- /dev/null
+++ b/res/values-night/colors.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2007 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.
+-->
+
+<resources>
+    <color name="contextual_card_stroke_color">#1fffffff</color>
+    <color name="default_icon_color">#DEFFFFFF</color>
+</resources>
\ No newline at end of file
diff --git a/res/values-night/styles.xml b/res/values-night/styles.xml
index 62cebfeb3cde7a1370d0541f0666afce69322fa8..35eed69230965d078d5abc99b2e2cde276cc8049 100644
--- a/res/values-night/styles.xml
+++ b/res/values-night/styles.xml
@@ -19,6 +19,10 @@
 
 <style name="Widget.ActionBar.Base" parent="@android:style/Widget.DeviceDefault.ActionBar.Solid">
   <item name="android:background">@color/color_default_primary_dark</item>
+  <item name="android:colorControlNormal">@color/default_icon_color</item>
+  <item name="colorControlNormal">@color/default_icon_color</item>
+  <item name="android:colorAccent">@color/color_default_accent</item>
+  <item name="colorAccent">@color/color_default_accent</item>
 </style>
 
 </resources>
\ No newline at end of file
diff --git a/res/values/colors.xml b/res/values/colors.xml
index fdf28c18ecbfa6fef508518f8f19e3de21f81cbe..298c743cd55bcf291e37f2aff9d97e991d43fa9d 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -34,10 +34,10 @@
     <color name="color_default_gray2">@lineageos.platform:color/color_default_gray2</color>
     <color name="color_default_view_on_accent">@lineageos.platform:color/color_default_view_on_accent</color>
 
-    <color name="crypt_keeper_clock_background">@color/color_default_background</color>
-    <color name="crypt_keeper_clock_foreground">@color/color_default_foreground</color>
-    <color name="crypt_keeper_clock_am_pm">@color/color_default_background</color>
-    <color name="crypt_keeper_password_background">@color/color_default_foreground</color>
+    <color name="crypt_keeper_clock_background">#ff9a9a9a</color>
+    <color name="crypt_keeper_clock_foreground">#ff666666</color>
+    <color name="crypt_keeper_clock_am_pm">#ff9a9a9a</color>
+    <color name="crypt_keeper_password_background">#70606060</color>
 
     <color name="divider_color">@color/color_default_divider</color>
     <color name="title_color">@color/color_default_accent</color>
@@ -148,7 +148,7 @@
     <color name="notification_alert_color">@color/color_default_orange1</color>
     <color name="notification_importance_button_unselected">@color/color_default_secondary_text</color>
     <color name="notification_importance_button_selected">@color/color_default_accent</color> <!-- material blue 700 -->
-    <color name="notification_importance_selection_bg">@color/color_default_background</color>
+    <color name="notification_importance_selection_bg">@color/color_default_foreground</color>
 
     <!-- launcher icon color -->
     <color name="icon_launcher_setting_color">@color/color_default_accent</color>
@@ -165,5 +165,8 @@
     <!-- Dialog background color -->
     <color name="dialog_background">@color/color_default_foreground</color>
 
-    <color name="face_intro_outline">@color/color_default_accent</color>
+    <color name="face_intro_outline">#ffdadce0</color>
+
+    <color name="default_icon_color">#DE000000</color>
+    <color name="color_icon_background_blue">#0088ED</color>
 </resources>
\ No newline at end of file
diff --git a/res/values/styles.xml b/res/values/styles.xml
index c7d214e4f4ae40c3e0c543c3f09112c351c428ea..f6bdd73ddc2960e2fe31cf6eb1721f9584ed716f 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -16,16 +16,33 @@
 
 <resources>
 
+    <style name="actionBarTheme" parent="@*android:style/ThemeOverlay.DeviceDefault.ActionBar">
+        <item name="android:colorControlNormal">@color/default_icon_color</item>
+        <item name="colorControlNormal">@color/default_icon_color</item>
+        <item name="android:colorAccent">@color/color_default_accent</item>
+        <item name="colorAccent">@color/color_default_accent</item>
+        <item name="android:actionOverflowButtonStyle">@style/customOverFlow</item>
+        <item name="actionOverflowButtonStyle">@style/customOverFlow</item>
+    </style>
+
     <style name="customOverFlow">
         <item name="android:src">@drawable/ic_more_24</item>
         <item name="android:paddingRight">10dp</item>
         <item name="android:foreground">?android:attr/selectableItemBackground</item>
     </style>
 
+    <style name="customMenuTextAppearance" parent="@android:style/TextAppearance.Widget.IconMenu.Item">
+        <item name="android:textColor">@color/color_default_primary_text</item>
+    </style>
+
     <style name="Widget.ActionBar.Base"
            parent="@android:style/Widget.DeviceDefault.Light.ActionBar.Solid">
         <item name="android:background">@color/color_default_primary_dark</item>
         <item name="actionOverflowButtonStyle">@style/customOverFlow</item>
+        <item name="android:colorControlNormal">@color/default_icon_color</item>
+        <item name="colorControlNormal">@color/default_icon_color</item>
+        <item name="android:colorAccent">@color/color_default_accent</item>
+        <item name="colorAccent">@color/color_default_accent</item>
     </style>
 
     <style name="Widget.ActionBar"
@@ -121,7 +138,7 @@
         <item name="android:textSize">14sp</item>
         <item name="android:textAlignment">viewStart</item>
         <item name="android:textAppearance">@*android:style/TextAppearance.DeviceDefault.Body1</item>
-        <item name="android:textColor">?android:attr/textColorSecondary</item>
+        <item name="android:textColor">@color/color_default_secondary_text</item>
     </style>
 
     <style name="wifi_item_warning">
@@ -135,7 +152,7 @@
     <style name="wifi_item_content">
         <item name="android:textAlignment">viewStart</item>
         <item name="android:textAppearance">@*android:style/TextAppearance.DeviceDefault.Subhead</item>
-        <item name="android:textColor">?android:attr/textColorPrimary</item>
+        <item name="android:textColor">@color/color_default_primary_text</item>
         <item name="android:minHeight">@dimen/min_tap_target_size</item>
     </style>
 
@@ -182,7 +199,7 @@
     <style name="SetupWizardButton.Positive" parent="@style/SudGlifButton.Primary"/>
 
     <style name="AccentColorHighlightBorderlessButton">
-        <item name="android:colorControlHighlight">?android:attr/colorAccent</item>
+        <item name="android:colorControlHighlight">@color/color_default_accent</item>
     </style>
 
     <style name="vpn_label">
@@ -227,7 +244,7 @@
     <style name="TextAppearance.PasswordEntry" parent="android:TextAppearance.DeviceDefault">
         <item name="android:gravity">center</item>
         <item name="android:singleLine">true</item>
-        <item name="android:textColor">?android:attr/textColorPrimary</item>
+        <item name="android:textColor">@color/color_default_primary_text</item>
         <item name="android:textSize">24sp</item>
     </style>
 
@@ -262,7 +279,7 @@
     </style>
 
     <style name="TextAppearance.SuggestionSummary" parent="TextAppearance.Small">
-        <item name="android:textColor">?android:attr/textColorSecondary</item>
+        <item name="android:textColor">@color/color_default_secondary_text</item>
     </style>
 
     <style name="TextAppearance.ErrorText"
@@ -271,14 +288,14 @@
     </style>
 
     <style name="TextAppearance.Small.SwitchBar">
-        <item name="android:textColor">?android:attr/textColorPrimary</item>
+        <item name="android:textColor">@color/color_default_primary_text</item>
         <item name="android:textStyle">normal</item>
     </style>
 
     <style name="TextAppearance.RemoveDialogContent"
            parent="@android:style/TextAppearance.DeviceDefault">
         <item name="android:textSize">16sp</item>
-        <item name="android:textColor">?android:attr/textColorPrimary</item>
+        <item name="android:textColor">@color/color_default_primary_text</item>
     </style>
 
     <style name="TextAppearance.SearchBar"
@@ -294,13 +311,13 @@
 
     <style name="TextAppearance.ConditionCardSummary"
            parent="@*android:style/TextAppearance.DeviceDefault.Body1">
-        <item name="android:textColor">?android:attr/textColorSecondary</item>
+        <item name="android:textColor">@color/color_default_secondary_text</item>
     </style>
 
     <style name="TextAppearance.ZenOnboardingButton">
         <item name="android:fontFamily">sans-serif-medium</item>
         <item name="android:textSize">14sp</item>
-        <item name="android:textColor">?android:attr/colorAccent</item>
+        <item name="android:textColor">@color/color_default_accent</item>
         <item name="android:background">@*android:drawable/btn_borderless_rect</item>
         <item name="android:gravity">center</item>
         <item name="android:focusable">true</item>
@@ -339,7 +356,7 @@
 
     <style name="PreviewPagerPageIndicator">
         <item name="dotGap">8dp</item>
-        <item name="pageIndicatorColor">?android:attr/colorControlNormal</item>
+        <item name="pageIndicatorColor">@color/color_default_accent</item>
         <item name="currentPageIndicatorColor">?android:attr/colorControlActivated</item>
     </style>
 
@@ -373,8 +390,8 @@
     </style>
 
     <style name="ActionPrimaryButton" parent="android:Widget.DeviceDefault.Button.Colored">
-        <item name="textColor">@color/color_default_view_on_accent</item>
-        <item name="android:textColor">@color/color_default_view_on_accent</item>
+        <item name="textColor">@color/color_default_primary</item>
+        <item name="android:textColor">@color/color_default_primary</item>
     </style>
 
     <style name="ActionSecondaryButton" parent="android:Widget.DeviceDefault.Button"/>
@@ -417,7 +434,7 @@
     <style name="device_info_dialog_label">
         <item name="android:textAlignment">viewStart</item>
         <item name="android:textAppearance">@*android:style/TextAppearance.DeviceDefault.Body1</item>
-        <item name="android:textColor">?android:attr/textColorSecondary</item>
+        <item name="android:textColor">@color/color_default_secondary_text</item>
     </style>
 
     <style name="device_info_dialog_value">
@@ -448,7 +465,7 @@
 
     <style name="ConditionCardBorderlessButton"
            parent="android:Widget.DeviceDefault.Button.Borderless">
-        <item name="android:textColor">?android:attr/colorAccent</item>
+        <item name="android:textColor">@color/color_default_accent</item>
         <item name="android:textSize">14sp</item>
         <item name="android:textAllCaps">false</item>
     </style>
@@ -484,7 +501,7 @@
 
     <style name="TextAppearance.DeferredSetupCardSummary"
            parent="@*android:style/TextAppearance.DeviceDefault.Body1">
-        <item name="android:textColor">?android:attr/textColorSecondary</item>
+        <item name="android:textColor">@color/color_default_secondary_text</item>
     </style>
 
     <style name="DeferredSetupCardButton" parent="android:Widget.DeviceDefault.Button.Colored">
@@ -572,11 +589,11 @@
     </style>
 
     <style name="TextAppearance.NotificationImportanceButton.Selected" parent="TextAppearance.NotificationImportanceButton">
-        <item name="android:textColor">?android:attr/colorAccent</item>
+        <item name="android:textColor">@color/color_default_accent</item>
     </style>
 
     <style name="TextAppearance.NotificationImportanceButton.Unselected" parent="TextAppearance.NotificationImportanceButton">
-        <item name="android:textColor">?android:attr/textColorPrimary</item>
+        <item name="android:textColor">@color/color_default_primary_text</item>
     </style>
 
     <style name="AccessibilityDialog">
@@ -608,7 +625,7 @@
         <item name="android:layout_height">wrap_content</item>
         <item name="android:gravity">center</item>
         <item name="android:textSize">20sp</item>
-        <item name="android:textColor">?android:attr/textColorPrimary</item>
+        <item name="android:textColor">@color/color_default_primary_text</item>
         <item name="android:fontFamily">google-sans-medium</item>
     </style>
 
@@ -619,7 +636,7 @@
         <item name="android:layout_marginTop">16dp</item>
         <item name="android:layout_marginBottom">32dp</item>
         <item name="android:textSize">16sp</item>
-        <item name="android:textColor">?android:attr/textColorPrimary</item>
+        <item name="android:textColor">@color/color_default_primary_text</item>
         <item name="android:fontFamily">sans-serif</item>
     </style>
 
@@ -628,7 +645,7 @@
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">wrap_content</item>
         <item name="android:textSize">16sp</item>
-        <item name="android:textColor">?android:attr/textColorPrimary</item>
+        <item name="android:textColor">@color/color_default_primary_text</item>
         <item name="android:fontFamily">sans-serif</item>
     </style>
 
@@ -637,7 +654,7 @@
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">wrap_content</item>
         <item name="android:textSize">14sp</item>
-        <item name="android:textColor">?android:attr/textColorSecondary</item>
+        <item name="android:textColor">@color/color_default_secondary_text</item>
         <item name="android:fontFamily">sans-serif</item>
     </style>
 
@@ -668,5 +685,4 @@
            parent="@style/AccessibilityDialogButton"></style>
     <style name="AccessibilityDialogButtonDeny"
            parent="@style/AccessibilityDialogButton"></style>
-
 </resources>
diff --git a/res/values/themes.xml b/res/values/themes.xml
index 9394b53157cbec572b5b0435d0000e18fd2a53b1..1d42983b57e9523a96e2d2201e92482886478ed6 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -63,6 +63,7 @@
         <item name="colorPrimary">@color/color_default_primary</item>
         <item name="colorPrimaryDark">@color/color_default_primary_dark</item>
         <item name="colorAccent">@color/color_default_accent</item>
+        <item name="android:colorAccent">@color/color_default_accent</item>
         <item name="colorPrimaryVariant">@color/color_default_primary_dark</item>
         <item name="android:colorBackground">@color/color_default_background</item>
         <item name="android:windowBackground">@color/color_default_background</item>
@@ -71,6 +72,14 @@
 
         <!-- For slice view in settings -->
         <item name="sliceViewStyle">@style/Widget.SliceView.Settings</item>
+
+        <item name="android:colorControlNormal">@color/default_icon_color</item>
+        <item name="colorControlNormal">@color/default_icon_color</item>
+        <item name="android:scrollbarThumbHorizontal">@color/color_default_gray2</item>
+        <item name="android:scrollbarThumbVertical">@color/color_default_gray2</item>
+        <item name="android:itemTextAppearance">@style/customMenuTextAppearance</item>
+        <item name="android:actionBarTheme">@style/actionBarTheme</item>
+        <item name="actionBarTheme">@style/actionBarTheme</item>
     </style>
 
     <style name="Theme.Settings" parent="Theme.SettingsBase">
@@ -102,12 +111,19 @@
         <item name="colorPrimary">@color/color_default_primary</item>
         <item name="colorPrimaryDark">@color/color_default_primary_dark</item>
         <item name="colorAccent">@color/color_default_accent</item>
+        <item name="android:colorAccent">@color/color_default_accent</item>
         <item name="android:colorBackground">@color/color_default_background</item>
         <item name="android:textColorPrimary">@color/color_default_primary_text</item>
         <item name="android:textColorSecondary">@color/color_default_secondary_text</item>
         <item name="android:navigationBarColor">@color/color_default_primary_dark</item>
         <item name="android:navigationBarDividerColor">@color/color_default_primary_dark</item>
         <item name="android:statusBarColor">@color/color_default_primary_dark</item>
+
+        <item name="android:colorControlNormal">@color/default_icon_color</item>
+        <item name="colorControlNormal">@color/default_icon_color</item>
+        <item name="android:scrollbarThumbHorizontal">@color/color_default_gray2</item>
+        <item name="android:scrollbarThumbVertical">@color/color_default_gray2</item>
+        <item name="android:itemTextAppearance">@style/customMenuTextAppearance</item>
     </style>
 
     <style name="Theme.ProvisioningActivity" parent="@style/Theme.ProvisioningActivity.Base">
@@ -149,6 +165,7 @@
 
     <style name="Theme.AlertDialog.Base" parent="@style/Theme.AppCompat.DayNight.Dialog.Alert">
         <item name="colorAccent">@color/color_default_accent</item>
+        <item name="android:colorAccent">@color/color_default_accent</item>
         <item name="android:windowBackground">@color/dialog_background</item>
         <item name="android:colorBackground">@color/dialog_background</item>
     </style>
@@ -170,9 +187,10 @@
 
     <style name="Theme.Dialog" parent="@style/Theme.DialogBase">
         <item name="android:alertDialogTheme">@style/Theme.AlertDialog</item>
+        <item name="colorAccent">@color/color_default_accent</item>
         <item name="android:colorAccent">@color/color_default_accent</item>
-        <item name="android:windowBackground">@color/color_default_background</item>
-        <item name="android:colorBackground">@color/color_default_background</item>
+        <item name="android:windowBackground">@color/dialog_background</item>
+        <item name="android:colorBackground">@color/dialog_background</item>
         <item name="android:textColorPrimary">@color/color_default_primary_text</item>
         <item name="android:textColorSecondary">@color/color_default_secondary_text</item>
     </style>
@@ -184,6 +202,7 @@
         <item name="android:colorPrimary">@color/color_default_primary</item>
         <item name="android:colorPrimaryDark">@color/color_default_primary_dark</item>
         <item name="android:alertDialogTheme">@style/Theme.AlertDialog</item>
+        <item name="colorAccent">@color/color_default_accent</item>
         <item name="android:colorAccent">@color/color_default_accent</item>
         <item name="android:windowBackground">@color/color_default_background</item>
         <item name="android:colorBackground">@color/color_default_background</item>
@@ -214,6 +233,7 @@
 
     <style name="Theme.ConfirmDeviceCredentialsWork" parent="Theme.ConfirmDeviceCredentialsDark">
         <item name="*android:lockPatternStyle">@style/LockPatternStyle.Dark.Work</item>
+        <item name="colorAccent">@color/color_default_accent</item>
         <item name="android:colorAccent">@color/color_default_accent</item>
     </style>
 
@@ -232,9 +252,18 @@
         <item name="colorPrimary">@color/color_default_primary</item>
         <item name="colorPrimaryDark">@color/color_default_primary_dark</item>
         <item name="colorAccent">@color/color_default_accent</item>
+        <item name="android:colorAccent">@color/color_default_accent</item>
         <item name="android:colorBackground">@color/color_default_background</item>
         <item name="android:textColorPrimary">@color/color_default_primary_text</item>
         <item name="android:textColorSecondary">@color/color_default_secondary_text</item>
+
+        <item name="android:colorControlNormal">@color/default_icon_color</item>
+        <item name="colorControlNormal">@color/default_icon_color</item>
+        <item name="android:scrollbarThumbHorizontal">@color/color_default_gray2</item>
+        <item name="android:scrollbarThumbVertical">@color/color_default_gray2</item>
+        <item name="android:itemTextAppearance">@style/customMenuTextAppearance</item>
+        <item name="android:actionOverflowButtonStyle">@style/customOverFlow</item>
+        <item name="android:homeAsUpIndicator">@drawable/ic_arrow_back</item>
     </style>
 
     <style name="FallbackHome" parent="@style/FallbackHome.Base">
@@ -252,9 +281,18 @@
         <item name="colorPrimary">@color/color_default_primary</item>
         <item name="colorPrimaryDark">@color/color_default_primary_dark</item>
         <item name="colorAccent">@color/color_default_accent</item>
+        <item name="android:colorAccent">@color/color_default_accent</item>
         <item name="android:colorBackground">@color/color_default_background</item>
         <item name="android:textColorPrimary">@color/color_default_primary_text</item>
         <item name="android:textColorSecondary">@color/color_default_secondary_text</item>
+
+        <item name="android:colorControlNormal">@color/default_icon_color</item>
+        <item name="colorControlNormal">@color/default_icon_color</item>
+        <item name="android:scrollbarThumbHorizontal">@color/color_default_gray2</item>
+        <item name="android:scrollbarThumbVertical">@color/color_default_gray2</item>
+        <item name="android:itemTextAppearance">@style/customMenuTextAppearance</item>
+        <item name="android:actionOverflowButtonStyle">@style/customOverFlow</item>
+        <item name="android:homeAsUpIndicator">@drawable/ic_arrow_back</item>
     </style>
 
     <style name="FallbackHome.SetupWizard" parent="@style/FallbackHome.SetupWizard.Base">
@@ -268,6 +306,7 @@
         <item name="colorPrimary">@color/color_default_primary</item>
         <item name="colorPrimaryDark">@color/color_default_primary_dark</item>
         <item name="colorAccent">@color/color_default_accent</item>
+        <item name="android:colorAccent">@color/color_default_accent</item>
         <item name="android:colorBackground">@color/color_default_background</item>
         <item name="android:navigationBarDividerColor">@color/color_default_primary_dark</item>
         <item name="android:navigationBarColor">@color/color_default_primary_dark</item>
@@ -276,18 +315,22 @@
         <item name="preferenceTheme">@style/PreferenceTheme</item>
 
         <!-- action bar, needed for search bar icon tinting -->
-        <item name="android:actionBarTheme">@style/customActionBarTheme</item>
+        <item name="android:actionBarTheme">@style/actionBarTheme</item>
 
         <!-- Define this color for material design -->
         <item name="colorPrimaryVariant">@color/color_default_primary_dark</item>
+
+        <item name="android:colorControlNormal">@color/default_icon_color</item>
+        <item name="colorControlNormal">@color/default_icon_color</item>
+        <item name="android:scrollbarThumbHorizontal">@color/color_default_gray2</item>
+        <item name="android:scrollbarThumbVertical">@color/color_default_gray2</item>
+        <item name="android:itemTextAppearance">@style/customMenuTextAppearance</item>
+        <item name="android:actionOverflowButtonStyle">@style/customOverFlow</item>
+        <item name="android:homeAsUpIndicator">@drawable/ic_arrow_back</item>
     </style>
 
     <style name="Theme.Settings.Home" parent="Theme.Settings.HomeBase">
     </style>
-    
-    <style name="customActionBarTheme" parent="@*android:style/ThemeOverlay.DeviceDefault.ActionBar">
-        <item name="android:background">@color/color_default_primary_dark</item>
-    </style>
 
     <!-- Note that Dialog themes do not set list dividers -->
     <style name="Theme.Panel" parent="@*android:style/Theme.DeviceDefault.Settings.Dialog">
@@ -311,12 +354,21 @@
         <item name="android:colorPrimaryDark">@color/color_default_primary_dark</item>
         <item name="android:windowBackground">@color/color_default_background</item>
         <item name="android:colorBackground">@color/color_default_background</item>
+        <item name="colorAccent">@color/color_default_accent</item>
         <item name="android:colorAccent">@color/color_default_accent</item>
 
         <item name="android:listDivider">@*android:color/list_divider_color_light</item>
 
         <item name="android:textColorPrimary">@color/color_default_primary_text</item>
         <item name="android:textColorSecondary">@color/color_default_secondary_text</item>
+
+        <item name="android:colorControlNormal">@color/default_icon_color</item>
+        <item name="colorControlNormal">@color/default_icon_color</item>
+        <item name="android:scrollbarThumbHorizontal">@color/color_default_gray2</item>
+        <item name="android:scrollbarThumbVertical">@color/color_default_gray2</item>
+        <item name="android:itemTextAppearance">@style/customMenuTextAppearance</item>
+        <item name="android:actionOverflowButtonStyle">@style/customOverFlow</item>
+        <item name="android:homeAsUpIndicator">@drawable/ic_arrow_back</item>
     </style>
 
     <style name="LightTheme.SettingsBase.SetupWizard" parent="@style/LightTheme.SettingsBase.SetupWizard.Base">
@@ -331,7 +383,16 @@
 
         <item name="android:colorPrimary">@color/color_default_primary</item>
         <item name="android:colorPrimaryDark">@color/color_default_primary_dark</item>
+        <item name="colorAccent">@color/color_default_accent</item>
         <item name="android:colorAccent">@color/color_default_accent</item>
+
+        <item name="android:colorControlNormal">@color/default_icon_color</item>
+        <item name="colorControlNormal">@color/default_icon_color</item>
+        <item name="android:scrollbarThumbHorizontal">@color/color_default_gray2</item>
+        <item name="android:scrollbarThumbVertical">@color/color_default_gray2</item>
+        <item name="android:itemTextAppearance">@style/customMenuTextAppearance</item>
+        <item name="android:actionOverflowButtonStyle">@style/customOverFlow</item>
+        <item name="android:homeAsUpIndicator">@drawable/ic_arrow_back</item>
     </style>
 
     <style name="LightTheme.SubSettings.SetupWizard" parent="@style/LightTheme.SubSettings.SetupWizard.Base">
diff --git a/res/xml/single_choice_list_item_2.xml b/res/xml/single_choice_list_item_2.xml
index ca80f444602103662bdc2ce475e906f2563c763f..d8b8012445c3e9486b3440de12b736cfdc88784b 100644
--- a/res/xml/single_choice_list_item_2.xml
+++ b/res/xml/single_choice_list_item_2.xml
@@ -51,7 +51,7 @@
             android:layout_height="wrap_content"
             android:paddingBottom="@dimen/select_dialog_summary_padding_bottom"
             android:textAppearance="?android:attr/textAppearanceListItemSecondary"
-            android:textColor="?android:attr/textColorSecondary"
+            android:textColor="@color/color_default_secondary_text"
             android:maxLines="10" />
 
     </LinearLayout>
diff --git a/res/xml/vpn_app_management.xml b/res/xml/vpn_app_management.xml
index bcaa6b0a62fc36ec71429aaab3ba20039274d661..4b916adc0753ab484c215d4a503b65c61bc5be7a 100644
--- a/res/xml/vpn_app_management.xml
+++ b/res/xml/vpn_app_management.xml
@@ -19,7 +19,7 @@
 
         <Preference
                 android:key="version"
-                android:textColor="?android:attr/textColorSecondary"
+                android:textColor="@color/color_default_secondary_text"
                 android:selectable="false"/>
 
         <com.android.settingslib.RestrictedSwitchPreference
diff --git a/src/com/android/settings/accessibility/AccessibilityGestureNavigationTutorial.java b/src/com/android/settings/accessibility/AccessibilityGestureNavigationTutorial.java
index 8c0bdabe95968574f4af4310d435ecfba710d419..1d098b636e49070107fc2ebee4bb86d193b08129 100644
--- a/src/com/android/settings/accessibility/AccessibilityGestureNavigationTutorial.java
+++ b/src/com/android/settings/accessibility/AccessibilityGestureNavigationTutorial.java
@@ -179,7 +179,7 @@ public class AccessibilityGestureNavigationTutorial {
         final int indexIconStart = messageString.indexOf("%s");
         final int indexIconEnd = indexIconStart + 2;
         final Drawable icon = context.getDrawable(R.drawable.ic_accessibility_new);
-        icon.setTint(getThemeAttrColor(context, android.R.attr.textColorPrimary));
+        icon.setTint(getThemeAttrColor(context, R.color.color_default_primary));
         icon.setBounds(0, 0, lineHeight, lineHeight);
         spannableMessage.setSpan(
                 new ImageSpan(icon), indexIconStart, indexIconEnd,
diff --git a/src/com/android/settings/applications/RunningProcessesView.java b/src/com/android/settings/applications/RunningProcessesView.java
index 5491ad14c6c0e360470a06fa3e1efdf337a796aa..c87f4c1db2d4f0b35767b655d72401651ed4fcb6 100644
--- a/src/com/android/settings/applications/RunningProcessesView.java
+++ b/src/com/android/settings/applications/RunningProcessesView.java
@@ -452,7 +452,7 @@ public class RunningProcessesView extends FrameLayout
         final Context context = getContext();
         mColorBar.setProgressTintList(
                 ColorStateList.valueOf(context.getColor(R.color.running_processes_system_ram)));
-        mColorBar.setSecondaryProgressTintList(Utils.getColorAccent(context));
+        mColorBar.setSecondaryProgressTintList(ColorStateList.valueOf(context.getResources().getColor(R.color.color_default_accent)));
         mColorBar.setSecondaryProgressTintMode(PorterDuff.Mode.SRC);
         mColorBar.setProgressBackgroundTintList(
                 ColorStateList.valueOf(context.getColor(R.color.running_processes_free_ram)));
diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintLocationAnimationView.java b/src/com/android/settings/biometrics/fingerprint/FingerprintLocationAnimationView.java
index 4d7e2d24427ccb4f83666bba609127c39a2bb319..0ce10cec64eb514b1aebff6705fb63e233f52ddc 100644
--- a/src/com/android/settings/biometrics/fingerprint/FingerprintLocationAnimationView.java
+++ b/src/com/android/settings/biometrics/fingerprint/FingerprintLocationAnimationView.java
@@ -64,7 +64,7 @@ public class FingerprintLocationAnimationView extends View implements
                 R.fraction.fingerprint_sensor_location_fraction_x, 1, 1);
         mFractionCenterY = getResources().getFraction(
                 R.fraction.fingerprint_sensor_location_fraction_y, 1, 1);
-        @ColorInt int colorAccent = Utils.getColorAccentDefaultColor(context);
+        @ColorInt int colorAccent = context.getResources().getColor(R.color.color_default_accent);
         mDotPaint.setAntiAlias(true);
         mPulsePaint.setAntiAlias(true);
         mDotPaint.setColor(colorAccent);
diff --git a/src/com/android/settings/bluetooth/AdvancedBluetoothDetailsHeaderController.java b/src/com/android/settings/bluetooth/AdvancedBluetoothDetailsHeaderController.java
index 86196fd0584d17bd675ad312b484259a298de1eb..c799989e7373137839d663f820b419a4981d043b 100644
--- a/src/com/android/settings/bluetooth/AdvancedBluetoothDetailsHeaderController.java
+++ b/src/com/android/settings/bluetooth/AdvancedBluetoothDetailsHeaderController.java
@@ -187,11 +187,11 @@ public class AdvancedBluetoothDetailsHeaderController extends BasePreferenceCont
                         context.getResources().getDimensionPixelSize(
                                 R.dimen.advanced_bluetooth_battery_meter_height));
         drawable.setBatteryLevel(level);
-        final int attr = level > LOW_BATTERY_LEVEL || charging
-                ? android.R.attr.colorControlNormal
-                : android.R.attr.colorError;
+        int color = level > LOW_BATTERY_LEVEL || charging
+                ? context.getColor(R.color.color_default_accent)
+                : com.android.settings.Utils.getColorAttrDefaultColor(context, android.R.attr.colorError);
         drawable.setColorFilter(new PorterDuffColorFilter(
-                com.android.settings.Utils.getColorAttrDefaultColor(context, attr),
+                color,
                 PorterDuff.Mode.SRC));
         drawable.setCharging(charging);
 
diff --git a/src/com/android/settings/bluetooth/BluetoothSliceBuilder.java b/src/com/android/settings/bluetooth/BluetoothSliceBuilder.java
index cbc338eda0ed12f1b574c42fcdcb64322e9deb67..8e3187bb0093dc40ad7bf28b54308af8a45b4e5e 100644
--- a/src/com/android/settings/bluetooth/BluetoothSliceBuilder.java
+++ b/src/com/android/settings/bluetooth/BluetoothSliceBuilder.java
@@ -74,8 +74,7 @@ public class BluetoothSliceBuilder {
         final CharSequence title = context.getText(R.string.bluetooth_settings);
         final IconCompat icon = IconCompat.createWithResource(context,
                 R.drawable.ic_settings_bluetooth);
-        @ColorInt final int color = com.android.settings.Utils.getColorAccent(
-                context).getDefaultColor();
+        @ColorInt final int color = context.getResources().getColor(R.color.color_default_accent);
         final PendingIntent toggleAction = getBroadcastIntent(context);
         final PendingIntent primaryAction = getPrimaryAction(context);
         final SliceAction primarySliceAction = SliceAction.createDeeplink(primaryAction, icon,
@@ -84,7 +83,6 @@ public class BluetoothSliceBuilder {
                 null /* actionTitle */, isBluetoothEnabled);
 
         return new ListBuilder(context, CustomSliceRegistry.BLUETOOTH_URI, ListBuilder.INFINITY)
-                .setAccentColor(color)
                 .addRow(new RowBuilder()
                         .setTitle(title)
                         .addEndItem(toggleSliceAction)
diff --git a/src/com/android/settings/datausage/ChartDataUsagePreference.java b/src/com/android/settings/datausage/ChartDataUsagePreference.java
index 17f23c4ec8f3fc02cf20290c9b20684f41747565..c7a32a8fea5c256be6484c978f7110306c3c03db 100644
--- a/src/com/android/settings/datausage/ChartDataUsagePreference.java
+++ b/src/com/android/settings/datausage/ChartDataUsagePreference.java
@@ -56,7 +56,7 @@ public class ChartDataUsagePreference extends Preference {
         super(context, attrs);
         setSelectable(false);
         mLimitColor = Utils.getColorAttrDefaultColor(context, android.R.attr.colorError);
-        mWarningColor = Utils.getColorAttrDefaultColor(context, android.R.attr.textColorSecondary);
+        mWarningColor = context.getColor(R.color.color_default_secondary_text);
         setLayoutResource(R.layout.data_usage_graph);
     }
 
diff --git a/src/com/android/settings/datausage/DataUsageSummaryPreference.java b/src/com/android/settings/datausage/DataUsageSummaryPreference.java
index 93df2f1bcdb61f3885664139ad69e38bacc47ab4..dc4c1eb7cc9204ee8755618106ad8ddb3388ea65 100644
--- a/src/com/android/settings/datausage/DataUsageSummaryPreference.java
+++ b/src/com/android/settings/datausage/DataUsageSummaryPreference.java
@@ -261,7 +261,7 @@ public class DataUsageSummaryPreference extends Preference {
                         TextUtils.expandTemplate(getContext().getText(R.string.data_remaining),
                                 DataUsageUtils.formatDataUsage(getContext(), dataRemaining)));
                 usageRemainingField.setTextColor(
-                        Utils.getColorAttr(getContext(), android.R.attr.colorAccent));
+                        Utils.getColorAttr(getContext(), R.color.color_default_accent));
             } else {
                 usageRemainingField.setText(
                         TextUtils.expandTemplate(getContext().getText(R.string.data_overusage),
@@ -327,7 +327,7 @@ public class DataUsageSummaryPreference extends Preference {
 
             if (updateAgeMillis <= WARNING_AGE) {
                 setCarrierInfoTextStyle(
-                        carrierInfo, android.R.attr.textColorSecondary, Typeface.SANS_SERIF);
+                        carrierInfo, R.color.color_default_secondary_text, Typeface.SANS_SERIF);
             } else {
                 setCarrierInfoTextStyle(carrierInfo, android.R.attr.colorError, SANS_SERIF_MEDIUM);
             }
diff --git a/src/com/android/settings/deviceinfo/StorageItemPreference.java b/src/com/android/settings/deviceinfo/StorageItemPreference.java
index 0766a740b3f2b9f7ef255673f936984c0a53c0bd..4640e8927c7829337d5a31b670242888722dfba8 100644
--- a/src/com/android/settings/deviceinfo/StorageItemPreference.java
+++ b/src/com/android/settings/deviceinfo/StorageItemPreference.java
@@ -36,12 +36,15 @@ public class StorageItemPreference extends Preference {
     private static final int PROGRESS_MAX = 100;
     private int mProgressPercent = UNINITIALIZED;
 
+    private Context mContext;
+
     public StorageItemPreference(Context context) {
         this(context, null);
     }
 
     public StorageItemPreference(Context context, AttributeSet attrs) {
         super(context, attrs);
+        this.mContext = context;
         setLayoutResource(R.layout.storage_item);
         setSummary(R.string.memory_calculating_size);
     }
@@ -64,7 +67,8 @@ public class StorageItemPreference extends Preference {
     protected void updateProgressBar() {
         if (mProgressBar == null || mProgressPercent == UNINITIALIZED)
             return;
-
+        mProgressBar.getProgressDrawable().setColorFilter(
+                mContext.getColor(R.color.color_default_accent), android.graphics.PorterDuff.Mode.SRC_IN);
         mProgressBar.setMax(PROGRESS_MAX);
         mProgressBar.setProgress(mProgressPercent);
     }
diff --git a/src/com/android/settings/deviceinfo/StorageVolumePreference.java b/src/com/android/settings/deviceinfo/StorageVolumePreference.java
index 6294ab90a14144462e8a25b635ff4d421f6b5bef..32883bac7fd33fbf2519ed2cf80e82cec6569fb8 100644
--- a/src/com/android/settings/deviceinfo/StorageVolumePreference.java
+++ b/src/com/android/settings/deviceinfo/StorageVolumePreference.java
@@ -59,7 +59,7 @@ public class StorageVolumePreference extends Preference {
 
         mStorageManager = context.getSystemService(StorageManager.class);
         mVolume = volume;
-        mColorTintList = Utils.getColorAttr(context, android.R.attr.colorControlNormal);
+        mColorTintList = Utils.getColorAttr(context, R.color.color_default_accent);
 
         setLayoutResource(R.layout.storage_volume);
 
diff --git a/src/com/android/settings/deviceinfo/StorageWizardBase.java b/src/com/android/settings/deviceinfo/StorageWizardBase.java
index 4326a46d0f540f637731c9fb8c9bd5603f7bf017..be0278af763063fefe253a48937edd022ab2734b 100644
--- a/src/com/android/settings/deviceinfo/StorageWizardBase.java
+++ b/src/com/android/settings/deviceinfo/StorageWizardBase.java
@@ -198,7 +198,6 @@ public abstract class StorageWizardBase extends FragmentActivity {
     protected void setIcon(int resId) {
         final GlifLayout layout = getGlifLayout();
         final Drawable icon = getDrawable(resId).mutate();
-        icon.setTintList(Utils.getColorAccent(layout.getContext()));
         layout.setIcon(icon);
     }
 
diff --git a/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceController.java b/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceController.java
index 525a887cb80b5c2d2f06bd376e2a70be3229743b..ba58200f637c528e3fa81f6bda3269d8222ce8f4 100644
--- a/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceController.java
+++ b/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceController.java
@@ -225,7 +225,7 @@ public class StorageItemPreferenceController extends AbstractPreferenceControlle
 
     private static Drawable applyTint(Context context, Drawable icon) {
         TypedArray array =
-                context.obtainStyledAttributes(new int[]{android.R.attr.colorControlNormal});
+                context.obtainStyledAttributes(new int[]{R.color.color_default_accent});
         icon = icon.mutate();
         icon.setTint(array.getColor(0, 0));
         array.recycle();
diff --git a/src/com/android/settings/deviceinfo/storage/UserProfileController.java b/src/com/android/settings/deviceinfo/storage/UserProfileController.java
index a2e19db235ea1192c144984e6a4654edea97579f..6d5f8d3a28fb057fcaab25ddaf14ca7c15b78358 100644
--- a/src/com/android/settings/deviceinfo/storage/UserProfileController.java
+++ b/src/com/android/settings/deviceinfo/storage/UserProfileController.java
@@ -28,6 +28,7 @@ import androidx.preference.Preference;
 import androidx.preference.PreferenceScreen;
 
 import com.android.internal.util.Preconditions;
+import com.android.settings.R;
 import com.android.settings.Utils;
 import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settings.core.SubSettingLauncher;
@@ -131,7 +132,7 @@ public class UserProfileController extends AbstractPreferenceController implemen
 
     private static Drawable applyTint(Context context, Drawable icon) {
         icon = icon.mutate();
-        icon.setTintList(Utils.getColorAttr(context, android.R.attr.colorControlNormal));
+        icon.setTintList(Utils.getColorAttr(context, R.color.color_default_accent));
         return icon;
     }
 
diff --git a/src/com/android/settings/enterprise/ActionDisabledByAdminDialogHelper.java b/src/com/android/settings/enterprise/ActionDisabledByAdminDialogHelper.java
index 21f7a80ea6b26a1c6fadb114546d45b7f2c34c00..1bfe537f91b64442f5e4e92bee11801952f7cbaf 100644
--- a/src/com/android/settings/enterprise/ActionDisabledByAdminDialogHelper.java
+++ b/src/com/android/settings/enterprise/ActionDisabledByAdminDialogHelper.java
@@ -127,7 +127,7 @@ public class ActionDisabledByAdminDialogHelper {
             supportIconView.setImageDrawable(
                     mActivity.getDrawable(R.drawable.ic_info));
 
-            TypedArray ta = mActivity.obtainStyledAttributes(new int[]{android.R.attr.colorAccent});
+            TypedArray ta = mActivity.obtainStyledAttributes(new int[]{R.color.color_default_accent});
             supportIconView.setImageTintList(ColorStateList.valueOf(ta.getColor(0, 0)));
             ta.recycle();
         } else {
diff --git a/src/com/android/settings/flashlight/FlashlightSlice.java b/src/com/android/settings/flashlight/FlashlightSlice.java
index a2c4561c1d55c78b08563e8ebf6e41eba0062152..f02360c86fd10ebab21ff20d9e8702eac83cde0d 100644
--- a/src/com/android/settings/flashlight/FlashlightSlice.java
+++ b/src/com/android/settings/flashlight/FlashlightSlice.java
@@ -70,12 +70,11 @@ public class FlashlightSlice implements CustomSliceable {
             return null;
         }
         final PendingIntent toggleAction = getBroadcastIntent(mContext);
-        @ColorInt final int color = Utils.getColorAccentDefaultColor(mContext);
+        @ColorInt final int color = mContext.getResources().getColor(R.color.color_default_accent);
         final IconCompat icon =
                 IconCompat.createWithResource(mContext, R.drawable.ic_signal_flashlight);
         return new ListBuilder(mContext, CustomSliceRegistry.FLASHLIGHT_SLICE_URI,
                 ListBuilder.INFINITY)
-                .setAccentColor(color)
                 .addRow(new RowBuilder()
                         .setTitle(mContext.getText(R.string.power_flashlight))
                         .setTitleItem(icon, ICON_IMAGE)
diff --git a/src/com/android/settings/fuelgauge/BatteryMeterView.java b/src/com/android/settings/fuelgauge/BatteryMeterView.java
index d54f5a4e2e06b0d218f5b8d92b3030a4a1fea310..3c5ad357ae3cc36f9695b1feedce09ccaedc334f 100644
--- a/src/com/android/settings/fuelgauge/BatteryMeterView.java
+++ b/src/com/android/settings/fuelgauge/BatteryMeterView.java
@@ -53,12 +53,12 @@ public class BatteryMeterView extends ImageView {
 
         final int frameColor = context.getColor(R.color.meter_background_color);
         mAccentColorFilter = new PorterDuffColorFilter(
-                Utils.getColorAttrDefaultColor(context, android.R.attr.colorAccent),
+                context.getColor(R.color.color_default_accent),
                 PorterDuff.Mode.SRC);
         mErrorColorFilter = new PorterDuffColorFilter(
                 context.getColor(R.color.battery_icon_color_error), PorterDuff.Mode.SRC_IN);
         mForegroundColorFilter =new PorterDuffColorFilter(
-                Utils.getColorAttrDefaultColor(context, android.R.attr.colorForeground),
+                context.getColor(R.color.color_default_foreground),
                 PorterDuff.Mode.SRC);
         mDrawable = new BatteryMeterDrawable(context, frameColor);
         mDrawable.setColorFilter(mAccentColorFilter);
diff --git a/src/com/android/settings/fuelgauge/BatterySaverDrawable.java b/src/com/android/settings/fuelgauge/BatterySaverDrawable.java
index ce2936177ace6fb06ff0427153131f53a465dd21..6ae63261c16cc468e67b30128568030bfdb07731 100644
--- a/src/com/android/settings/fuelgauge/BatterySaverDrawable.java
+++ b/src/com/android/settings/fuelgauge/BatterySaverDrawable.java
@@ -20,6 +20,7 @@ import android.content.Context;
 import android.graphics.PorterDuff;
 import android.graphics.PorterDuffColorFilter;
 
+import com.android.settings.R;
 import com.android.settingslib.Utils;
 import com.android.settingslib.graph.BatteryMeterDrawableBase;
 
@@ -37,7 +38,7 @@ public class BatterySaverDrawable extends BatteryMeterDrawableBase {
         setPowerSave(true);
         setCharging(false);
         setPowerSaveAsColorError(false);
-        final int tintColor = Utils.getColorAttrDefaultColor(context, android.R.attr.colorAccent);
+        final int tintColor = context.getColor(R.color.color_default_accent);
         setColorFilter(new PorterDuffColorFilter(tintColor, PorterDuff.Mode.SRC_IN));
     }
 }
diff --git a/src/com/android/settings/homepage/contextualcards/deviceinfo/DataUsageSlice.java b/src/com/android/settings/homepage/contextualcards/deviceinfo/DataUsageSlice.java
index 419b7708675f21b912b0d368617bd3745d7fbd7a..980c5142e60ac739d8e3a8aacc8679c224f83c20 100644
--- a/src/com/android/settings/homepage/contextualcards/deviceinfo/DataUsageSlice.java
+++ b/src/com/android/settings/homepage/contextualcards/deviceinfo/DataUsageSlice.java
@@ -73,7 +73,6 @@ public class DataUsageSlice implements CustomSliceable {
         final ListBuilder listBuilder =
                 new ListBuilder(mContext, CustomSliceRegistry.DATA_USAGE_SLICE_URI,
                         ListBuilder.INFINITY)
-                        .setAccentColor(Utils.getColorAccentDefaultColor(mContext))
                         .setHeader(new ListBuilder.HeaderBuilder().setTitle(title));
         if (DataUsageUtils.hasSim(mContext)) {
             listBuilder.addRow(new ListBuilder.RowBuilder()
diff --git a/src/com/android/settings/homepage/contextualcards/deviceinfo/DeviceInfoSlice.java b/src/com/android/settings/homepage/contextualcards/deviceinfo/DeviceInfoSlice.java
index 48a9aa54617b9540b5c44da66eec4aab20092ea5..69492bd8f1321db8e0736e9934d9c0461889ff4d 100644
--- a/src/com/android/settings/homepage/contextualcards/deviceinfo/DeviceInfoSlice.java
+++ b/src/com/android/settings/homepage/contextualcards/deviceinfo/DeviceInfoSlice.java
@@ -65,7 +65,6 @@ public class DeviceInfoSlice implements CustomSliceable {
                 ListBuilder.ICON_IMAGE, title);
         return new ListBuilder(mContext, CustomSliceRegistry.DEVICE_INFO_SLICE_URI,
                 ListBuilder.INFINITY)
-                .setAccentColor((Utils.getColorAccentDefaultColor(mContext)))
                 .setHeader(new ListBuilder.HeaderBuilder().setTitle(title))
                 .addRow(new ListBuilder.RowBuilder()
                         .setTitle(getPhoneNumber())
diff --git a/src/com/android/settings/homepage/contextualcards/deviceinfo/StorageSlice.java b/src/com/android/settings/homepage/contextualcards/deviceinfo/StorageSlice.java
index d03b3593bdb166eb7ce5566438359fbe064cacf8..64c06d54b7af0443180aa6c4736403a9fd4777d3 100644
--- a/src/com/android/settings/homepage/contextualcards/deviceinfo/StorageSlice.java
+++ b/src/com/android/settings/homepage/contextualcards/deviceinfo/StorageSlice.java
@@ -65,7 +65,6 @@ public class StorageSlice implements CustomSliceable {
         final PrivateStorageInfo info = getPrivateStorageInfo();
         return new ListBuilder(mContext, CustomSliceRegistry.STORAGE_SLICE_URI,
                 ListBuilder.INFINITY)
-                .setAccentColor(Utils.getColorAccentDefaultColor(mContext))
                 .setHeader(new ListBuilder.HeaderBuilder().setTitle(title))
                 .addRow(new ListBuilder.RowBuilder()
                         .setTitle(getStorageUsedText(info))
diff --git a/src/com/android/settings/homepage/contextualcards/slices/BatteryFixSlice.java b/src/com/android/settings/homepage/contextualcards/slices/BatteryFixSlice.java
index d1051fe867a63093ccc36ad0b609f5cd7a8b2ba8..2fb68f8d420ce5c979d96a1cc9dace52026604bd 100644
--- a/src/com/android/settings/homepage/contextualcards/slices/BatteryFixSlice.java
+++ b/src/com/android/settings/homepage/contextualcards/slices/BatteryFixSlice.java
@@ -93,8 +93,7 @@ public class BatteryFixSlice implements CustomSliceable {
     @Override
     public Slice getSlice() {
         final ListBuilder sliceBuilder =
-                new ListBuilder(mContext, BATTERY_FIX_SLICE_URI, ListBuilder.INFINITY)
-                        .setAccentColor(COLOR_NOT_TINTED);
+                new ListBuilder(mContext, BATTERY_FIX_SLICE_URI, ListBuilder.INFINITY);
 
         if (!isBatteryTipAvailableFromCache(mContext)) {
             return buildBatteryGoodSlice(sliceBuilder, true /* isError */);
diff --git a/src/com/android/settings/homepage/contextualcards/slices/BluetoothDevicesSlice.java b/src/com/android/settings/homepage/contextualcards/slices/BluetoothDevicesSlice.java
index 7cc6efe97dcc1decc828d1a9d3338bf89cd7131c..c1de546f6be9838df76653ab9f862a8ee46d9631 100644
--- a/src/com/android/settings/homepage/contextualcards/slices/BluetoothDevicesSlice.java
+++ b/src/com/android/settings/homepage/contextualcards/slices/BluetoothDevicesSlice.java
@@ -100,8 +100,7 @@ public class BluetoothDevicesSlice implements CustomSliceable {
         final SliceAction primarySliceAction = SliceAction.createDeeplink(primaryActionIntent, icon,
                 ListBuilder.ICON_IMAGE, title);
         final ListBuilder listBuilder =
-                new ListBuilder(mContext, getUri(), ListBuilder.INFINITY)
-                        .setAccentColor(COLOR_NOT_TINTED);
+                new ListBuilder(mContext, getUri(), ListBuilder.INFINITY);
 
         // Get row builders by Bluetooth devices.
         final List<ListBuilder.RowBuilder> rows = getBluetoothRowBuilder();
@@ -265,7 +264,7 @@ public class BluetoothDevicesSlice implements CustomSliceable {
     SliceAction buildBluetoothDetailDeepLinkAction(CachedBluetoothDevice bluetoothDevice) {
         return SliceAction.createDeeplink(
                 getBluetoothDetailIntent(bluetoothDevice),
-                IconCompat.createWithResource(mContext, R.drawable.ic_settings_accent),
+                IconCompat.createWithResource(mContext, R.drawable.ic_settings_cog),
                 ListBuilder.ICON_IMAGE,
                 bluetoothDevice.getName());
     }
diff --git a/src/com/android/settings/homepage/contextualcards/slices/ContextualAdaptiveSleepSlice.java b/src/com/android/settings/homepage/contextualcards/slices/ContextualAdaptiveSleepSlice.java
index c477abc986b6fd6d966fde05b8e3da3e3b953a36..235184fa910ce7dfcce027536fcfcab8ea8f5dab 100644
--- a/src/com/android/settings/homepage/contextualcards/slices/ContextualAdaptiveSleepSlice.java
+++ b/src/com/android/settings/homepage/contextualcards/slices/ContextualAdaptiveSleepSlice.java
@@ -92,7 +92,6 @@ public class ContextualAdaptiveSleepSlice implements CustomSliceable {
             final ListBuilder listBuilder = new ListBuilder(mContext,
                     CONTEXTUAL_ADAPTIVE_SLEEP_URI,
                     ListBuilder.INFINITY)
-                    .setAccentColor(COLOR_NOT_TINTED)
                     .addRow(new ListBuilder.RowBuilder()
                             .setTitleItem(icon, ListBuilder.ICON_IMAGE)
                             .setTitle(title)
diff --git a/src/com/android/settings/homepage/contextualcards/slices/DarkThemeSlice.java b/src/com/android/settings/homepage/contextualcards/slices/DarkThemeSlice.java
index 1b7f003ac8f47be89955077e6b674070a6610054..32b768258dd789449f732a8303cb1e77bccfb798 100644
--- a/src/com/android/settings/homepage/contextualcards/slices/DarkThemeSlice.java
+++ b/src/com/android/settings/homepage/contextualcards/slices/DarkThemeSlice.java
@@ -87,12 +87,11 @@ public class DarkThemeSlice implements CustomSliceable {
         }
         sKeepSliceShow = true;
         final PendingIntent toggleAction = getBroadcastIntent(mContext);
-        @ColorInt final int color = Utils.getColorAccentDefaultColor(mContext);
+        @ColorInt final int color = mContext.getResources().getColor(R.color.color_default_accent);
         final IconCompat icon =
                 IconCompat.createWithResource(mContext, R.drawable.dark_theme);
         return new ListBuilder(mContext, CustomSliceRegistry.DARK_THEME_SLICE_URI,
                 ListBuilder.INFINITY)
-                .setAccentColor(color)
                 .addRow(new ListBuilder.RowBuilder()
                         .setTitle(mContext.getText(R.string.dark_theme_slice_title))
                         .setTitleItem(icon, ICON_IMAGE)
diff --git a/src/com/android/settings/homepage/contextualcards/slices/FaceSetupSlice.java b/src/com/android/settings/homepage/contextualcards/slices/FaceSetupSlice.java
index 2e348240172f6cd52c2b4b5867e199fae41f1562..cff9bb03a1c5dd5cce943617e9a217885fd57a62 100644
--- a/src/com/android/settings/homepage/contextualcards/slices/FaceSetupSlice.java
+++ b/src/com/android/settings/homepage/contextualcards/slices/FaceSetupSlice.java
@@ -112,8 +112,7 @@ public class FaceSetupSlice implements CustomSliceable {
         }
 
         final ListBuilder listBuilder = new ListBuilder(mContext,
-                CustomSliceRegistry.FACE_ENROLL_SLICE_URI, ListBuilder.INFINITY)
-                .setAccentColor(Utils.getColorAccentDefaultColor(mContext));
+                CustomSliceRegistry.FACE_ENROLL_SLICE_URI, ListBuilder.INFINITY);
         final IconCompat icon = IconCompat.createWithResource(mContext, R.drawable.ic_face_24dp);
         return listBuilder.addRow(buildRowBuilder(title, subtitle, icon, mContext, getIntent()))
                 .build();
diff --git a/src/com/android/settings/homepage/contextualcards/slices/LowStorageSlice.java b/src/com/android/settings/homepage/contextualcards/slices/LowStorageSlice.java
index 2bc09e9f72d8e44efb9615cf68c5771735788827..65a977f9cd5ffbd002d1ad78ef02db4fd2243bb2 100644
--- a/src/com/android/settings/homepage/contextualcards/slices/LowStorageSlice.java
+++ b/src/com/android/settings/homepage/contextualcards/slices/LowStorageSlice.java
@@ -66,8 +66,7 @@ public class LowStorageSlice implements CustomSliceable {
         final String percentageString = NumberFormat.getPercentInstance().format(usedPercentage);
         final String freeSizeString = Formatter.formatFileSize(mContext, info.freeBytes);
         final ListBuilder listBuilder = new ListBuilder(mContext,
-                CustomSliceRegistry.LOW_STORAGE_SLICE_URI, ListBuilder.INFINITY).setAccentColor(
-                Utils.getColorAccentDefaultColor(mContext));
+                CustomSliceRegistry.LOW_STORAGE_SLICE_URI, ListBuilder.INFINITY);
         final IconCompat icon = IconCompat.createWithResource(mContext, R.drawable.ic_storage);
 
         if (usedPercentage < LOW_STORAGE_THRESHOLD) {
diff --git a/src/com/android/settings/homepage/contextualcards/slices/NotificationChannelSlice.java b/src/com/android/settings/homepage/contextualcards/slices/NotificationChannelSlice.java
index bdf97a802a0fc2f25b589df4da8d04421a0068e1..99c0dbe92a46fd58cf0067a61da8c9216440cb67 100644
--- a/src/com/android/settings/homepage/contextualcards/slices/NotificationChannelSlice.java
+++ b/src/com/android/settings/homepage/contextualcards/slices/NotificationChannelSlice.java
@@ -146,8 +146,7 @@ public class NotificationChannelSlice implements CustomSliceable {
     @Override
     public Slice getSlice() {
         final ListBuilder listBuilder =
-                new ListBuilder(mContext, getUri(), ListBuilder.INFINITY)
-                        .setAccentColor(COLOR_NOT_TINTED);
+                new ListBuilder(mContext, getUri(), ListBuilder.INFINITY);
         /**
          * Get package which is satisfied with:
          * 1. Recently installed.
diff --git a/src/com/android/settings/location/LocationSlice.java b/src/com/android/settings/location/LocationSlice.java
index e2078e3a13baba633e2ed014b147e80e2d57d062..875dc4e239a38f9af08fe02e50ddca7ece180ec2 100644
--- a/src/com/android/settings/location/LocationSlice.java
+++ b/src/com/android/settings/location/LocationSlice.java
@@ -57,14 +57,13 @@ public class LocationSlice implements CustomSliceable {
         final IconCompat icon = IconCompat.createWithResource(mContext,
                 R.drawable.ic_signal_location);
         final CharSequence title = mContext.getText(R.string.location_settings_title);
-        @ColorInt final int color = Utils.getColorAccentDefaultColor(mContext);
+        @ColorInt final int color = mContext.getResources().getColor(R.color.color_default_accent);
         final PendingIntent primaryAction = getPrimaryAction();
         final SliceAction primarySliceAction = SliceAction.createDeeplink(primaryAction, icon,
                 ListBuilder.ICON_IMAGE, title);
 
         return new ListBuilder(mContext, CustomSliceRegistry.LOCATION_SLICE_URI,
                 ListBuilder.INFINITY)
-                .setAccentColor(color)
                 .addRow(new RowBuilder()
                         .setTitle(title)
                         .setTitleItem(icon, ICON_IMAGE)
diff --git a/src/com/android/settings/media/MediaOutputIndicatorSlice.java b/src/com/android/settings/media/MediaOutputIndicatorSlice.java
index 852f86f9b88a51052192dc89e80bda751b341dd3..0eae06f401181e58ab7b64f545c5ef1f319e9487 100644
--- a/src/com/android/settings/media/MediaOutputIndicatorSlice.java
+++ b/src/com/android/settings/media/MediaOutputIndicatorSlice.java
@@ -75,12 +75,11 @@ public class MediaOutputIndicatorSlice implements CustomSliceable {
                 0 /* requestCode */, getMediaOutputSliceIntent(), 0 /* flags */);
         final SliceAction primarySliceAction = SliceAction.createDeeplink(
                 primaryActionIntent, icon, ListBuilder.ICON_IMAGE, title);
-        @ColorInt final int color = Utils.getColorAccentDefaultColor(mContext);
+        @ColorInt final int color = mContext.getResources().getColor(R.color.color_default_accent);
 
         final ListBuilder listBuilder = new ListBuilder(mContext,
                 MEDIA_OUTPUT_INDICATOR_SLICE_URI,
                 ListBuilder.INFINITY)
-                .setAccentColor(color)
                 .addRow(new ListBuilder.RowBuilder()
                         .setTitle(title)
                         .setSubtitle(findActiveDeviceName())
diff --git a/src/com/android/settings/media/MediaOutputSlice.java b/src/com/android/settings/media/MediaOutputSlice.java
index 5463320547f08f5af8457744d7e0c6e2272533b2..e51181a78b4234a7d85bcc46eef3b2ee7bf8709e 100644
--- a/src/com/android/settings/media/MediaOutputSlice.java
+++ b/src/com/android/settings/media/MediaOutputSlice.java
@@ -74,8 +74,7 @@ public class MediaOutputSlice implements CustomSliceable {
         // Reload theme for switching dark mode on/off
         mContext.getTheme().applyStyle(R.style.Theme_Settings_Home, true /* force */);
 
-        final ListBuilder listBuilder = new ListBuilder(mContext, getUri(), ListBuilder.INFINITY)
-                .setAccentColor(COLOR_NOT_TINTED);
+        final ListBuilder listBuilder = new ListBuilder(mContext, getUri(), ListBuilder.INFINITY);
 
         if (!isVisible()) {
             Log.d(TAG, "getSlice() is not visible");
diff --git a/src/com/android/settings/network/telephony/Enhanced4gLteSliceHelper.java b/src/com/android/settings/network/telephony/Enhanced4gLteSliceHelper.java
index 4ff28f2fb1d1d3a4d48e4bce763b79cdfc317046..a38fceb202c0e08a24dbdf22c23da3223bc018b6 100644
--- a/src/com/android/settings/network/telephony/Enhanced4gLteSliceHelper.java
+++ b/src/com/android/settings/network/telephony/Enhanced4gLteSliceHelper.java
@@ -168,7 +168,6 @@ public class Enhanced4gLteSliceHelper {
                 R.mipmap.ic_launcher);
 
         return new ListBuilder(mContext, sliceUri, ListBuilder.INFINITY)
-                .setAccentColor(Utils.getColorAccentDefaultColor(mContext))
                 .addRow(new RowBuilder()
                         .setTitle(getEnhanced4glteModeTitle(subId))
                         .addEndItem(
diff --git a/src/com/android/settings/network/telephony/MobileDataSlice.java b/src/com/android/settings/network/telephony/MobileDataSlice.java
index 65eaf8708b54045e3850a3e4f12a2c82cb361cd0..668be0d742735c12e3cdd8aefd78c957a276768d 100644
--- a/src/com/android/settings/network/telephony/MobileDataSlice.java
+++ b/src/com/android/settings/network/telephony/MobileDataSlice.java
@@ -76,7 +76,7 @@ public class MobileDataSlice implements CustomSliceable {
         final IconCompat icon = IconCompat.createWithResource(mContext,
                 R.drawable.ic_network_cell);
         final String title = mContext.getText(R.string.mobile_data_settings_title).toString();
-        @ColorInt final int color = Utils.getColorAccentDefaultColor(mContext);
+        @ColorInt final int color = mContext.getResources().getColor(R.color.color_default_accent);
 
         // Return null until we can show a disabled-action Slice, blaming Airplane mode.
         if (isAirplaneModeEnabled()) {
@@ -98,7 +98,6 @@ public class MobileDataSlice implements CustomSliceable {
 
         final ListBuilder listBuilder = new ListBuilder(mContext, getUri(),
                 ListBuilder.INFINITY)
-                .setAccentColor(color)
                 .addRow(new ListBuilder.RowBuilder()
                         .setTitle(title)
                         .setSubtitle(summary)
diff --git a/src/com/android/settings/network/telephony/MobileNetworkUtils.java b/src/com/android/settings/network/telephony/MobileNetworkUtils.java
index 62491bfc2fe6c8f42c20527100fc6b86e32ef138..dd993fa553f3480274fbb5b17943ce92e0cc3d1d 100644
--- a/src/com/android/settings/network/telephony/MobileNetworkUtils.java
+++ b/src/com/android/settings/network/telephony/MobileNetworkUtils.java
@@ -539,7 +539,7 @@ public class MobileNetworkUtils {
         // Set the signal strength icon at the bottom right
         icons.setLayerGravity(1 /* index of SignalDrawable */, Gravity.BOTTOM | Gravity.RIGHT);
         icons.setLayerSize(1 /* index of SignalDrawable */, iconSize, iconSize);
-        icons.setTintList(Utils.getColorAttr(context, android.R.attr.colorControlNormal));
+        icons.setTintList(Utils.getColorAttr(context, R.color.color_default_accent));
         return icons;
     }
 
diff --git a/src/com/android/settings/notification/ChannelListPreferenceController.java b/src/com/android/settings/notification/ChannelListPreferenceController.java
index 7ff407c8e29528bd33c65c393d5c6a24ab4d9a59..d69dbc13b411bf471c86e4fac3b55b4816d153a8 100644
--- a/src/com/android/settings/notification/ChannelListPreferenceController.java
+++ b/src/com/android/settings/notification/ChannelListPreferenceController.java
@@ -227,7 +227,6 @@ public class ChannelListPreferenceController extends NotificationPreferenceContr
 
     private Drawable getAlertingIcon() {
         Drawable icon = mContext.getDrawable(R.drawable.ic_notifications_alert);
-        icon.setTintList(Utils.getColorAccent(mContext));
         return icon;
     }
 
diff --git a/src/com/android/settings/notification/ImportancePreference.java b/src/com/android/settings/notification/ImportancePreference.java
index b059f9165e7db0e62424b4938d0f2d8eeaa57d8d..7cca2bc86c42f35e5b5683ff60ade3c2dd377788 100644
--- a/src/com/android/settings/notification/ImportancePreference.java
+++ b/src/com/android/settings/notification/ImportancePreference.java
@@ -155,11 +155,11 @@ public class ImportancePreference extends Preference {
     }
 
     private ColorStateList getAccentTint() {
-        return Utils.getColorAccent(getContext());
+        return Utils.getColorAttr(getContext(), com.android.settings.R.color.color_default_accent);
     }
 
     private ColorStateList getRegularTint() {
-        return Utils.getColorAttr(getContext(), android.R.attr.textColorPrimary);
+        return Utils.getColorAttr(getContext(), com.android.settings.R.color.color_default_primary_text);
     }
 
     void setImportanceSummary(ViewGroup parent, int importance, boolean fromUser) {
diff --git a/src/com/android/settings/notification/ZenModeSliceBuilder.java b/src/com/android/settings/notification/ZenModeSliceBuilder.java
index 11094042848380d40132487b2a826920007813df..1db2697cea01d9ba7dc688a14f50ea2ab535d2cb 100644
--- a/src/com/android/settings/notification/ZenModeSliceBuilder.java
+++ b/src/com/android/settings/notification/ZenModeSliceBuilder.java
@@ -74,7 +74,7 @@ public class ZenModeSliceBuilder {
         final boolean isZenModeEnabled = isZenModeEnabled(context);
         final CharSequence title = context.getText(R.string.zen_mode_settings_title);
         final CharSequence subtitle = context.getText(R.string.zen_mode_slice_subtitle);
-        @ColorInt final int color = Utils.getColorAccentDefaultColor(context);
+        @ColorInt final int color = context.getResources().getColor(R.color.color_default_accent);
         final PendingIntent toggleAction = getBroadcastIntent(context);
         final PendingIntent primaryAction = getPrimaryAction(context);
         final SliceAction primarySliceAction = SliceAction.createDeeplink(primaryAction,
@@ -85,7 +85,6 @@ public class ZenModeSliceBuilder {
 
         return new ListBuilder(context, CustomSliceRegistry.ZEN_MODE_SLICE_URI,
                 ListBuilder.INFINITY)
-                .setAccentColor(color)
                 .addRow(new RowBuilder()
                         .setTitle(title)
                         .setSubtitle(subtitle)
diff --git a/src/com/android/settings/print/PrintJobPreferenceController.java b/src/com/android/settings/print/PrintJobPreferenceController.java
index 32375ec430c1fd013fa588924b1b55da2d5bc2e0..527de3f24c09b8057e61397aebe4c0f18c88c7e0 100644
--- a/src/com/android/settings/print/PrintJobPreferenceController.java
+++ b/src/com/android/settings/print/PrintJobPreferenceController.java
@@ -89,7 +89,7 @@ public class PrintJobPreferenceController extends PrintJobPreferenceControllerBa
                         DateFormat.SHORT)));
 
         TypedArray a = mContext.obtainStyledAttributes(new int[]{
-                android.R.attr.colorControlNormal});
+                R.color.color_default_accent});
         int tintColor = a.getColor(0, 0);
         a.recycle();
 
diff --git a/src/com/android/settings/print/PrintSettingsFragment.java b/src/com/android/settings/print/PrintSettingsFragment.java
index e90b64f2c1422898e5a5430a4fa4ce1372ded93a..b14b2fe4105a90ee24a70762dec9a979f097f9a7 100644
--- a/src/com/android/settings/print/PrintSettingsFragment.java
+++ b/src/com/android/settings/print/PrintSettingsFragment.java
@@ -212,7 +212,7 @@ public class PrintSettingsFragment extends ProfileSettingsPreferenceFragment
 
                 Drawable drawable = service.getResolveInfo().loadIcon(pm);
                 if (drawable != null) {
-                    drawable.mutate().setTint(context.getResources().getColor(R.color.color_default_accent));
+                    drawable.mutate().setTint(context.getResources().getColor(R.color.default_icon_color));
                     preference.setIcon(drawable);
                 }
 
@@ -358,7 +358,7 @@ public class PrintSettingsFragment extends ProfileSettingsPreferenceFragment
                                     DateFormat.SHORT, DateFormat.SHORT)));
 
                     TypedArray a = getActivity().obtainStyledAttributes(new int[]{
-                            android.R.attr.colorControlNormal});
+                            R.color.color_default_accent});
                     int tintColor = a.getColor(0, 0);
                     a.recycle();
 
diff --git a/src/com/android/settings/privacy/PermissionBarChartPreferenceController.java b/src/com/android/settings/privacy/PermissionBarChartPreferenceController.java
index bb43a16bc775b0c3043716127ad21b5b12c60b0a..62ea975ce102f2daa183f11bb5893af0a09338d1 100644
--- a/src/com/android/settings/privacy/PermissionBarChartPreferenceController.java
+++ b/src/com/android/settings/privacy/PermissionBarChartPreferenceController.java
@@ -206,7 +206,7 @@ public class PermissionBarChartPreferenceController extends BasePreferenceContro
         try {
             icon = mPackageManager.getPermissionGroupInfo(permissionGroup, 0)
                     .loadIcon(mPackageManager);
-            icon.setTintList(Utils.getColorAttr(mContext, android.R.attr.textColorSecondary));
+            icon.setTintList(Utils.getColorAttr(mContext, R.color.color_default_secondary_text));
         } catch (PackageManager.NameNotFoundException e) {
             Log.w(TAG, "Cannot find group icon for " + permissionGroup, e);
         }
diff --git a/src/com/android/settings/search/actionbar/SearchMenuController.java b/src/com/android/settings/search/actionbar/SearchMenuController.java
index 6f0a7ee8aecef6203dbb824d55372b1f2e3e40b6..cfa69b54887f5b3198868eed5b682d3379745495 100644
--- a/src/com/android/settings/search/actionbar/SearchMenuController.java
+++ b/src/com/android/settings/search/actionbar/SearchMenuController.java
@@ -79,7 +79,7 @@ public class SearchMenuController implements LifecycleObserver, OnCreateOptionsM
         }
         final MenuItem searchItem = menu.add(Menu.NONE, Menu.NONE, 0 /* order */,
                 R.string.search_menu);
-        searchItem.setIcon(R.drawable.ic_homepage_search);
+        searchItem.setIcon(R.drawable.ic_search);
         searchItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
 
         searchItem.setOnMenuItemClickListener(target -> {
diff --git a/src/com/android/settings/sim/SimListDialogFragment.java b/src/com/android/settings/sim/SimListDialogFragment.java
index a5d4157818c2e4251913d752ef24d12f1e1b0bd4..9163a97f1f519555c60e3d134a3ab8f3b70f68c5 100644
--- a/src/com/android/settings/sim/SimListDialogFragment.java
+++ b/src/com/android/settings/sim/SimListDialogFragment.java
@@ -177,7 +177,7 @@ public class SimListDialogFragment extends SimDialogFragment implements
                 summary.setText("");
                 icon.setImageDrawable(mContext.getDrawable(R.drawable.ic_feedback_24dp));
                 icon.setImageTintList(
-                        Utils.getColorAttr(mContext, android.R.attr.textColorSecondary));
+                        Utils.getColorAttr(mContext, R.color.color_default_secondary_text));
             } else {
                 title.setText(sub.getDisplayName());
                 summary.setText(isMdnProvisioned(sub.getNumber()) ? sub.getNumber() : "");
diff --git a/src/com/android/settings/slices/SliceBuilderUtils.java b/src/com/android/settings/slices/SliceBuilderUtils.java
index cde8d1401c908cafdae8e2eb492b96060320d507..5cb3847ed90b245ea44c94569d85f16ff33759cd 100644
--- a/src/com/android/settings/slices/SliceBuilderUtils.java
+++ b/src/com/android/settings/slices/SliceBuilderUtils.java
@@ -258,7 +258,7 @@ public class SliceBuilderUtils {
         final PendingIntent contentIntent = getContentPendingIntent(context, sliceData);
         final IconCompat icon = getSafeIcon(context, sliceData);
         final CharSequence subtitleText = getSubtitleText(context, controller, sliceData);
-        @ColorInt final int color = Utils.getColorAccentDefaultColor(context);
+        @ColorInt final int color = context.getResources().getColor(R.color.color_default_accent);
         final TogglePreferenceController toggleController =
                 (TogglePreferenceController) controller;
         final SliceAction sliceAction = getToggleAction(context, sliceData,
@@ -266,7 +266,6 @@ public class SliceBuilderUtils {
         final Set<String> keywords = buildSliceKeywords(sliceData);
 
         return new ListBuilder(context, sliceData.getUri(), ListBuilder.INFINITY)
-                .setAccentColor(color)
                 .addRow(new RowBuilder()
                         .setTitle(sliceData.getTitle())
                         .setSubtitle(subtitleText)
@@ -283,11 +282,10 @@ public class SliceBuilderUtils {
         final PendingIntent contentIntent = getContentPendingIntent(context, sliceData);
         final IconCompat icon = getSafeIcon(context, sliceData);
         final CharSequence subtitleText = getSubtitleText(context, controller, sliceData);
-        @ColorInt final int color = Utils.getColorAccentDefaultColor(context);
+        @ColorInt final int color = context.getResources().getColor(R.color.color_default_accent);
         final Set<String> keywords = buildSliceKeywords(sliceData);
 
         return new ListBuilder(context, sliceData.getUri(), ListBuilder.INFINITY)
-                .setAccentColor(color)
                 .addRow(new RowBuilder()
                         .setTitle(sliceData.getTitle())
                         .setSubtitle(subtitleText)
@@ -309,7 +307,7 @@ public class SliceBuilderUtils {
         final PendingIntent actionIntent = getSliderAction(context, sliceData);
         final PendingIntent contentIntent = getContentPendingIntent(context, sliceData);
         final IconCompat icon = getSafeIcon(context, sliceData);
-        @ColorInt final int color = Utils.getColorAccentDefaultColor(context);
+        @ColorInt final int color = context.getResources().getColor(R.color.color_default_accent);
         final CharSequence subtitleText = getSubtitleText(context, controller, sliceData);
         final SliceAction primaryAction = SliceAction.createDeeplink(contentIntent, icon,
                 ListBuilder.ICON_IMAGE, sliceData.getTitle());
@@ -324,7 +322,6 @@ public class SliceBuilderUtils {
         }
 
         return new ListBuilder(context, sliceData.getUri(), ListBuilder.INFINITY)
-                .setAccentColor(color)
                 .addInputRange(new InputRangeBuilder()
                         .setTitle(sliceData.getTitle())
                         .setSubtitle(subtitleText)
@@ -346,11 +343,10 @@ public class SliceBuilderUtils {
                 ListBuilder.ICON_IMAGE,
                 sliceData.getTitle());
         final CharSequence subtitleText = getSubtitleText(context, controller, sliceData);
-        @ColorInt final int color = Utils.getColorAccentDefaultColor(context);
+        @ColorInt final int color = context.getResources().getColor(R.color.color_default_accent);
         final Set<String> keywords = buildSliceKeywords(sliceData);
 
         return new ListBuilder(context, sliceData.getUri(), ListBuilder.INFINITY)
-                .setAccentColor(color)
                 .addRow(new RowBuilder()
                         .setTitle(sliceData.getTitle())
                         .setSubtitle(subtitleText)
@@ -427,7 +423,7 @@ public class SliceBuilderUtils {
     private static Slice buildUnavailableSlice(Context context, SliceData data) {
         final String title = data.getTitle();
         final Set<String> keywords = buildSliceKeywords(data);
-        @ColorInt final int color = Utils.getColorAccentDefaultColor(context);
+        @ColorInt final int color = context.getResources().getColor(R.color.color_default_accent);
 
         final String customSubtitle = data.getUnavailableSliceSubtitle();
         final CharSequence subtitle = !TextUtils.isEmpty(customSubtitle) ? customSubtitle
@@ -438,7 +434,6 @@ public class SliceBuilderUtils {
                 icon, ListBuilder.ICON_IMAGE, title);
 
         return new ListBuilder(context, data.getUri(), ListBuilder.INFINITY)
-                .setAccentColor(color)
                 .addRow(new RowBuilder()
                         .setTitle(title)
                         .setTitleItem(icon, ListBuilder.ICON_IMAGE)
@@ -453,14 +448,14 @@ public class SliceBuilderUtils {
         int iconResource = data.getIconResource();
 
         if (iconResource == 0) {
-            iconResource = R.drawable.ic_settings_accent;
+            iconResource = R.drawable.ic_settings_cog;
         }
         try {
             return IconCompat.createWithResource(context, iconResource);
         } catch (Exception e) {
             Log.w(TAG, "Falling back to settings icon because there is an error getting slice icon "
                     + data.getUri(), e);
-            return IconCompat.createWithResource(context, R.drawable.ic_settings_accent);
+            return IconCompat.createWithResource(context, R.drawable.ic_settings_cog);
         }
     }
 }
diff --git a/src/com/android/settings/widget/DonutView.java b/src/com/android/settings/widget/DonutView.java
index 13716636d91522f69d42067056f54c2437d141f8..fd13bb4b8f20eb6f6f913838f67ca7ea50fbc273 100644
--- a/src/com/android/settings/widget/DonutView.java
+++ b/src/com/android/settings/widget/DonutView.java
@@ -109,7 +109,7 @@ public class DonutView extends View {
         if (applyColorAccent) {
             final ColorFilter mAccentColorFilter =
                     new PorterDuffColorFilter(
-                            Utils.getColorAttrDefaultColor(context, android.R.attr.colorAccent),
+                            context.getColor(R.color.color_default_accent),
                             PorterDuff.Mode.SRC_IN);
             mBackgroundCircle.setColorFilter(mAccentColorFilter);
             mFilledArc.setColorFilter(mAccentColorFilter);
@@ -122,7 +122,7 @@ public class DonutView extends View {
                 : Paint.BIDI_RTL;
 
         mTextPaint = new TextPaint();
-        mTextPaint.setColor(Utils.getColorAccentDefaultColor(getContext()));
+        mTextPaint.setColor(getContext().getResources().getColor(R.color.color_default_accent));
         mTextPaint.setAntiAlias(true);
         mTextPaint.setTextSize(
                 resources.getDimension(R.dimen.storage_donut_view_label_text_size));
@@ -130,7 +130,7 @@ public class DonutView extends View {
         mTextPaint.setBidiFlags(bidiFlags);
 
         mBigNumberPaint = new TextPaint();
-        mBigNumberPaint.setColor(Utils.getColorAccentDefaultColor(getContext()));
+        mBigNumberPaint.setColor(getContext().getResources().getColor(R.color.color_default_accent));
         mBigNumberPaint.setAntiAlias(true);
         mBigNumberPaint.setTextSize(
                 resources.getDimension(R.dimen.storage_donut_view_percent_text_size));
diff --git a/src/com/android/settings/widget/RadioButtonPreferenceWithExtraWidget.java b/src/com/android/settings/widget/RadioButtonPreferenceWithExtraWidget.java
index 19fd92377c8bc1db0dae7748aced013b3ed5f2ee..213409a4c776fab01d14257d5106bb8f565c53b3 100644
--- a/src/com/android/settings/widget/RadioButtonPreferenceWithExtraWidget.java
+++ b/src/com/android/settings/widget/RadioButtonPreferenceWithExtraWidget.java
@@ -72,7 +72,7 @@ public class RadioButtonPreferenceWithExtraWidget extends RadioButtonPreference
                 mExtraWidget.setContentDescription(
                         getContext().getResources().getText(R.string.information_label));
             } else if (mExtraWidgetVisibility == EXTRA_WIDGET_VISIBILITY_SETTING) {
-                mExtraWidget.setImageResource(R.drawable.ic_settings_accent);
+                mExtraWidget.setImageResource(R.drawable.ic_settings_cog);
                 mExtraWidget.setContentDescription(
                         getContext().getResources().getText(R.string.settings_label));
             }
diff --git a/src/com/android/settings/wifi/LongPressAccessPointPreference.java b/src/com/android/settings/wifi/LongPressAccessPointPreference.java
index 8390f1b16bd5ff028c8de728a799e9bd14f689ff..34dad195dc184b20eb7296c22863b9d48510c0b5 100644
--- a/src/com/android/settings/wifi/LongPressAccessPointPreference.java
+++ b/src/com/android/settings/wifi/LongPressAccessPointPreference.java
@@ -51,7 +51,7 @@ public class LongPressAccessPointPreference extends AccessPointPreference {
     @Override
     public void setIcon(Drawable drawable) {
         if (drawable != null) {
-            drawable.setColorFilter(mContext.getColor(R.color.color_default_accent), PorterDuff.Mode.SRC_IN);
+            drawable.setColorFilter(mContext.getColor(R.color.default_icon_color), PorterDuff.Mode.SRC_IN);
         }
         super.setIcon(drawable);
     }
diff --git a/src/com/android/settings/wifi/calling/WifiCallingSliceHelper.java b/src/com/android/settings/wifi/calling/WifiCallingSliceHelper.java
index 70eef2cc57500a9e50133b570dd8b297ba01a962..08548bec8c6306e85fc3b5f30755c03ed3cfaece 100644
--- a/src/com/android/settings/wifi/calling/WifiCallingSliceHelper.java
+++ b/src/com/android/settings/wifi/calling/WifiCallingSliceHelper.java
@@ -190,7 +190,6 @@ public class WifiCallingSliceHelper {
         final IconCompat icon = IconCompat.createWithResource(mContext, R.drawable.wifi_signal);
 
         return new ListBuilder(mContext, sliceUri, ListBuilder.INFINITY)
-                .setAccentColor(Utils.getColorAccentDefaultColor(mContext))
                 .addRow(new RowBuilder()
                         .setTitle(mContext.getText(R.string.wifi_calling_settings_title))
                         .addEndItem(
@@ -279,8 +278,7 @@ public class WifiCallingSliceHelper {
             Uri sliceUri) {
         final IconCompat icon = IconCompat.createWithResource(mContext, R.drawable.wifi_signal);
         // Top row shows information on current preference state
-        ListBuilder listBuilder = new ListBuilder(mContext, sliceUri, ListBuilder.INFINITY)
-                .setAccentColor(Utils.getColorAccentDefaultColor(mContext));
+        ListBuilder listBuilder = new ListBuilder(mContext, sliceUri, ListBuilder.INFINITY);
         listBuilder.setHeader(new ListBuilder.HeaderBuilder()
                 .setTitle(mContext.getText(R.string.wifi_calling_mode_title))
                 .setSubtitle(getWifiCallingPreferenceSummary(currentWfcPref))
@@ -468,7 +466,6 @@ public class WifiCallingSliceHelper {
             Uri sliceUri, PendingIntent primaryActionIntent) {
         final IconCompat icon = IconCompat.createWithResource(mContext, R.drawable.wifi_signal);
         return new ListBuilder(mContext, sliceUri, ListBuilder.INFINITY)
-                .setAccentColor(Utils.getColorAccentDefaultColor(mContext))
                 .addRow(new RowBuilder()
                         .setTitle(title)
                         .setSubtitle(subtitle)
diff --git a/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java b/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java
index 24e99da9951887d8711a00c7b123bf4b7cc2fec2..92ad0534a2299f1ed4a90c092868a1ab0383aa37 100644
--- a/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java
+++ b/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java
@@ -394,7 +394,7 @@ public class WifiDetailPreferenceController extends AbstractPreferenceController
                 .setButton3OnClickListener(view -> connectNetwork())
                 .setButton3Enabled(true)
                 .setButton4Text(R.string.share)
-                .setButton4Icon(R.drawable.ic_qrcode_24dp)
+                .setButton4Icon(R.drawable.ic_qrcode)
                 .setButton4OnClickListener(view -> shareNetwork());
 
         mSignalStrengthPref = screen.findPreference(KEY_SIGNAL_STRENGTH_PREF);
@@ -611,7 +611,7 @@ public class WifiDetailPreferenceController extends AbstractPreferenceController
         Drawable newIcon = new BitmapDrawable(null /*resource*/, bitmap);
 
         // config color for 87% black after enlarge
-        newIcon.setTintList(Utils.getColorAttr(mContext, R.color.color_default_accent));
+        newIcon.setTintList(Utils.getColorAttr(mContext, R.color.default_icon_color));
 
         return newIcon;
     }
@@ -959,7 +959,7 @@ public class WifiDetailPreferenceController extends AbstractPreferenceController
 
         public Drawable getIcon(int level) {
             Drawable icon = mContext.getDrawable(Utils.getWifiIconResource(level));
-            icon.setTint(mContext.getColor(R.color.color_default_accent));
+            icon.setTint(mContext.getColor(R.color.default_icon_color));
             return icon.mutate();
         }
     }
diff --git a/src/com/android/settings/wifi/dpp/WifiDppQrCodeGeneratorFragment.java b/src/com/android/settings/wifi/dpp/WifiDppQrCodeGeneratorFragment.java
index d388931407cd23153208180ae01c19b8270ae469..13522c00178e90f0fd82bb71ca16a96562f671be 100644
--- a/src/com/android/settings/wifi/dpp/WifiDppQrCodeGeneratorFragment.java
+++ b/src/com/android/settings/wifi/dpp/WifiDppQrCodeGeneratorFragment.java
@@ -116,7 +116,7 @@ public class WifiDppQrCodeGeneratorFragment extends WifiDppQrCodeBaseFragment {
 
         mQrCodeView = view.findViewById(R.id.qrcode_view);
 
-        setHeaderIconImageResource(R.drawable.ic_qrcode_24dp);
+        setHeaderIconImageResource(R.drawable.ic_qrcode);
 
         final WifiNetworkConfig wifiNetworkConfig = getWifiNetworkConfigFromHostActivity();
         if (wifiNetworkConfig.isHotspot()) {
diff --git a/src/com/android/settings/wifi/slice/WifiSlice.java b/src/com/android/settings/wifi/slice/WifiSlice.java
index e5c8de59f8cd04051a3ce9b2464baba6ea35dc59..dab4421528ea6a1803eedb3417e5dce8a5b48235 100644
--- a/src/com/android/settings/wifi/slice/WifiSlice.java
+++ b/src/com/android/settings/wifi/slice/WifiSlice.java
@@ -157,7 +157,6 @@ public class WifiSlice implements CustomSliceable {
                 null /* actionTitle */, isWifiEnabled);
 
         return new ListBuilder(mContext, getUri(), ListBuilder.INFINITY)
-                .setAccentColor(COLOR_NOT_TINTED)
                 .setKeywords(getKeywords())
                 .addRow(new ListBuilder.RowBuilder()
                         .setTitle(title)
@@ -205,13 +204,12 @@ public class WifiSlice implements CustomSliceable {
         if (accessPoint.isActive()) {
             final NetworkInfo.State state = accessPoint.getNetworkInfo().getState();
             if (state == NetworkInfo.State.CONNECTED) {
-                color = Utils.getColorAccentDefaultColor(mContext);
+                color = mContext.getResources().getColor(R.color.color_default_accent);
             } else { // connecting
-                color = Utils.getDisabled(mContext, Utils.getColorAttrDefaultColor(mContext,
-                        android.R.attr.colorControlNormal));
+                color = Utils.getDisabled(mContext, mContext.getColor(R.color.color_default_accent));
             }
         } else {
-            color = Utils.getColorAttrDefaultColor(mContext, android.R.attr.colorControlNormal);
+            color = mContext.getColor(R.color.color_default_accent);
         }
 
         d.setColorFilter(new PorterDuffColorFilter(color, PorterDuff.Mode.SRC_IN));
@@ -231,7 +229,7 @@ public class WifiSlice implements CustomSliceable {
 
     private SliceAction getCaptivePortalEndAction(AccessPoint accessPoint, CharSequence title) {
         return getAccessPointAction(accessPoint, false /* isCaptivePortal */,
-                IconCompat.createWithResource(mContext, R.drawable.ic_settings_accent), title);
+                IconCompat.createWithResource(mContext, R.drawable.ic_settings_cog), title);
     }
 
     private SliceAction getAccessPointAction(AccessPoint accessPoint, boolean isCaptivePortal,
diff --git a/src/com/android/settings/wifi/tether/WifiTetherSsidPreference.java b/src/com/android/settings/wifi/tether/WifiTetherSsidPreference.java
index 4343fcc399decb18afb571fd73b96a0c80c9fb3d..10d1555a61b3445cf8d61a57f359f79872812cb1 100644
--- a/src/com/android/settings/wifi/tether/WifiTetherSsidPreference.java
+++ b/src/com/android/settings/wifi/tether/WifiTetherSsidPreference.java
@@ -71,7 +71,7 @@ public class WifiTetherSsidPreference extends ValidatedEditTextPreference {
         setLayoutResource(com.android.settingslib.R.layout.preference_two_target);
         setWidgetLayoutResource(R.layout.wifi_button_preference_widget);
 
-        mShareIconDrawable = getDrawable(R.drawable.ic_qrcode_24dp);
+        mShareIconDrawable = getDrawable(R.drawable.ic_qrcode);
     }
 
     @Override
diff --git a/tests/robotests/res/layout/preference.xml b/tests/robotests/res/layout/preference.xml
index 7ac733f3de8baff0fe0d8d76eb4e0fd4d9bf0ac4..7500a1f2dd8973703dbc95b819a2a4813c56e5bc 100644
--- a/tests/robotests/res/layout/preference.xml
+++ b/tests/robotests/res/layout/preference.xml
@@ -31,7 +31,7 @@
         android:layout_height="wrap_content"
         android:singleLine="true"
         android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Subhead"
-        android:textColor="?android:attr/textColorPrimary"
+        android:textColor="@color/color_default_primary_text"
         android:ellipsize="marquee"
         android:fadingEdge="horizontal" />
 
@@ -44,7 +44,7 @@
         android:visibility="gone"
         android:textAlignment="viewStart"
         android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Body1"
-        android:textColor="?android:attr/textColorSecondary"
+        android:textColor="@color/color_default_secondary_text"
         android:maxLines="10" />
 
     <LinearLayout
diff --git a/tests/robotests/res/values/themes.xml b/tests/robotests/res/values/themes.xml
index 92edb17b503fb732962f08709502f1981fa129fd..cdd143a7ae58b465e49e1b1a04ab34e4eadb4ee2 100644
--- a/tests/robotests/res/values/themes.xml
+++ b/tests/robotests/res/values/themes.xml
@@ -23,8 +23,8 @@
         <item name="android:textColorPrimary">@android:color/white</item>
         <item name="switchBarMarginStart">@dimen/switchbar_subsettings_margin_start</item>
         <item name="switchBarMarginEnd">@dimen/switchbar_subsettings_margin_end</item>
-        <item name="switchBarBackgroundColor">?android:attr/textColorSecondary</item>
-        <item name="switchBarBackgroundActivatedColor">?android:attr/colorAccent</item>
+        <item name="switchBarBackgroundColor">@color/color_default_secondary_text</item>
+        <item name="switchBarBackgroundActivatedColor">@color/color_default_accent</item>
         <item name="switchBarRestrictionIcon">@drawable/ic_help</item>
     </style>
 
diff --git a/wrap_alpha.py b/wrap_alpha.py
index 53db4eb4ce6ca5a5fab64b771aa3a0f217211a07..45c07c9363e650f1960fc01a120b768f827dcf4d 100755
--- a/wrap_alpha.py
+++ b/wrap_alpha.py
@@ -26,7 +26,7 @@ for root, dirs, files in os.walk('.'):
         alpha = src.endswith("_alpha")
         if alpha:
             src = src[0:-6]
-            alpha_clause = '\n    android:tint="?android:attr/colorAccent"'
+            alpha_clause = '\n    android:tint="@color/color_default_accent"'
         else:
             alpha_clause = ''