diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index dab3a7db9ae0faaccbe2cda86f34af7c9e5b091a..a2772debaa8a8d3b8c3a96695a011b71a5ca3d79 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1609,7 +1609,7 @@
         <activity android:name=".SetupRedactionInterstitial"
             android:enabled="false"
             android:exported="true"
-            android:theme="@style/SudThemeGlif.DayNight"
+            android:theme="@style/Theme.Settings"
             android:label="@string/lock_screen_notifications_interstitial_title"
             android:icon="@drawable/ic_suggested_notifications">
             <intent-filter>
@@ -2014,7 +2014,7 @@
 
         <activity android:name=".development.AppPicker"
                   android:label="@string/select_application"
-                  android:theme="@android:style/Theme.DeviceDefault.Light.Dialog" />
+                  android:theme="@style/Theme.Dialog" />
 
         <activity android:name="Settings$WebViewAppPickerActivity"
                   android:label="@string/select_webview_provider_dialog_title" />
@@ -2097,7 +2097,7 @@
                   android:label="@string/bluetooth_connection_permission_request"
                   android:excludeFromRecents="true"
                   android:permission="android.permission.BLUETOOTH_ADMIN"
-                  android:theme="@android:style/Theme.DeviceDefault.Light.Dialog.Alert">
+                  android:theme="@style/Theme.AlertDialog">
             <intent-filter android:priority="1">
                 <action android:name="android.bluetooth.device.action.CONNECTION_ACCESS_REQUEST" />
                 <action android:name="android.bluetooth.device.action.CONNECTION_ACCESS_CANCEL" />
@@ -2444,7 +2444,7 @@
         <activity android:name=".nfc.PaymentDefaultDialog"
                   android:label="@string/nfc_payment_set_default_label"
                   android:excludeFromRecents="true"
-                  android:theme="@android:style/Theme.DeviceDefault.Light.Dialog.Alert">
+                  android:theme="@style/Theme.AlertDialog">
             <intent-filter android:priority="1">
                 <action android:name="android.nfc.cardemulation.action.ACTION_CHANGE_DEFAULT" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -2676,7 +2676,7 @@
 
         <!-- Confirmation dialog for enabling notification access from CompanionDeviceManager -->
         <activity android:name=".notification.NotificationAccessConfirmationActivity"
-                  android:theme="@android:style/Theme.DeviceDefault.Light.Dialog.Alert" />
+                  android:theme="@style/Theme.AlertDialog" />
 
         <receiver android:name="com.android.settingslib.bluetooth.BluetoothDiscoverableTimeoutReceiver">
             <intent-filter>
@@ -2720,7 +2720,7 @@
 
         <activity
             android:name=".wifi.RequestToggleWiFiActivity"
-            android:theme="@android:style/Theme.DeviceDefault.Light.Dialog.Alert"
+            android:theme="@style/Theme.AlertDialog"
             android:excludeFromRecents="true"
             android:permission="android.permission.CHANGE_WIFI_STATE">
             <intent-filter>
@@ -3031,7 +3031,7 @@
         <activity android:name=".support.SupportDashboardActivity"
                   android:label="@string/page_tab_title_support"
                   android:icon="@drawable/ic_homepage_support"
-                  android:theme="@android:style/Theme.DeviceDefault.Light.Panel"
+                  android:theme="@style/Custom.Panel"
                   android:enabled="@bool/config_support_enabled">
             <intent-filter>
                 <action android:name="com.android.settings.action.SUPPORT_SETTINGS" />
@@ -3272,10 +3272,10 @@
         </activity>
 
         <activity android:name=".homepage.contextualcards.ContextualCardFeedbackDialog"
-                  android:theme="@android:style/Theme.DeviceDefault.Light.Dialog.Alert" />
+                  android:theme="@style/Theme.AlertDialog" />
 
         <activity android:name=".homepage.contextualcards.FaceReEnrollDialog"
-                  android:theme="@android:style/Theme.DeviceDefault.Light.Dialog.Alert" />
+                  android:theme="@style/Theme.AlertDialog" />
 
         <activity
             android:name="Settings$WifiCallingDisclaimerActivity"
diff --git a/res/anim/enrollment_fingerprint_background_1_path_animation.xml b/res/anim/enrollment_fingerprint_background_1_path_animation.xml
index aed30c027aa48021902da039f599dc93a9029355..76235c452d5d470fd1e286c2d12498c1e68e6221 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="#4285F4"
+            android:valueTo="@color/color_default_accent"
             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="#4285F4"
+            android:valueFrom="@color/color_default_accent"
             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 aed30c027aa48021902da039f599dc93a9029355..76235c452d5d470fd1e286c2d12498c1e68e6221 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="#4285F4"
+            android:valueTo="@color/color_default_accent"
             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="#4285F4"
+            android:valueFrom="@color/color_default_accent"
             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 aed30c027aa48021902da039f599dc93a9029355..76235c452d5d470fd1e286c2d12498c1e68e6221 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="#4285F4"
+            android:valueTo="@color/color_default_accent"
             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="#4285F4"
+            android:valueFrom="@color/color_default_accent"
             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 aed30c027aa48021902da039f599dc93a9029355..76235c452d5d470fd1e286c2d12498c1e68e6221 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="#4285F4"
+            android:valueTo="@color/color_default_accent"
             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="#4285F4"
+            android:valueFrom="@color/color_default_accent"
             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 aed30c027aa48021902da039f599dc93a9029355..76235c452d5d470fd1e286c2d12498c1e68e6221 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="#4285F4"
+            android:valueTo="@color/color_default_accent"
             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="#4285F4"
+            android:valueFrom="@color/color_default_accent"
             android:valueTo="#000000"
             android:valueType="intType"
             android:interpolator="@android:interpolator/fast_out_slow_in" />
diff --git a/res/drawable/color_bar_progress.xml b/res/drawable/color_bar_progress.xml
index d2774678636251360daaf3b0df80ac3e8b5e9f8d..9f3a1994a7602a86c481a280b08ff43ea893e1c8 100644
--- a/res/drawable/color_bar_progress.xml
+++ b/res/drawable/color_bar_progress.xml
@@ -21,7 +21,7 @@
             <size android:height="10dp" />
             <solid android:color="@*android:color/white_disabled_material" />
         </shape>
-    </item>r
+    </item>
     <item android:id="@android:id/secondaryProgress">
         <scale android:scaleWidth="100%">
             <shape android:shape="rectangle"
diff --git a/res/drawable/conversation_message_icon.xml b/res/drawable/conversation_message_icon.xml
index a1192ec5f1ec0dc668df335f1f99d775f55eb613..efbc3a211c70e8f34c8eb0e624edb39a0643b413 100644
--- a/res/drawable/conversation_message_icon.xml
+++ b/res/drawable/conversation_message_icon.xml
@@ -18,7 +18,7 @@
     android:shape="oval">
 
    <solid
-       android:color="#FF0000"/>
+       android:color="@color/color_default_red1"/>
 
    <size
        android:width="42dp"
diff --git a/res/drawable/dark_theme.xml b/res/drawable/dark_theme.xml
index 3425002417ae1d9492674b54b9f39cc95aec62f8..803062c5ec9c47bd0e40897b6e043bc2a7f30bc6 100644
--- a/res/drawable/dark_theme.xml
+++ b/res/drawable/dark_theme.xml
@@ -18,9 +18,8 @@
         android:width="48dp"
         android:height="48dp"
         android:viewportWidth="24.0"
-        android:viewportHeight="24.0"
-        android:tint="?android:attr/colorAccent">
+        android:viewportHeight="24.0">
     <path
-        android:fillColor="#FF000000"
+        android:fillColor="@color/color_default_accent"
         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/data_sweep_limit.xml b/res/drawable/data_sweep_limit.xml
index b0f5fda569f103760f62a8c8069a02836aaa2b12..c05b98792a73c0ef6e066832d4a0c664e6297b68 100644
--- a/res/drawable/data_sweep_limit.xml
+++ b/res/drawable/data_sweep_limit.xml
@@ -20,6 +20,6 @@
     android:viewportWidth="2"
     android:viewportHeight="56">
     <path
-        android:fillColor="#ffffffff"
+        android:fillColor="@android:color/white"
         android:pathData="M0,48l2,0l0,8l-2,0l0,-8z" />
 </vector>
diff --git a/res/drawable/data_sweep_warning.xml b/res/drawable/data_sweep_warning.xml
index b0f5fda569f103760f62a8c8069a02836aaa2b12..c05b98792a73c0ef6e066832d4a0c664e6297b68 100644
--- a/res/drawable/data_sweep_warning.xml
+++ b/res/drawable/data_sweep_warning.xml
@@ -20,6 +20,6 @@
     android:viewportWidth="2"
     android:viewportHeight="56">
     <path
-        android:fillColor="#ffffffff"
+        android:fillColor="@android:color/white"
         android:pathData="M0,48l2,0l0,8l-2,0l0,-8z" />
 </vector>
diff --git a/res/drawable/drag_handle.xml b/res/drawable/drag_handle.xml
index 1e3efeb3d4573473a042f705a63191bdb4ba438f..0704f710e645c8abc72b4c3f0ae462505bf664d4 100644
--- a/res/drawable/drag_handle.xml
+++ b/res/drawable/drag_handle.xml
@@ -18,10 +18,9 @@
         android:width="24dp"
         android:height="24dp"
         android:viewportWidth="24"
-        android:viewportHeight="24"
-        android:tint="?android:attr/colorControlNormal">
+        android:viewportHeight="24">
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="@color/color_default_accent"
         android:pathData="M20,9H4v2h16V9zM4,15h16v-2H4V15z"/>
 </vector>
 
diff --git a/res/drawable/face_enroll_introduction.xml b/res/drawable/face_enroll_introduction.xml
index 217b13c2ff21b1270160dad254509742d0e3d0b3..818536a79ea36b4e1443120038fe2b39dd90d60a 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="?android:attr/colorAccent"
+        android:fillColor="@color/color_default_accent"
         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="?android:attr/colorAccent"
+        android:fillColor="@color/color_default_accent"
         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="?android:attr/colorAccent"
+        android:fillColor="@color/color_default_accent"
         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="?android:attr/colorAccent"
+        android:fillColor="@color/color_default_accent"
         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 9ec3874672a0cac5e8fc6bb561f1ce9a8d6b6986..0ade2aed00072bb72da9c41835f80d64969b4465 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="#000000" />
\ No newline at end of file
+    android:color="@color/color_default_background" />
\ No newline at end of file
diff --git a/res/drawable/fingerprint_enroll_finish.xml b/res/drawable/fingerprint_enroll_finish.xml
index 925e6bc544f1d75ba20909667ef705146ff2b534..479caee69e5a754e33d9d02f79dcde2d456c17da 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="#4285F4"
+        android:fillColor="@color/color_default_accent"
         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="#FF000000"
+        android:fillColor="@color/color_default_accent"
         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="#FF000000"
+        android:fillColor="@color/color_default_accent"
         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="#FF000000"
+        android:fillColor="@color/color_default_accent"
         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="#FF000000"
+        android:fillColor="@color/color_default_accent"
         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="#FF000000"
+        android:fillColor="@color/color_default_accent"
         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="#FF000000"
+        android:fillColor="@color/color_default_accent"
         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="#FF000000"
+        android:fillColor="@color/color_default_accent"
         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="#FF000000"
+        android:fillColor="@color/color_default_accent"
         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="#FF000000"
+        android:fillColor="@color/color_default_accent"
         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="#FF000000"
+        android:fillColor="@color/color_default_accent"
         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="#4285F4"
+        android:fillColor="@color/color_default_accent"
         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="#4285F4"
+        android:fillColor="@color/color_default_accent"
         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="#4285F4"
+        android:fillColor="@color/color_default_accent"
         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="#4285F4"
+        android:fillColor="@color/color_default_accent"
         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="#4285F4"
+        android:fillColor="@color/color_default_accent"
         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="#FFFFFF"
+        android:fillColor="@color/color_default_view_on_accent"
         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="#32A753"
+        android:fillColor="@color/color_default_green1"
         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="#32A753"
+        android:fillColor="@color/color_default_green1"
         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 9781c54000fdce119cc196e654ac3b18689bed67..089b61f8d8433be00ecf6d2bb18fa8f2feb4eb4e 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="#34A853"
+        android:fillColor="@color/color_default_green1"
         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="#34A853"
+        android:fillColor="@color/color_default_green1"
         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="#34A853"
+        android:fillColor="@color/color_default_green1"
         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="#34A853"
+        android:fillColor="@color/color_default_green1"
         android:pathData="M136.21,62.11h7v19.4h-7z" />
     <path
-        android:fillColor="#3E82F1"
+        android:fillColor="@color/color_default_accent"
         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="#3E82F1"
+        android:fillColor="@color/color_default_accent"
         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="#3E82F1"
+        android:fillColor="@color/color_default_accent"
         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="#3E82F1"
+        android:fillColor="@color/color_default_accent"
         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="#3E82F1"
+        android:fillColor="@color/color_default_accent"
         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="#DADCE0"
+        android:fillColor="@color/color_default_primary_text"
         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_add_24dp.xml b/res/drawable/ic_add_24dp.xml
index 71969814df6399b5592905292a73b287ac0e9da4..1387bf40bcf869c33352b423465b38578d5e4278 100644
--- a/res/drawable/ic_add_24dp.xml
+++ b/res/drawable/ic_add_24dp.xml
@@ -17,10 +17,9 @@
         android:width="24dp"
         android:height="24dp"
         android:viewportWidth="24"
-        android:viewportHeight="24"
-        android:tint="?android:attr/colorControlNormal">
+        android:viewportHeight="24">
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="@color/color_default_accent"
         android:pathData="M20,13h-7v7h-2v-7H4v-2h7V4h2v7h7V13z"/>
 </vector>
 
diff --git a/res/drawable/ic_android.xml b/res/drawable/ic_android.xml
index b9b407557c72b4e74ab224bef449d9e5a58fba80..71f3fed80b0a38349a6ddb291b11b62704e9f3ce 100644
--- a/res/drawable/ic_android.xml
+++ b/res/drawable/ic_android.xml
@@ -17,9 +17,8 @@
         android:width="24dp"
         android:height="24dp"
         android:viewportWidth="24.0"
-        android:viewportHeight="24.0"
-        android:tint="?android:attr/colorControlNormal">
+        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="#FFFFFFFF"/>
+        android:fillColor="@color/color_default_accent"/>
 </vector>
diff --git a/res/drawable/ic_arrow_back.xml b/res/drawable/ic_arrow_back.xml
index b6a80cfd9d81d7baf2becece22a9f8db932d91ff..1f6a921f14766b74cb47ddc4f9aaa633e0c5cc9d 100644
--- a/res/drawable/ic_arrow_back.xml
+++ b/res/drawable/ic_arrow_back.xml
@@ -18,9 +18,8 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24"
-    android:autoMirrored="true"
-    android:tint="?android:attr/colorControlNormal">
+    android:autoMirrored="true">
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="@color/color_default_accent"
         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
new file mode 100644
index 0000000000000000000000000000000000000000..4193466b8465c55ba09476a5c5583ab5201824b4
--- /dev/null
+++ b/res/drawable/ic_arrow_circle_down.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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/color_default_accent"
+        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
new file mode 100644
index 0000000000000000000000000000000000000000..a739f368048c61967134acef261d43e633b3b72d
--- /dev/null
+++ b/res/drawable/ic_arrow_circle_up.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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/color_default_accent"
+        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 f2efb4cded89883cbe42a55ea8814d9740a3514c..9efd9d8cf8a4ab7daa650604749d7d291e5cc59b 100644
--- a/res/drawable/ic_arrow_down_24dp.xml
+++ b/res/drawable/ic_arrow_down_24dp.xml
@@ -16,10 +16,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:width="24dp"
         android:height="24dp"
-        android:tint="?android:attr/colorControlNormal"
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="@color/color_default_accent"
         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 12605fd9c666016a8700df16efde955b2b79fadb..aef0995fea758b3e1449fc30136ec5b8f1fc82dc 100644
--- a/res/drawable/ic_attach_money_black_24dp.xml
+++ b/res/drawable/ic_attach_money_black_24dp.xml
@@ -17,9 +17,8 @@
         android:width="24dp"
         android:height="24dp"
         android:viewportWidth="24.0"
-        android:viewportHeight="24.0"
-        android:tint="?android:attr/colorControlNormal">
+        android:viewportHeight="24.0">
     <path
-        android:fillColor="#FF000000"
+        android:fillColor="@color/color_default_accent"
         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
new file mode 100644
index 0000000000000000000000000000000000000000..3bd484336c3a9f4705a7a9d7f9cb9fd3105e8425
--- /dev/null
+++ b/res/drawable/ic_audio_alarm.xml
@@ -0,0 +1,9 @@
+<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/color_default_accent"
+        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
new file mode 100644
index 0000000000000000000000000000000000000000..83fc2edca212c0f930184b2d32305896631a5f7f
--- /dev/null
+++ b/res/drawable/ic_audio_alarm_mute.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="48.0"
+    android:viewportHeight="48.0">
+    <path
+        android:fillColor="@color/color_default_accent"
+        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 82e42f09e120d4327b4a15d68fcfd2ede331c274..441b761c9c42d22107b882b38735a419351272b3 100644
--- a/res/drawable/ic_auto_wifi.xml
+++ b/res/drawable/ic_auto_wifi.xml
@@ -17,19 +17,18 @@
         android:width="24dp"
         android:height="24dp"
         android:viewportWidth="24.0"
-        android:viewportHeight="24.0"
-        android:tint="?android:attr/colorControlNormal">
+        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="#FFFFFFFF" />
+        android:fillColor="@color/color_default_accent" />
     <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="#FFFFFFFF"
+        android:fillColor="@color/color_default_accent"
         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="#FFFFFFFF"
+        android:fillColor="@color/color_default_accent"
         android:strokeMiterLimit="10" />
 </vector>
\ No newline at end of file
diff --git a/res/drawable/ic_battery_circle.xml b/res/drawable/ic_battery_circle.xml
index 5c736fdf4ed7d76ab359daee186a06438414a77d..bb913e86a96bc603a4c3f3640ed8713cb8d4ea97 100644
--- a/res/drawable/ic_battery_circle.xml
+++ b/res/drawable/ic_battery_circle.xml
@@ -17,8 +17,7 @@
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="24.0"
-    android:viewportHeight="24.0"
-    android:tint="?android:attr/colorControlNormal">
-    <path android:fillColor="#FF000000"
+    android:viewportHeight="24.0">
+    <path android:fillColor="@color/color_default_accent"
           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_bt_headphones_a2dp.xml b/res/drawable/ic_bt_headphones_a2dp.xml
new file mode 100644
index 0000000000000000000000000000000000000000..a91283164b51641b6fe0adc5deb07784f7e7361c
--- /dev/null
+++ b/res/drawable/ic_bt_headphones_a2dp.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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/color_default_accent"
+        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 c84f18ede0595e45160523c91e5c0944e4cc383a..2b700a3dd46356e226ced1dbec98586019231aa5 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="#FF000000"
+        android:fillColor="@color/color_default_accent"
         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="#FF000000"
+        android:fillColor="@color/color_default_accent"
         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
new file mode 100644
index 0000000000000000000000000000000000000000..a51a484ee98344cc8cec4d1db12a4856b3a68ee3
--- /dev/null
+++ b/res/drawable/ic_cancel_cross.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/color_default_accent"
+        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 2ac48ef5be5258a3aeb77642fcc35ae0ccaaff86..5b442585bab7ed3338686b62c152ca2423a8825c 100644
--- a/res/drawable/ic_cast_24dp.xml
+++ b/res/drawable/ic_cast_24dp.xml
@@ -7,7 +7,7 @@
 
     <group>
         <path
-            android:fillColor="#0088ED"
+            android:fillColor="@color/color_default_accent"
             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 23caacc22443211a7b555359d8fa9e1c3bdac939..a9f2d3f7f81bebfac2c75ab4fd8d8ee646613f1d 100644
--- a/res/drawable/ic_cellular_1_bar.xml
+++ b/res/drawable/ic_cellular_1_bar.xml
@@ -18,12 +18,11 @@
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?android:attr/colorControlNormal">
+    android:viewportHeight="24">
     <path
-        android:fillColor="#000000"
+        android:fillColor="@color/color_default_accent"
         android:pathData="M20,7v13H7L20,7 M22,2L2,22h20V2L22,2z" />
     <path
-        android:fillColor="#000000"
+        android:fillColor="@color/color_default_accent"
         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_check_circle_green.xml b/res/drawable/ic_check_circle_green.xml
index 214d2cffc306c318f9ac819da3e381a75ee26dd9..ef3428e03b9e977f9431ba349913f36516439e62 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="#FFFFFF"
+        android:fillColor="@color/color_default_view_on_accent"
         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 17e2b92a2d8c1280973f9e336edd87207e49369f..10160e76f69e28b3f0691528b160915783c0b3cc 100644
--- a/res/drawable/ic_chevron_right_24dp.xml
+++ b/res/drawable/ic_chevron_right_24dp.xml
@@ -20,8 +20,7 @@
     android:height="24dp"
     android:width="24dp"
     android:viewportHeight="24.0"
-    android:viewportWidth="24.0"
-    android:tint="?android:attr/colorControlNormal">
-    <path android:fillColor="#FF000000"
+    android:viewportWidth="24.0">
+    <path android:fillColor="@color/color_default_accent"
           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
new file mode 100644
index 0000000000000000000000000000000000000000..028e61b3b8adf23020a5bc468d0c33f24f460fc5
--- /dev/null
+++ b/res/drawable/ic_corp_badge.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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/color_default_accent"
+        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: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 aefcd8494219a801959a3b7f1c6a0076d0c66ffd..feb407cfd898abb000a65b6ceeb0fe4ba495de8f 100644
--- a/res/drawable/ic_data_saver.xml
+++ b/res/drawable/ic_data_saver.xml
@@ -18,16 +18,15 @@
         android:height="24dp"
         android:autoMirrored="true"
         android:viewportHeight="24"
-        android:viewportWidth="24"
-        android:tint="?android:attr/colorControlNormal">
+        android:viewportWidth="24">
     <path
-        android:fillColor="#FFFFFFFF"
+        android:fillColor="@color/color_default_accent"
         android:pathData="M11,8l0,3l-3,0l0,2l3,0l0,3l2,0l0,-3l3,0l0,-2l-3,0l0,-3z"/>
     <path
-        android:fillColor="#FFFFFFFF"
+        android:fillColor="@color/color_default_accent"
         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="#FFFFFFFF"
+        android:fillColor="@color/color_default_accent"
         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 d1290c50a0284d7126c9d32af0a78a695808b972..e08bbf706477c749291b137582225e90fa488733 100644
--- a/res/drawable/ic_delete.xml
+++ b/res/drawable/ic_delete.xml
@@ -17,15 +17,14 @@ Copyright (C) 2015 The Android Open Source Project
         android:width="24.0dp"
         android:height="24.0dp"
         android:viewportWidth="24.0"
-        android:viewportHeight="24.0"
-        android:tint="?android:attr/colorControlNormal">
+        android:viewportHeight="24.0">
     <path
-        android:fillColor="#FF000000"
+        android:fillColor="@color/color_default_accent"
         android:pathData="M15,4V3H9v1H4v2h1v13c0,1.1 0.9,2 2,2h10c1.1,0 2,-0.9 2,-2V6h1V4H15zM17,19H7V6h10V19z"/>
     <path
-        android:fillColor="#FF000000"
+        android:fillColor="@color/color_default_accent"
         android:pathData="M9,8h2v9h-2z"/>
     <path
-        android:fillColor="#FF000000"
+        android:fillColor="@color/color_default_accent"
         android:pathData="M13,8h2v9h-2z"/>
 </vector>
diff --git a/res/drawable/ic_devices_other.xml b/res/drawable/ic_devices_other.xml
index 6338301e6f14417c037c61f727fc3e0e2725eb88..1d5fb2ff863982e5935eb165b088390384845d80 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="#0088ED"/>
+      android:fillColor="@color/color_default_accent"/>
   <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
new file mode 100644
index 0000000000000000000000000000000000000000..699eba6a10e2eb70292cd198d8ea50e18ac8fb3b
--- /dev/null
+++ b/res/drawable/ic_dialog_alert_material.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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:pathData="M1,21l22,0L12,2L1,21zM13,18l-2,0l0,-2l2,0L13,18zM13,14l-2,0l0,-4l2,0L13,14z"
+        android:fillColor="@color/color_default_accent"/>
+</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 cace8d4433f59bd3848bf9e8c8d75e9226d1172e..e799afc9e0b8b82b2c216d4ab380ce73daec35e8 100644
--- a/res/drawable/ic_do_not_disturb_on_24dp.xml
+++ b/res/drawable/ic_do_not_disturb_on_24dp.xml
@@ -17,12 +17,11 @@
         android:width="24dp"
         android:height="24dp"
         android:viewportWidth="24.0"
-        android:viewportHeight="24.0"
-        android:tint="?android:attr/colorControlNormal">
+        android:viewportHeight="24.0">
     <path
-        android:fillColor="#FFFFFFFF"
+        android:fillColor="@color/color_default_accent"
         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="#FFFFFFFF"
+        android:fillColor="@color/color_default_accent"
         android:pathData="M7,11h10v2h-10z"/>
 </vector>
diff --git a/res/drawable/ic_eject_24dp.xml b/res/drawable/ic_eject_24dp.xml
index 8755ccb4d05e7a5e2bb3bf679d6b323d12a59cb0..1a6ab14b156961fe682d7d49743c8ad7106c1e8a 100644
--- a/res/drawable/ic_eject_24dp.xml
+++ b/res/drawable/ic_eject_24dp.xml
@@ -17,9 +17,8 @@ Copyright (C) 2015 The Android Open Source Project
         android:width="24dp"
         android:height="24dp"
         android:viewportWidth="24.0"
-        android:viewportHeight="24.0"
-        android:tint="?android:attr/colorControlNormal">
+        android:viewportHeight="24.0">
     <path
-        android:fillColor="#FF000000"
+        android:fillColor="@color/color_default_accent"
         android:pathData="M5 17h14v2H5zm7,-12L5.33 15h13.34z"/>
 </vector>
diff --git a/res/drawable/ic_event_white.xml b/res/drawable/ic_event_white.xml
index d80429b7ec06d105733d618a3822dd4485db3249..54e01067c9410350b7be3fb500244994931318e1 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="#FFFFFFFF"
+        android:fillColor="@color/color_default_view_on_accent"
         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.xml b/res/drawable/ic_expand.xml
index f5b3f66981ef1047911c4b196effaf2888d3c327..af180db70964b473fd44fd26698cf9f3fe43bdf9 100644
--- a/res/drawable/ic_expand.xml
+++ b/res/drawable/ic_expand.xml
@@ -19,6 +19,6 @@
 
     <item android:state_checked="true" android:drawable="@drawable/ic_expand_less" />
 
-    <item android:drawable="@*android:drawable/ic_expand_more" />
+    <item android:drawable="@drawable/ic_expand_more_inverse" />
 
 </selector>
diff --git a/res/drawable/ic_expand_less.xml b/res/drawable/ic_expand_less.xml
index 7ccc08091724874b5827e8b3937e5f09cddd264d..fbae47236d3296a3c9e5fa9f1b643a761e817fab 100644
--- a/res/drawable/ic_expand_less.xml
+++ b/res/drawable/ic_expand_less.xml
@@ -19,11 +19,10 @@
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?android:attr/colorControlNormal">
+    android:viewportHeight="24">
 
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="@color/color_default_accent"
         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 c39e3f97f0b62d241029ad69c355a9f89e45f9a6..b148d2f2231b796f73ff60a11d01bf835f2527a9 100644
--- a/res/drawable/ic_expand_more_inverse.xml
+++ b/res/drawable/ic_expand_more_inverse.xml
@@ -19,11 +19,10 @@
         android:width="24dp"
         android:height="24dp"
         android:viewportWidth="24"
-        android:viewportHeight="24"
-        android:tint="?android:attr/colorForegroundInverse">
+        android:viewportHeight="24">
 
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="@color/color_default_accent"
         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 386f8c7e1e778c51b3028addacab8c145d6784d6..901a8a2cb4ccf54e20a01107b4199e0cd2ab8512 100644
--- a/res/drawable/ic_face_enroll_introduction_detail.xml
+++ b/res/drawable/ic_face_enroll_introduction_detail.xml
@@ -17,7 +17,6 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="?android:attr/colorControlNormal"
     android:viewportWidth="24"
     android:viewportHeight="24">
 
@@ -26,9 +25,9 @@
     <path
         android:pathData="M0,0h24v24H0V0z" />
     <path
-        android:fillColor="#000000"
+        android:fillColor="@color/color_default_accent"
         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="#000000"
+        android:fillColor="@color/color_default_accent"
         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 b452efe14fde8f3ca10b054c7cbb6f02f484e2ef..4f5074d613857618774689154669035ecad6666c 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="?android:attr/colorControlNormal">
+                android:tint="@color/color_default_accent">
             <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 09d3909cbe1a9024c102372d7fea3b2fb3616dec..1554f2e0d35db7a7183d3fbe011f877e17ce4df8 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="?android:attr/colorControlNormal">
+                android:tint="@color/color_default_accent">
             <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 04ff21f4cacb7fc4a3591dd54483dacd1c238046..25923e55b8dadf37f0094c288aff83a0e822dffd 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="?android:attr/colorControlNormal">
+                android:tint="@color/color_default_accent">
             <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"
+                    <path android:name="_R_G_L_0_G_D_0_P_0" android:fillColor="@color/color_default_accent"
                           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="#000000"
+                    <path android:name="_R_G_L_0_G_D_1_P_0" android:fillColor="@color/color_default_accent"
                           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 15ea7aeb968744627c1093d1cc373ce36b858f88..772441209634d52d248fa53740bb5d554be5e0c0 100644
--- a/res/drawable/ic_face_header.xml
+++ b/res/drawable/ic_face_header.xml
@@ -17,15 +17,14 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="32dp"
     android:height="32dp"
-    android:tint="?android:attr/colorPrimary"
     android:viewportHeight="24"
     android:viewportWidth="24">
 
     <path
-        android:fillColor="#000000"
+        android:fillColor="@color/color_default_accent"
         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="#000000"
+        android:fillColor="@color/color_default_accent"
         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 a65f4443d8fe490fd7eeb48760eba29d6b892537..7fa4a6278be0508375bd272a45130626b19a8b51 100644
--- a/res/drawable/ic_feedback_24dp.xml
+++ b/res/drawable/ic_feedback_24dp.xml
@@ -14,17 +14,17 @@
   ~ 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">
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
     <path
-        android:fillColor="#FF000000"
-        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"/>
+        android:fillColor="@color/color_default_accent"
+        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="#FF000000"
-        android:pathData="M11,12h2v2h-2z"/>
+        android:fillColor="@color/color_default_accent"
+        android:pathData="M11,12h2v2h-2z" />
     <path
-        android:fillColor="#FF000000"
-        android:pathData="M11,6h2v4h-2z"/>
+        android:fillColor="@color/color_default_accent"
+        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 18895e49a1c883a867a14185fd150547a4627a62..54438275b427346af8b3476b818273e936afa964 100644
--- a/res/drawable/ic_find_in_page_24px.xml
+++ b/res/drawable/ic_find_in_page_24px.xml
@@ -19,9 +19,8 @@
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?android:attr/colorControlNormal">
+    android:viewportHeight="24">
   <path
-      android:fillColor="#FFFFFFFF"
+      android:fillColor="@color/color_default_accent"
       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 048826b88d9e1787392ff86bcdbf1a1f93709c8c..2d24a4d7b8eb23b5b329777247db62f0fc53f914 100644
--- a/res/drawable/ic_fingerprint.xml
+++ b/res/drawable/ic_fingerprint.xml
@@ -6,26 +6,26 @@
     android:viewportHeight="32">
 
     <path
-        android:fillColor="#0088ED"
+        android:fillColor="@color/color_default_accent"
         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"
+        android:fillColor="@color/color_default_view_on_accent"
         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="#ffffff"
+        android:fillColor="@color/color_default_view_on_accent"
         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="#ffffff"
+        android:fillColor="@color/color_default_view_on_accent"
         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="#ffffff"
+        android:fillColor="@color/color_default_view_on_accent"
         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="#ffffff"
+        android:fillColor="@color/color_default_view_on_accent"
         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 2f635bc23588f2571760a838af6872c1476f8942..d235609d6eb5809ee1d3c49822963cf7244c10c3 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="#0088ED"
+        android:fillColor="@color/color_default_accent"
         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 048826b88d9e1787392ff86bcdbf1a1f93709c8c..2d24a4d7b8eb23b5b329777247db62f0fc53f914 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="#0088ED"
+        android:fillColor="@color/color_default_accent"
         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"
+        android:fillColor="@color/color_default_view_on_accent"
         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="#ffffff"
+        android:fillColor="@color/color_default_view_on_accent"
         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="#ffffff"
+        android:fillColor="@color/color_default_view_on_accent"
         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="#ffffff"
+        android:fillColor="@color/color_default_view_on_accent"
         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="#ffffff"
+        android:fillColor="@color/color_default_view_on_accent"
         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 2f635bc23588f2571760a838af6872c1476f8942..646e9807aa18b0763c18552e9fa876126f631042 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="#0088ED"
+        android:fillColor="@color/color_default_accent"
         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"
+        android:fillColor="@color/color_default_view_on_accent"
         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="#ffffff"
+        android:fillColor="@color/color_default_view_on_accent"
         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="#ffffff"
+        android:fillColor="@color/color_default_view_on_accent"
         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="#ffffff"
+        android:fillColor="@color/color_default_view_on_accent"
         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="#ffffff"
+        android:fillColor="@color/color_default_view_on_accent"
         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 e800fae86dcc5000d9a35b347d94dfa13f3f1234..14a585c4aca58d8b9da79f6d42528554c64f56e5 100644
--- a/res/drawable/ic_fingerprint_success.xml
+++ b/res/drawable/ic_fingerprint_success.xml
@@ -25,5 +25,5 @@
         android:fillColor="?android:attr/colorAccent"/>
     <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="#FFFFFF"/>
+        android:fillColor="@color/color_default_view_on_accent"/>
 </vector>
diff --git a/res/drawable/ic_folder_vd_theme_24.xml b/res/drawable/ic_folder_vd_theme_24.xml
index 5e3b55fbc06b7f7807cd73c710f52dc2904b3e8a..faa67fbe3837b73f9494520a8b5d4bdf79f3e297 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="#0088ED"
+            android:fillColor="@color/color_default_accent"
             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="#ffffff"
+                android:fillColor="@color/color_default_view_on_accent"
                 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="#ffffff"
+                android:fillColor="@color/color_default_view_on_accent"
                 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 dd8cab887fed368c888807207f4f1e5c5e55a03e..751fef7138fa17176153c55f68cd659774b91fd3 100644
--- a/res/drawable/ic_font_size_16dp.xml
+++ b/res/drawable/ic_font_size_16dp.xml
@@ -17,10 +17,9 @@
     android:width="16dp"
     android:height="16dp"
     android:viewportWidth="48"
-    android:viewportHeight="48"
-    android:tint="?android:attr/colorAccent">
+    android:viewportHeight="48">
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="@color/color_default_accent"
         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 063917a138be98de3e1d1224b4c2e3c8cf86622c..071429ae1c5f39f9cc3a7ab5faa708e845f80626 100644
--- a/res/drawable/ic_font_size_24dp.xml
+++ b/res/drawable/ic_font_size_24dp.xml
@@ -17,10 +17,9 @@
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="48"
-    android:viewportHeight="48"
-    android:tint="?android:attr/colorAccent">
+    android:viewportHeight="48">
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="@color/color_default_accent"
         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 716a98a12050b3a8c91568c0acb81ad167b2060a..2e14d0f6d1dc8e82c0904d0c215302ec5cda72e7 100644
--- a/res/drawable/ic_frequency_antenna.xml
+++ b/res/drawable/ic_frequency_antenna.xml
@@ -18,11 +18,10 @@
         android:viewportWidth="24"
         android:viewportHeight="24"
         android:width="24dp"
-        android:height="24dp"
-        android:tint="?android:attr/colorControlNormal">
+        android:height="24dp">
     <path
         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="#FFFFFFFF" />
+        android:fillColor="@color/color_default_accent" />
 </vector>
diff --git a/res/drawable/ic_friction_lock_closed.xml b/res/drawable/ic_friction_lock_closed.xml
index 2c34060ccd61fe9a60b75f31223e57350cd17b75..a35dc9a735d6740c9758857941ee4c51a81058b1 100644
--- a/res/drawable/ic_friction_lock_closed.xml
+++ b/res/drawable/ic_friction_lock_closed.xml
@@ -17,10 +17,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:width="24dp"
         android:height="24dp"
-        android:tint="?android:attr/colorControlNormal"
         android:viewportWidth="24"
         android:viewportHeight="24">
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="@color/color_default_accent"
         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 fb1904aa82c305fb2cc2234db6122ef41c46dcfa..fff25d00f7f96cda673a46e94c3fd144fadbf98d 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="?android:attr/colorControlNormal"
+    <path android:fillColor="@color/color_default_accent"
           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 29ba78e6c7fe442520aa080e3caa44c21b42ade0..59c511cee53d63e14314113428e397758358f4e7 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="#FFFFFF" android:pathData="M24,24m-19,0a19,19 0,1 1,38 0a19,19 0,1 1,-38 0"/>
-    <path android:fillColor="#1A73E8" android:pathData="M20,33l12,-9l-12,-9z"/>
-    <path android:fillColor="#1A73E8" 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="@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"/>
 </vector>
diff --git a/res/drawable/ic_gray_scale_24dp.xml b/res/drawable/ic_gray_scale_24dp.xml
index 3fda134ade70e10fafb1dfc22188aa5ef36b4d45..815b0752ab7682c5b82e2197589440337bb0412b 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="#FF000000"
+        android:fillColor="@color/color_default_accent"
         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 23210d05a044ec7589c710925d6fac9d3ddec4e3..35f5be2832d0e34a34365d87ecbce0923ab6d7bd 100644
--- a/res/drawable/ic_headset_24dp.xml
+++ b/res/drawable/ic_headset_24dp.xml
@@ -17,9 +17,8 @@
         android:width="24dp"
         android:height="24dp"
         android:viewportWidth="24.0"
-        android:viewportHeight="24.0"
-        android:tint="?android:attr/colorControlNormal">
+        android:viewportHeight="24.0">
     <path
-        android:fillColor="#FF000000"
+        android:fillColor="@color/color_default_accent"
         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 f8bac71e8778646b3bb21956af9fafdb3964e32a..ea676944412abccf8cb98b40ecefdb38d6da1cd9 100644
--- a/res/drawable/ic_help.xml
+++ b/res/drawable/ic_help.xml
@@ -14,11 +14,11 @@
     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">
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
     <path
-        android:fillColor="#FFFFFFFF"
-        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"/>
+        android:fillColor="@color/color_default_accent"
+        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 fe2e3dc9ed32c4a1f076dadf665ae1450dcf7a0e..db52edffb72430a1681a4aee0964cc8c73224816 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="#0088ED"
+        android:fillColor="@color/color_default_accent"
         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 4379ef2078b60c5c51d349163a33f9ca26df888e..cfd4daf152e3219d2e64700d657054ec308148c3 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="#953EB4"
+        android:fillColor="@color/color_default_accent"
         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 34a41f44b4bc95ce4739c93eb8b109e3f3418b1d..fe063afb6a3bae2a25211a07a6323fc17125e856 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="#ffffff"
+        android:fillColor="@color/color_default_view_on_accent"
         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="#ffffff"
+        android:fillColor="@color/color_default_view_on_accent"
         android:pathData="M18.4051 5.51019H13.6176V7.33941H18.4051V5.51019Z" />
     <path
-        android:fillColor="#ffffff"
+        android:fillColor="@color/color_default_view_on_accent"
         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="#ffffff"
+        android:fillColor="@color/color_default_view_on_accent"
         android:pathData="M19.7374 22.9442H12.2625V23.4185H19.7374V22.9442Z" />
     <path
-        android:fillColor="#ffffff"
+        android:fillColor="@color/color_default_view_on_accent"
         android:fillType="evenOdd"
         android:pathData="M11.4722 22.1537H20.5279V24.2088H11.4722V22.1537Z" />
     <path
-        android:fillColor="#ffffff"
+        android:fillColor="@color/color_default_view_on_accent"
         android:pathData="M19.7374 19.3761H12.2625V19.8503H19.7374V19.3761Z" />
     <path
-        android:fillColor="#ffffff"
+        android:fillColor="@color/color_default_view_on_accent"
         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 6ae67bd2e3082ecea2f14b8438513dbff307d136..1bbdd28e185b6b288f829b4613787e33347482ee 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="#0088ED"
+        android:fillColor="@color/color_default_accent"
         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 c8aa01ebc2316f2048d63a3da395d670a86c2997..ff1c18bbae2b960f65b73e0c079532f0fdafb503 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="#0088ED"
+        android:fillColor="@color/color_default_accent"
         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 f0d0a93e425d5fcab2cde2d4892324123f60dfda..ef99b3d7eaba473d667d11c62a32b3d787425482 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="#0088ED"
+        android:fillColor="@color/color_default_accent"
         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"
+        android:fillColor="@color/color_default_view_on_accent"
         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="#ffffff"
+        android:fillColor="@color/color_default_view_on_accent"
         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="#ffffff"
+        android:fillColor="@color/color_default_view_on_accent"
         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 be8c00af901063d8a19cfe11cdb55ce2fcde82e6..7fc10c360bfd941adedbbece52f31d7fcf73ac94 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="#0088ed"
+      android:fillColor="@color/color_default_accent"
       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 3895b6b2e85da0dbb6c9975fa16ee3b141769dad..807ac10c3d697e0bade1aff627697ba1411d8f9f 100644
--- a/res/drawable/ic_homepage_search.xml
+++ b/res/drawable/ic_homepage_search.xml
@@ -19,9 +19,8 @@
         android:width="24dp"
         android:height="24dp"
         android:viewportWidth="24"
-        android:viewportHeight="24"
-        android:tint="?android:attr/colorAccent">
+        android:viewportHeight="24">
     <path
-        android:fillColor="#FF000000"
+        android:fillColor="@color/color_default_accent"
         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 17da9bae45f6581377494357deff3529798ff820..d0e02b5e49503ec452215eee037f748a54aba523 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="#0088ED"
+        android:fillColor="@color/color_default_accent"
         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 3c5dd449af0e0ad5df6ee5e6f93b046f93c1ddc5..3c146b743ceb0987acf57f3c80e882c338be7b92 100644
--- a/res/drawable/ic_hotspot.xml
+++ b/res/drawable/ic_hotspot.xml
@@ -6,27 +6,27 @@
     android:viewportHeight="32">
 
     <path
-        android:fillColor="#24527F"
+        android:fillColor="@color/color_default_accent"
         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"
+        android:fillColor="@color/color_default_view_on_accent"
         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="#ffffff"
+        android:fillColor="@color/color_default_view_on_accent"
         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="#ffffff"
+        android:fillColor="@color/color_default_view_on_accent"
         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="#ffffff"
+        android:fillColor="@color/color_default_view_on_accent"
         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="#ffffff"
+        android:fillColor="@color/color_default_view_on_accent"
         android:pathData="M25.2704 9.95898H24.4574V13.1658H25.2704V9.95898Z" />
     <path
-        android:fillColor="#ffffff"
+        android:fillColor="@color/color_default_view_on_accent"
         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
new file mode 100644
index 0000000000000000000000000000000000000000..e53b5588f9b262b3b2ec48e5420d77cfb614734d
--- /dev/null
+++ b/res/drawable/ic_info.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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/color_default_accent"
+        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 634d797c7f2e9d001e2977ca99831fb11071aadb..8f97ce93e6e0727858470da69fb378e29a366f49 100644
--- a/res/drawable/ic_info_outline_24dp.xml
+++ b/res/drawable/ic_info_outline_24dp.xml
@@ -18,15 +18,14 @@
         android:width="24dp"
         android:height="24dp"
         android:viewportHeight="24"
-        android:viewportWidth="24"
-        android:tint="?android:attr/textColorSecondary">
+        android:viewportWidth="24">
     <path
-        android:fillColor="#FF000000"
+        android:fillColor="@color/color_default_accent"
         android:pathData="M11,7h2v2h-2z"/>
     <path
-        android:fillColor="#FF000000"
+        android:fillColor="@color/color_default_accent"
         android:pathData="M11,11h2v6h-2z"/>
     <path
-        android:fillColor="#FF000000"
+        android:fillColor="@color/color_default_accent"
         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
new file mode 100644
index 0000000000000000000000000000000000000000..d2ce7c5b98d8f98340edb3d96fbd87ffee14e9e9
--- /dev/null
+++ b/res/drawable/ic_keyboard.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2015 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<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/color_default_accent"
+        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 b1ed068abec08eb2eaa0327403cd5d144c81fc3a..d1810a120c06eb087e1e15a7ad52807b9ad25439 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="?android:attr/colorControlNormal"
+        android:fillColor="@color/color_default_accent"
         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 89cf8fabc06b09e084c66f5f9f6f2d76cbd2ad72..e079b4b5e0637b190dea1173d96a3c926f650acb 100644
--- a/res/drawable/ic_lightbulb_outline_24.xml
+++ b/res/drawable/ic_lightbulb_outline_24.xml
@@ -19,10 +19,9 @@
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="24.0"
-    android:viewportHeight="24.0"
-    android:tint="?android:attr/colorAccent">
+    android:viewportHeight="24.0">
     <path
-        android:fillColor="#FF000000"
+        android:fillColor="@color/color_default_accent"
         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 175bf205449b857ecbabf4988a48c6489cd6db2e..25e7414b85ee8aac85549dd1e1ea1545374ce9d0 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="#ffffff"
+                android:fillColor="@color/color_default_view_on_accent"
                 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="#ffffff"
+                android:fillColor="@color/color_default_view_on_accent"
                 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="#ffffff"
+                android:fillColor="@color/color_default_view_on_accent"
                 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="#ffffff"
+                android:fillColor="@color/color_default_view_on_accent"
                 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="#ffffff"
+                android:fillColor="@color/color_default_view_on_accent"
                 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="#ffffff"
+                android:fillColor="@color/color_default_view_on_accent"
                 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
new file mode 100644
index 0000000000000000000000000000000000000000..9b09bc2898152aea8a3ea99b8bd56463abccf6e6
--- /dev/null
+++ b/res/drawable/ic_lock_lock.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2015 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<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/color_default_accent"
+        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 4398527d7dd30f0a177f5fed9f3ae90356225eed..76e8ee1a791488c4dcab64bfcb31d6bd8a0b0f17 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="#0088ED"
+                android:fillColor="@color/color_default_accent"
                 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="#0088ED"
+                android:fillColor="@color/color_default_accent"
                 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
new file mode 100644
index 0000000000000000000000000000000000000000..fca2f19284c853d4fb49055185bded0a911f5235
--- /dev/null
+++ b/res/drawable/ic_menu_sd_card.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="48dp"
+    android:viewportWidth="48.0"
+    android:viewportHeight="48.0">
+    <path
+        android:fillColor="@color/color_default_accent"
+        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
new file mode 100644
index 0000000000000000000000000000000000000000..c38cba709d5df0a98eb0687f018dc44d1b786bce
--- /dev/null
+++ b/res/drawable/ic_mode_edit.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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/color_default_accent"
+        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
new file mode 100644
index 0000000000000000000000000000000000000000..5def0c25af8419bfda36cce8843b6118ea75be20
--- /dev/null
+++ b/res/drawable/ic_more_24.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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/color_default_accent"
+        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 9f7f4fca4689d4aa8b81be691448ee3daaaca5db..764781c1b9c7cb70f402c74671660aed51c5872a 100644
--- a/res/drawable/ic_network_cell.xml
+++ b/res/drawable/ic_network_cell.xml
@@ -7,7 +7,7 @@
 
     <group>
         <path
-            android:fillColor="#0088ED"
+            android:fillColor="@color/color_default_accent"
             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 d9321ac021affed0b4110a9291189a1b24f16154..1dabc33427c59225bffc06c74e256cc52fe607c5 100644
--- a/res/drawable/ic_nfc.xml
+++ b/res/drawable/ic_nfc.xml
@@ -17,9 +17,8 @@
         android:width="24dp"
         android:height="24dp"
         android:viewportWidth="24.0"
-        android:viewportHeight="24.0"
-        android:tint="?android:attr/colorControlNormal">
+        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="#FFFFFFFF"/>
+        android:fillColor="@color/color_default_accent"/>
 </vector>
diff --git a/res/drawable/ic_notification_alert.xml b/res/drawable/ic_notification_alert.xml
index 927f7ccfc3c69033563b781751416b408d51ed2c..1fccfaec0b3ab0051e2e8d0d573dc7693552668c 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="#FFFFFFFF"
+                android:fillColor="@color/color_default_view_on_accent"
                 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 9da56dd0bbf7192378318432714052968bc65407..be1b73da81fbf02548d16131777c622b5c726cc6 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="#FFFFFFFF"
+                android:fillColor="@color/color_default_view_on_accent"
                 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 5a25459e35357df7984618c8cf45b365e2f1e375..3dfa3bbe438e39618f2ae3ff9488845491b89058 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="@android:color/white"
+        android:fillColor="@color/color_default_accent"
         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_notifications_off_24dp.xml b/res/drawable/ic_notifications_off_24dp.xml
index 3d02bca3b3736a8b9eb2de89436b7df0cf75fb9c..6e5219a4f8bfd2acc2960ba933229c5c43ecc764 100644
--- a/res/drawable/ic_notifications_off_24dp.xml
+++ b/res/drawable/ic_notifications_off_24dp.xml
@@ -21,7 +21,7 @@
     android:viewportHeight="24.0"
     android:viewportWidth="24.0"
     android:width="24dp"
-    android:tint="@color/red_1">
+    android:tint="@color/color_default_red1">
     <path android:fillColor="#FF000000"
           android:pathData="M12,22c1.1,0 2,-0.9 2,-2h-4C10,21.1 10.9,22 12,22z" />
     <path android:fillColor="#FF000000"
diff --git a/res/drawable/ic_open_wifi_autoconnect.xml b/res/drawable/ic_open_wifi_autoconnect.xml
index c752522fd909efece39ddbbd8c25fc99d1273a99..37b8d08e69a7287cd7a54206920cc67614a8b45d 100644
--- a/res/drawable/ic_open_wifi_autoconnect.xml
+++ b/res/drawable/ic_open_wifi_autoconnect.xml
@@ -17,9 +17,8 @@
         android:width="24dp"
         android:height="24dp"
         android:viewportWidth="24.0"
-        android:viewportHeight="24.0"
-        android:tint="?android:attr/colorControlNormal">
+        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="#FFFFFFFF"/>
+        android:fillColor="@color/color_default_accent"/>
 </vector>
diff --git a/res/drawable/ic_open_wifi_notifications.xml b/res/drawable/ic_open_wifi_notifications.xml
index 5435bdb476a33bc68a82a6fc65a7ca132235c8cd..55fbe16b3f1801dde441e2b2db397bc36d4fc484 100644
--- a/res/drawable/ic_open_wifi_notifications.xml
+++ b/res/drawable/ic_open_wifi_notifications.xml
@@ -17,21 +17,20 @@
         android:width="24.0dp"
         android:height="24.0dp"
         android:viewportWidth="24.0"
-        android:viewportHeight="24.0"
-        android:tint="?android:attr/colorControlNormal">
+        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="#FFFFFFFF" />
+        android:fillColor="@color/color_default_accent" />
     <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="#FFFFFFFF" />
+        android:fillColor="@color/color_default_accent" />
     <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="#FFFFFFFF" />
+        android:fillColor="@color/color_default_accent" />
     <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="#FFFFFFFF" />
+        android:fillColor="@color/color_default_accent" />
     <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="#FFFFFFFF" />
+        android:fillColor="@color/color_default_accent" />
 </vector>
diff --git a/res/drawable/ic_ota_update_available.xml b/res/drawable/ic_ota_update_available.xml
index b03f9d741aa1adc58786eea1d063f3ab97a107ac..fec0f05a46df7954f30fc54ae14c23ba87a25031 100644
--- a/res/drawable/ic_ota_update_available.xml
+++ b/res/drawable/ic_ota_update_available.xml
@@ -20,6 +20,6 @@
     android:viewportHeight="24">
 
     <path
-        android:fillColor="#FFF44336"
+        android:fillColor="@color/color_default_red1"
         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,21H7l0,-1h10V21zM17,18H7V6h10V18zM7,4V3h10v1H7zM16,12.5l-4,4l-4,-4l1.41,-1.41L11,12.67V8.5V8h2v0.5v4.17l1.59,-1.59L16,12.5z"/>
 </vector>
diff --git a/res/drawable/ic_ota_update_current.xml b/res/drawable/ic_ota_update_current.xml
index c38a0838d57fa91ccb44ba35d4b24c0655ebd5d0..e06697f0dd3c9b1284c259b0fd5f063e8914c954 100644
--- a/res/drawable/ic_ota_update_current.xml
+++ b/res/drawable/ic_ota_update_current.xml
@@ -20,6 +20,6 @@
     android:viewportHeight="24">
 
     <path
-        android:fillColor="#FF43A047"
+        android:fillColor="@color/color_default_green1"
         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,21H7l0,-1h10V21zM17,18H7V6h10V18zM7,4V3h10v1H7zM11.14,16l-3.84,-3.84l1.41,-1.42l2.43,2.42l4.16,-4.16l1.42,1.41L11.14,16z"/>
 </vector>
diff --git a/res/drawable/ic_ota_update_none.xml b/res/drawable/ic_ota_update_none.xml
index b49b4247646f7a9c64a6cd0fe801b70127f6ffb2..6ef346e7562c606bf3db355928a06cccbe9e7d5d 100644
--- a/res/drawable/ic_ota_update_none.xml
+++ b/res/drawable/ic_ota_update_none.xml
@@ -20,6 +20,6 @@
     android:viewportHeight="24">
 
     <path
-        android:fillColor="#FFF44336"
+        android:fillColor="@color/color_default_red1"
         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,21H7l0,-1h10V21zM17,18H7V6h10V18zM7,4V3h10v1H7zM11,15h2v2h-2V15zM13,8h-2v5h2V8z"/>
 </vector>
diff --git a/res/drawable/ic_ota_update_stale.xml b/res/drawable/ic_ota_update_stale.xml
index b49b4247646f7a9c64a6cd0fe801b70127f6ffb2..6ef346e7562c606bf3db355928a06cccbe9e7d5d 100644
--- a/res/drawable/ic_ota_update_stale.xml
+++ b/res/drawable/ic_ota_update_stale.xml
@@ -20,6 +20,6 @@
     android:viewportHeight="24">
 
     <path
-        android:fillColor="#FFF44336"
+        android:fillColor="@color/color_default_red1"
         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,21H7l0,-1h10V21zM17,18H7V6h10V18zM7,4V3h10v1H7zM11,15h2v2h-2V15zM13,8h-2v5h2V8z"/>
 </vector>
diff --git a/res/drawable/ic_pan_tool_18dp.xml b/res/drawable/ic_pan_tool_18dp.xml
index 3ebfc9ce2c6e0a538c75fab30dcea83dd0439ecb..a12560ea29d1b665c65187df7203e43ae566869c 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="#757575"/>
+        android:fillColor="@color/color_default_accent"/>
   </group>
 </vector>
diff --git a/res/drawable/ic_password.xml b/res/drawable/ic_password.xml
index 7d5f47190e90764cca1c1505438d41ccad812fab..67983218713863e32c71f80892a42a8459a3a178 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="?attr/sudListItemIconColor"
+        android:fillColor="@color/color_default_accent"
         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="?attr/sudListItemIconColor"
+        android:fillColor="@color/color_default_accent"
         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="?attr/sudListItemIconColor"
+        android:fillColor="@color/color_default_accent"
         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="?attr/sudListItemIconColor"
+        android:fillColor="@color/color_default_accent"
         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 b41129fb7c1e263b3377c49393e232426144f805..fee4b01341643528622a516dbbf45aef36f0fd93 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="?attr/sudListItemIconColor"
+        android:fillColor="@color/color_default_accent"
         android:pathData="M4,4m-2,0a2,2 0,1 1,4 0a2,2 0,1 1,-4 0" />
     <path
-        android:fillColor="?attr/sudListItemIconColor"
+        android:fillColor="@color/color_default_accent"
         android:pathData="M4,12m-2,0a2,2 0,1 1,4 0a2,2 0,1 1,-4 0" />
     <path
-        android:fillColor="?attr/sudListItemIconColor"
+        android:fillColor="@color/color_default_accent"
         android:pathData="M12,4m-2,0a2,2 0,1 1,4 0a2,2 0,1 1,-4 0" />
     <path
-        android:fillColor="?attr/sudListItemIconColor"
+        android:fillColor="@color/color_default_accent"
         android:pathData="M20,12m-2,0a2,2 0,1 1,4 0a2,2 0,1 1,-4 0" />
     <path
-        android:fillColor="?attr/sudListItemIconColor"
+        android:fillColor="@color/color_default_accent"
         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 7aee3e86ebca44995ddbfa5f003ac1693a77a436..ada4d9f6fb604bbd66868032a9f71e54493c3b52 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="#FFFFFFFF"
+        android:fillColor="#FFFFFF"
         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 a60b05a4b4b220dfc5af6a5c8a94d95db856c01b..6217067f9cf81c32c6e1ade769818944e76970e8 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="#0088ED"/>
+        android:fillColor="@color/color_default_accent"/>
     <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 577e04f6adcf180833401e8c07a0e9b50f6683c3..28ed9b4113c2b97ce9d72426ae0963a38fef4845 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="?attr/sudListItemIconColor"
+        android:fillColor="@color/color_default_accent"
         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
new file mode 100644
index 0000000000000000000000000000000000000000..01e345625fda2d92f513e6f658ae29bc1cb0ffe4
--- /dev/null
+++ b/res/drawable/ic_print.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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: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"/>
+</vector>
\ No newline at end of file
diff --git a/res/drawable/ic_print_error.xml b/res/drawable/ic_print_error.xml
new file mode 100644
index 0000000000000000000000000000000000000000..ef4745cdce3421977183527f88b122a9ef7f7615
--- /dev/null
+++ b/res/drawable/ic_print_error.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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: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"/>
+</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 a051e88ef5871522c41ffa248f8caf9d85d8a2d9..02a1c637477eb155db36d743ee40b0b14736e7a5 100644
--- a/res/drawable/ic_privacy_shield_24dp.xml
+++ b/res/drawable/ic_privacy_shield_24dp.xml
@@ -18,12 +18,11 @@
         android:width="24dp"
         android:height="24dp"
         android:viewportWidth="24.0"
-        android:viewportHeight="24.0"
-        android:tint="?android:attr/textColorSecondary">>
+        android:viewportHeight="24.0">
     <path
-        android:fillColor="#FF000000"
+        android:fillColor="@color/color_default_accent"
         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="#FF000000"
+        android:fillColor="@color/color_default_accent"
         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 a94fd380f8ee3a647231dfa6eeea85c8137d5c80..88e25913a87cf48e50c6640302cda26185fb0772 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="#0088ED"
+            android:fillColor="@color/color_default_accent"
             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_24dp.xml b/res/drawable/ic_qrcode_24dp.xml
index 57aec5776cfde762ce17db5cd74db035a1cdadf8..3691db74831db875fc9fe7eaacd52e9ff6ee9a9f 100644
--- a/res/drawable/ic_qrcode_24dp.xml
+++ b/res/drawable/ic_qrcode_24dp.xml
@@ -2,9 +2,8 @@
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?android:attr/colorAccent">
+    android:viewportHeight="24">
   <path
-      android:fillColor="#FF000000"
+      android:fillColor="@color/color_default_accent"
       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 3be6f9962e304694ea1a4d3a44cd4bf0a7f22b8a..27b7c61dc51bbdf5252048352870bee4881f0df9 100644
--- a/res/drawable/ic_radio_button_checked_black_24dp.xml
+++ b/res/drawable/ic_radio_button_checked_black_24dp.xml
@@ -14,11 +14,11 @@
   ~ 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">
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
     <path
-        android:fillColor="#FF000000"
-        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"/>
+        android:fillColor="@color/color_default_accent"
+        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 a864f7b07b431b58dce1f4d3e768e44906b523af..fd289428bbe6265615c8c7f12e735f2562bfde1d 100644
--- a/res/drawable/ic_radio_button_unchecked_black_24dp.xml
+++ b/res/drawable/ic_radio_button_unchecked_black_24dp.xml
@@ -14,11 +14,11 @@
   ~ 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">
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
     <path
-        android:fillColor="#FF000000"
-        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"/>
+        android:fillColor="@color/color_default_accent"
+        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 923362360a5b7bcc1d7da74d570e3a9b1f37d156..82443fe5022c0c5aecdea4d90ac9d4226cf4f5da 100644
--- a/res/drawable/ic_remove_24dp.xml
+++ b/res/drawable/ic_remove_24dp.xml
@@ -17,9 +17,8 @@
         android:width="24dp"
         android:height="24dp"
         android:viewportWidth="48"
-        android:viewportHeight="48"
-        android:tint="?android:attr/colorAccent">
+        android:viewportHeight="48">
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="@color/color_default_accent"
         android:pathData="M38 26H10v-4h28v4z"/>
 </vector>
diff --git a/res/drawable/ic_restore.xml b/res/drawable/ic_restore.xml
index 8312acafdd84c688902ef7be13e5f812d0572d01..e79c406c7d1b870857c54be713b128e594fe83bf 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="#0088ED"
+            android:fillColor="@color/color_default_accent"
             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 692bfe8569ad00ce4a54e82111474e25f1ad3f28..3739e1e5da4a514fa5d7f5279f91b89338c02b26 100644
--- a/res/drawable/ic_scan_24dp.xml
+++ b/res/drawable/ic_scan_24dp.xml
@@ -2,9 +2,8 @@
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?android:attr/colorAccent">
+    android:viewportHeight="24">
   <path
-      android:fillColor="#FF000000"
+      android:fillColor="@color/color_default_accent"
       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 5ddeed3b0ba2c24fbc06f52f062cc5ff49996c10..0f4c18c5c71df36542f62d2750c33b89ada2e92a 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="#953EB4"
+            android:fillColor="@color/color_default_accent"
             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_security_lock_24dp.xml b/res/drawable/ic_security_lock_24dp.xml
index 40b510962c83d4e083f07a48db899d27a0c9efcb..e30c161bd443282f524182dd2b79b0a8e6637b83 100644
--- a/res/drawable/ic_security_lock_24dp.xml
+++ b/res/drawable/ic_security_lock_24dp.xml
@@ -18,9 +18,8 @@
         android:viewportWidth="24"
         android:viewportHeight="24"
         android:width="24dp"
-        android:height="24dp"
-        android:tint="?android:attr/colorControlNormal">
+        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="#FFFFFFFF" />
+        android:fillColor="@color/color_default_accent" />
 </vector>
diff --git a/res/drawable/ic_settings_24dp.xml b/res/drawable/ic_settings_24dp.xml
index 44a4c2ed7467e8919fad1756dafb9ae8caf2967e..e0dbb26846a618fcf222f18b452673a67764ebeb 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="#24527F"/>
+        android:fillColor="@color/color_default_accent"/>
     <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="#ffffff"/>
+          android:fillColor="@color/color_default_view_on_accent"/>
       <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="#ffffff"/>
+          android:fillColor="@color/color_default_view_on_accent"/>
     </group>
   </group>
 </vector>
diff --git a/res/drawable/ic_settings_accent.xml b/res/drawable/ic_settings_accent.xml
index 7d871bc9591069c34fb9e9e7e4871b88c4bac6dd..a3d917d691219dd5774fd936276b8d1c82ae516e 100644
--- a/res/drawable/ic_settings_accent.xml
+++ b/res/drawable/ic_settings_accent.xml
@@ -18,12 +18,11 @@
         android:width="24dp"
         android:height="24dp"
         android:viewportWidth="24.0"
-        android:viewportHeight="24.0"
-        android:tint="?android:attr/colorAccent">
+        android:viewportHeight="24.0">
     <path
-        android:fillColor="#FFFFFFFF"
+        android:fillColor="@color/color_default_accent"
         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="#FFFFFFFF"
+        android:fillColor="@color/color_default_accent"
         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 11a9d50084ae799fe64734335b5aa2dd56580636..1bdd6a44eb3b070bfbcc2e6c7911ac0fb47c020a 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="#0088ED"
+        android:fillColor="@color/color_default_accent"
         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 2f351fce50a44a9c92a2ae15cda4c7807045f6f3..59730321077f70ce0c966b5a49db64dc51f42f6e 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="#953EB4"
+        android:fillColor="@color/color_default_accent"
         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 ac103dd44311a0931331c67ce7bcf45eca26924e..4e018e1e4045e0e5c5919d7e21325fce68a228d7 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="#12B5CB"
+        android:fillColor="@color/color_default_accent"
         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 03958abe13bb1420f08fffb5c5c59ad2b06d0293..38d5099d7d58431582297b2eb97c2610f32f3355 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="#000000"/>
+      android:fillColor="@color/color_default_accent"/>
 </vector>
 
diff --git a/res/drawable/ic_settings_aod.xml b/res/drawable/ic_settings_aod.xml
index b238e3a3201a8806d1abc3aafac9f983da91eb90..35c60033ad188bf3a5788e44e41d8bd54acc7f80 100644
--- a/res/drawable/ic_settings_aod.xml
+++ b/res/drawable/ic_settings_aod.xml
@@ -18,17 +18,16 @@
         android:width="24dp"
         android:height="24dp"
         android:viewportWidth="24"
-        android:viewportHeight="24"
-        android:tint="?android:attr/colorControlNormal">
+        android:viewportHeight="24">
 
     <path
-        android:fillColor="#000000"
+        android:fillColor="@color/color_default_accent"
         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="#000000"
+        android:fillColor="@color/color_default_accent"
         android:pathData="M 8 10 H 16 V 11.5 H 8 V 10 Z" />
     <path
-        android:fillColor="#000000"
+        android:fillColor="@color/color_default_accent"
         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 715a2e84c284dfd1eca96ad4e46b8b2f672199a5..8eaf64f00cef23e643c9cceca058acdb717534e7 100644
--- a/res/drawable/ic_settings_backup.xml
+++ b/res/drawable/ic_settings_backup.xml
@@ -17,9 +17,8 @@
         android:width="24dp"
         android:height="24dp"
         android:viewportWidth="24.0"
-        android:viewportHeight="24.0"
-        android:tint="?android:attr/colorControlNormal">
+        android:viewportHeight="24.0">
     <path
-        android:fillColor="#FFFFFFFF"
+        android:fillColor="@color/color_default_accent"
         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 245b0fcc855ab0969628d5084bfac8f6083fa9ff..d69149f20df2e31cd58ef30e862ba44e9b0e8f58 100644
--- a/res/drawable/ic_settings_backup_restore.xml
+++ b/res/drawable/ic_settings_backup_restore.xml
@@ -17,9 +17,8 @@
         android:width="24dp"
         android:height="24dp"
         android:viewportWidth="24.0"
-        android:viewportHeight="24.0"
-        android:tint="?android:attr/colorControlNormal">
+        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="#FFFFFFFF"/>
+        android:fillColor="@color/color_default_accent"/>
 </vector>
diff --git a/res/drawable/ic_settings_battery.xml b/res/drawable/ic_settings_battery.xml
index 550649cb69f46ac2f970f835a726c7730aaaef36..a19de30c8128d181267db204cdd877ccd6ef4c1c 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="#ffffff"
+        android:fillColor="@color/color_default_view_on_accent"
         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="#ffffff"
+        android:fillColor="@color/color_default_view_on_accent"
         android:pathData="M18.4051 5.51019H13.6176V7.33941H18.4051V5.51019Z" />
     <path
-        android:fillColor="#ffffff"
+        android:fillColor="@color/color_default_view_on_accent"
         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="#ffffff"
+        android:fillColor="@color/color_default_view_on_accent"
         android:pathData="M19.7374 22.9442H12.2625V23.4185H19.7374V22.9442Z" />
     <path
-        android:fillColor="#ffffff"
+        android:fillColor="@color/color_default_view_on_accent"
         android:fillType="evenOdd"
         android:pathData="M11.4722 22.1537H20.5279V24.2088H11.4722V22.1537Z" />
     <path
-        android:fillColor="#ffffff"
+        android:fillColor="@color/color_default_view_on_accent"
         android:pathData="M19.7374 19.3761H12.2625V19.8503H19.7374V19.3761Z" />
     <path
-        android:fillColor="#ffffff"
+        android:fillColor="@color/color_default_view_on_accent"
         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 255b75e7d9e1196b99ed309da9db42a84347839c..621f37dc1d4b80862d55ae0355141fc8388ac59a 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="#FFFFFF"
+        android:fillColor="@color/color_default_view_on_accent"
         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 f93ab968077bcfeefcb54380e9679c84f842c8d9..80fb602a8e1ebf6f55a4324cd366fec133a018e7 100644
--- a/res/drawable/ic_settings_bluetooth.xml
+++ b/res/drawable/ic_settings_bluetooth.xml
@@ -2,14 +2,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:viewportWidth="32"
-    android:viewportHeight="32">
-
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
     <path
-        android:fillColor="#0088ED"
-        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"
-        android:fillType="evenOdd"
-        android:pathData="M16.0928 4.73483C16.3881 4.61249 16.7281 4.68011 16.9541 4.90616L22.2611 10.2132C22.5698 10.5218 22.5698 11.0223 22.2611 11.3309L17.5921 16L22.2611 20.669C22.5698 20.9777 22.5698 21.4782 22.2611 21.7868L16.9541 27.0938C16.7281 27.3199 16.3881 27.3875 16.0928 27.2652C15.7974 27.1428 15.6048 26.8546 15.6048 26.5349V17.9872L10.8567 22.7353C10.5481 23.044 10.0476 23.044 9.73895 22.7353C9.43028 22.4267 9.43028 21.9262 9.73895 21.6175L15.3565 16L9.73895 10.3825C9.43028 10.0738 9.43028 9.57334 9.73895 9.26467C10.0476 8.956 10.5481 8.956 10.8567 9.26467L15.6048 14.0128V5.46506C15.6048 5.14537 15.7974 4.85716 16.0928 4.73483ZM17.1856 17.8292L20.5844 21.2279L17.1856 24.6267V17.8292ZM17.1856 14.1708V7.37326L20.5844 10.772L17.1856 14.1708Z" />
+        android:fillColor="@color/color_default_accent"
+        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 3c8553231830174143296b310d80d91167e908b2..d89005547343620011cd5ba455bcff4166e7119c 100644
--- a/res/drawable/ic_settings_camera.xml
+++ b/res/drawable/ic_settings_camera.xml
@@ -20,10 +20,9 @@
     android:height="24dp"
     android:viewportWidth="48"
     android:viewportHeight="48"
-    android:autoMirrored="true"
-    android:tint="?android:attr/colorControlNormal">
+    android:autoMirrored="true">
 
-    <path android:fillColor="#000000"
+    <path android:fillColor="@color/color_default_accent"
           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 058b4b5b2e337ac3d143813e70cf1e4a3b0b9d69..077e55f8af6a1ac7757b92f8d676cdf36c370a4d 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="#FF000000"
+      android:fillColor="@color/color_default_accent"
       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_data_usage.xml b/res/drawable/ic_settings_data_usage.xml
index 3127640b0cca01f9692fe157813cb18ccbaf71e4..fd550ee87a95334b8f595688378de5260d3afc7e 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="#ffffff"
+        android:fillColor="@color/color_default_view_on_accent"
         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="#ffffff"
+        android:fillColor="@color/color_default_view_on_accent"
         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="#ffffff"
+        android:fillColor="@color/color_default_view_on_accent"
         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="#ffffff"
+        android:fillColor="@color/color_default_view_on_accent"
         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 10125acd4987bf54bc120d53070b426212fe75d4..8d5a5ff019cb5c06218c15a3a3fd8952e76b5b90 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="#FF000000"
+      android:fillColor="@color/color_default_accent"
       android:pathData="M15,4V3H9v1H4v2h1v13c0,1.1 0.9,2 2,2h10c1.1,0 2,-0.9 2,-2V6h1V4H15zM17,19H7V6h10V19z"/>
   <path
-      android:fillColor="#FF000000"
+      android:fillColor="@color/color_default_accent"
       android:pathData="M9,8h2v9h-2z"/>
   <path
-      android:fillColor="#FF000000"
+      android:fillColor="@color/color_default_accent"
       android:pathData="M13,8h2v9h-2z"/>
 </vector>
diff --git a/res/drawable/ic_settings_disable.xml b/res/drawable/ic_settings_disable.xml
index e7a8f4116cb5ac5651ad9400449a30af41a2be8e..f5ed2ca86f63c4115feefd9718c6b56847879988 100644
--- a/res/drawable/ic_settings_disable.xml
+++ b/res/drawable/ic_settings_disable.xml
@@ -18,9 +18,8 @@
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?android:attr/colorControlNormal">
+    android:viewportHeight="24">
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="@color/color_default_accent"
         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 75c6e5e088b06a7f8dce724791b80277cc521c48..267021a74ddde55ebb6a880768ba4dcc1fbc6f1d 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="#0088ED"
+        android:fillColor="@color/color_default_accent"
         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 62dc21f305b024cebef56885eb988ec2ab3c1a39..6731b58097c7e7119e3f2d367b80519b497bc846 100644
--- a/res/drawable/ic_settings_display_white.xml
+++ b/res/drawable/ic_settings_display_white.xml
@@ -14,11 +14,11 @@
   limitations under the License.
   -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24.0dp"
-        android:height="24.0dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
+    android:width="24.0dp"
+    android:height="24.0dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
     <path
-        android:fillColor="#FFFFFFFF"
-        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"/>
+        android:fillColor="@color/color_default_accent"
+        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 673471d874eadf3ff9551b115a94ec4a36e56204..ea698e864dd3a873551c0d4be771e11d4af92656 100644
--- a/res/drawable/ic_settings_enable.xml
+++ b/res/drawable/ic_settings_enable.xml
@@ -18,9 +18,8 @@
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?android:attr/colorControlNormal">
+    android:viewportHeight="24">
   <path
-      android:fillColor="@android:color/white"
+      android:fillColor="@color/color_default_accent"
       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 eda6079c48fd7256c1f7133984f9eb79483639f7..2fc9b5eced0ced70f08f3cc074ebccf51e857d4e 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="#FF000000"
+      android:fillColor="@color/color_default_accent"
       android:pathData="M12,5.99L19.53,19H4.47L12,5.99M12,2L1,21h22L12,2L12,2z"/>
   <path
-      android:fillColor="#FF000000"
+      android:fillColor="@color/color_default_accent"
       android:pathData="M13,16l-2,0l0,2l2,0l0,-2z"/>
   <path
-      android:fillColor="#FF000000"
+      android:fillColor="@color/color_default_accent"
       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 5023a13ffa1a8f36aec2c9e85a003e5f3ffbf0f2..753dfd44a756f757368ca6e6d71e576a60710997 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="#0088ED"
+        android:fillColor="@color/color_default_accent"
         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"
+        android:fillColor="@color/color_default_view_on_accent"
         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="#ffffff"
+        android:fillColor="@color/color_default_view_on_accent"
         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 3de5f14ce908c0d48a0ae1de49cfa18aa3d77db8..60b2ebd6fa27061ccddc996c2ba36708bb8097c7 100644
--- a/res/drawable/ic_settings_home.xml
+++ b/res/drawable/ic_settings_home.xml
@@ -17,8 +17,7 @@
         android:width="24dp"
         android:height="24dp"
         android:viewportWidth="24.0"
-        android:viewportHeight="24.0"
-        android:tint="?android:attr/colorControlNormal">
-    <path android:fillColor="#FFFFFFFF"
+        android:viewportHeight="24.0">
+    <path android:fillColor="@color/color_default_accent"
           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 5bd5e300eae34389bd41987567756ec27da2a99d..c96449b94ffc24e8d94ec502e48c3a247af15db3 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="#FF000000"
+      android:fillColor="@color/color_default_accent"
       android:pathData="M18,15v3H6v-3H4v3c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2v-3H18z"/>
   <path
-      android:fillColor="#FF000000"
+      android:fillColor="@color/color_default_accent"
       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 962bfe0a9d55237807cdfa5b3e270edc6f0e712b..690c1639eed0fe90f66f44dc0343086c8f2c09d1 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="#0088ED"
+        android:fillColor="@color/color_default_accent"
         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 2fe0983b1cfb77fe33f5042e85b5b758968b106b..0dbb3f8de590fa5d9f0813d1c0c7d0ae2fdf41bb 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="#ffffff"
+      android:fillColor="@color/color_default_view_on_accent"
       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="#ffffff"
+      android:fillColor="@color/color_default_view_on_accent"
       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 03ee95e0bc3215d3f2a44913a1458353fbd33830..799e371112a4dc4760f6c17da364686b9e1f7b56 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="#953EB4"
+        android:fillColor="@color/color_default_accent"
         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"
+        android:fillColor="@color/color_default_view_on_accent"
         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="#ffffff"
+        android:fillColor="@color/color_default_view_on_accent"
         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="#ffffff"
+        android:fillColor="@color/color_default_view_on_accent"
         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="#ffffff"
+        android:fillColor="@color/color_default_view_on_accent"
         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="#ffffff"
+        android:fillColor="@color/color_default_view_on_accent"
         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="#ffffff"
+        android:fillColor="@color/color_default_view_on_accent"
         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="#ffffff"
+        android:fillColor="@color/color_default_view_on_accent"
         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="#ffffff"
+        android:fillColor="@color/color_default_view_on_accent"
         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="#ffffff"
+        android:fillColor="@color/color_default_view_on_accent"
         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="#ffffff"
+        android:fillColor="@color/color_default_view_on_accent"
         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 c3f6657589f2244b6d9d59ae2dbdb929089592f3..949491ef80dd7224cd3e4ec9a7c70222f4e8374c 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="#0088ED"
+        android:fillColor="@color/color_default_accent"
         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"
+        android:fillColor="@color/color_default_view_on_accent"
         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="#ffffff"
+        android:fillColor="@color/color_default_view_on_accent"
         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 555a6b4f1d2a670522ed9e1173a36d7f79ca4682..92b8b99c630fdaf95d27655a17761ffa03dd730f 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="?android:attr/colorControlNormal"
+    android:tint="@color/color_default_accent"
     android:autoMirrored="true" />
 
diff --git a/res/drawable/ic_settings_night_display.xml b/res/drawable/ic_settings_night_display.xml
index 4cd1347602fc4256954b984ca58a49cdca54ac61..f730a07ba9b77a3fa315ed07284f59ccecb07f76 100644
--- a/res/drawable/ic_settings_night_display.xml
+++ b/res/drawable/ic_settings_night_display.xml
@@ -16,10 +16,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:width="24dp"
         android:height="24dp"
-        android:tint="?android:attr/colorControlNormal"
         android:viewportHeight="24"
         android:viewportWidth="24">
     <path
-        android:fillColor="#FF000000"
+        android:fillColor="@color/color_default_accent"
         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 ea7771028b1e46ceb9767571dbda5b869687e125..e7198de9b436e1f99086af3d7205ef6c971aa92f 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="#FF000000"
+      android:fillColor="@color/color_default_accent"
       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 5139405fb2b064abf68a7e6b97845570f3c05919..d092ffa4f41a07f0ccb1f876063b362de424b8a6 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="#FF000000"
+      android:fillColor="@color/color_default_accent"
       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="#FF000000"
+      android:fillColor="@color/color_default_accent"
       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 7bb6c3192be9370c769fa7163ce98f9e7645250b..9a1e8e095c7a0558df4cb1e6b5448dd6ad3626dc 100644
--- a/res/drawable/ic_settings_phone_idle.xml
+++ b/res/drawable/ic_settings_phone_idle.xml
@@ -17,9 +17,8 @@
     android:width="48dp"
     android:height="48dp"
     android:viewportWidth="48"
-    android:viewportHeight="48"
-    android:tint="?android:attr/colorControlNormal">
+    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="#000000"/>
+      android:fillColor="@color/color_default_accent"/>
 </vector>
diff --git a/res/drawable/ic_settings_print.xml b/res/drawable/ic_settings_print.xml
index 308d09fb72f28b9ac431349c0560dffbe2a107b5..3551e6210aa5854c2fa954a302235bd564d79cb3 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="#0088ED"
+        android:fillColor="@color/color_default_accent"
         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 be8c00af901063d8a19cfe11cdb55ce2fcde82e6..3eebb8e65acc5d5ff7d504a07cf8769748654744 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="#0088ed"
+      android:fillColor="@color/color_default_accent"
       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="#ffffff"
+      android:fillColor="@color/color_default_view_on_accent"
       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="#ffffff"
+      android:fillColor="@color/color_default_view_on_accent"
       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 41fa591ad519bb71c30c1059334e215212e0d542..1b71fe81ec1a3d9f792ec745c863eff726587257 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="#ffffff"
+        android:fillColor="@color/color_default_view_on_accent"
         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="#ffffff"
+        android:fillColor="@color/color_default_view_on_accent"
         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 4e2b1ee8124650a95f909802fb38040cd2f9f299..05b1c6596ef4e4328dad5ea0d1c54d5a76d0a38c 100644
--- a/res/drawable/ic_settings_security_white.xml
+++ b/res/drawable/ic_settings_security_white.xml
@@ -14,14 +14,14 @@
   limitations under the License.
   -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportHeight="24"
-        android:viewportWidth="24">
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
     <path
-        android:fillColor="#FFFFFFFF"
-        android:pathData="M12,15m-2,0a2,2 0,1 1,4 0a2,2 0,1 1,-4 0"/>
+        android:fillColor="@color/color_default_accent"
+        android:pathData="M12,15m-2,0a2,2 0,1 1,4 0a2,2 0,1 1,-4 0" />
     <path
-        android:fillColor="#FFFFFFFF"
-        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"/>
+        android:fillColor="@color/color_default_accent"
+        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 e2fa5d82d1cb587517a8f7cbe43b85b25452a764..1d3312433ce353c93d9ca60167c4aa4e43ecf6a1 100644
--- a/res/drawable/ic_settings_sign_in.xml
+++ b/res/drawable/ic_settings_sign_in.xml
@@ -14,11 +14,11 @@
     limitations under the License.
 -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24.0dp"
-        android:height="24.0dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
+    android:width="24.0dp"
+    android:height="24.0dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
     <path
-        android:fillColor="#FFFFFFFF"
-        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"/>
+        android:fillColor="@color/color_default_accent"
+        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 5ea2754f12a077bc174b18d8ffac2da089a81506..f7aba8f8aebbc44074b3a65074a52dc82014ec8f 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="#24527F"
+        android:fillColor="@color/color_default_accent"
         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 0b1721c4741477c8d89f68ac8d7426fbef3ec947..1a9378f8c0d5de0166d0a0a662b26bbe3234cb17 100644
--- a/res/drawable/ic_settings_sync.xml
+++ b/res/drawable/ic_settings_sync.xml
@@ -17,9 +17,8 @@
         android:width="24.0dp"
         android:height="24.0dp"
         android:viewportWidth="24.0"
-        android:viewportHeight="24.0"
-        android:tint="?android:attr/colorAccent">
+        android:viewportHeight="24.0">
     <path
-        android:fillColor="#FFFFFFFF"
+        android:fillColor="@color/color_default_accent"
         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 5a697d4ab2121f5c52d8c655ee8badbac89f0011..17a2417878a07aaf7c888bf360d7a87845cc029a 100644
--- a/res/drawable/ic_settings_system_dashboard_white.xml
+++ b/res/drawable/ic_settings_system_dashboard_white.xml
@@ -14,17 +14,17 @@
   limitations under the License.
   -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24.0dp"
-        android:height="24.0dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
+    android:width="24.0dp"
+    android:height="24.0dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
     <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M11,7h2v2h-2z"/>
+        android:fillColor="@color/color_default_accent"
+        android:pathData="M11,7h2v2h-2z" />
     <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M11,11h2v6h-2z"/>
+        android:fillColor="@color/color_default_accent"
+        android:pathData="M11,11h2v6h-2z" />
     <path
-        android:fillColor="#FFFFFF"
-        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"/>
+        android:fillColor="@color/color_default_accent"
+        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 b455f0ab3d8c3c779562a68bb2f1f40999be449a..d13100fa78b4391521367d10dc912eff5cea3ffe 100644
--- a/res/drawable/ic_settings_voice_calls.xml
+++ b/res/drawable/ic_settings_voice_calls.xml
@@ -17,9 +17,8 @@
     android:width="48dp"
     android:height="48dp"
     android:viewportWidth="48"
-    android:viewportHeight="48"
-    android:tint="?android:attr/colorControlNormal">
+    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="#000000"/>
+      android:fillColor="@color/color_default_accent"/>
 </vector>
diff --git a/res/drawable/ic_settings_wireless.xml b/res/drawable/ic_settings_wireless.xml
index 0cc986b48ac907c7e08a8300b98d247b3d95bb32..5cabb3e73b2a242f4c7dcf66fcd239b6bd7120ea 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="#0088ED"
+        android:fillColor="@color/color_default_accent"
         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 ffa9226aa4a3c8ec5554db9a8c8fd44d6359702f..43f10525f8e31cd4593d1ebb7477706e7496819d 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="@*android:color/accent_device_default_light"
+                    android:fillColor="@color/color_default_accent"
                     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 36a148cb215d79cdb55434c8df55388274d19336..878b262dec3710782532ff77f9a56e6be32ff1ca 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="@*android:color/accent_device_default_light"
+                    android:fillColor="@color/color_default_accent"
                     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 2fd05a55816b9740aee2a0425244b108718b944d..70822e89409723f9ebcc8da9b4d1c0582c945af6 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="@*android:color/accent_device_default_light"
+                    android:fillColor="@color/color_default_accent"
                     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 e63595300d5f691ac5b2d22b1dcd74ad5a5c8e6c..833c5229d4fc398548ec878a3ae551354d3a36f2 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="#FFFFFFFF"
+        android:fillColor="@color/color_default_accent"
         android:pathData="M18,2H6v6l2,3v11h8V11l2,-3L18,2zM16,4l0,1H8V4H16zM14,10.4V20h-4v-9.61l-2,-3V7h8l0,0.39L14,10.4z"/>
     <path
-        android:fillColor="#FFFFFFFF"
+        android:fillColor="@color/color_default_accent"
         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
new file mode 100644
index 0000000000000000000000000000000000000000..903152b4db93a06a83865854840b473b43d12e85
--- /dev/null
+++ b/res/drawable/ic_signal_location.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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/color_default_accent"
+        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: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 906209657525d102f95627b5cba349db15fd11f3..837ae3d2870ae82c73969e15863f7e876f5c2cef 100644
--- a/res/drawable/ic_signal_strength_4g.xml
+++ b/res/drawable/ic_signal_strength_4g.xml
@@ -17,12 +17,11 @@ Copyright (C) 2014 The Android Open Source Project
     android:width="9.208dp"
     android:height="17dp"
     android:viewportWidth="13.0"
-    android:viewportHeight="24.0"
-    android:tint="?android:attr/colorControlNormal">
+    android:viewportHeight="24.0">
     <path
-        android:fillColor="#FFFFFFFF"
+        android:fillColor="@color/color_default_accent"
         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="#FFFFFFFF"
+        android:fillColor="@color/color_default_accent"
         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 f7e8c806b1b5dec1c6bd1e2c6c0626d93ce5acff..0fa3b37d07d259cffa564799db80cef99162be3e 100644
--- a/res/drawable/ic_signal_workmode_enable.xml
+++ b/res/drawable/ic_signal_workmode_enable.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="42dp"
-        android:height="42dp"
-        android:viewportWidth="42.0"
-        android:viewportHeight="42.0">
+    android:width="42dp"
+    android:height="42dp"
+    android:viewportWidth="42.0"
+    android:viewportHeight="42.0">
     <path
-        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"
-        android:fillColor="#FFFFFF"/>
+        android:fillColor="@color/color_default_accent"
+        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 ed9aa437b801a6884f412a951d422dc75893549e..627fe5584e128d16cb0142df263bd736bd51c163 100644
--- a/res/drawable/ic_sim_alert.xml
+++ b/res/drawable/ic_sim_alert.xml
@@ -15,13 +15,13 @@
   -->
 
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24"
-        android:viewportHeight="24">
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
     <path
+        android:fillColor="@color/color_default_accent"
         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"
-        android:fillColor="#ffffff"/>
+        android:strokeWidth="0.12533334" />
 </vector>
 
diff --git a/res/drawable/ic_sim_sd.xml b/res/drawable/ic_sim_sd.xml
index d7e31a2480932a5347cc5c4552413ef1ff67dcc9..e7e33778888a50e85c75ecb5b4f30e43846623a8 100644
--- a/res/drawable/ic_sim_sd.xml
+++ b/res/drawable/ic_sim_sd.xml
@@ -17,11 +17,10 @@
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="24.0"
-    android:viewportHeight="24.0"
-    android:tint="?android:attr/colorControlNormal">
+    android:viewportHeight="24.0">
   <path
       android:pathData="M0 0h24v24H0z" />
   <path
-      android:fillColor="#000000"
+      android:fillColor="@color/color_default_accent"
       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 9d8ae2bb0f5dc599a74e6bb79d047562ea37cc8f..df9881d3f5214d291fb54d1b80135fbd2a57a290 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="?attr/sudListItemIconColor"
+        android:fillColor="@color/color_default_accent"
         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 55e66c3d8bce0bc2ca147b6608798eec2426bcf6..616b45c2a477a5783369ffa7b83ec7a93b4065ab 100644
--- a/res/drawable/ic_storage.xml
+++ b/res/drawable/ic_storage.xml
@@ -17,9 +17,8 @@
         android:width="24dp"
         android:height="24dp"
         android:viewportWidth="24.0"
-        android:viewportHeight="24.0"
-        android:tint="?android:attr/colorControlNormal">
+        android:viewportHeight="24.0">
     <path
-        android:fillColor="#FF000000"
+        android:fillColor="@color/color_default_accent"
         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 eed91406ec136f51bd4f0faced6eb10ee3a39544..2ac7c3953abd6ecc1c55e0c0ac9e98fba37e11ff 100644
--- a/res/drawable/ic_storage_white.xml
+++ b/res/drawable/ic_storage_white.xml
@@ -14,11 +14,11 @@
   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">
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
     <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M3,20h18v-4H3V20zM5,17h2v2H5V17zM3,4v4h18V4H3zM7,7H5V5h2V7zM3,14h18v-4H3V14zM5,11h2v2H5V11z"/>
+        android:fillColor="@color/color_default_accent"
+        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 99e2698633d762016e50d49bb751f7e341512037..301297cd3393be89bbb1bb12f44046e2bec6bc99 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="#FFFFFF"
+        android:fillColor="@color/color_default_view_on_accent"
         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="#FFFFFF"
+        android:fillColor="@color/color_default_view_on_accent"
         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="#FFFFFF"
+        android:fillColor="@color/color_default_view_on_accent"
         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="?android:attr/colorAccent"
+        android:fillColor="@color/color_default_accent"
         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="?android:attr/colorAccent"
+        android:fillColor="@color/color_default_accent"
         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 41768f7727d9269c7393113a130eaa2890a34129..675851014a5c73564df96c74e70fc22f150a0ea4 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="?android:attr/colorAccent"
+        android:fillColor="@color/color_default_accent"
         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="?android:attr/colorAccent"
+        android:fillColor="@color/color_default_accent"
         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="?android:attr/colorAccent"
+        android:fillColor="@color/color_default_accent"
         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 5bce00032867864dca37b5d443ce821080cae6fb..ebef374d63434626304b3733a918e61aa0f0781a 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/sud_color_accent_light"
+        android:fillColor="@color/color_default_accent"
         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/sud_color_accent_light"
+        android:fillColor="@color/color_default_accent"
         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 8b1f0f8122a07e3d2ef50255df3ec3eac7a38c27..5662c7c64386129dc0e63733b00ea310d4d0be54 100644
--- a/res/drawable/ic_suggestion_close_button.xml
+++ b/res/drawable/ic_suggestion_close_button.xml
@@ -18,10 +18,9 @@
         android:width="24dp"
         android:height="24dp"
         android:viewportWidth="24.0"
-        android:viewportHeight="24.0"
-        android:tint="?android:attr/colorControlNormal">
+        android:viewportHeight="24.0">
 
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="@color/color_default_accent"
         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 816b148c406dc2945241333014d6d0a05260c00a..50113539711939ffebb67e19682d02708201863f 100644
--- a/res/drawable/ic_suggestion_dnd.xml
+++ b/res/drawable/ic_suggestion_dnd.xml
@@ -17,12 +17,11 @@
         android:width="24dp"
         android:height="24dp"
         android:viewportWidth="24.0"
-        android:viewportHeight="24.0"
-        android:tint="?android:attr/colorControlNormal">
+        android:viewportHeight="24.0">
     <path
-        android:fillColor="#FFFFFFFF"
+        android:fillColor="@color/color_default_accent"
         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="#FFFFFFFF"
+        android:fillColor="@color/color_default_accent"
         android:pathData="M7,11h10v2h-10z"/>
 </vector>
diff --git a/res/drawable/ic_suggestion_fingerprint.xml b/res/drawable/ic_suggestion_fingerprint.xml
index bf5ee2effe715e6d25caeccd83919c6a1cdc25bb..0947f76472e78af218fa60023284e16e9c4c679e 100644
--- a/res/drawable/ic_suggestion_fingerprint.xml
+++ b/res/drawable/ic_suggestion_fingerprint.xml
@@ -18,23 +18,22 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:width="32dp"
         android:height="32dp"
-        android:tint="?android:attr/colorControlNormal"
         android:viewportWidth="32.0"
         android:viewportHeight="32.0">
     <path
-        android:fillColor="#ffffff"
+        android:fillColor="@color/color_default_accent"
         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="#ffffff"
+        android:fillColor="@color/color_default_accent"
         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="#ffffff"
+        android:fillColor="@color/color_default_accent"
         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="#ffffff"
+        android:fillColor="@color/color_default_accent"
         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="#ffffff"
+        android:fillColor="@color/color_default_accent"
         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 16cb04ef90bb763942ab5d2add2219e503a92693..43162058dd182077b997b7e3ae7d21e46c8972f9 100644
--- a/res/drawable/ic_suggestion_night_display.xml
+++ b/res/drawable/ic_suggestion_night_display.xml
@@ -16,10 +16,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:width="24dp"
         android:height="24dp"
-        android:tint="?android:attr/colorControlNormal"
         android:viewportHeight="24"
         android:viewportWidth="24">
     <path
-        android:fillColor="#FF000000"
+        android:fillColor="@color/color_default_accent"
         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 e2d3a90e962ee6b980aeceab934b32d4b08feb8d..720519381c669ddc1c87d84ebaee456046fcec78 100644
--- a/res/drawable/ic_suggestion_security.xml
+++ b/res/drawable/ic_suggestion_security.xml
@@ -17,12 +17,11 @@
         android:width="24dp"
         android:height="24dp"
         android:viewportHeight="24"
-        android:viewportWidth="24"
-        android:tint="?android:attr/colorControlNormal">
+        android:viewportWidth="24">
     <path
-        android:fillColor="#FFFFFFFF"
+        android:fillColor="@color/color_default_accent"
         android:pathData="M12,15m-2,0a2,2 0,1 1,4 0a2,2 0,1 1,-4 0"/>
     <path
-        android:fillColor="#FFFFFFFF"
+        android:fillColor="@color/color_default_accent"
         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 74b4cee4cdf2008847026547831aa3876879836c..18ee359f4424ce8eb09070518645e99b93c329f2 100644
--- a/res/drawable/ic_suggestion_wireless.xml
+++ b/res/drawable/ic_suggestion_wireless.xml
@@ -17,9 +17,8 @@
         android:width="24.0dp"
         android:height="24.0dp"
         android:viewportWidth="24.0"
-        android:viewportHeight="24.0"
-        android:tint="?android:attr/colorControlNormal">
+        android:viewportHeight="24.0">
     <path
-        android:fillColor="#FFFFFFFF"
+        android:fillColor="@color/color_default_accent"
         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
new file mode 100644
index 0000000000000000000000000000000000000000..24a0ccbf8b9a1e642d6386be99fcd05e247238aa
--- /dev/null
+++ b/res/drawable/ic_supervisor.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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/color_default_accent"
+        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 b7e2f53f0224728f30ac7b8bbcaea689575fc784..4e1235e3e5603a3b0414f0714edb734acdcbdbf8 100644
--- a/res/drawable/ic_support_24dp.xml
+++ b/res/drawable/ic_support_24dp.xml
@@ -20,10 +20,9 @@
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="24.0"
-    android:viewportHeight="24.0"
-    android:tint="?android:attr/colorControlNormal">
+    android:viewportHeight="24.0">
     <path
-        android:fillColor="#FF000000"
+        android:fillColor="@color/color_default_accent"
         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 a38833becab9402822eb4102348988ab5dde5070..2115613387bd965c0dacfeba152baefcc5bf1b02 100644
--- a/res/drawable/ic_swap_horiz.xml
+++ b/res/drawable/ic_swap_horiz.xml
@@ -14,11 +14,11 @@
     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">
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
     <path
-        android:pathData="M6.99,11L3,15l3.99,4v-3H14v-2H6.99v-3zM21,9l-3.99,-4v3H10v2h7.01v3L21,9z"
-        android:fillColor="#000000"/>
+        android:fillColor="@color/color_default_accent"
+        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 ed16b03df572ece1c2dc63120f42deb20afeda1e..6f7771aa988eb867a26085ccf13367b9dbe63560 100644
--- a/res/drawable/ic_sync.xml
+++ b/res/drawable/ic_sync.xml
@@ -17,12 +17,11 @@
         android:width="24dp"
         android:height="24dp"
         android:viewportWidth="24"
-        android:viewportHeight="24"
-        android:tint="?android:attr/colorControlNormal">
+        android:viewportHeight="24">
     <path
-        android:fillColor="#FFFFFFFF"
+        android:fillColor="@color/color_default_accent"
         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="#FFFFFFFF"
+        android:fillColor="@color/color_default_accent"
         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 200a1b0ebbf894a4a3055d6d0420b033293df56b..900fe404eb55112ab3a6fbc952974837c41bc450 100644
--- a/res/drawable/ic_sync_problem_24dp.xml
+++ b/res/drawable/ic_sync_problem_24dp.xml
@@ -18,9 +18,8 @@
         android:width="24dp"
         android:height="24dp"
         android:viewportWidth="24.0"
-        android:viewportHeight="24.0"
-        android:tint="?android:attr/colorControlNormal">
+        android:viewportHeight="24.0">
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="@color/color_default_accent"
         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 4764ff1b9c164ce5dbe4985b34a7d1b4c6dec8cc..8e97607e2dcde07c4d8e89276f5a6de65e8b63a4 100644
--- a/res/drawable/ic_theme.xml
+++ b/res/drawable/ic_theme.xml
@@ -18,9 +18,8 @@
         android:width="24dp"
         android:height="24dp"
         android:viewportWidth="24"
-        android:viewportHeight="24"
-        android:tint="?android:attr/colorAccent">
+        android:viewportHeight="24">
     <path
-        android:fillColor="#FF000000"
+        android:fillColor="@color/color_default_accent"
         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_white.xml b/res/drawable/ic_timelapse_white.xml
index f287747d2bc052cff2dc560928a9042f239e916a..f4cb2b00799757074c91a4a7dd547b456acac398 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="#FFFFFFFF"
+        android:fillColor="#FFFFFF"
         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 962bfe0a9d55237807cdfa5b3e270edc6f0e712b..690c1639eed0fe90f66f44dc0343086c8f2c09d1 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="#0088ED"
+        android:fillColor="@color/color_default_accent"
         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 9e27815cb765c7b1fc11fba3b6141d8e9443e5d2..4dd8be85d2aa12ddd69795c88267ed9ff955c092 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="#757575"/>
+      android:fillColor="@color/color_default_accent"/>
 </vector>
diff --git a/res/drawable/ic_volume_ringer_vibrate.xml b/res/drawable/ic_volume_ringer_vibrate.xml
index 13fcd6a4ebba7c39bcf6e16a9f623ac92756e443..4256c3ffb15f984d22ad839f5df1626318224ae6 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="#0088ED"
+            android:fillColor="@color/color_default_accent"
             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="#ffffff"
+                android:fillColor="@color/color_default_view_on_accent"
                 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="#ffffff"
+                android:fillColor="@color/color_default_view_on_accent"
                 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="#ffffff"
+                android:fillColor="@color/color_default_view_on_accent"
                 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="#ffffff"
+                android:fillColor="@color/color_default_view_on_accent"
                 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="#ffffff"
+                android:fillColor="@color/color_default_view_on_accent"
                 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 8c68c0070f92e23911c402861b4584e013e331dc..7f6dcaa958d6350edd813ab18c78c7e77c89d05f 100644
--- a/res/drawable/ic_volume_up_24dp.xml
+++ b/res/drawable/ic_volume_up_24dp.xml
@@ -15,17 +15,17 @@
   -->
 
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
     <path
-        android:fillColor="#FFFFFFFF"
-        android:pathData="M3,9v6h4l5,5V4L7,9H3zM10,8.83v6.34L7.83,13H5v-2h2.83L10,8.83z"/>
+        android:fillColor="@color/color_default_accent"
+        android:pathData="M3,9v6h4l5,5V4L7,9H3zM10,8.83v6.34L7.83,13H5v-2h2.83L10,8.83z" />
     <path
-        android:fillColor="#FFFFFFFF"
-        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"/>
+        android:fillColor="@color/color_default_accent"
+        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="#FFFFFFFF"
-        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"/>
+        android:fillColor="@color/color_default_accent"
+        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 d0fc6becdd89508ebadad18d9579afd39ccfc008..e08f8544754c333d34b3e8e35df5ab7edd24960c 100644
--- a/res/drawable/ic_wallpaper.xml
+++ b/res/drawable/ic_wallpaper.xml
@@ -17,9 +17,8 @@
         android:width="24dp"
         android:height="24dp"
         android:viewportWidth="24"
-        android:viewportHeight="24"
-        android:tint="?android:attr/colorControlNormal">
+        android:viewportHeight="24">
     <path
-        android:fillColor="#FF000000"
+        android:fillColor="@color/color_default_accent"
         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 2ca48e0fb068a98bf8b7934c2d9dccfb463b8ec0..94efde512c02f4485785de0abd67dc49ad5c47c2 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="#FF000000"
+        android:fillColor="@color/color_default_accent"
         android:pathData="M12,5.99L19.53,19H4.47L12,5.99M12,2L1,21h22L12,2L12,2z"/>
     <path
-        android:fillColor="#FF000000"
+        android:fillColor="@color/color_default_accent"
         android:pathData="M13,16l-2,0l0,2l2,0l0,-2z"/>
     <path
-        android:fillColor="#FF000000"
+        android:fillColor="@color/color_default_accent"
         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 c23fbc164dff7911055ae14f636b207edcff1a27..deb91342816694baec20c535b30dcb3ba530bf84 100644
--- a/res/drawable/ic_wifi_privacy_24dp.xml
+++ b/res/drawable/ic_wifi_privacy_24dp.xml
@@ -18,15 +18,14 @@
         android:viewportWidth="24"
         android:viewportHeight="24"
         android:width="24dp"
-        android:height="24dp"
-        android:tint="?android:attr/colorControlNormal">
+        android:height="24dp">
     <path
-        android:fillColor="#FFFFFFFF"
+        android:fillColor="@color/color_default_accent"
         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="#FFFFFFFF"
+        android:fillColor="@color/color_default_accent"
         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="#FFFFFFFF"
+        android:fillColor="@color/color_default_accent"
         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 8e6dbbb858cab89464922a4e13aca64414a1b05a..a0c2eb503a09c3d9e92e8c1f259d25ff767a3e39 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="#0088ED"
+        android:fillColor="@color/color_default_accent"
         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="#0088ED"
+        android:fillColor="@color/color_default_accent"
         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="#0088ED"
+        android:fillColor="@color/color_default_accent"
         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="#0088ED"
+        android:fillColor="@color/color_default_accent"
         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 e8431c068bccc9ab6c1351a885fd263623edaf39..46aba21157ceb9c17af44fca7919960574feb445 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="#0088ED"
+            android:fillColor="@color/color_default_accent"
             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="#0088ED"
+            android:fillColor="@color/color_default_accent"
             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="#0088ED"
+            android:fillColor="@color/color_default_accent"
             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="#0088ED"
+            android:fillColor="@color/color_default_accent"
             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 f520283d0644a94a259bff6c69b55259db3a484b..0fee7d2f05b8304fa614d461717ea46636f85104 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="#0088ED"
+            android:fillColor="@color/color_default_accent"
             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="#0088ED"
+            android:fillColor="@color/color_default_accent"
             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="#0088ED"
+            android:fillColor="@color/color_default_accent"
             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="#0088ED"
+            android:fillColor="@color/color_default_accent"
             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 f89289e33859a579efbf9f86354261a45dd5197c..55a051241bb3c8e853c9466bffad36dbd5e59eed 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="#0088ED"
+            android:fillColor="@color/color_default_accent"
             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="#0088ED"
+            android:fillColor="@color/color_default_accent"
             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="#0088ED"
+            android:fillColor="@color/color_default_accent"
             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="#0088ED"
+            android:fillColor="@color/color_default_accent"
             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 6314dfb9440d7a5438d9f5f7f8ec8b5841f7e8bc..1f8684df3949c7870a9820517148e3931db398f3 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="#0088ED"
+            android:fillColor="@color/color_default_accent"
             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="#0088ED"
+            android:fillColor="@color/color_default_accent"
             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="#0088ED"
+            android:fillColor="@color/color_default_accent"
             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="#0088ED"
+            android:fillColor="@color/color_default_accent"
             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 9c0a9845d939eb7df3d5ad8561b6f9c19643bc09..430139904a09bbf9eee1b7c08e65c6c74b85290e 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="#0088ED"
+            android:fillColor="@color/color_default_accent"
             android:pathData="M31.1684 24.4571H24.3684V29H31.1684V24.4571Z" />
         <path
-            android:fillColor="#0088ED"
+            android:fillColor="@color/color_default_accent"
             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="#0088ED"
+            android:fillColor="@color/color_default_accent"
             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 3c5dd449af0e0ad5df6ee5e6f93b046f93c1ddc5..a375e5c44a53d2088c0ba00465d1d21ba9aa1896 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="#24527F"
+        android:fillColor="@color/color_default_accent"
         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"
+        android:fillColor="@color/color_default_view_on_accent"
         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="#ffffff"
+        android:fillColor="@color/color_default_view_on_accent"
         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 d69b0dc07afeae44ae36370c0ceb08fa34933eb0..2c191f26cac3819c590500a2f282795e93a5505e 100644
--- a/res/drawable/signal_strength_1x.xml
+++ b/res/drawable/signal_strength_1x.xml
@@ -18,12 +18,11 @@
     android:width="8.5dp"
     android:height="17dp"
     android:viewportWidth="12.0"
-    android:viewportHeight="24.0"
-    android:tint="?android:attr/colorControlNormal">
+    android:viewportHeight="24.0">
     <path
-        android:fillColor="#FFFFFFFF"
+        android:fillColor="@color/color_default_accent"
         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="#FFFFFFFF"
+        android:fillColor="@color/color_default_accent"
         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 9b5e4a65717187a8679f76f33602f51e6758ecee..7a951f7e55b72371e61067aee37a42e8d5562f82 100644
--- a/res/drawable/signal_strength_3g.xml
+++ b/res/drawable/signal_strength_3g.xml
@@ -18,12 +18,11 @@
     android:width="9.208dp"
     android:height="17dp"
     android:viewportWidth="13.0"
-    android:viewportHeight="24.0"
-    android:tint="?android:attr/colorControlNormal">
+    android:viewportHeight="24.0">
     <path
-        android:fillColor="#FFFFFFFF"
+        android:fillColor="@color/color_default_accent"
         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="#FFFFFFFF"
+        android:fillColor="@color/color_default_accent"
         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 6f6e21b2524667d2c9e8e6520e4c4e26f2b3a060..ebff17f208e1ffaeb90049f558e86073bf8ad525 100644
--- a/res/drawable/signal_strength_g.xml
+++ b/res/drawable/signal_strength_g.xml
@@ -18,9 +18,8 @@
     android:width="4.958dp"
     android:height="17dp"
     android:viewportWidth="7.0"
-    android:viewportHeight="24.0"
-    android:tint="?android:attr/colorControlNormal">
+    android:viewportHeight="24.0">
     <path
-        android:fillColor="#FFFFFFFF"
+        android:fillColor="@color/color_default_accent"
         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 998999f4782640d3887cb42e7d68c9901556f9e9..e056709a851e5c2473a99ac5b08725b6fa688bd4 100644
--- a/res/drawable/signal_strength_lte.xml
+++ b/res/drawable/signal_strength_lte.xml
@@ -18,15 +18,14 @@
     android:width="9.208dp"
     android:height="17dp"
     android:viewportWidth="13.0"
-    android:viewportHeight="24.0"
-    android:tint="?android:attr/colorControlNormal">
+    android:viewportHeight="24.0">
     <path
-        android:fillColor="#FFFFFFFF"
+        android:fillColor="@color/color_default_accent"
         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="#FFFFFFFF"
+        android:fillColor="@color/color_default_accent"
         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="#FFFFFFFF"
+        android:fillColor="@color/color_default_accent"
         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/tile_icon_animation_speed.xml b/res/drawable/tile_icon_animation_speed.xml
index 4a7c708fb4542177b1d08256c72d7b5f8c07013f..d0c2aa45c42f9fc2c79078d01f877a3174ced5cd 100644
--- a/res/drawable/tile_icon_animation_speed.xml
+++ b/res/drawable/tile_icon_animation_speed.xml
@@ -17,9 +17,8 @@ Copyright (C) 2017 The Android Open Source Project
         android:width="24dp"
         android:height="24dp"
         android:viewportWidth="24.0"
-        android:viewportHeight="24.0"
-        android:tint="?android:attr/colorControlNormal">
+        android:viewportHeight="24.0">
     <path
-        android:fillColor="#FFFFFFFF"
+        android:fillColor="@color/color_default_accent"
         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 e87bddeeb0e28236323e3a2db344017527423647..907db9efb79ddb1db3e7a2e4895536e2f07bade3 100644
--- a/res/drawable/tile_icon_force_rtl.xml
+++ b/res/drawable/tile_icon_force_rtl.xml
@@ -17,45 +17,44 @@ Copyright (C) 2017 The Android Open Source Project
         android:width="24dp"
         android:height="24dp"
         android:viewportWidth="24.0"
-        android:viewportHeight="24.0"
-        android:tint="?android:attr/colorControlNormal">
+        android:viewportHeight="24.0">
     <path
-        android:fillColor="#FFFFFFFF"
+        android:fillColor="@color/color_default_accent"
         android:pathData="M7,12L12,7V10H16V14H12V17L7,12" />
     <path
-        android:fillColor="#80FFFFFF"
+        android:fillColor="@color/color_default_accent"
         android:pathData="M0.0,6.0h1.0v12.0h-1.0z"/>
     <path
-        android:fillColor="#80FFFFFF"
+        android:fillColor="@color/color_default_accent"
         android:pathData="M6.0,0.0h12.0v1.0h-12.0z"/>
     <path
-        android:fillColor="#80FFFFFF"
+        android:fillColor="@color/color_default_accent"
         android:pathData="M23.0,6.0h1.0v12.0h-1.0z"/>
     <path
-        android:fillColor="#80FFFFFF"
+        android:fillColor="@color/color_default_accent"
         android:pathData="M6.0,23.0h12.0v1.0h-12.0z"/>
     <path
-        android:fillColor="#FFFFFFFF"
+        android:fillColor="@color/color_default_accent"
         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="#FFFFFFFF"
+        android:fillColor="@color/color_default_accent"
         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="#FFFFFFFF"
+        android:fillColor="@color/color_default_accent"
         android:pathData="M18.0,0.0l0.0,1.0l5.0,0.0l0.0,5.0l1.0,0.0l0.0,-6.0z"/>
     <path
-        android:fillColor="#FFFFFFFF"
+        android:fillColor="@color/color_default_accent"
         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="#80FFFFFF"
+        android:fillColor="@color/color_default_accent"
         android:pathData="M9.5,4h5.0v1.0h-5.0z"/>
     <path
-        android:fillColor="#80FFFFFF"
+        android:fillColor="@color/color_default_accent"
         android:pathData="M9.5,19h5.0v1.0h-5.0z"/>
     <path
-        android:fillColor="#FFFFFFFF"
+        android:fillColor="@color/color_default_accent"
         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="#FFFFFFFF"
+        android:fillColor="@color/color_default_accent"
         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 af611aca947da801c9ee49ee845dcdda8dbaec49..b0521e431a6cac0208c302b79a90150ef89883af 100644
--- a/res/drawable/tile_icon_graphics.xml
+++ b/res/drawable/tile_icon_graphics.xml
@@ -17,37 +17,36 @@ Copyright (C) 2015 The Android Open Source Project
         android:width="24dp"
         android:height="24dp"
         android:viewportWidth="24.0"
-        android:viewportHeight="24.0"
-        android:tint="?android:attr/colorControlNormal">
+        android:viewportHeight="24.0">
     <path
-        android:fillColor="#FFFFFFFF"
+        android:fillColor="@color/color_default_accent"
         android:pathData="M23,1v22H1V1H23 M24,0H0v24h24V0L24,0z"/>
     <path
-        android:strokeColor="#FFFFFFFF"
+        android:strokeColor="@color/color_default_accent"
         android:strokeWidth="0.667"
         android:pathData="M5,19L1,23"/>
     <path
-        android:strokeColor="#FFFFFFFF"
+        android:strokeColor="@color/color_default_accent"
         android:strokeWidth="0.667"
         android:pathData="M1,1L5,5"/>
     <path
-        android:strokeColor="#FFFFFFFF"
+        android:strokeColor="@color/color_default_accent"
         android:strokeWidth="0.667"
         android:pathData="M19,5L23,1"/>
     <path
-        android:strokeColor="#FFFFFFFF"
+        android:strokeColor="@color/color_default_accent"
         android:strokeWidth="0.667"
         android:pathData="M19,19L23,23"/>
     <path
-        android:fillColor="#FFFFFFFF"
+        android:fillColor="@color/color_default_accent"
         android:pathData="M14,3.8l-4,0l-0.2,-0.8l4.4,0z"/>
     <path
-        android:fillColor="#FFFFFFFF"
+        android:fillColor="@color/color_default_accent"
         android:pathData="M18.8,5.2v13.5H5.2V5.2H18.8 M19.5,4.5h-15v15h15V4.5L19.5,4.5z"/>
     <path
-        android:fillColor="#FFFFFFFF"
+        android:fillColor="@color/color_default_accent"
         android:pathData="M6.5,9.5h5v11h-5z"/>
     <path
-        android:fillColor="#FFFFFFFF"
+        android:fillColor="@color/color_default_accent"
         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 890fa839717e7561e9bce2a7e32abb280375004b..accb1670d1047076234219a7ff56b1d334b78ed6 100644
--- a/res/drawable/tile_icon_sensors_off.xml
+++ b/res/drawable/tile_icon_sensors_off.xml
@@ -22,16 +22,16 @@
     <path
         android:pathData="M21.966,2 L2,22"
         android:strokeLineCap="round"
-        android:strokeColor="#000000"
-        android:fillColor="#00000000"
+        android:strokeColor="@color/color_default_accent"
+        android:fillColor="@android:color/transparent"
         android:strokeWidth="1.6521436"
         android:strokeLineJoin="miter"
         android:strokeAlpha="1"/>
     <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="#000000"
-        android:fillColor="#00000000"
+        android:strokeColor="@color/color_default_accent"
+        android:fillColor="@android:color/transparent"
         android:strokeWidth="1.25090861"
         android:strokeLineJoin="round"
         android:strokeAlpha="1"/>
diff --git a/res/drawable/tile_icon_show_layout.xml b/res/drawable/tile_icon_show_layout.xml
index e23b24cd945fe2f818942c7c052be68951f79839..70fe35f4b9548b69b0c686fabd052774a10a39cb 100644
--- a/res/drawable/tile_icon_show_layout.xml
+++ b/res/drawable/tile_icon_show_layout.xml
@@ -14,48 +14,50 @@ Copyright (C) 2015 The Android Open Source Project
     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"
-        android:tint="?android:attr/colorControlNormal">
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
     <path
-        android:fillColor="#FFFFFFFF"
-        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"/>
+        android:fillColor="@color/color_default_accent"
+        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:fillColor="#80FFFFFF"
-        android:pathData="M0.0,6.0h1.0v12.0h-1.0z"/>
+        android:fillAlpha="0.7"
+        android:fillColor="@color/color_default_accent"
+        android:pathData="M0.0,6.0h1.0v12.0h-1.0z" />
     <path
-        android:fillColor="#80FFFFFF"
-        android:pathData="M6.0,0.0h12.0v1.0h-12.0z"/>
+        android:fillColor="@color/color_default_gray1"
+        android:pathData="M6.0,0.0h12.0v1.0h-12.0z" />
     <path
-        android:fillColor="#80FFFFFF"
-        android:pathData="M23.0,6.0h1.0v12.0h-1.0z"/>
+        android:fillColor="@color/color_default_gray1"
+        android:pathData="M23.0,6.0h1.0v12.0h-1.0z" />
     <path
-        android:fillColor="#80FFFFFF"
-        android:pathData="M6.0,23.0h12.0v1.0h-12.0z"/>
+        android:fillColor="@color/color_default_gray1"
+        android:pathData="M6.0,23.0h12.0v1.0h-12.0z" />
     <path
-        android:fillColor="#FFFFFFFF"
-        android:pathData="M1.0,23.0l0.0,-5.0l-1.0,0.0l0.0,6.0l6.0,0.0l0.0,-1.0z"/>
+        android:fillColor="@color/color_default_accent"
+        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="#FFFFFFFF"
-        android:pathData="M1.0,1.0l5.0,0.0l0.0,-1.0l-6.0,0.0l0.0,6.0l1.0,0.0z"/>
+        android:fillColor="@color/color_default_accent"
+        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="#FFFFFFFF"
-        android:pathData="M18.0,0.0l0.0,1.0l5.0,0.0l0.0,5.0l1.0,0.0l0.0,-6.0z"/>
+        android:fillColor="@color/color_default_accent"
+        android:pathData="M18.0,0.0l0.0,1.0l5.0,0.0l0.0,5.0l1.0,0.0l0.0,-6.0z" />
     <path
-        android:fillColor="#FFFFFFFF"
-        android:pathData="M23.0,23.0l-5.0,0.0l0.0,1.0l6.0,0.0l0.0,-6.0l-1.0,0.0z"/>
+        android:fillColor="@color/color_default_accent"
+        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="#80FFFFFF"
-        android:pathData="M9.5,6.0h5.0v1.0h-5.0z"/>
+        android:fillAlpha="0.7"
+        android:fillColor="@color/color_default_accent"
+        android:pathData="M9.5,6.0h5.0v1.0h-5.0z" />
     <path
-        android:fillColor="#80FFFFFF"
-        android:pathData="M9.5,17.0h5.0v1.0h-5.0z"/>
+        android:fillAlpha="0.7"
+        android:fillColor="@color/color_default_accent"
+        android:pathData="M9.5,17.0h5.0v1.0h-5.0z" />
     <path
-        android:fillColor="#FFFFFFFF"
-        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"/>
+        android:fillColor="@color/color_default_accent"
+        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="#FFFFFFFF"
-        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"/>
+        android:fillColor="@color/color_default_accent"
+        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 256304944768d9706e7909144c33b1d3867964cf..d97d31a5eeb4539af973d03aacf47acc40e51096 100644
--- a/res/drawable/tile_icon_winscope_trace.xml
+++ b/res/drawable/tile_icon_winscope_trace.xml
@@ -17,13 +17,12 @@
         android:width="24dp"
         android:height="24dp"
         android:viewportWidth="24.0"
-        android:viewportHeight="24.0"
-        android:tint="?android:attr/colorControlNormal">
+        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="#FFFFFFFF"/>
+        android:fillColor="@color/color_default_accent"/>
     <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="#FFFFFFFF"/>
+        android:fillColor="@color/color_default_accent"/>
 </vector>
 
diff --git a/res/drawable/wifi_dpp_success.xml b/res/drawable/wifi_dpp_success.xml
index 5ef3d1f68a7c6a75bda831e18440f409b8137778..d8ed51407efe4cad164afbb2b33b773c78e0526c 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="#4285F4"/>
+      android:fillColor="@color/color_default_accent"/>
   <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/advanced_bt_entity_header.xml b/res/layout/advanced_bt_entity_header.xml
index 4aadad1fc34734df0ab99bc0f9f5590ffba8047a..7c4a6db46f9c06f24ebe1d6547d794f3c664ce9f 100644
--- a/res/layout/advanced_bt_entity_header.xml
+++ b/res/layout/advanced_bt_entity_header.xml
@@ -19,6 +19,7 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/entity_header"
     style="@style/EntityHeader"
+    android:background="@color/color_default_primary_dark"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical">
diff --git a/res/layout/battery_header.xml b/res/layout/battery_header.xml
index dca0972a79f3075b372dadf8a2c6c478d8228434..26a38b912257ec7210b11daf0f3e3afef589a478 100644
--- a/res/layout/battery_header.xml
+++ b/res/layout/battery_header.xml
@@ -22,7 +22,8 @@
     android:layout_height="match_parent"
     android:layout_gravity="center"
     android:orientation="horizontal"
-    style="@style/EntityHeader">
+    style="@style/EntityHeader"
+    android:background="@color/color_default_primary_dark">
 
     <LinearLayout
         android:layout_width="170dp"
diff --git a/res/layout/conditional_card_header.xml b/res/layout/conditional_card_header.xml
index 219468a55758389c404377940624f04e164ebc64..c7c069c5d57346cc1bfaf0a51c3c9e3c9084529d 100644
--- a/res/layout/conditional_card_header.xml
+++ b/res/layout/conditional_card_header.xml
@@ -47,7 +47,7 @@
             android:paddingStart="@dimen/contextual_condition_header_indicator_padding_start"
             android:paddingEnd="@dimen/contextual_condition_header_indicator_padding_end"
             android:src="@drawable/ic_expand_more_inverse"
-            android:tint="?android:attr/colorControlNormal"/>
+            android:tint="@color/color_default_accent"/>
 
     </LinearLayout>
 
diff --git a/res/layout/crypt_keeper_switch_input_method.xml b/res/layout/crypt_keeper_switch_input_method.xml
index 3fae593bbf6127943d99beb542a7b2d49d94d602..3086ab6c24c19f1404b5e2745bfcb93cb6721b09 100644
--- a/res/layout/crypt_keeper_switch_input_method.xml
+++ b/res/layout/crypt_keeper_switch_input_method.xml
@@ -22,7 +22,7 @@
     android:id="@+id/switch_ime_button"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:src="@*android:drawable/ic_lockscreen_ime"
+    android:src="@drawable/ic_keyboard"
     android:clickable="true"
     android:contentDescription="@string/crypt_keeper_switch_input_method"
     android:padding="@dimen/crypt_keeper_edit_text_ime_padding"
diff --git a/res/layout/data_usage_summary_preference.xml b/res/layout/data_usage_summary_preference.xml
index 6617ac9cacffff5246b81d505696983428dd5bdb..0369908c0a3d8f438948266a8b076042e7fe6ca8 100644
--- a/res/layout/data_usage_summary_preference.xml
+++ b/res/layout/data_usage_summary_preference.xml
@@ -24,7 +24,8 @@
     android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
     android:orientation="vertical"
     android:selectable="false"
-    style="@style/EntityHeader">
+    style="@style/EntityHeader"
+    android:background="@color/color_default_primary_dark">
 
     <TextView
         android:id="@+id/usage_title"
diff --git a/res/layout/empty_print_state.xml b/res/layout/empty_print_state.xml
index 43312c8c2674830ef46be1b386f3e96ac7d9d07a..f60bf9e048fbd7beacc3e48e250f8327ffd84bc4 100644
--- a/res/layout/empty_print_state.xml
+++ b/res/layout/empty_print_state.xml
@@ -26,10 +26,9 @@
         android:layout_width="120dp"
         android:layout_height="110dp"
         android:layout_marginBottom="12dp"
-        android:src="@*android:drawable/ic_print"
+        android:src="@drawable/ic_print"
         android:scaleType="fitEnd"
         android:alpha="0.1"
-        android:tint="?android:colorForeground"
         android:importantForAccessibility="no" />
 
     <TextView
diff --git a/res/layout/empty_printers_list_service_enabled.xml b/res/layout/empty_printers_list_service_enabled.xml
index 481f9c0c15242adf4ee52587cbb008d5077880a2..c42cb86d8aa14972668ee646d3938f6247bc4c97 100644
--- a/res/layout/empty_printers_list_service_enabled.xml
+++ b/res/layout/empty_printers_list_service_enabled.xml
@@ -26,10 +26,9 @@
         android:layout_width="120dp"
         android:layout_height="110dp"
         android:layout_marginBottom="12dp"
-        android:src="@*android:drawable/ic_print"
+        android:src="@drawable/ic_print"
         android:scaleType="fitEnd"
         android:alpha="0.1"
-        android:tint="?android:colorForeground"
         android:importantForAccessibility="no"/>
 
     <TextView
diff --git a/res/layout/lockscreen_remote_input.xml b/res/layout/lockscreen_remote_input.xml
index 4fa44ce1b2e935dec2ad15df40f70745bc196b5d..59523a3d8fe8b70a3f502555374facd56287f8c7 100644
--- a/res/layout/lockscreen_remote_input.xml
+++ b/res/layout/lockscreen_remote_input.xml
@@ -39,7 +39,7 @@
             android:layout_width="@*android:dimen/config_restrictedIconSize"
             android:layout_height="@*android:dimen/config_restrictedIconSize"
             android:tint="?android:attr/colorAccent"
-            android:src="@*android:drawable/ic_info"
+            android:src="@drawable/ic_info"
             android:layout_marginEnd="?android:attr/dialogPreferredPadding"
             android:layout_gravity="center_vertical"
             android:scaleType="centerInside" />
diff --git a/res/layout/master_clear_confirm.xml b/res/layout/master_clear_confirm.xml
index a236cd381e3913b981c49dcf8bba7cff458f1722..4266139848a5fe16bd5d3b39caae353176cd1867 100644
--- a/res/layout/master_clear_confirm.xml
+++ b/res/layout/master_clear_confirm.xml
@@ -19,7 +19,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    android:theme="@style/SudThemeGlifV3.DayNight"
+    android:theme="@style/Theme.Settings"
     android:id="@+id/setup_wizard_layout"
     android:icon="@drawable/ic_delete_accent"
     app:sucHeaderText="@string/master_clear_confirm_title">
diff --git a/res/layout/mobile_network_settings_container.xml b/res/layout/mobile_network_settings_container.xml
index c88b512f44305f984d1d3336b3f94da7e03bc085..e7abc27c30424e786b17d0ae9eb66e285180549e 100644
--- a/res/layout/mobile_network_settings_container.xml
+++ b/res/layout/mobile_network_settings_container.xml
@@ -27,6 +27,7 @@
         style="?android:attr/actionBarStyle"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:background="@color/color_default_primary_dark"
         android:navigationContentDescription="@*android:string/action_bar_up_description"
         android:theme="?android:attr/actionBarTheme"/>
 
diff --git a/res/layout/mobile_network_settings_container_v2.xml b/res/layout/mobile_network_settings_container_v2.xml
index ed7296b39aeffaa3da7f50577be96f6a748eca1a..01c43cc06ce0050c1dc646fe72248917a0c16fdf 100644
--- a/res/layout/mobile_network_settings_container_v2.xml
+++ b/res/layout/mobile_network_settings_container_v2.xml
@@ -27,6 +27,7 @@
         style="?android:attr/actionBarStyle"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:background="@color/color_default_primary_dark"
         android:navigationContentDescription="@*android:string/action_bar_up_description"
         android:theme="?android:attr/actionBarTheme"/>
 
diff --git a/res/layout/printer_dropdown_item.xml b/res/layout/printer_dropdown_item.xml
index fd581bbdcc0640d139ab1e22bf872c0268d220bd..2e793b3cdb481a7a9fffd27bce2b386325c15c3c 100644
--- a/res/layout/printer_dropdown_item.xml
+++ b/res/layout/printer_dropdown_item.xml
@@ -77,8 +77,8 @@
             android:layout_gravity="center_vertical"
             android:paddingLeft="16dip"
             android:contentDescription="@string/printer_info_desc"
-            android:src="@*android:drawable/ic_info"
-            android:tint="?android:attr/colorControlNormal"
+            android:src="@drawable/ic_info"
+            android:tint="@color/color_default_accent"
             android:tintMode="src_in" />
 
     </LinearLayout>
diff --git a/res/layout/restricted_dialog_singlechoice.xml b/res/layout/restricted_dialog_singlechoice.xml
index a9984a84fc331f239676ddfcc90c336e7cf2dc19..c378a5d1df4af2e9f591b22f9d0a177b32df7a86 100644
--- a/res/layout/restricted_dialog_singlechoice.xml
+++ b/res/layout/restricted_dialog_singlechoice.xml
@@ -40,7 +40,7 @@
             android:layout_width="@*android:dimen/config_restrictedIconSize"
             android:layout_height="@*android:dimen/config_restrictedIconSize"
             android:tint="?android:attr/colorAccent"
-            android:src="@*android:drawable/ic_info"
+            android:src="@drawable/ic_info"
             android:layout_marginLeft="@dimen/restricted_icon_padding"
             android:baselineAlignBottom="true"
             android:scaleType="centerInside"
diff --git a/res/layout/restricted_popup_menu_item.xml b/res/layout/restricted_popup_menu_item.xml
index 636e3f91847f6b6e4380f537500308220dd40bce..2c700f7d6925b996381e4a2b09adfada63b02abe 100644
--- a/res/layout/restricted_popup_menu_item.xml
+++ b/res/layout/restricted_popup_menu_item.xml
@@ -38,7 +38,7 @@
         android:layout_height="@*android:dimen/config_restrictedIconSize"
         android:scaleType="centerInside"
         android:tint="?android:attr/colorAccent"
-        android:src="@*android:drawable/ic_info"
+        android:src="@drawable/ic_info"
         android:layout_alignParentRight="true"
         android:visibility="gone" />
 </RelativeLayout>
diff --git a/res/layout/restricted_radio_with_summary.xml b/res/layout/restricted_radio_with_summary.xml
index 5e7fcd82fe641b632a90e3f43557b27f48fd205e..283331bbe3b15eb6df78bc83782afc3aaefe9923 100644
--- a/res/layout/restricted_radio_with_summary.xml
+++ b/res/layout/restricted_radio_with_summary.xml
@@ -45,7 +45,7 @@
             android:layout_height="match_parent"
             android:scaleType="centerInside"
             android:tint="?android:attr/colorAccent"
-            android:src="@*android:drawable/ic_info"
+            android:src="@drawable/ic_info"
             android:layout_marginLeft="@dimen/restricted_icon_padding"
             android:visibility="gone" />
     </com.android.settings.CheckableLinearLayout>
diff --git a/res/layout/settings_base_layout.xml b/res/layout/settings_base_layout.xml
index f94d25d48411b7f95e881673ce2c25f8d2b6ef6b..ec72a0c58cfe189595e6b8d13d2df1fcc6c28561 100644
--- a/res/layout/settings_base_layout.xml
+++ b/res/layout/settings_base_layout.xml
@@ -27,6 +27,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:theme="?android:attr/actionBarTheme"
+        android:background="@color/color_default_primary_dark"
         android:navigationContentDescription="@*android:string/action_bar_up_description" />
     <FrameLayout
         android:id="@+id/content_frame"
diff --git a/res/layout/spinner_dropdown_restricted_item.xml b/res/layout/spinner_dropdown_restricted_item.xml
index d95e4be3894b6e28729f229bf088b99c20901015..2faeb7e79806f858b8af67df394a6baf1aa171e5 100644
--- a/res/layout/spinner_dropdown_restricted_item.xml
+++ b/res/layout/spinner_dropdown_restricted_item.xml
@@ -29,7 +29,7 @@
             android:layout_width="@*android:dimen/config_restrictedIconSize"
             android:layout_height="@*android:dimen/config_restrictedIconSize"
             android:tint="?android:attr/colorAccent"
-            android:src="@*android:drawable/ic_info"
+            android:src="@drawable/ic_info"
             android:baselineAlignBottom="true"
             android:layout_marginEnd="@dimen/restricted_icon_padding"
             android:gravity="end|center_vertical"
diff --git a/res/layout/switch_bar.xml b/res/layout/switch_bar.xml
index 3bdfbd49cbcf0517a8c79718b2a9eba99100d756..c0867dd3bfbe2d80a2d2df924da23a9ec04b0704 100644
--- a/res/layout/switch_bar.xml
+++ b/res/layout/switch_bar.xml
@@ -28,7 +28,7 @@
         android:maxLines="2"
         android:ellipsize="end"
         android:textAppearance="@style/TextAppearance.Switch"
-        android:textColor="?android:attr/textColorPrimaryInverse"
+        android:textColor="@color/color_default_view_on_accent"
         android:textAlignment="viewStart"/>
 
     <ImageView
@@ -45,8 +45,7 @@
         android:id="@+id/switch_widget"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical"
-        android:theme="@style/Widget.SwitchBar.Switch"/>
+        android:layout_gravity="center_vertical" />
 
 </merge>
 
diff --git a/res/layout/user_credential_preference.xml b/res/layout/user_credential_preference.xml
index 3671b7fac5b72a2cab36e3f5a5d099d40dbe599e..9c8a72886ac805af46dd114b033cd032e7e2dab4 100644
--- a/res/layout/user_credential_preference.xml
+++ b/res/layout/user_credential_preference.xml
@@ -28,8 +28,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:paddingEnd="?android:attr/listPreferredItemPaddingStart"
-        android:src="@android:drawable/ic_lock_lock"
-        android:tint="?android:attr/colorAccent"/>
+        android:src="@drawable/ic_lock_lock"/>
 
     <include layout="@layout/user_credential"/>
 </LinearLayout>
diff --git a/res/layout/wifi_dpp_fragment_header.xml b/res/layout/wifi_dpp_fragment_header.xml
index 364f36041cb3c94a197bd6093d9ad2e1806ecf2f..341c07752256faf1556c634feb778e804e833c56 100644
--- a/res/layout/wifi_dpp_fragment_header.xml
+++ b/res/layout/wifi_dpp_fragment_header.xml
@@ -18,6 +18,7 @@
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     style="@style/EntityHeader"
+    android:background="@color/color_default_primary_dark"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_centerHorizontal="true"
diff --git a/res/menu/time_zone_base_search_menu.xml b/res/menu/time_zone_base_search_menu.xml
index 6df42c4260d9a60e7534683ae438236ef4ad5b92..39261e17d04d06c937d9a427ca753b52e89058c1 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_search_24dp"
+        android:icon="@drawable/ic_homepage_search"
         android:showAsAction="always|collapseActionView"
         android:actionViewClass="android.widget.SearchView" />
 
diff --git a/res/values-night-v27/themes.xml b/res/values-night-v27/themes.xml
new file mode 100644
index 0000000000000000000000000000000000000000..194e7975a7ec9938442e772218a9a38767108097
--- /dev/null
+++ b/res/values-night-v27/themes.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2010 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>
+
+    <style name="Theme.Settings" parent="Theme.SettingsBase">
+        <item name="android:windowLightNavigationBar">false</item>
+        <item name="android:windowLightStatusBar">false</item>
+    </style>
+
+    <style name="Theme.Settings.Home" parent="Theme.Settings.HomeBase">
+        <item name="android:windowLightNavigationBar">false</item>
+        <item name="android:windowLightStatusBar">false</item>
+    </style>
+
+    <style name="LightTheme.SettingsBase.SetupWizard" parent="@style/LightTheme.SettingsBase.SetupWizard.Base">
+        <item name="android:windowLightNavigationBar">false</item>
+        <item name="android:windowLightStatusBar">false</item>
+    </style>
+
+    <style name="LightTheme.SubSettings.SetupWizard" parent="@style/LightTheme.SubSettings.SetupWizard.Base">
+        <item name="android:windowLightNavigationBar">false</item>
+        <item name="android:windowLightStatusBar">false</item>
+    </style>
+
+    <style name="Theme.ProvisioningActivity" parent="@style/Theme.ProvisioningActivity.Base">
+        <item name="android:windowLightNavigationBar">false</item>
+        <item name="android:windowLightStatusBar">false</item>
+    </style>
+
+    <style name="Theme.CryptKeeper" parent="@style/Theme.CryptKeeper.Base">
+        <item name="android:windowLightNavigationBar">false</item>
+        <item name="android:windowLightStatusBar">false</item>
+    </style>
+
+    <style name="FallbackHome" parent="@style/FallbackHome.Base">
+        <item name="android:windowLightNavigationBar">false</item>
+        <item name="android:windowLightStatusBar">false</item>
+    </style>
+
+    <style name="FallbackHome.SetupWizard" parent="@style/FallbackHome.SetupWizard.Base">
+        <item name="android:windowLightNavigationBar">false</item>
+        <item name="android:windowLightStatusBar">false</item>
+    </style>
+</resources>
\ No newline at end of file
diff --git a/res/values-night/bools.xml b/res/values-night/bools.xml
new file mode 100644
index 0000000000000000000000000000000000000000..29312e7389eaa8a3406166c187a660f6798a59d3
--- /dev/null
+++ b/res/values-night/bools.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2010 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>
+    <bool name="lightModeActive">false</bool>
+</resources>
\ No newline at end of file
diff --git a/res/values-night/colors.xml b/res/values-night/colors.xml
deleted file mode 100644
index b1f9dfbd675b33cfb1fcf409abe024656ba6ea6f..0000000000000000000000000000000000000000
--- a/res/values-night/colors.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2018 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="switchbar_switch_track_tint">#82000000</color>
-    <color name="switchbar_switch_thumb_tint">@android:color/black</color>
-    <color name="homepage_accessibility_background">#783BE5</color>
-    <color name="homepage_support_background">#3F5FBD</color>
-    <color name="homepage_card_dismissal_background">@*android:color/material_grey_900</color>
-    <color name="contextual_card_background">@*android:color/material_grey_900</color>
-    <color name="search_bar_background">@*android:color/material_grey_800</color>
-    <!-- Dialog background color -->
-    <color name="dialog_background">@*android:color/material_grey_800</color>
-    <color name="notification_importance_selection_bg">@*android:color/material_grey_800</color>
-    <color name="notification_importance_button_selected">#AECBFA</color> <!-- material blue 200 -->
-    <color name="notification_importance_button_unselected">#5F6368</color>
-    <color name="face_intro_outline">?android:attr/colorAccent</color>
-</resources>
-
diff --git a/res/values-night/styles.xml b/res/values-night/styles.xml
index 87159b8b76f16ba07396f29e8df79c71c11620c0..62cebfeb3cde7a1370d0541f0666afce69322fa8 100644
--- a/res/values-night/styles.xml
+++ b/res/values-night/styles.xml
@@ -18,7 +18,7 @@
 <resources>
 
 <style name="Widget.ActionBar.Base" parent="@android:style/Widget.DeviceDefault.ActionBar.Solid">
-  <item name="android:background">?android:attr/colorPrimaryDark</item>
+  <item name="android:background">@color/color_default_primary_dark</item>
 </style>
 
 </resources>
\ No newline at end of file
diff --git a/res/values-night/themes.xml b/res/values-night/themes.xml
index ec0978b3391db14b64ae72195b442facf74a0815..9ba92a11de9a35bd8a001b7efcc1b7559f0dffa8 100644
--- a/res/values-night/themes.xml
+++ b/res/values-night/themes.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2018 The Android Open Source Project
+<!-- Copyright (C) 2010 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.
@@ -16,28 +15,9 @@
 -->
 
 <resources>
-
-    <style name="Theme.Settings.Home" parent="Theme.Settings.HomeBase">
-        <item name="colorPrimary">@*android:color/primary_device_default_settings</item>
-        <item name="colorPrimaryDark">@*android:color/primary_dark_device_default_settings</item>
-        <item name="android:colorBackground">?android:attr/colorPrimaryDark</item>
-    </style>
-
-    <style name="ThemeOverlay.Settings.SearchBar" parent="Theme.Settings">
-        <item name="android:colorBackground">?android:attr/colorPrimaryDark</item>
-        <item name="cardBackgroundColor">?android:attr/colorPrimary</item>
-        <item name="android:colorControlNormal">?android:attr/colorAccent</item>
+    <style name="Theme.DialogBase" parent="@android:style/Theme.DeviceDefault.Dialog">
     </style>
 
-    <style name="Theme.SubSettings" parent="Theme.SubSettings.Base"/>
-
-    <style name="ThemeOverlay.SwitchBar.Settings" parent="ThemeOverlay.SwitchBar.Settings.Base">
-        <item name="android:textColorPrimaryInverse">@android:color/black</item>
+    <style name="Custom.PanelBase" parent="@android:style/Theme.DeviceDefault.Panel">
     </style>
-
-    <style name="Theme.AlertDialog.Base" parent="@style/Theme.AppCompat.DayNight.Dialog.Alert">
-        <item name="colorAccent">@*android:color/accent_device_default_dark</item>
-        <item name="android:colorBackground">@color/dialog_background</item>
-    </style>
-
-</resources>
+</resources>
\ No newline at end of file
diff --git a/res/values-v27/themes.xml b/res/values-v27/themes.xml
new file mode 100644
index 0000000000000000000000000000000000000000..8aebb2137956313d74aa09ce43e33805b03305d2
--- /dev/null
+++ b/res/values-v27/themes.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2010 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>
+
+    <style name="Theme.Settings" parent="Theme.SettingsBase">
+        <item name="android:windowLightNavigationBar">true</item>
+        <item name="android:windowLightStatusBar">true</item>
+    </style>
+
+    <style name="Theme.Settings.Home" parent="Theme.Settings.HomeBase">
+        <item name="android:windowLightNavigationBar">true</item>
+        <item name="android:windowLightStatusBar">true</item>
+    </style>
+
+    <style name="LightTheme.SettingsBase.SetupWizard" parent="@style/LightTheme.SettingsBase.SetupWizard.Base">
+        <item name="android:windowLightNavigationBar">true</item>
+        <item name="android:windowLightStatusBar">true</item>
+    </style>
+
+    <style name="LightTheme.SubSettings.SetupWizard" parent="@style/LightTheme.SubSettings.SetupWizard.Base">
+        <item name="android:windowLightNavigationBar">true</item>
+        <item name="android:windowLightStatusBar">true</item>
+    </style>
+
+    <style name="Theme.ProvisioningActivity" parent="@style/Theme.ProvisioningActivity.Base">
+        <item name="android:windowLightNavigationBar">true</item>
+        <item name="android:windowLightStatusBar">true</item>
+    </style>
+
+    <style name="Theme.CryptKeeper" parent="@style/Theme.CryptKeeper.Base">
+        <item name="android:windowLightNavigationBar">true</item>
+        <item name="android:windowLightStatusBar">true</item>
+    </style>
+
+    <style name="FallbackHome" parent="@style/FallbackHome.Base">
+        <item name="android:windowLightNavigationBar">true</item>
+        <item name="android:windowLightStatusBar">true</item>
+    </style>
+
+    <style name="FallbackHome.SetupWizard" parent="@style/FallbackHome.SetupWizard.Base">
+        <item name="android:windowLightNavigationBar">true</item>
+        <item name="android:windowLightStatusBar">true</item>
+    </style>
+</resources>
\ No newline at end of file
diff --git a/res/values/bools.xml b/res/values/bools.xml
new file mode 100644
index 0000000000000000000000000000000000000000..973f85033201360de7178acba81d8c9ebb1436c9
--- /dev/null
+++ b/res/values/bools.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <bool name="lightModeActive">true</bool>
+</resources>
\ No newline at end of file
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 7114bb15152f24d9fefcdda8c60b922e285c44a2..fdf28c18ecbfa6fef508518f8f19e3de21f81cbe 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -16,99 +16,117 @@
 
 <resources>
 
-    <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">#20ffffff</color>
-    <color name="title_color">@android:color/holo_blue_light</color>
+    <color name="color_default_accent">@lineageos.platform:color/color_default_accent</color>
+    <color name="color_default_primary">@lineageos.platform:color/color_default_primary</color>
+    <color name="color_default_primary_dark">@lineageos.platform:color/color_default_primary_dark</color>
+    <color name="color_default_primary_text">@lineageos.platform:color/color_default_primary_text</color>
+    <color name="color_default_secondary_text">@lineageos.platform:color/color_default_secondary_text</color>
+    <color name="color_default_background">@lineageos.platform:color/color_default_background</color>
+    <color name="color_default_foreground">@lineageos.platform:color/color_default_foreground</color>
+    <color name="color_default_divider">@lineageos.platform:color/color_default_divider</color>
+    <color name="color_default_selector">@lineageos.platform:color/color_default_selector</color>
+    <color name="color_default_blue1">@lineageos.platform:color/color_default_blue1</color>
+    <color name="color_default_blue2">@lineageos.platform:color/color_default_blue2</color>
+    <color name="color_default_red1">@lineageos.platform:color/color_default_red1</color>
+    <color name="color_default_orange1">@lineageos.platform:color/color_default_orange1</color>
+    <color name="color_default_green1">@lineageos.platform:color/color_default_green1</color>
+    <color name="color_default_gray1">@lineageos.platform:color/color_default_gray1</color>
+    <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="divider_color">@color/color_default_divider</color>
+    <color name="title_color">@color/color_default_accent</color>
     <color name="setup_lock_pattern_view_regular_color_light">
         @color/lock_pattern_view_regular_color
     </color>
-    <color name="setup_lock_pattern_view_success_color_dark">#ff84ffff</color>
-    <color name="setup_lock_pattern_view_success_color_light">@color/sud_color_accent_light</color>
-    <color name="setup_lock_pattern_view_error_color_dark">#fff44336</color>
-    <color name="setup_wizard_wifi_color_dark">#89ffffff</color>
-    <color name="setup_wizard_wifi_color_light">#89000000</color>
+    <color name="setup_lock_pattern_view_success_color_dark">@color/color_default_accent</color>
+    <color name="setup_lock_pattern_view_success_color_light">@color/color_default_accent</color>
+    <color name="setup_lock_pattern_view_error_color_dark">@color/color_default_red1</color>
+    <color name="setup_wizard_wifi_color_dark">@color/color_default_accent</color>
+    <color name="setup_wizard_wifi_color_light">@color/color_default_accent</color>
 
-    <color name="lock_pattern_background">#00000000</color>
-    <color name="lock_pattern_view_regular_color">#ff37474f</color>
+    <color name="lock_pattern_background">@color/color_default_background</color>
+    <color name="lock_pattern_view_regular_color">@color/color_default_accent</color>
 
-    <color name="lock_pattern_view_regular_color_dark">#ffffff</color>
+    <color name="lock_pattern_view_regular_color_dark">@color/color_default_accent</color>
 
-    <color name="unlock_pattern_view_regular_color">@android:color/white</color>
+    <color name="unlock_pattern_view_regular_color">@color/color_default_background</color>
 
-    <color name="fingerprint_title_area_bg">?android:attr/colorAccent</color>
-    <color name="fingerprint_title_color">#ffffffff</color>
-    <color name="fingerprint_message_color">#de000000</color>
+    <color name="fingerprint_title_area_bg">@color/color_default_background</color>
+    <color name="fingerprint_title_color">@color/color_default_primary_text</color>
+    <color name="fingerprint_message_color">@color/color_default_secondary_text</color>
 
-    <color name="running_processes_system_ram">#ff384248</color>
-    <color name="running_processes_free_ram">#ffced7db</color>
+    <color name="running_processes_system_ram">@color/color_default_accent</color>
+    <color name="running_processes_free_ram">@color/color_default_gray1</color>
 
-    <color name="sim_noitification">@*android:color/accent_device_default_light</color>
+    <color name="sim_noitification">@color/color_default_accent</color>
 
     <color name="confirm_device_credential_transparent_black">#60000000</color>
 
     <!-- Accent color that matches the settings launcher icon -->
-    <color name="icon_accent">#ffabffec</color>
+    <color name="icon_accent">@color/color_default_accent</color>
 
     <!-- Accessibility SUW colors -->
-    <color name="material_blue_500">#4285F4</color>
-    <color name="material_blue_700">#3367D6</color>
-    <color name="material_grey_100">#f5f5f5</color>
-    <color name="material_grey_200">#ffffff</color>
-
-    <color name="message_text_incoming">#ffffffff</color>
-    <color name="message_text_outgoing">#ff323232</color>
-    <color name="timestamp_text_outgoing">#99323232</color>
-    <color name="timestamp_text_incoming">#99ffffff</color>
-    <color name="message_bubble_incoming">#689f38</color>
-    <color name="message_bubble_outgoing">#ffffffff</color>
-    <color name="message_icon_background_incoming">#689f38</color>
-    <color name="message_icon_text_incoming">#ffffffff</color>
-    <color name="message_icon_background_outgoing">#4285f4</color>
-    <color name="message_icon_text_outgoing">#ffffffff</color>
-
-    <color name="usage_graph_dots">#B0BEC5</color>
+    <color name="material_blue_500">@color/color_default_blue1</color>
+    <color name="material_blue_700">@color/color_default_blue2</color>
+    <color name="material_grey_100">@color/color_default_gray1</color>
+    <color name="material_grey_200">@color/color_default_gray2</color>
+
+    <color name="message_text_incoming">@color/color_default_primary_text</color>
+    <color name="message_text_outgoing">@color/color_default_secondary_text</color>
+    <color name="timestamp_text_outgoing">@color/color_default_secondary_text</color>
+    <color name="timestamp_text_incoming">@color/color_default_primary_text</color>
+    <color name="message_bubble_incoming">@color/color_default_green1</color>
+    <color name="message_bubble_outgoing">@color/color_default_primary_text</color>
+    <color name="message_icon_background_incoming">@color/color_default_green1</color>
+    <color name="message_icon_text_incoming">@color/color_default_view_on_accent</color>
+    <color name="message_icon_background_outgoing">@color/color_default_accent</color>
+    <color name="message_icon_text_outgoing">@color/color_default_view_on_accent</color>
+
+    <color name="usage_graph_dots">@color/color_default_accent</color>
 
     <!-- Gestures settings -->
-    <color name="gestures_setting_background_color">#ffffff</color>
+    <color name="gestures_setting_background_color">@color/color_default_background</color>
 
     <!-- Color for the background of the shortcut icons.-->
-    <color name="shortcut_background">#fff5f5f5</color>
+    <color name="shortcut_background">@color/color_default_background</color>
 
     <!-- The fallback color for tinting icons. Only used when colorControlNormal is unavailable -->
-    <color name="fallback_tintColor">#89000000</color>
+    <color name="fallback_tintColor">@color/color_default_accent</color>
 
     <!-- Dashboard/homepage icon background colors -->
-    <color name="homepage_network_background">#2196F3</color>
-    <color name="homepage_connected_device_background">#72B70F</color>
-    <color name="homepage_app_and_notification_background">#FF7E0F</color>
-    <color name="homepage_battery_background">#258982</color>
-    <color name="homepage_display_background">#FFA727</color>
-    <color name="homepage_sound_background">#01B1AF</color>
-    <color name="homepage_storage_background">#C14CE6</color>
-    <color name="homepage_security_background">#0F9D58</color>
-    <color name="homepage_accounts_background">#F15B8D</color>
-    <color name="homepage_accessibility_background">#5011C1</color>
-    <color name="homepage_system_background">#9E9E9E</color>
-    <color name="homepage_support_background">#26459C</color>
-    <color name="homepage_generic_icon_background">#1A73E8</color>
-    <color name="homepage_location_background">#2EC7DC</color>
-    <color name="homepage_about_background">#6F86DA</color>
-    <color name="homepage_privacy_background">#5E97F6</color>
+    <color name="homepage_network_background">@color/color_default_background</color>
+    <color name="homepage_connected_device_background">@color/color_default_background</color>
+    <color name="homepage_app_and_notification_background">@color/color_default_background</color>
+    <color name="homepage_battery_background">@color/color_default_background</color>
+    <color name="homepage_display_background">@color/color_default_background</color>
+    <color name="homepage_sound_background">@color/color_default_background</color>
+    <color name="homepage_storage_background">@color/color_default_background</color>
+    <color name="homepage_security_background">@color/color_default_background</color>
+    <color name="homepage_accounts_background">@color/color_default_background</color>
+    <color name="homepage_accessibility_background">@color/color_default_background</color>
+    <color name="homepage_system_background">@color/color_default_background</color>
+    <color name="homepage_support_background">@color/color_default_background</color>
+    <color name="homepage_generic_icon_background">@color/color_default_background</color>
+    <color name="homepage_location_background">@color/color_default_background</color>
+    <color name="homepage_about_background">@color/color_default_background</color>
+    <color name="homepage_privacy_background">@color/color_default_background</color>
 
     <color name="contextual_card_stroke_color">#1f000000</color>
-    <color name="contextual_card_dismissal_background">@*android:color/material_grey_100</color>
-    <color name="contextual_card_background">@*android:color/background_device_default_light</color>
+    <color name="contextual_card_dismissal_background">@color/color_default_gray1</color>
+    <color name="contextual_card_background">@color/color_default_background</color>
     <!-- End of dashboard/homepage icon background colors -->
 
-    <color name="switchbar_background_color">@*android:color/material_grey_600</color>
-    <color name="switchbar_switch_track_tint">#BFFFFFFF</color>
-    <color name="switchbar_switch_thumb_tint">@android:color/white</color>
+    <color name="switchbar_background_color">@color/color_default_blue2</color>
+    <color name="switchbar_switch_track_tint">@color/color_default_green1</color>
+    <color name="switchbar_switch_thumb_tint">@color/color_default_view_on_accent</color>
 
-    <color name="glif_error_color">@*android:color/material_red_A700</color>
+    <color name="glif_error_color">@color/color_default_red1</color>
 
     <color name="battery_good_color_light">#43a047</color> <!-- Material Green 600 -->
     <color name="battery_maybe_color_light">#ef6c00</color> <!-- Material Orange 800 -->
@@ -125,27 +143,27 @@
     <color name="face_anim_particle_error">#ff9e9e9e</color> <!-- Material Gray 500 -->
 
     <!-- notification settings -->
-    <color name="notification_block_color">#ffff0000</color>
-    <color name="notification_silence_color">#FF32c1de</color>
-    <color name="notification_alert_color">#FFF87B2B</color>
-    <color name="notification_importance_button_unselected">#DADCE0</color>
-    <color name="notification_importance_button_selected">#1967D2</color> <!-- material blue 700 -->
-    <color name="notification_importance_selection_bg">#FFFFFF</color>
+    <color name="notification_block_color">@color/color_default_red1</color>
+    <color name="notification_silence_color">@color/color_default_accent</color>
+    <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>
 
     <!-- launcher icon color -->
-    <color name="icon_launcher_setting_color">@*android:color/accent_device_default_light</color>
+    <color name="icon_launcher_setting_color">@color/color_default_accent</color>
 
     <!-- QR code scanner colors -->
-    <color name="qr_corner_line_color">#ffdadce0</color>
-    <color name="qr_focused_corner_line_color">#ff1a73e8</color>
-    <color name="qr_background_color">#b3ffffff</color> <!-- 70% white transparency -->
+    <color name="qr_corner_line_color">@color/color_default_foreground</color>
+    <color name="qr_focused_corner_line_color">@color/color_default_accent</color>
+    <color name="qr_background_color">@color/color_default_background</color> <!-- 70% white transparency -->
     <!-- End of QR code scanner colors -->
 
     <!-- Search bar background color -->
-    <color name="search_bar_background">@android:color/white</color>
+    <color name="search_bar_background">@color/color_default_primary_dark</color>
 
     <!-- Dialog background color -->
-    <color name="dialog_background">@*android:color/background_device_default_light</color>
+    <color name="dialog_background">@color/color_default_foreground</color>
 
-    <color name="face_intro_outline">#ffdadce0</color>
+    <color name="face_intro_outline">@color/color_default_accent</color>
 </resources>
\ No newline at end of file
diff --git a/res/values/lineage_styles.xml b/res/values/lineage_styles.xml
index 1ce2e23597b4f8baf2fea3df29dce45735204077..02f070c8dfbf1619987c1f4abc9121e565fb8914 100644
--- a/res/values/lineage_styles.xml
+++ b/res/values/lineage_styles.xml
@@ -17,7 +17,7 @@
 <resources>
     <style name="LockPatternSizeHeaderStyle" parent="android:style/TextAppearance.Material.Subhead">
         <item name="android:paddingTop">16dp</item>
-        <item name="android:textColor">@color/primary_dark_material_light</item>
+        <item name="android:textColor">@color/color_default_primary_text</item>
         <item name="android:lineSpacingMultiplier">1.2</item>
     </style>
 </resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index d3d3199f62bb73e25489843dadf6f0dff550f5fc..c7d214e4f4ae40c3e0c543c3f09112c351c428ea 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -16,8 +16,17 @@
 
 <resources>
 
+    <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="Widget.ActionBar.Base"
-           parent="@android:style/Widget.DeviceDefault.Light.ActionBar.Solid"/>
+           parent="@android:style/Widget.DeviceDefault.Light.ActionBar.Solid">
+        <item name="android:background">@color/color_default_primary_dark</item>
+        <item name="actionOverflowButtonStyle">@style/customOverFlow</item>
+    </style>
 
     <style name="Widget.ActionBar"
            parent="Widget.ActionBar.Base">
@@ -26,6 +35,7 @@
 
     <style name="Widget.ActionBar.SubSettings" parent="Widget.ActionBar">
         <item name="android:contentInsetStart">@dimen/actionbar_subsettings_contentInsetStart</item>
+        <item name="android:background">@color/color_default_primary_dark</item>
     </style>
 
     <style name="info_label">
@@ -362,7 +372,10 @@
         <item name="android:progressDrawable">@drawable/ring_progress</item>
     </style>
 
-    <style name="ActionPrimaryButton" parent="android:Widget.DeviceDefault.Button.Colored"/>
+    <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>
+    </style>
 
     <style name="ActionSecondaryButton" parent="android:Widget.DeviceDefault.Button"/>
 
diff --git a/res/values/themes.xml b/res/values/themes.xml
index b96fd868baa139a8bf136167152dcc758f292b0e..eb9b02909754bb9250495d7c256cf0b2efce6e9c 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -23,27 +23,29 @@
         <item name="android:windowIsFloating">true</item>
     </style>
 
-    <style name="Theme.SettingsBase" parent="@android:style/Theme.DeviceDefault.Settings" />
-
-    <style name="Theme.Settings" parent="Theme.SettingsBase">
+    <style name="Theme.SettingsBase" parent="@android:style/Theme.DeviceDefault.Settings">
         <item name="preferenceTheme">@style/PreferenceTheme</item>
         <item name="android:clipToPadding">false</item>
         <item name="android:clipChildren">false</item>
         <item name="android:listPreferredItemHeight">72dip</item>
         <item name="android:homeAsUpIndicator">@drawable/ic_arrow_back</item>
-        <item name="android:navigationBarColor">@android:color/transparent</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="fingerprint_layout_theme">@style/FingerprintLayoutTheme</item>
         <item name="face_layout_theme">@style/FaceLayoutTheme</item>
-        <item name="ic_menu_moreoverflow">@*android:drawable/ic_menu_moreoverflow_holo_dark</item>
+        <item name="ic_menu_moreoverflow">@drawable/ic_more_24</item>
+        <item name="actionOverflowButtonStyle">@style/customOverFlow</item>
+        <item name="android:actionOverflowButtonStyle">@style/customOverFlow</item>
 
         <!-- For wifi icon -->
         <item name="wifi_signal">@drawable/wifi_signal</item>
-        <item name="wifi_signal_color">?android:attr/colorAccent</item>
+        <item name="wifi_signal_color">@color/color_default_accent</item>
         <item name="wifi_friction">@drawable/wifi_friction</item>
 
         <item name="side_margin">0dp</item>
-        <item name="sudListItemIconColor">?android:attr/colorAccent</item>
+        <item name="sudListItemIconColor">@color/color_default_accent</item>
 
         <!-- Redefine the ActionBar style for contentInsetStart -->
         <item name="android:actionBarStyle">@style/Widget.ActionBar</item>
@@ -58,13 +60,22 @@
         <item name="*android:lockPatternStyle">@style/LockPatternStyle.Setup</item>
 
         <!-- For AppBarLayout -->
-        <item name="colorPrimary">@*android:color/primary_device_default_settings_light</item>
-        <item name="colorPrimaryVariant">@android:color/white</item>
+        <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="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>
+        <item name="android:textColorPrimary">@color/color_default_primary_text</item>
+        <item name="android:textColorSecondary">@color/color_default_secondary_text</item>
 
         <!-- For slice view in settings -->
         <item name="sliceViewStyle">@style/Widget.SliceView.Settings</item>
     </style>
 
+    <style name="Theme.Settings" parent="Theme.SettingsBase">
+    </style>
+
     <!-- Variant of the settings theme with no action bar. -->
     <style name="Theme.Settings.NoActionBar">
         <item name="android:windowActionBar">false</item>
@@ -80,14 +91,26 @@
 
     <style name="Theme.SubSettings" parent="Theme.SubSettings.Base"/>
 
-    <style name="Theme.ProvisioningActivity" parent="@android:style/Theme.Translucent.NoTitleBar">
+    <style name="Theme.ProvisioningActivity.Base" parent="@android:style/Theme.Translucent.NoTitleBar">
         <item name="android:windowAnimationStyle">@null</item>
         <item name="android:windowIsTranslucent">true</item>
-        <item name="android:windowBackground">@android:color/transparent</item>
+        <item name="android:windowBackground">@color/color_default_background</item>
         <item name="android:windowContentOverlay">@null</item>
         <item name="android:windowNoTitle">true</item>
         <item name="android:windowIsFloating">true</item>
         <item name="android:backgroundDimEnabled">false</item>
+        <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: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>
+    </style>
+
+    <style name="Theme.ProvisioningActivity" parent="@style/Theme.ProvisioningActivity.Base">
     </style>
 
     <style name="ThemeOverlay.SwitchBar.Settings.Base" parent="@*android:style/ThemeOverlay.DeviceDefault.ActionBar">
@@ -95,11 +118,13 @@
         <item name="switchBarMarginStart">@dimen/switchbar_subsettings_margin_start</item>
         <item name="switchBarMarginEnd">@dimen/switchbar_subsettings_margin_end</item>
         <item name="switchBarBackgroundColor">@color/switchbar_background_color</item>
-        <item name="switchBarBackgroundActivatedColor">?android:attr/colorAccent</item>
-        <item name="switchBarRestrictionIcon">@*android:drawable/ic_info</item>
+        <item name="switchBarBackgroundActivatedColor">@color/color_default_accent</item>
+        <item name="switchBarRestrictionIcon">@drawable/ic_info</item>
     </style>
 
-    <style name="ThemeOverlay.SwitchBar.Settings" parent="ThemeOverlay.SwitchBar.Settings.Base"/>
+    <style name="ThemeOverlay.SwitchBar.Settings" parent="ThemeOverlay.SwitchBar.Settings.Base">
+        <item name="android:textColorPrimaryInverse">@color/color_default_foreground</item>
+    </style>
 
     <style name="Widget.SwitchBar.Switch" parent="@android:style/Widget.Material.CompoundButton.Switch">
         <item name="android:trackTint">@color/switchbar_switch_track_tint</item>
@@ -108,13 +133,27 @@
         <item name="android:minWidth">@dimen/min_tap_target_size</item>
     </style>
 
-    <style name="Theme.CryptKeeper" parent="@android:style/Theme.Material.NoActionBar">
+    <style name="Theme.CryptKeeper.Base" parent="@android:style/Theme.Material.NoActionBar">
         <item name="android:windowTranslucentStatus">false</item>
         <item name="android:windowTranslucentNavigation">false</item>
         <item name="android:windowDrawsSystemBarBackgrounds">false</item>
-        <item name="android:background">@android:color/black</item>
+        <item name="android:background">@color/color_default_background</item>
 
         <item name="*android:lockPatternStyle">@style/LockPatternStyle.Unlock</item>
+
+        <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:windowBackground">@color/color_default_background</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>
+    </style>
+
+    <style name="Theme.CryptKeeper" parent="@style/Theme.CryptKeeper.Base">
     </style>
 
     <style name="ThemeOverlay.AlertDialog" parent="@android:style/ThemeOverlay.Material.Dialog.Alert">
@@ -122,7 +161,8 @@
     </style>
 
     <style name="Theme.AlertDialog.Base" parent="@style/Theme.AppCompat.DayNight.Dialog.Alert">
-        <item name="colorAccent">@*android:color/accent_device_default_light</item>
+        <item name="colorAccent">@color/color_default_accent</item>
+        <item name="android:windowBackground">@color/dialog_background</item>
         <item name="android:colorBackground">@color/dialog_background</item>
     </style>
 
@@ -141,6 +181,32 @@
         <item name="buttonBarButtonStyle">@*android:style/Widget.DeviceDefault.Button.ButtonBar.AlertDialog</item>
     </style>
 
+    <style name="Theme.Dialog" parent="@style/Theme.DialogBase">
+        <item name="android:alertDialogTheme">@style/Theme.AlertDialog</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:textColorPrimary">@color/color_default_primary_text</item>
+        <item name="android:textColorSecondary">@color/color_default_secondary_text</item>
+    </style>
+
+    <style name="Theme.DialogBase" parent="@android:style/Theme.DeviceDefault.Light.Dialog">
+    </style>
+
+    <style name="Custom.Panel" parent="@style/Custom.PanelBase">
+        <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="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:textColorPrimary">@color/color_default_primary_text</item>
+        <item name="android:textColorSecondary">@color/color_default_secondary_text</item>
+    </style>
+
+    <style name="Custom.PanelBase" parent="@android:style/Theme.DeviceDefault.Light.Panel">
+    </style>
+
     <style name="Theme.ConfirmDeviceCredentials" parent="Theme.SubSettings">
         <item name="confirmDeviceCredentialsSideMargin">@dimen/confirm_credentials_side_margin</item>
         <item name="confirmDeviceCredentialsTopMargin">@dimen/confirm_credentials_top_margin</item>
@@ -149,7 +215,7 @@
     <style name="Theme.ConfirmDeviceCredentialsDark" parent="@android:style/Theme.DeviceDefault">
         <item name="android:windowActionBar">false</item>
         <item name="android:windowNoTitle">true</item>
-        <item name="android:windowBackground">?android:attr/colorPrimary</item>
+        <item name="android:windowBackground">@color/color_default_background</item>
 
         <item name="confirmDeviceCredentialsSideMargin">32dp</item>
         <item name="confirmDeviceCredentialsTopMargin">32dp</item>
@@ -161,28 +227,50 @@
 
     <style name="Theme.ConfirmDeviceCredentialsWork" parent="Theme.ConfirmDeviceCredentialsDark">
         <item name="*android:lockPatternStyle">@style/LockPatternStyle.Dark.Work</item>
-        <item name="android:colorAccent">@*android:color/white</item>
+        <item name="android:colorAccent">@color/color_default_accent</item>
     </style>
 
-    <style name="FallbackHome" parent="@android:style/Theme.DeviceDefault.NoActionBar">
-        <item name="android:windowBackground">@android:color/transparent</item>
+    <style name="FallbackHome.Base" parent="@android:style/Theme.DeviceDefault.NoActionBar">
+        <item name="android:windowBackground">@color/color_default_background</item>
         <item name="android:colorBackgroundCacheHint">@null</item>
         <item name="android:windowShowWallpaper">true</item>
         <item name="android:windowNoTitle">true</item>
         <item name="android:windowTranslucentStatus">false</item>
         <item name="android:windowTranslucentNavigation">false</item>
         <item name="android:windowDrawsSystemBarBackgrounds">true</item>
-        <item name="android:statusBarColor">#00000000</item>
-        <item name="android:navigationBarColor">#00000000</item>
+        <item name="android:statusBarColor">@color/color_default_primary_dark</item>
+        <item name="android:navigationBarColor">@color/color_default_primary_dark</item>
+        <item name="android:navigationBarDividerColor">@color/color_default_primary_dark</item>
+
+        <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: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>
+    </style>
+
+    <style name="FallbackHome" parent="@style/FallbackHome.Base">
     </style>
 
-    <style name="FallbackHome.SetupWizard" parent="@android:style/Theme.Material.NoActionBar.Fullscreen">
+    <style name="FallbackHome.SetupWizard.Base" parent="@android:style/Theme.Material.NoActionBar.Fullscreen">
         <item name="android:windowBackground">@drawable/fallback_home_unprovisioned_background</item>
         <item name="android:colorBackgroundCacheHint">@null</item>
         <item name="android:windowNoTitle">true</item>
         <item name="android:windowDrawsSystemBarBackgrounds">true</item>
-        <item name="android:statusBarColor">#00000000</item>
-        <item name="android:navigationBarColor">#00000000</item>
+        <item name="android:statusBarColor">@color/color_default_primary_dark</item>
+        <item name="android:navigationBarColor">@color/color_default_primary_dark</item>
+        <item name="android:navigationBarDividerColor">@color/color_default_primary_dark</item>
+
+        <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: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>
+    </style>
+
+    <style name="FallbackHome.SetupWizard" parent="@style/FallbackHome.SetupWizard.Base">
     </style>
 
     <style name="Theme.BluetoothPermission" parent="@style/Theme.AlertDialog">
@@ -190,23 +278,28 @@
     </style>
 
     <style name="Theme.Settings.HomeBase" parent="Theme.Settings.NoActionBar">
-        <item name="colorPrimary">@*android:color/primary_device_default_settings_light</item>
-        <item name="colorAccent">@*android:color/accent_device_default_light</item>
+        <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: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>
+        <item name="android:statusBarColor">@color/color_default_primary_dark</item>
+        <item name="android:windowBackground">@color/color_default_background</item>
         <item name="preferenceTheme">@style/PreferenceTheme</item>
 
         <!-- action bar, needed for search bar icon tinting -->
-        <item name="android:actionBarTheme">@*android:style/ThemeOverlay.DeviceDefault.ActionBar</item>
+        <item name="android:actionBarTheme">@style/customActionBarTheme</item>
 
         <!-- Define this color for material design -->
-        <item name="colorPrimaryVariant">@android:color/white</item>
+        <item name="colorPrimaryVariant">@color/color_default_primary_dark</item>
     </style>
 
     <style name="Theme.Settings.Home" parent="Theme.Settings.HomeBase">
-        <item name="colorPrimaryDark">@*android:color/primary_dark_device_default_settings_light</item>
-        <item name="android:windowLightStatusBar">true</item>
-        <item name="android:navigationBarDividerColor">@*android:color/ripple_material_light</item>
-        <item name="android:navigationBarColor">@android:color/transparent</item>
-        <item name="android:windowBackground">@android:color/white</item>
+    </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 -->
@@ -222,34 +315,38 @@
          regardless of whether system theme changed to dark or light theme. WARNING: your settings
          activity shows in setupwizard flow, but doesn't use setupwizard theme. This theme must be
          set to ensure settings activity always shows light theme in setupwizard flow. -->
-    <style name="LightTheme.SettingsBase.SetupWizard" parent="@android:style/Theme.DeviceDefault">
-        <item name="android:windowLightStatusBar">true</item>
-        <item name="android:navigationBarColor">@android:color/white</item>
-        <item name="android:windowLightNavigationBar">true</item>
-        <item name="android:navigationBarDividerColor">@*android:color/navigation_bar_divider_device_default_settings</item>
+    <style name="LightTheme.SettingsBase.SetupWizard.Base" parent="@android:style/Theme.DeviceDefault">
+        <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:colorPrimary">@*android:color/primary_device_default_settings_light</item>
-        <item name="android:colorPrimaryDark">@*android:color/primary_dark_device_default_settings_light</item>
-        <item name="android:colorBackground">@*android:color/background_device_default_light</item>
-        <item name="android:colorAccent">@*android:color/accent_device_default_light</item>
+        <item name="android:colorPrimary">@color/color_default_primary</item>
+        <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="android:colorAccent">@color/color_default_accent</item>
 
         <item name="android:listDivider">@*android:color/list_divider_color_light</item>
 
-        <item name="android:textColorPrimary">@*android:color/primary_text_light</item>
-        <item name="android:textColorSecondary">@*android:color/secondary_text_light</item>
+        <item name="android:textColorPrimary">@color/color_default_primary_text</item>
+        <item name="android:textColorSecondary">@color/color_default_secondary_text</item>
+    </style>
+
+    <style name="LightTheme.SettingsBase.SetupWizard" parent="@style/LightTheme.SettingsBase.SetupWizard.Base">
     </style>
 
     <!-- Light theme for those pages inherit SubSettings and launched during setup flow -->
-    <style name="LightTheme.SubSettings.SetupWizard" parent="@android:style/Theme.DeviceDefault.Light">
-        <item name="android:windowLightStatusBar">true</item>
-        <item name="android:statusBarColor">@android:color/white</item>
-        <item name="android:navigationBarColor">@android:color/white</item>
-        <item name="android:windowLightNavigationBar">true</item>
-        <item name="android:windowBackground">@android:color/white</item>
-        <item name="android:navigationBarDividerColor">@*android:color/navigation_bar_divider_device_default_settings</item>
-
-        <item name="android:colorPrimary">@android:color/white</item>
-        <item name="android:colorPrimaryDark">@android:color/white</item>
-        <item name="android:colorAccent">@color/material_blue_700</item>
+    <style name="LightTheme.SubSettings.SetupWizard.Base" parent="@android:style/Theme.DeviceDefault.Light">
+        <item name="android:statusBarColor">@color/color_default_primary_dark</item>
+        <item name="android:navigationBarColor">@color/color_default_primary_dark</item>
+        <item name="android:windowBackground">@color/color_default_background</item>
+        <item name="android:navigationBarDividerColor">@color/color_default_primary_dark</item>
+
+        <item name="android:colorPrimary">@color/color_default_primary</item>
+        <item name="android:colorPrimaryDark">@color/color_default_primary_dark</item>
+        <item name="android:colorAccent">@color/color_default_accent</item>
+    </style>
+
+    <style name="LightTheme.SubSettings.SetupWizard" parent="@style/LightTheme.SubSettings.SetupWizard.Base">
     </style>
 </resources>
diff --git a/res/values/themes_suw.xml b/res/values/themes_suw.xml
index f7f1d16bb8b3eb66f2dd88c036bb08a71a239726..762fa2e436dbe8a417dcdd5301759f4f45c40dc6 100644
--- a/res/values/themes_suw.xml
+++ b/res/values/themes_suw.xml
@@ -20,120 +20,162 @@
     <style name="GlifTheme" parent="SudThemeGlif.DayNight">
         <!-- For all AndroidX Alert Dialogs -->
         <item name="alertDialogTheme">@style/ThemeOverlay.AlertDialog</item>
-        <item name="android:windowBackground">?android:attr/colorBackground</item>
+        <item name="android:windowBackground">@color/color_default_background</item>
         <item name="*android:preferencePanelStyle">@*android:style/PreferencePanel.Dialog</item>
         <item name="fingerprint_layout_theme">@style/FingerprintLayoutTheme</item>
         <item name="face_layout_theme">@style/FaceLayoutTheme</item>
-        <item name="ic_menu_moreoverflow">@*android:drawable/ic_menu_moreoverflow_material</item>
+        <item name="ic_menu_moreoverflow">@drawable/ic_more_24</item>
         <item name="side_margin">0dip</item>
         <item name="wifi_signal_color">@color/setup_wizard_wifi_color_dark</item>
         <item name="wifi_signal">@drawable/wifi_signal</item>
         <item name="wifi_friction">@drawable/wifi_friction</item>
-        <item name="preferenceBackgroundColor">?android:attr/colorBackground</item>
+        <item name="preferenceBackgroundColor">@color/color_default_background</item>
         <item name="preferenceTheme">@style/PreferenceTheme.SetupWizard</item>
 
         <!-- LockPatternView colors -->
         <item name="*android:lockPatternStyle">@style/LockPatternStyle.Setup</item>
+
+        <item name="android:statusBarColor">@color/color_default_primary_dark</item>
+        <item name="android:navigationBarColor">@color/color_default_primary_dark</item>
+        <item name="android:navigationBarDividerColor">@color/color_default_primary_dark</item>
+        <item name="android:windowLightNavigationBar">@bool/lightModeActive</item>
+        <item name="android:windowLightStatusBar">@bool/lightModeActive</item>
     </style>
 
-    <style name="GlifTheme.Light" parent="SudThemeGlif.Light">
+    <style name="GlifTheme.Light" parent="SudThemeGlif.DayNight">
         <!-- For all AndroidX Alert Dialogs -->
         <item name="alertDialogTheme">@style/ThemeOverlay.AlertDialog</item>
-        <item name="android:windowBackground">?android:attr/colorBackground</item>
+        <item name="android:windowBackground">@color/color_default_background</item>
         <item name="*android:preferencePanelStyle">@*android:style/PreferencePanel.Dialog</item>
         <item name="fingerprint_layout_theme">@style/FingerprintLayoutTheme</item>
         <item name="face_layout_theme">@style/FaceLayoutTheme</item>
-        <item name="ic_menu_moreoverflow">@*android:drawable/ic_menu_moreoverflow_material</item>
+        <item name="ic_menu_moreoverflow">@drawable/ic_more_24</item>
         <item name="side_margin">0dip</item>
         <item name="wifi_signal_color">@color/setup_wizard_wifi_color_light</item>
         <item name="wifi_signal">@drawable/wifi_signal</item>
         <item name="wifi_friction">@drawable/wifi_friction</item>
-        <item name="preferenceBackgroundColor">?android:attr/colorBackground</item>
+        <item name="preferenceBackgroundColor">@color/color_default_background</item>
         <item name="preferenceTheme">@style/PreferenceTheme.SetupWizard</item>
 
         <item name="*android:lockPatternStyle">@style/LockPatternStyle.Setup</item>
         <item name="*android:colorError">@color/glif_error_color</item>
+
+        <item name="android:statusBarColor">@color/color_default_primary_dark</item>
+        <item name="android:navigationBarColor">@color/color_default_primary_dark</item>
+        <item name="android:navigationBarDividerColor">@color/color_default_primary_dark</item>
+        <item name="android:windowLightNavigationBar">@bool/lightModeActive</item>
+        <item name="android:windowLightStatusBar">@bool/lightModeActive</item>
     </style>
 
     <style name="GlifV2Theme" parent="SudThemeGlifV2.DayNight">
         <!-- For all AndroidX Alert Dialogs -->
         <item name="alertDialogTheme">@style/GlifV2ThemeAlertDialog</item>
-        <item name="android:windowBackground">?android:attr/colorBackground</item>
+        <item name="android:windowBackground">@color/color_default_background</item>
         <item name="*android:preferencePanelStyle">@*android:style/PreferencePanel.Dialog</item>
         <item name="fingerprint_layout_theme">@style/FingerprintLayoutTheme</item>
         <item name="face_layout_theme">@style/FaceLayoutTheme</item>
-        <item name="ic_menu_moreoverflow">@*android:drawable/ic_menu_moreoverflow_material</item>
+        <item name="ic_menu_moreoverflow">@drawable/ic_more_24</item>
         <item name="side_margin">0dip</item>
         <item name="wifi_signal_color">@color/setup_wizard_wifi_color_dark</item>
         <item name="wifi_signal">@drawable/wifi_signal</item>
         <item name="wifi_friction">@drawable/wifi_friction</item>
-        <item name="preferenceBackgroundColor">?android:attr/colorBackground</item>
+        <item name="preferenceBackgroundColor">@color/color_default_background</item>
         <item name="preferenceTheme">@style/PreferenceTheme.SetupWizard</item>
 
         <!-- LockPatternView colors -->
         <item name="*android:lockPatternStyle">@style/LockPatternStyle.Setup</item>
+
+        <item name="android:statusBarColor">@color/color_default_primary_dark</item>
+        <item name="android:navigationBarColor">@color/color_default_primary_dark</item>
+        <item name="android:navigationBarDividerColor">@color/color_default_primary_dark</item>
+        <item name="android:windowLightNavigationBar">@bool/lightModeActive</item>
+        <item name="android:windowLightStatusBar">@bool/lightModeActive</item>
     </style>
 
-    <style name="GlifV2Theme.Light" parent="SudThemeGlifV2.Light">
+    <style name="GlifV2Theme.Light" parent="SudThemeGlifV2.DayNight">
         <!-- For all AndroidX Alert Dialogs -->
         <item name="alertDialogTheme">@style/GlifV2ThemeAlertDialog.Light</item>
-        <item name="android:windowBackground">?android:attr/colorBackground</item>
+        <item name="android:windowBackground">@color/color_default_background</item>
         <item name="*android:preferencePanelStyle">@*android:style/PreferencePanel.Dialog</item>
         <item name="fingerprint_layout_theme">@style/FingerprintLayoutTheme</item>
         <item name="face_layout_theme">@style/FaceLayoutTheme</item>
-        <item name="ic_menu_moreoverflow">@*android:drawable/ic_menu_moreoverflow_material</item>
+        <item name="ic_menu_moreoverflow">@drawable/ic_more_24</item>
         <item name="side_margin">0dip</item>
         <item name="wifi_signal_color">@color/setup_wizard_wifi_color_light</item>
         <item name="wifi_signal">@drawable/wifi_signal</item>
         <item name="wifi_friction">@drawable/wifi_friction</item>
-        <item name="preferenceBackgroundColor">?android:attr/colorBackground</item>
+        <item name="preferenceBackgroundColor">@color/color_default_background</item>
         <item name="preferenceTheme">@style/PreferenceTheme.SetupWizard</item>
 
         <item name="*android:lockPatternStyle">@style/LockPatternStyle.Setup</item>
         <item name="*android:colorError">@color/glif_error_color</item>
+
+        <item name="android:statusBarColor">@color/color_default_primary_dark</item>
+        <item name="android:navigationBarColor">@color/color_default_primary_dark</item>
+        <item name="android:navigationBarDividerColor">@color/color_default_primary_dark</item>
+        <item name="android:windowLightNavigationBar">@bool/lightModeActive</item>
+        <item name="android:windowLightStatusBar">@bool/lightModeActive</item>
     </style>
 
     <style name="GlifV3Theme" parent="SudThemeGlifV3.DayNight">
         <!-- For all AndroidX Alert Dialogs -->
         <item name="alertDialogTheme">@style/GlifV2ThemeAlertDialog</item>
-        <item name="android:windowBackground">?android:attr/colorBackground</item>
+        <item name="android:windowBackground">@color/color_default_background</item>
         <item name="*android:preferencePanelStyle">@*android:style/PreferencePanel.Dialog</item>
         <item name="fingerprint_layout_theme">@style/FingerprintLayoutTheme</item>
         <item name="face_layout_theme">@style/FaceLayoutTheme</item>
-        <item name="ic_menu_moreoverflow">@*android:drawable/ic_menu_moreoverflow_material</item>
+        <item name="ic_menu_moreoverflow">@drawable/ic_more_24</item>
         <item name="side_margin">0dip</item>
         <item name="wifi_signal_color">@color/setup_wizard_wifi_color_dark</item>
         <item name="wifi_signal">@drawable/wifi_signal</item>
         <item name="wifi_friction">@drawable/wifi_friction</item>
-        <item name="preferenceBackgroundColor">?android:attr/colorBackground</item>
+        <item name="preferenceBackgroundColor">@color/color_default_background</item>
         <item name="preferenceTheme">@style/PreferenceTheme.SetupWizard</item>
 
         <!-- LockPatternView colors -->
         <item name="*android:lockPatternStyle">@style/LockPatternStyle.Setup</item>
+
+        <item name="android:statusBarColor">@color/color_default_primary_dark</item>
+        <item name="android:navigationBarColor">@color/color_default_primary_dark</item>
+        <item name="android:navigationBarDividerColor">@color/color_default_primary_dark</item>
+        <item name="android:windowLightNavigationBar">@bool/lightModeActive</item>
+        <item name="android:windowLightStatusBar">@bool/lightModeActive</item>
     </style>
 
     <style name="GlifV3Theme.Footer" parent="@style/SudThemeGlifV3.DayNight">
         <item name="android:clipChildren">true</item>
         <item name="android:clipToPadding">true</item>
+
+        <item name="android:statusBarColor">@color/color_default_primary_dark</item>
+        <item name="android:navigationBarColor">@color/color_default_primary_dark</item>
+        <item name="android:navigationBarDividerColor">@color/color_default_primary_dark</item>
+        <item name="android:windowLightNavigationBar">@bool/lightModeActive</item>
+        <item name="android:windowLightStatusBar">@bool/lightModeActive</item>
     </style>
 
-    <style name="GlifV3Theme.Light" parent="SudThemeGlifV3.Light">
+    <style name="GlifV3Theme.Light" parent="SudThemeGlifV3.DayNight">
         <!-- For all AndroidX Alert Dialogs -->
         <item name="alertDialogTheme">@style/GlifV2ThemeAlertDialog.Light</item>
-        <item name="android:windowBackground">?android:attr/colorBackground</item>
+        <item name="android:windowBackground">@color/color_default_background</item>
         <item name="*android:preferencePanelStyle">@*android:style/PreferencePanel.Dialog</item>
         <item name="fingerprint_layout_theme">@style/FingerprintLayoutTheme</item>
         <item name="face_layout_theme">@style/FaceLayoutTheme</item>
-        <item name="ic_menu_moreoverflow">@*android:drawable/ic_menu_moreoverflow_material</item>
+        <item name="ic_menu_moreoverflow">@drawable/ic_more_24</item>
         <item name="side_margin">0dip</item>
         <item name="wifi_signal_color">@color/setup_wizard_wifi_color_light</item>
         <item name="wifi_signal">@drawable/wifi_signal</item>
         <item name="wifi_friction">@drawable/wifi_friction</item>
-        <item name="preferenceBackgroundColor">?android:attr/colorBackground</item>
+        <item name="preferenceBackgroundColor">@color/color_default_background</item>
         <item name="preferenceTheme">@style/PreferenceTheme.SetupWizard</item>
 
         <item name="*android:lockPatternStyle">@style/LockPatternStyle.Setup</item>
         <item name="*android:colorError">@color/glif_error_color</item>
+
+        <item name="android:statusBarColor">@color/color_default_primary_dark</item>
+        <item name="android:navigationBarColor">@color/color_default_primary_dark</item>
+        <item name="android:navigationBarDividerColor">@color/color_default_primary_dark</item>
+        <item name="android:windowLightNavigationBar">@bool/lightModeActive</item>
+        <item name="android:windowLightStatusBar">@bool/lightModeActive</item>
     </style>
 
     <style name="GlifV2Theme.Transparent">
@@ -141,6 +183,12 @@
         <item name="android:windowNoTitle">true</item>
         <item name="android:windowIsFloating">true</item>
         <item name="android:windowAnimationStyle">@null</item>
+
+        <item name="android:statusBarColor">@color/color_default_primary_dark</item>
+        <item name="android:navigationBarColor">@color/color_default_primary_dark</item>
+        <item name="android:navigationBarDividerColor">@color/color_default_primary_dark</item>
+        <item name="android:windowLightNavigationBar">@bool/lightModeActive</item>
+        <item name="android:windowLightStatusBar">@bool/lightModeActive</item>
     </style>
 
     <style name="GlifV2Theme.Light.Transparent">
@@ -148,6 +196,12 @@
         <item name="android:windowNoTitle">true</item>
         <item name="android:windowIsFloating">true</item>
         <item name="android:windowAnimationStyle">@null</item>
+
+        <item name="android:statusBarColor">@color/color_default_primary_dark</item>
+        <item name="android:navigationBarColor">@color/color_default_primary_dark</item>
+        <item name="android:navigationBarDividerColor">@color/color_default_primary_dark</item>
+        <item name="android:windowLightNavigationBar">@bool/lightModeActive</item>
+        <item name="android:windowLightStatusBar">@bool/lightModeActive</item>
     </style>
 
     <style name="GlifV2ThemeAlertDialog" parent="SuwAlertDialogThemeCompat">
@@ -163,6 +217,12 @@
         <item name="android:windowNoTitle">true</item>
         <item name="android:windowIsFloating">true</item>
         <item name="android:windowAnimationStyle">@null</item>
+
+        <item name="android:statusBarColor">@color/color_default_primary_dark</item>
+        <item name="android:navigationBarColor">@color/color_default_primary_dark</item>
+        <item name="android:navigationBarDividerColor">@color/color_default_primary_dark</item>
+        <item name="android:windowLightNavigationBar">@bool/lightModeActive</item>
+        <item name="android:windowLightStatusBar">@bool/lightModeActive</item>
     </style>
 
     <style name="GlifV3Theme.Light.Transparent">
@@ -170,6 +230,12 @@
         <item name="android:windowNoTitle">true</item>
         <item name="android:windowIsFloating">true</item>
         <item name="android:windowAnimationStyle">@null</item>
+
+        <item name="android:statusBarColor">@color/color_default_primary_dark</item>
+        <item name="android:navigationBarColor">@color/color_default_primary_dark</item>
+        <item name="android:navigationBarDividerColor">@color/color_default_primary_dark</item>
+        <item name="android:windowLightNavigationBar">@bool/lightModeActive</item>
+        <item name="android:windowLightStatusBar">@bool/lightModeActive</item>
     </style>
 
     <style name="SetupWizardTheme.Transparent" parent="GlifTheme">
@@ -177,6 +243,12 @@
         <item name="android:windowNoTitle">true</item>
         <item name="android:windowIsFloating">true</item>
         <item name="android:windowAnimationStyle">@null</item>
+
+        <item name="android:statusBarColor">@color/color_default_primary_dark</item>
+        <item name="android:navigationBarColor">@color/color_default_primary_dark</item>
+        <item name="android:navigationBarDividerColor">@color/color_default_primary_dark</item>
+        <item name="android:windowLightNavigationBar">@bool/lightModeActive</item>
+        <item name="android:windowLightStatusBar">@bool/lightModeActive</item>
     </style>
 
     <style name="SetupWizardTheme.Light.Transparent" parent="GlifTheme.Light">
@@ -184,34 +256,39 @@
         <item name="android:windowNoTitle">true</item>
         <item name="android:windowIsFloating">true</item>
         <item name="android:windowAnimationStyle">@null</item>
+
+        <item name="android:statusBarColor">@color/color_default_primary_dark</item>
+        <item name="android:navigationBarColor">@color/color_default_primary_dark</item>
+        <item name="android:navigationBarDividerColor">@color/color_default_primary_dark</item>
+        <item name="android:windowLightNavigationBar">@bool/lightModeActive</item>
+        <item name="android:windowLightStatusBar">@bool/lightModeActive</item>
     </style>
 
     <!-- Accessibility portion of Setup Wizard -->
     <style name="SetupWizardAccessibilityTheme" parent="Theme.SettingsBase">
-        <item name="android:colorPrimary">@color/material_grey_100</item>
-        <item name="android:colorAccent">@color/material_blue_700</item>
-        <item name="android:titleTextColor">@color/material_blue_700</item>
+        <item name="android:colorPrimary">@color/color_default_primary</item>
+        <item name="android:colorPrimaryDark">@color/color_default_primary_dark</item>
+        <item name="android:textColorPrimary">@color/color_default_primary_text</item>
+        <item name="android:textColorSecondary">@color/color_default_secondary_text</item>
+        <item name="android:colorAccent">@color/color_default_accent</item>
+        <item name="android:titleTextColor">@color/color_default_accent</item>
         <item name="preferenceTheme">@style/PreferenceTheme</item>
         <item name="switchBarTheme">@style/ThemeOverlay.SwitchBar.Settings</item>
     </style>
 
-    <style name="SuwAlertDialogThemeCompat" parent="@style/Theme.AppCompat.Dialog.Alert">
+    <style name="SuwAlertDialogThemeCompat" parent="@style/Theme.AlertDialog">
         <!-- Referenced SudThemeGlifV3 style -->
         <item name="android:textAllCaps">false</item>
 
         <item name="android:windowSoftInputMode">adjustResize</item>
-        <!-- copied from Theme.DeviceDefault.Light.Dialog.Alert -->
-        <item name="colorAccent">@*android:color/accent_device_default_light</item>
         <item name="dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
     </style>
 
-    <style name="SuwAlertDialogThemeCompat.Light" parent="@style/Theme.AppCompat.Light.Dialog.Alert">
+    <style name="SuwAlertDialogThemeCompat.Light" parent="@style/Theme.AlertDialog">
         <!-- Referenced SudThemeGlifV3.Light style -->
         <item name="android:textAllCaps">false</item>
 
         <item name="android:windowSoftInputMode">adjustResize</item>
-        <!-- copied from Theme.DeviceDefault.Light.Dialog.Alert -->
-        <item name="colorAccent">@*android:color/accent_device_default_light</item>
         <item name="dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
     </style>
 </resources>
diff --git a/res/xml/connected_devices_advanced.xml b/res/xml/connected_devices_advanced.xml
index ab8967d5d6b9f23ca3ffeb12e136925275c4d8b7..2ceceb384f054c5482fcbb573e36842a057f98a2 100644
--- a/res/xml/connected_devices_advanced.xml
+++ b/res/xml/connected_devices_advanced.xml
@@ -24,7 +24,7 @@
         android:fragment="com.android.settings.connecteddevice.BluetoothDashboardFragment"
         android:key="bluetooth_settings"
         android:title="@string/bluetooth_settings_title"
-        android:icon="@*android:drawable/ic_settings_bluetooth"
+        android:icon="@drawable/ic_settings_bluetooth"
         android:order="-9"
         settings:searchable="false"/>
 
@@ -56,7 +56,7 @@
         android:key="connected_device_printing"
         android:title="@string/print_settings"
         android:summary="@string/summary_placeholder"
-        android:icon="@*android:drawable/ic_settings_print"
+        android:icon="@drawable/ic_settings_print"
         android:fragment="com.android.settings.print.PrintSettingsFragment"
         android:order="-3"
         settings:searchable="false"/>
diff --git a/res/xml/sound_settings.xml b/res/xml/sound_settings.xml
index 8fc50e8806ae7d2feb88b8ef1f0e23fa537ccce7..310eac836d1669ede4c561f0108753e150dfdc1e 100644
--- a/res/xml/sound_settings.xml
+++ b/res/xml/sound_settings.xml
@@ -75,7 +75,7 @@
     <!-- Alarm volume -->
     <com.android.settings.notification.VolumeSeekBarPreference
         android:key="alarm_volume"
-        android:icon="@*android:drawable/ic_audio_alarm"
+        android:icon="@drawable/ic_audio_alarm"
         android:title="@string/alarm_volume_option_title"
         android:order="-150"
         settings:controller="com.android.settings.notification.AlarmVolumePreferenceController"/>
diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java
index 977c2728ef888d9fe5ee3a2a095c50f29f1a84af..7eebb7aaccb5d573420c04dc59350306a3018f67 100644
--- a/src/com/android/settings/SettingsActivity.java
+++ b/src/com/android/settings/SettingsActivity.java
@@ -29,6 +29,7 @@ import android.content.pm.ActivityInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.PackageManager.NameNotFoundException;
 import android.content.res.Resources.Theme;
+import android.graphics.drawable.ColorDrawable;
 import android.os.AsyncTask;
 import android.os.Bundle;
 import android.os.UserHandle;
@@ -276,6 +277,7 @@ public class SettingsActivity extends SettingsBaseActivity
             actionBar.setDisplayHomeAsUpEnabled(deviceProvisioned);
             actionBar.setHomeButtonEnabled(deviceProvisioned);
             actionBar.setDisplayShowTitleEnabled(true);
+            actionBar.setBackgroundDrawable(new ColorDrawable(getColor(R.color.color_default_primary_dark)));
         }
         mSwitchBar = findViewById(R.id.switch_bar);
         if (mSwitchBar != null) {
diff --git a/src/com/android/settings/accounts/AccountSyncSettings.java b/src/com/android/settings/accounts/AccountSyncSettings.java
index ec74cd842b4b9bedaf743c1d3e10906b50463277..4dda0e166feaa53462ac40a1ede58ffbafcee9dc 100644
--- a/src/com/android/settings/accounts/AccountSyncSettings.java
+++ b/src/com/android/settings/accounts/AccountSyncSettings.java
@@ -191,7 +191,7 @@ public class AccountSyncSettings extends AccountPreferenceBase {
                 .setIcon(R.drawable.ic_menu_refresh_holo_dark);
         MenuItem syncCancel = menu.add(0, MENU_SYNC_CANCEL_ID, 0,
                 getString(R.string.sync_menu_sync_cancel))
-                .setIcon(com.android.internal.R.drawable.ic_menu_close_clear_cancel);
+                .setIcon(R.drawable.ic_cancel_cross);
 
         syncNow.setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER |
                 MenuItem.SHOW_AS_ACTION_WITH_TEXT);
diff --git a/src/com/android/settings/applications/RunningState.java b/src/com/android/settings/applications/RunningState.java
index d4abe6c4e28597b30e98f9cc1e6c609289608b6d..1c4b05778624e94fbc7bb058d26dc6e5d1fa8f5e 100644
--- a/src/com/android/settings/applications/RunningState.java
+++ b/src/com/android/settings/applications/RunningState.java
@@ -719,7 +719,7 @@ public class RunningState {
                 }
             }
             return context.getDrawable(
-                    com.android.internal.R.drawable.ic_menu_cc);
+                    R.drawable.ic_supervisor);
         }
     }
 
diff --git a/src/com/android/settings/applications/UsageAccessDetails.java b/src/com/android/settings/applications/UsageAccessDetails.java
index 58dff7c2e02f8898582962574dd93ed726767d53..378393511c020295ae75b56c93dd3bc4b262a3e7 100644
--- a/src/com/android/settings/applications/UsageAccessDetails.java
+++ b/src/com/android/settings/applications/UsageAccessDetails.java
@@ -90,7 +90,7 @@ public class UsageAccessDetails extends AppInfoWithHeader implements OnPreferenc
             if (mUsageState != null && (Boolean) newValue != mUsageState.isPermissible()) {
                 if (mUsageState.isPermissible() && mDpm.isProfileOwnerApp(mPackageName)) {
                     new AlertDialog.Builder(getContext())
-                            .setIcon(com.android.internal.R.drawable.ic_dialog_alert_material)
+                            .setIcon(R.drawable.ic_dialog_alert_material)
                             .setTitle(android.R.string.dialog_alert_title)
                             .setMessage(R.string.work_profile_usage_access_warning)
                             .setPositiveButton(R.string.okay, null)
diff --git a/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminAdd.java b/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminAdd.java
index 786efd1ef4cfcc3b43d4c2e40abe1c01323197b6..ec14a869e9fd117f0813ff05625b584ca3fe5273 100644
--- a/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminAdd.java
+++ b/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminAdd.java
@@ -734,8 +734,8 @@ public class DeviceAdminAdd extends Activity {
         tv.setMaxLines(mAddMsgEllipsized ? getEllipsizedLines() : MAX_ADD_MSG_LINES);
 
         mAddMsgExpander.setImageResource(mAddMsgEllipsized ?
-            com.android.internal.R.drawable.expander_ic_minimized :
-            com.android.internal.R.drawable.expander_ic_maximized);
+            R.drawable.ic_arrow_circle_down :
+            R.drawable.ic_arrow_circle_up);
     }
 
     int getEllipsizedLines() {
diff --git a/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragment.java b/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragment.java
index c31b13ecb0f082a572d62c88e2ee936a16a249e9..8556f26693afb7eed33ffb6fda28a407097ffbcc 100644
--- a/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragment.java
+++ b/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragment.java
@@ -143,7 +143,7 @@ public class BluetoothDeviceDetailsFragment extends RestrictedDashboardFragment
     @Override
     public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
         MenuItem item = menu.add(0, EDIT_DEVICE_NAME_ITEM_ID, 0, R.string.bluetooth_rename_button);
-        item.setIcon(com.android.internal.R.drawable.ic_mode_edit);
+        item.setIcon(R.drawable.ic_mode_edit);
         item.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
         super.onCreateOptionsMenu(menu, inflater);
     }
diff --git a/src/com/android/settings/bluetooth/BluetoothSliceBuilder.java b/src/com/android/settings/bluetooth/BluetoothSliceBuilder.java
index 5a4ee1fe029b238c39957fbc0e188838addf4620..cbc338eda0ed12f1b574c42fcdcb64322e9deb67 100644
--- a/src/com/android/settings/bluetooth/BluetoothSliceBuilder.java
+++ b/src/com/android/settings/bluetooth/BluetoothSliceBuilder.java
@@ -73,7 +73,7 @@ public class BluetoothSliceBuilder {
         final boolean isBluetoothEnabled = isBluetoothEnabled();
         final CharSequence title = context.getText(R.string.bluetooth_settings);
         final IconCompat icon = IconCompat.createWithResource(context,
-                com.android.internal.R.drawable.ic_settings_bluetooth);
+                R.drawable.ic_settings_bluetooth);
         @ColorInt final int color = com.android.settings.Utils.getColorAccent(
                 context).getDefaultColor();
         final PendingIntent toggleAction = getBroadcastIntent(context);
diff --git a/src/com/android/settings/dashboard/profileselector/UserAdapter.java b/src/com/android/settings/dashboard/profileselector/UserAdapter.java
index 46c87a1600256dea0c11750e300c2a47e5765cd8..b5087df529e62d6591302f46a0aebc7ac9ce129f 100644
--- a/src/com/android/settings/dashboard/profileselector/UserAdapter.java
+++ b/src/com/android/settings/dashboard/profileselector/UserAdapter.java
@@ -56,7 +56,7 @@ public class UserAdapter implements SpinnerAdapter, ListAdapter {
             if (userInfo.isManagedProfile()) {
                 mName = context.getString(R.string.managed_user_title);
                 icon = context.getDrawable(
-                        com.android.internal.R.drawable.ic_corp_badge);
+                        R.drawable.ic_corp_badge);
             } else {
                 mName = userInfo.name;
                 final int userId = userInfo.id;
diff --git a/src/com/android/settings/deviceinfo/StorageWizardBase.java b/src/com/android/settings/deviceinfo/StorageWizardBase.java
index 92afa56cc0a5333806429e686550baccc5de7d6e..4326a46d0f540f637731c9fb8c9bd5603f7bf017 100644
--- a/src/com/android/settings/deviceinfo/StorageWizardBase.java
+++ b/src/com/android/settings/deviceinfo/StorageWizardBase.java
@@ -115,7 +115,7 @@ public abstract class StorageWizardBase extends FragmentActivity {
         mBack = mFooterBarMixin.getSecondaryButton();
         mNext = mFooterBarMixin.getPrimaryButton();
 
-        setIcon(com.android.internal.R.drawable.ic_sd_card_48dp);
+        setIcon(R.drawable.ic_menu_sd_card);
     }
 
     @Override
diff --git a/src/com/android/settings/enterprise/ActionDisabledByAdminDialogHelper.java b/src/com/android/settings/enterprise/ActionDisabledByAdminDialogHelper.java
index 5599a94a2123de74c60620e2a41732e19f0d0bd8..21f7a80ea6b26a1c6fadb114546d45b7f2c34c00 100644
--- a/src/com/android/settings/enterprise/ActionDisabledByAdminDialogHelper.java
+++ b/src/com/android/settings/enterprise/ActionDisabledByAdminDialogHelper.java
@@ -125,7 +125,7 @@ public class ActionDisabledByAdminDialogHelper {
             admin = null;
 
             supportIconView.setImageDrawable(
-                    mActivity.getDrawable(com.android.internal.R.drawable.ic_info));
+                    mActivity.getDrawable(R.drawable.ic_info));
 
             TypedArray ta = mActivity.obtainStyledAttributes(new int[]{android.R.attr.colorAccent});
             supportIconView.setImageTintList(ColorStateList.valueOf(ta.getColor(0, 0)));
diff --git a/src/com/android/settings/fuelgauge/BatteryEntry.java b/src/com/android/settings/fuelgauge/BatteryEntry.java
index 38ae2b2df76be010b951b9efb3d7ccf8c85b98c8..9491bde960224c671eef4e759cfdd725f68ad6ab 100644
--- a/src/com/android/settings/fuelgauge/BatteryEntry.java
+++ b/src/com/android/settings/fuelgauge/BatteryEntry.java
@@ -157,7 +157,7 @@ public class BatteryEntry {
                 break;
             case BLUETOOTH:
                 name = context.getResources().getString(R.string.power_bluetooth);
-                iconId = com.android.internal.R.drawable.ic_settings_bluetooth;
+                iconId = R.drawable.ic_settings_bluetooth;
                 break;
             case SCREEN:
                 name = context.getResources().getString(R.string.power_screen);
diff --git a/src/com/android/settings/fuelgauge/PowerUsageSummary.java b/src/com/android/settings/fuelgauge/PowerUsageSummary.java
index d25c2d491ae267b408f2a422455dc2ce2b48debf..c341d7b392a478e7c11b796d938b7d594bee6ed0 100644
--- a/src/com/android/settings/fuelgauge/PowerUsageSummary.java
+++ b/src/com/android/settings/fuelgauge/PowerUsageSummary.java
@@ -268,7 +268,7 @@ public class PowerUsageSummary extends PowerUsageBase implements OnLongClickList
     public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
         if (DEBUG) {
             menu.add(Menu.NONE, MENU_STATS_TYPE, Menu.NONE, R.string.menu_stats_total)
-                    .setIcon(com.android.internal.R.drawable.ic_menu_info_details)
+                    .setIcon(R.drawable.ic_info_outline_24dp)
                     .setAlphabeticShortcut('t');
         }
 
diff --git a/src/com/android/settings/homepage/contextualcards/slices/BluetoothDevicesSlice.java b/src/com/android/settings/homepage/contextualcards/slices/BluetoothDevicesSlice.java
index aa4d53b7f59d25fd0c1a50adb5af17977debc21d..7cc6efe97dcc1decc828d1a9d3338bf89cd7131c 100644
--- a/src/com/android/settings/homepage/contextualcards/slices/BluetoothDevicesSlice.java
+++ b/src/com/android/settings/homepage/contextualcards/slices/BluetoothDevicesSlice.java
@@ -91,7 +91,7 @@ public class BluetoothDevicesSlice implements CustomSliceable {
         mContext.getTheme().applyStyle(R.style.Theme_Settings_Home, true /* force */);
 
         final IconCompat icon = IconCompat.createWithResource(mContext,
-                com.android.internal.R.drawable.ic_settings_bluetooth);
+                R.drawable.ic_settings_bluetooth);
         final CharSequence title = mContext.getText(R.string.bluetooth_devices);
         final CharSequence titleNoBluetoothDevices = mContext.getText(
                 R.string.no_bluetooth_devices);
@@ -215,7 +215,7 @@ public class BluetoothDevicesSlice implements CustomSliceable {
         // Use default bluetooth icon if can't get icon.
         if (drawable == null) {
             return IconCompat.createWithResource(mContext,
-                    com.android.internal.R.drawable.ic_settings_bluetooth);
+                    R.drawable.ic_settings_bluetooth);
         }
 
         return Utils.createIconWithDrawable(drawable);
diff --git a/src/com/android/settings/location/LocationSlice.java b/src/com/android/settings/location/LocationSlice.java
index 275969046ad9b69d48f678ccffd4ed98962c1592..e2078e3a13baba633e2ed014b147e80e2d57d062 100644
--- a/src/com/android/settings/location/LocationSlice.java
+++ b/src/com/android/settings/location/LocationSlice.java
@@ -55,7 +55,7 @@ public class LocationSlice implements CustomSliceable {
     @Override
     public Slice getSlice() {
         final IconCompat icon = IconCompat.createWithResource(mContext,
-                com.android.internal.R.drawable.ic_signal_location);
+                R.drawable.ic_signal_location);
         final CharSequence title = mContext.getText(R.string.location_settings_title);
         @ColorInt final int color = Utils.getColorAccentDefaultColor(mContext);
         final PendingIntent primaryAction = getPrimaryAction();
diff --git a/src/com/android/settings/media/MediaOutputIndicatorSlice.java b/src/com/android/settings/media/MediaOutputIndicatorSlice.java
index 0ffa9ff200673aaf9f4d76de65437376dc71c2c2..852f86f9b88a51052192dc89e80bda751b341dd3 100644
--- a/src/com/android/settings/media/MediaOutputIndicatorSlice.java
+++ b/src/com/android/settings/media/MediaOutputIndicatorSlice.java
@@ -69,7 +69,7 @@ public class MediaOutputIndicatorSlice implements CustomSliceable {
             return null;
         }
         final IconCompat icon = IconCompat.createWithResource(mContext,
-                com.android.internal.R.drawable.ic_settings_bluetooth);
+                R.drawable.ic_settings_bluetooth);
         final CharSequence title = mContext.getText(R.string.media_output_title);
         final PendingIntent primaryActionIntent = PendingIntent.getActivity(mContext,
                 0 /* requestCode */, getMediaOutputSliceIntent(), 0 /* flags */);
diff --git a/src/com/android/settings/media/MediaOutputSlice.java b/src/com/android/settings/media/MediaOutputSlice.java
index 734c31e5b4a9613baffb48d437c877093283b237..5463320547f08f5af8457744d7e0c6e2272533b2 100644
--- a/src/com/android/settings/media/MediaOutputSlice.java
+++ b/src/com/android/settings/media/MediaOutputSlice.java
@@ -122,7 +122,7 @@ public class MediaOutputSlice implements CustomSliceable {
         if (drawable == null) {
             Log.d(TAG, "getDeviceIconCompat() device : " + device.getName() + ", drawable is null");
             // Use default Bluetooth device icon to handle getIcon() is null case.
-            drawable = mContext.getDrawable(com.android.internal.R.drawable.ic_bt_headphones_a2dp);
+            drawable = mContext.getDrawable(R.drawable.ic_bt_headphones_a2dp);
         }
 
         return Utils.createIconWithDrawable(drawable);
diff --git a/src/com/android/settings/network/telephony/MobileNetworkSettings.java b/src/com/android/settings/network/telephony/MobileNetworkSettings.java
index 8d83ef2a3f9d3ead932e89ba1e091a2dcc312773..9bf700b40b7e2918737c3686add8d0971ec5f5ff 100644
--- a/src/com/android/settings/network/telephony/MobileNetworkSettings.java
+++ b/src/com/android/settings/network/telephony/MobileNetworkSettings.java
@@ -248,7 +248,7 @@ public class MobileNetworkSettings extends RestrictedDashboardFragment {
                 mSubId != SubscriptionManager.INVALID_SUBSCRIPTION_ID) {
             final MenuItem item = menu.add(Menu.NONE, R.id.edit_sim_name, Menu.NONE,
                     R.string.mobile_network_sim_name);
-            item.setIcon(com.android.internal.R.drawable.ic_mode_edit);
+            item.setIcon(R.drawable.ic_mode_edit);
             item.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
         }
         super.onCreateOptionsMenu(menu, inflater);
diff --git a/src/com/android/settings/notification/AlarmVolumePreferenceController.java b/src/com/android/settings/notification/AlarmVolumePreferenceController.java
index d6a4110dcdd196f579a2b7e698bf99da457150e6..50721d15b470633edaf9d7382855e0ba00025e0e 100644
--- a/src/com/android/settings/notification/AlarmVolumePreferenceController.java
+++ b/src/com/android/settings/notification/AlarmVolumePreferenceController.java
@@ -58,6 +58,6 @@ public class AlarmVolumePreferenceController extends VolumeSeekBarPreferenceCont
 
     @Override
     public int getMuteIcon() {
-        return com.android.internal.R.drawable.ic_audio_alarm_mute;
+        return R.drawable.ic_audio_alarm_mute;
     }
 }
diff --git a/src/com/android/settings/notification/ZenRuleButtonsPreferenceController.java b/src/com/android/settings/notification/ZenRuleButtonsPreferenceController.java
index a014ec90683159a85be94b7451c9ad9b2bf83e3f..a773908607e31e4d5464b628a8238a472c58617b 100644
--- a/src/com/android/settings/notification/ZenRuleButtonsPreferenceController.java
+++ b/src/com/android/settings/notification/ZenRuleButtonsPreferenceController.java
@@ -62,7 +62,7 @@ public class ZenRuleButtonsPreferenceController extends AbstractZenModePreferenc
         if (isAvailable()) {
             mButtonsPref = ((ActionButtonsPreference) screen.findPreference(KEY))
                     .setButton1Text(R.string.zen_mode_rule_name_edit)
-                    .setButton1Icon(com.android.internal.R.drawable.ic_mode_edit)
+                    .setButton1Icon(R.drawable.ic_mode_edit)
                     .setButton1OnClickListener(new EditRuleNameClickListener())
                     .setButton2Text(R.string.zen_mode_delete_rule_button)
                     .setButton2Icon(R.drawable.ic_settings_delete)
diff --git a/src/com/android/settings/password/ChooseLockPattern.java b/src/com/android/settings/password/ChooseLockPattern.java
index b102f4101c87faacfa9ac0b21b54977a99c08a26..b9a04a068ac4ec92268dde79769298e3661a1030 100644
--- a/src/com/android/settings/password/ChooseLockPattern.java
+++ b/src/com/android/settings/password/ChooseLockPattern.java
@@ -22,6 +22,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.res.ColorStateList;
 import android.content.res.Resources.Theme;
+import android.graphics.Color;
 import android.os.Bundle;
 import android.util.Log;
 import android.util.Pair;
@@ -30,6 +31,7 @@ import android.view.KeyEvent;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.WindowManager;
 import android.widget.LinearLayout;
 import android.widget.ScrollView;
 import android.widget.TextView;
@@ -62,7 +64,7 @@ import java.util.List;
 
 /**
  * If the user has a lock pattern set already, makes them confirm the existing one.
- *
+ * <p>
  * Then, prompts the user to choose a lock pattern:
  * - prompts for initial pattern
  * - asks for confirmation / restart
@@ -212,7 +214,7 @@ public class ChooseLockPattern extends SettingsActivity {
 
         @Override
         public void onActivityResult(int requestCode, int resultCode,
-                Intent data) {
+                                     Intent data) {
             super.onActivityResult(requestCode, resultCode, data);
             switch (requestCode) {
                 case CONFIRM_EXISTING_REQUEST:
@@ -244,64 +246,64 @@ public class ChooseLockPattern extends SettingsActivity {
         protected LockPatternView.OnPatternListener mChooseNewLockPatternListener =
                 new LockPatternView.OnPatternListener() {
 
-                public void onPatternStart() {
-                    mLockPatternView.removeCallbacks(mClearPatternRunnable);
-                    patternInProgress();
-                }
+                    public void onPatternStart() {
+                        mLockPatternView.removeCallbacks(mClearPatternRunnable);
+                        patternInProgress();
+                    }
 
-                public void onPatternCleared() {
-                    mLockPatternView.removeCallbacks(mClearPatternRunnable);
-                }
+                    public void onPatternCleared() {
+                        mLockPatternView.removeCallbacks(mClearPatternRunnable);
+                    }
 
-                public void onPatternDetected(List<LockPatternView.Cell> pattern) {
-                    if (mUiStage == Stage.NeedToConfirm || mUiStage == Stage.ConfirmWrong) {
-                        if (mChosenPattern == null) throw new IllegalStateException(
-                                "null chosen pattern in stage 'need to confirm");
-                        final String chosenPatternStr = LockPatternUtils.patternToString(
-                                mChosenPattern, mPatternSize);
-                        final String potentialPatternStr = LockPatternUtils.patternToString(
-                                pattern, mPatternSize);
-
-                        if (chosenPatternStr.equals(potentialPatternStr)) {
-                            updateStage(Stage.ChoiceConfirmed);
-                        } else {
-                            updateStage(Stage.ConfirmWrong);
-                        }
-                    } else if (mUiStage == Stage.Introduction || mUiStage == Stage.ChoiceTooShort){
-                        if (pattern.size() < LockPatternUtils.MIN_LOCK_PATTERN_SIZE) {
-                            updateStage(Stage.ChoiceTooShort);
+                    public void onPatternDetected(List<LockPatternView.Cell> pattern) {
+                        if (mUiStage == Stage.NeedToConfirm || mUiStage == Stage.ConfirmWrong) {
+                            if (mChosenPattern == null) throw new IllegalStateException(
+                                    "null chosen pattern in stage 'need to confirm");
+                            final String chosenPatternStr = LockPatternUtils.patternToString(
+                                    mChosenPattern, mPatternSize);
+                            final String potentialPatternStr = LockPatternUtils.patternToString(
+                                    pattern, mPatternSize);
+
+                            if (chosenPatternStr.equals(potentialPatternStr)) {
+                                updateStage(Stage.ChoiceConfirmed);
+                            } else {
+                                updateStage(Stage.ConfirmWrong);
+                            }
+                        } else if (mUiStage == Stage.Introduction || mUiStage == Stage.ChoiceTooShort) {
+                            if (pattern.size() < LockPatternUtils.MIN_LOCK_PATTERN_SIZE) {
+                                updateStage(Stage.ChoiceTooShort);
+                            } else {
+                                mChosenPattern = new ArrayList<LockPatternView.Cell>(pattern);
+                                updateStage(Stage.FirstChoiceValid);
+                            }
                         } else {
-                            mChosenPattern = new ArrayList<LockPatternView.Cell>(pattern);
-                            updateStage(Stage.FirstChoiceValid);
+                            throw new IllegalStateException("Unexpected stage " + mUiStage + " when "
+                                    + "entering the pattern.");
                         }
-                    } else {
-                        throw new IllegalStateException("Unexpected stage " + mUiStage + " when "
-                                + "entering the pattern.");
                     }
-                }
 
-                public void onPatternCellAdded(List<Cell> pattern) {
+                    public void onPatternCellAdded(List<Cell> pattern) {
 
-                }
-
-                private void patternInProgress() {
-                    mHeaderText.setText(R.string.lockpattern_recording_inprogress);
-                    if (mDefaultHeaderColorList != null) {
-                        mHeaderText.setTextColor(mDefaultHeaderColorList);
                     }
-                    mFooterText.setText("");
-                    mNextButton.setEnabled(false);
-
-                    if (mTitleHeaderScrollView != null) {
-                        mTitleHeaderScrollView.post(new Runnable() {
-                            @Override
-                            public void run() {
-                                mTitleHeaderScrollView.fullScroll(ScrollView.FOCUS_DOWN);
-                            }
-                        });
+
+                    private void patternInProgress() {
+                        mHeaderText.setText(R.string.lockpattern_recording_inprogress);
+                        if (mDefaultHeaderColorList != null) {
+                            mHeaderText.setTextColor(mDefaultHeaderColorList);
+                        }
+                        mFooterText.setText("");
+                        mNextButton.setEnabled(false);
+
+                        if (mTitleHeaderScrollView != null) {
+                            mTitleHeaderScrollView.post(new Runnable() {
+                                @Override
+                                public void run() {
+                                    mTitleHeaderScrollView.fullScroll(ScrollView.FOCUS_DOWN);
+                                }
+                            });
+                        }
                     }
-                }
-         };
+                };
 
         @Override
         public int getMetricsCategory() {
@@ -319,7 +321,7 @@ public class ChooseLockPattern extends SettingsActivity {
 
 
             /**
-             * @param text The displayed text for this mode.
+             * @param text    The displayed text for this mode.
              * @param enabled Whether the button should be enabled.
              */
             LeftButtonMode(int text, boolean enabled) {
@@ -342,7 +344,7 @@ public class ChooseLockPattern extends SettingsActivity {
             Ok(android.R.string.ok, true);
 
             /**
-             * @param text The displayed text for this mode.
+             * @param text    The displayed text for this mode.
              * @param enabled Whether the button should be enabled.
              */
             RightButtonMode(int text, boolean enabled) {
@@ -394,18 +396,18 @@ public class ChooseLockPattern extends SettingsActivity {
 
             /**
              * @param messageForBiometrics The message displayed at the top, above header for
-             *                              fingerprint flow.
-             * @param message The message displayed at the top.
-             * @param headerMessage The message displayed at the top.
-             * @param leftMode The mode of the left button.
-             * @param rightMode The mode of the right button.
-             * @param footerMessage The footer message.
-             * @param patternEnabled Whether the pattern widget is enabled.
+             *                             fingerprint flow.
+             * @param message              The message displayed at the top.
+             * @param headerMessage        The message displayed at the top.
+             * @param leftMode             The mode of the left button.
+             * @param rightMode            The mode of the right button.
+             * @param footerMessage        The footer message.
+             * @param patternEnabled       Whether the pattern widget is enabled.
              */
             Stage(int messageForBiometrics, int message, int headerMessage,
-                    LeftButtonMode leftMode,
-                    RightButtonMode rightMode,
-                    int footerMessage, boolean patternEnabled) {
+                  LeftButtonMode leftMode,
+                  RightButtonMode rightMode,
+                  int footerMessage, boolean patternEnabled) {
                 this.headerMessage = headerMessage;
                 this.messageForBiometrics = messageForBiometrics;
                 this.message = message;
@@ -474,7 +476,7 @@ public class ChooseLockPattern extends SettingsActivity {
 
         @Override
         public View onCreateView(LayoutInflater inflater, ViewGroup container,
-                Bundle savedInstanceState) {
+                                 Bundle savedInstanceState) {
             final GlifLayout layout = (GlifLayout) inflater.inflate(
                     R.layout.choose_lock_pattern, container, false);
             layout.setHeaderText(getActivity().getTitle());
@@ -519,7 +521,7 @@ public class ChooseLockPattern extends SettingsActivity {
                     LockPatternView.Cell.of(0, 1, mPatternSize),
                     LockPatternView.Cell.of(1, 1, mPatternSize),
                     LockPatternView.Cell.of(2, 1, mPatternSize)
-                    ));
+            ));
 
             return layout;
         }
@@ -566,10 +568,10 @@ public class ChooseLockPattern extends SettingsActivity {
                     // know there isn't an existing password or the user confirms their password.
                     updateStage(Stage.NeedToConfirm);
                     boolean launchedConfirmationActivity =
-                        mChooseLockSettingsHelper.launchConfirmationActivity(
-                                CONFIRM_EXISTING_REQUEST,
-                                getString(R.string.unlock_set_unlock_launch_picker_title), true,
-                                mUserId);
+                            mChooseLockSettingsHelper.launchConfirmationActivity(
+                                    CONFIRM_EXISTING_REQUEST,
+                                    getString(R.string.unlock_set_unlock_launch_picker_title), true,
+                                    mUserId);
                     if (!launchedConfirmationActivity) {
                         updateStage(Stage.Introduction);
                     }
@@ -694,6 +696,7 @@ public class ChooseLockPattern extends SettingsActivity {
          * Updates the messages and buttons appropriate to what stage the user
          * is at in choosing a view.  This doesn't handle clearing out the pattern;
          * the pattern is expected to be in the right state.
+         *
          * @param stage
          */
         protected void updateStage(Stage stage) {
@@ -856,9 +859,9 @@ public class ChooseLockPattern extends SettingsActivity {
         private byte mPatternSize;
 
         public void start(LockPatternUtils utils, boolean credentialRequired,
-                boolean hasChallenge, long challenge,
-                List<LockPatternView.Cell> chosenPattern, byte[] currentPattern,
-                int userId, byte patternSize) {
+                          boolean hasChallenge, long challenge,
+                          List<LockPatternView.Cell> chosenPattern, byte[] currentPattern,
+                          int userId, byte patternSize) {
             prepare(utils, credentialRequired, hasChallenge, challenge, userId);
 
             mCurrentPattern = currentPattern;
diff --git a/src/com/android/settings/print/PrintJobPreferenceController.java b/src/com/android/settings/print/PrintJobPreferenceController.java
index 0eff0d6d612cca307fea63fafcee3fac6394c95a..32375ec430c1fd013fa588924b1b55da2d5bc2e0 100644
--- a/src/com/android/settings/print/PrintJobPreferenceController.java
+++ b/src/com/android/settings/print/PrintJobPreferenceController.java
@@ -96,7 +96,7 @@ public class PrintJobPreferenceController extends PrintJobPreferenceControllerBa
         switch (info.getState()) {
             case PrintJobInfo.STATE_QUEUED:
             case PrintJobInfo.STATE_STARTED: {
-                Drawable icon = mContext.getDrawable(com.android.internal.R.drawable.ic_print);
+                Drawable icon = mContext.getDrawable(R.drawable.ic_print);
                 icon.setTint(tintColor);
                 mPreference.setIcon(icon);
                 break;
@@ -105,7 +105,7 @@ public class PrintJobPreferenceController extends PrintJobPreferenceControllerBa
             case PrintJobInfo.STATE_FAILED:
             case PrintJobInfo.STATE_BLOCKED: {
                 Drawable icon = mContext.getDrawable(
-                        com.android.internal.R.drawable.ic_print_error);
+                        R.drawable.ic_print_error);
                 icon.setTint(tintColor);
                 mPreference.setIcon(icon);
                 break;
diff --git a/src/com/android/settings/print/PrintSettingsFragment.java b/src/com/android/settings/print/PrintSettingsFragment.java
index 09a0a279e44bab27486adafdae419860aff351ef..e90b64f2c1422898e5a5430a4fa4ce1372ded93a 100644
--- a/src/com/android/settings/print/PrintSettingsFragment.java
+++ b/src/com/android/settings/print/PrintSettingsFragment.java
@@ -212,6 +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));
                     preference.setIcon(drawable);
                 }
 
@@ -365,7 +366,7 @@ public class PrintSettingsFragment extends ProfileSettingsPreferenceFragment
                         case PrintJobInfo.STATE_QUEUED:
                         case PrintJobInfo.STATE_STARTED: {
                             Drawable icon = getActivity().getDrawable(
-                                    com.android.internal.R.drawable.ic_print);
+                                    R.drawable.ic_print);
                             icon.setTint(tintColor);
                             preference.setIcon(icon);
                             break;
@@ -374,7 +375,7 @@ public class PrintSettingsFragment extends ProfileSettingsPreferenceFragment
                         case PrintJobInfo.STATE_FAILED:
                         case PrintJobInfo.STATE_BLOCKED: {
                             Drawable icon = getActivity().getDrawable(
-                                    com.android.internal.R.drawable.ic_print_error);
+                                    R.drawable.ic_print_error);
                             icon.setTint(tintColor);
                             preference.setIcon(icon);
                             break;
diff --git a/src/com/android/settings/search/actionbar/SearchMenuController.java b/src/com/android/settings/search/actionbar/SearchMenuController.java
index 25d0d3027d563e17fc684d65790dbeab25c7422d..6f0a7ee8aecef6203dbb824d55372b1f2e3e40b6 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_search_24dp);
+        searchItem.setIcon(R.drawable.ic_homepage_search);
         searchItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
 
         searchItem.setOnMenuItemClickListener(target -> {
diff --git a/src/com/android/settings/widget/EntityHeaderController.java b/src/com/android/settings/widget/EntityHeaderController.java
index 8e31290577e9f0b8207f4b78dab0f7e0f9c6d5e6..7bd21c5598e1f1047a2bcd0d45f60317c8e94509 100644
--- a/src/com/android/settings/widget/EntityHeaderController.java
+++ b/src/com/android/settings/widget/EntityHeaderController.java
@@ -122,6 +122,10 @@ public class EntityHeaderController {
             mHeader = LayoutInflater.from(fragment.getContext())
                     .inflate(R.layout.settings_entity_header, null /* root */);
         }
+        View headerView = mHeader.findViewById(R.id.entity_header);
+        if(headerView != null) {
+            headerView.setBackgroundColor(mActivity.getColor(R.color.color_default_primary_dark));
+        }
     }
 
     public EntityHeaderController setRecyclerView(RecyclerView recyclerView, Lifecycle lifecycle) {
@@ -318,8 +322,7 @@ public class EntityHeaderController {
             return this;
         }
         actionBar.setBackgroundDrawable(
-                new ColorDrawable(
-                        Utils.getColorAttrDefaultColor(activity, android.R.attr.colorPrimaryDark)));
+                new ColorDrawable(activity.getColor(R.color.color_default_primary_dark)));
         actionBar.setElevation(0);
         if (mRecyclerView != null && mLifecycle != null) {
             ActionBarShadowController.attachToView(mActivity, mLifecycle, mRecyclerView);
@@ -345,7 +348,7 @@ public class EntityHeaderController {
                 if (mEditOnClickListener == null) {
                     button.setVisibility(View.GONE);
                 } else {
-                    button.setImageResource(com.android.internal.R.drawable.ic_mode_edit);
+                    button.setImageResource(R.drawable.ic_mode_edit);
                     button.setVisibility(View.VISIBLE);
                     button.setOnClickListener(mEditOnClickListener);
                 }
diff --git a/src/com/android/settings/wifi/ConnectedAccessPointPreference.java b/src/com/android/settings/wifi/ConnectedAccessPointPreference.java
index c7953c3f695fae7b9c8577a1c76f03651b3ace9b..9fd8918d989d09cd8e424fb5cc7d67769955c3c7 100644
--- a/src/com/android/settings/wifi/ConnectedAccessPointPreference.java
+++ b/src/com/android/settings/wifi/ConnectedAccessPointPreference.java
@@ -35,6 +35,7 @@ public class ConnectedAccessPointPreference extends LongPressAccessPointPreferen
     private OnGearClickListener mOnGearClickListener;
     private boolean mIsCaptivePortal;
 
+
     public ConnectedAccessPointPreference(AccessPoint accessPoint, Context context,
             UserBadgeCache cache, @DrawableRes int iconResId, boolean forSavedNetworks,
             Fragment fragment) {
diff --git a/src/com/android/settings/wifi/LongPressAccessPointPreference.java b/src/com/android/settings/wifi/LongPressAccessPointPreference.java
index c3c08f0c408c577866f624ddf712e463ff1d90b0..8390f1b16bd5ff028c8de728a799e9bd14f689ff 100644
--- a/src/com/android/settings/wifi/LongPressAccessPointPreference.java
+++ b/src/com/android/settings/wifi/LongPressAccessPointPreference.java
@@ -16,21 +16,26 @@
 package com.android.settings.wifi;
 
 import android.content.Context;
+import android.graphics.PorterDuff;
+import android.graphics.drawable.Drawable;
 
 import androidx.fragment.app.Fragment;
 import androidx.preference.PreferenceViewHolder;
 
+import com.android.settings.R;
 import com.android.settingslib.wifi.AccessPoint;
 import com.android.settingslib.wifi.AccessPointPreference;
 
 public class LongPressAccessPointPreference extends AccessPointPreference {
 
     private final Fragment mFragment;
+    private Context mContext;
 
     public LongPressAccessPointPreference(AccessPoint accessPoint, Context context,
             UserBadgeCache cache, boolean forSavedNetworks, int iconResId, Fragment fragment) {
         super(accessPoint, context, cache, iconResId, forSavedNetworks);
         mFragment = fragment;
+        this.mContext = context;
     }
 
     @Override
@@ -42,4 +47,12 @@ public class LongPressAccessPointPreference extends AccessPointPreference {
             view.itemView.setLongClickable(true);
         }
     }
+
+    @Override
+    public void setIcon(Drawable drawable) {
+        if (drawable != null) {
+            drawable.setColorFilter(mContext.getColor(R.color.color_default_accent), PorterDuff.Mode.SRC_IN);
+        }
+        super.setIcon(drawable);
+    }
 }
diff --git a/src/com/android/settings/wifi/NetworkRequestDialogFragment.java b/src/com/android/settings/wifi/NetworkRequestDialogFragment.java
index ceda8a70a05b4cfb30a9c81d82fa88f90002ffb8..9c5db4b754f9586beee3f30feaa660a8a36bb102 100644
--- a/src/com/android/settings/wifi/NetworkRequestDialogFragment.java
+++ b/src/com/android/settings/wifi/NetworkRequestDialogFragment.java
@@ -400,7 +400,7 @@ public class NetworkRequestDialogFragment extends InstrumentedDialogFragment imp
                 final Drawable drawable = getContext().getDrawable(
                         Utils.getWifiIconResource(level));
                 drawable.setTintList(
-                        Utils.getColorAttr(getContext(), android.R.attr.colorControlNormal));
+                        Utils.getColorAttr(getContext(), R.color.color_default_accent));
                 imageView.setImageDrawable(drawable);
             }
 
diff --git a/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java b/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java
index afcf883fb680ddc85f23b4eed42a0b9b7521386c..24e99da9951887d8711a00c7b123bf4b7cc2fec2 100644
--- a/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java
+++ b/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java
@@ -28,6 +28,8 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.graphics.Bitmap;
+import android.graphics.PorterDuff;
+import android.graphics.PorterDuffColorFilter;
 import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
 import android.graphics.drawable.VectorDrawable;
@@ -585,7 +587,6 @@ public class WifiDetailPreferenceController extends AbstractPreferenceController
         }
 
         Drawable wifiIconDark = wifiIcon.getConstantState().newDrawable().mutate();
-        wifiIconDark.setTintList(Utils.getColorAttr(mContext, android.R.attr.colorControlNormal));
         mSignalStrengthPref.setIcon(wifiIconDark);
 
         mSignalStrengthPref.setSummary(mSignalStr[mRssiSignalLevel]);
@@ -603,9 +604,6 @@ public class WifiDetailPreferenceController extends AbstractPreferenceController
             return original;
         }
 
-        // clear tint list to make sure can set 87% black after enlarge
-        original.setTintList(null);
-
         // enlarge icon size
         final Bitmap bitmap = Utils.createBitmap(original,
                 iconSize /*width*/,
@@ -613,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, android.R.attr.textColorPrimary));
+        newIcon.setTintList(Utils.getColorAttr(mContext, R.color.color_default_accent));
 
         return newIcon;
     }
@@ -960,7 +958,9 @@ public class WifiDetailPreferenceController extends AbstractPreferenceController
         }
 
         public Drawable getIcon(int level) {
-            return mContext.getDrawable(Utils.getWifiIconResource(level)).mutate();
+            Drawable icon = mContext.getDrawable(Utils.getWifiIconResource(level));
+            icon.setTint(mContext.getColor(R.color.color_default_accent));
+            return icon.mutate();
         }
     }
 
diff --git a/src/com/android/settings/wifi/details/WifiNetworkDetailsFragment.java b/src/com/android/settings/wifi/details/WifiNetworkDetailsFragment.java
index ee03e6e7074cd12120ba11f2c3292b3095c9b9ae..c75b03d4c26b2cc6198b446001764c8a828d05b2 100644
--- a/src/com/android/settings/wifi/details/WifiNetworkDetailsFragment.java
+++ b/src/com/android/settings/wifi/details/WifiNetworkDetailsFragment.java
@@ -133,7 +133,7 @@ public class WifiNetworkDetailsFragment extends RestrictedDashboardFragment impl
     public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
         if (!mIsUiRestricted) {
             MenuItem item = menu.add(0, Menu.FIRST, 0, R.string.wifi_modify);
-            item.setIcon(com.android.internal.R.drawable.ic_mode_edit);
+            item.setIcon(R.drawable.ic_mode_edit);
             item.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
         }
         super.onCreateOptionsMenu(menu, inflater);