diff --git a/app/src/main/res/drawable-anydpi/ic_account_circle.xml b/app/src/main/res/drawable-anydpi/ic_account_circle.xml
index f9354694..de6ed35b 100644
--- a/app/src/main/res/drawable-anydpi/ic_account_circle.xml
+++ b/app/src/main/res/drawable-anydpi/ic_account_circle.xml
@@ -2,11 +2,10 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:width="24dp"
     android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:tint="?attr/colorControlNormal">
+    android:viewportWidth="24"
+    android:viewportHeight="24">
   <path
-      android:fillColor="@android:color/white"
-      android:pathData="M234,684Q285,645 348,622.5Q411,600 480,600Q549,600 612,622.5Q675,645 726,684Q761,643 780.5,591Q800,539 800,480Q800,347 706.5,253.5Q613,160 480,160Q347,160 253.5,253.5Q160,347 160,480Q160,539 179.5,591Q199,643 234,684ZM480,520Q421,520 380.5,479.5Q340,439 340,380Q340,321 380.5,280.5Q421,240 480,240Q539,240 579.5,280.5Q620,321 620,380Q620,439 579.5,479.5Q539,520 480,520ZM480,880Q397,880 324,848.5Q251,817 197,763Q143,709 111.5,636Q80,563 80,480Q80,397 111.5,324Q143,251 197,197Q251,143 324,111.5Q397,80 480,80Q563,80 636,111.5Q709,143 763,197Q817,251 848.5,324Q880,397 880,480Q880,563 848.5,636Q817,709 763,763Q709,817 636,848.5Q563,880 480,880ZM480,800Q533,800 580,784.5Q627,769 666,740Q627,711 580,695.5Q533,680 480,680Q427,680 380,695.5Q333,711 294,740Q333,769 380,784.5Q427,800 480,800ZM480,440Q506,440 523,423Q540,406 540,380Q540,354 523,337Q506,320 480,320Q454,320 437,337Q420,354 420,380Q420,406 437,423Q454,440 480,440ZM480,380Q480,380 480,380Q480,380 480,380Q480,380 480,380Q480,380 480,380Q480,380 480,380Q480,380 480,380Q480,380 480,380Q480,380 480,380ZM480,740Q480,740 480,740Q480,740 480,740Q480,740 480,740Q480,740 480,740Q480,740 480,740Q480,740 480,740Q480,740 480,740Q480,740 480,740Z"
+      android:fillColor="?attr/colorSecondary"
+      android:pathData="M5.85,17.1Q7.12,16.12 8.7,15.56Q10.28,15 12,15Q13.72,15 15.3,15.56Q16.88,16.12 18.15,17.1Q19.02,16.07 19.51,14.78Q20,13.47 20,12Q20,8.68 17.66,6.34Q15.32,4 12,4Q8.68,4 6.34,6.34Q4,8.68 4,12Q4,13.47 4.49,14.78Q4.97,16.07 5.85,17.1ZM12,13Q10.53,13 9.51,11.99Q8.5,10.97 8.5,9.5Q8.5,8.03 9.51,7.01Q10.53,6 12,6Q13.47,6 14.49,7.01Q15.5,8.03 15.5,9.5Q15.5,10.97 14.49,11.99Q13.47,13 12,13ZM12,22Q9.93,22 8.1,21.21Q6.28,20.43 4.92,19.07Q3.58,17.73 2.79,15.9Q2,14.07 2,12Q2,9.93 2.79,8.1Q3.58,6.28 4.92,4.92Q6.28,3.58 8.1,2.79Q9.93,2 12,2Q14.07,2 15.9,2.79Q17.73,3.58 19.07,4.92Q20.43,6.28 21.21,8.1Q22,9.93 22,12Q22,14.07 21.21,15.9Q20.43,17.73 19.07,19.07Q17.73,20.43 15.9,21.21Q14.07,22 12,22ZM12,20Q13.32,20 14.5,19.61Q15.68,19.23 16.65,18.5Q15.68,17.77 14.5,17.39Q13.32,17 12,17Q10.68,17 9.5,17.39Q8.32,17.77 7.35,18.5Q8.32,19.23 9.5,19.61Q10.68,20 12,20ZM12,11Q12.65,11 13.07,10.57Q13.5,10.15 13.5,9.5Q13.5,8.85 13.07,8.43Q12.65,8 12,8Q11.35,8 10.93,8.43Q10.5,8.85 10.5,9.5Q10.5,10.15 10.93,10.57Q11.35,11 12,11ZM12,9.5Q12,9.5 12,9.5Q12,9.5 12,9.5Q12,9.5 12,9.5Q12,9.5 12,9.5Q12,9.5 12,9.5Q12,9.5 12,9.5Q12,9.5 12,9.5Q12,9.5 12,9.5ZM12,18.5Q12,18.5 12,18.5Q12,18.5 12,18.5Q12,18.5 12,18.5Q12,18.5 12,18.5Q12,18.5 12,18.5Q12,18.5 12,18.5Q12,18.5 12,18.5Q12,18.5 12,18.5Z"
       tools:ignore="VectorPath" />
 </vector>
diff --git a/app/src/main/res/drawable-anydpi/ic_ad_group.xml b/app/src/main/res/drawable-anydpi/ic_ad_group.xml
index ce9c4b1b..968abc34 100644
--- a/app/src/main/res/drawable-anydpi/ic_ad_group.xml
+++ b/app/src/main/res/drawable-anydpi/ic_ad_group.xml
@@ -1,10 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:tint="?attr/colorControlNormal">
+    android:viewportWidth="24"
+    android:viewportHeight="24">
   <path
-      android:fillColor="@android:color/white"
-      android:pathData="M320,640L800,640Q800,640 800,640Q800,640 800,640L800,240L320,240L320,640Q320,640 320,640Q320,640 320,640ZM320,720Q287,720 263.5,696.5Q240,673 240,640L240,160Q240,127 263.5,103.5Q287,80 320,80L800,80Q833,80 856.5,103.5Q880,127 880,160L880,640Q880,673 856.5,696.5Q833,720 800,720L320,720ZM160,880Q127,880 103.5,856.5Q80,833 80,800L80,240L160,240L160,800Q160,800 160,800Q160,800 160,800L720,800L720,880L160,880ZM320,160Q320,160 320,160Q320,160 320,160L320,640Q320,640 320,640Q320,640 320,640L320,640Q320,640 320,640Q320,640 320,640L320,160Q320,160 320,160Q320,160 320,160Z"/>
+      android:fillColor="?attr/colorSecondary"
+      android:pathData="M8,16L20,16Q20,16 20,16Q20,16 20,16L20,6L8,6L8,16Q8,16 8,16Q8,16 8,16ZM8,18Q7.17,18 6.59,17.41Q6,16.82 6,16L6,4Q6,3.17 6.59,2.59Q7.17,2 8,2L20,2Q20.82,2 21.41,2.59Q22,3.17 22,4L22,16Q22,16.82 21.41,17.41Q20.82,18 20,18L8,18ZM4,22Q3.17,22 2.59,21.41Q2,20.82 2,20L2,6L4,6L4,20Q4,20 4,20Q4,20 4,20L18,20L18,22L4,22ZM8,4Q8,4 8,4Q8,4 8,4L8,16Q8,16 8,16Q8,16 8,16L8,16Q8,16 8,16Q8,16 8,16L8,4Q8,4 8,4Q8,4 8,4Z"/>
 </vector>
diff --git a/app/src/main/res/drawable-anydpi/ic_ad_units.xml b/app/src/main/res/drawable-anydpi/ic_ad_units.xml
index 6185336a..7000e04d 100644
--- a/app/src/main/res/drawable-anydpi/ic_ad_units.xml
+++ b/app/src/main/res/drawable-anydpi/ic_ad_units.xml
@@ -1,10 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:tint="?attr/colorControlNormal">
+    android:viewportWidth="24"
+    android:viewportHeight="24">
   <path
-      android:fillColor="@android:color/white"
-      android:pathData="M280,920Q247,920 223.5,896.5Q200,873 200,840L200,120Q200,87 223.5,63.5Q247,40 280,40L680,40Q713,40 736.5,63.5Q760,87 760,120L760,244Q778,251 789,266Q800,281 800,300L800,380Q800,399 789,414Q778,429 760,436L760,840Q760,873 736.5,896.5Q713,920 680,920L280,920ZM280,840L680,840Q680,840 680,840Q680,840 680,840L680,120Q680,120 680,120Q680,120 680,120L280,120Q280,120 280,120Q280,120 280,120L280,840Q280,840 280,840Q280,840 280,840ZM280,840Q280,840 280,840Q280,840 280,840L280,120Q280,120 280,120Q280,120 280,120L280,120Q280,120 280,120Q280,120 280,120L280,840Q280,840 280,840Q280,840 280,840ZM320,480L640,480L640,400L320,400L320,480Z"/>
+      android:fillColor="?attr/colorSecondary"
+      android:pathData="M7,23Q6.17,23 5.59,22.41Q5,21.82 5,21L5,3Q5,2.17 5.59,1.59Q6.17,1 7,1L17,1Q17.82,1 18.41,1.59Q19,2.17 19,3L19,6.1Q19.45,6.28 19.73,6.65Q20,7.03 20,7.5L20,9.5Q20,9.97 19.73,10.35Q19.45,10.72 19,10.9L19,21Q19,21.82 18.41,22.41Q17.82,23 17,23L7,23ZM7,21L17,21Q17,21 17,21Q17,21 17,21L17,3Q17,3 17,3Q17,3 17,3L7,3Q7,3 7,3Q7,3 7,3L7,21Q7,21 7,21Q7,21 7,21ZM7,21Q7,21 7,21Q7,21 7,21L7,3Q7,3 7,3Q7,3 7,3L7,3Q7,3 7,3Q7,3 7,3L7,21Q7,21 7,21Q7,21 7,21ZM8,12L16,12L16,10L8,10L8,12Z"/>
 </vector>
diff --git a/app/src/main/res/drawable-anydpi/ic_album.xml b/app/src/main/res/drawable-anydpi/ic_album.xml
index 68dcadfd..6f31fca4 100644
--- a/app/src/main/res/drawable-anydpi/ic_album.xml
+++ b/app/src/main/res/drawable-anydpi/ic_album.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="?android:textColorPrimary"
+        android:fillColor="?attr/colorSecondary"
         android:pathData="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm0 18c-4.41 0-8-3.59-8-8s3.59-8 8-8 8 3.59 8 8-3.59 8-8 8zm0-12.5c-2.49 0-4.5 2.01-4.5 4.5s2.01 4.5 4.5 4.5 4.5-2.01 4.5-4.5-2.01-4.5-4.5-4.5zm0 5.5c-0.55 0-1-0.45-1-1s0.45-1 1-1 1 0.45 1 1-0.45 1-1 1z" />
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-anydpi/ic_all_inbox.xml b/app/src/main/res/drawable-anydpi/ic_all_inbox.xml
index d35f0af4..30967517 100644
--- a/app/src/main/res/drawable-anydpi/ic_all_inbox.xml
+++ b/app/src/main/res/drawable-anydpi/ic_all_inbox.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="32dp"
-    android:height="32dp"
+    android:width="24dp"
+    android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="?android:textColorPrimary"
+        android:fillColor="?attr/colorSecondary"
         android:pathData="M19 3H5c-1.1 0-2 0.9-2 2v7c0 1.1 0.9 2 2 2h14c1.1 0 2-0.9 2-2V5c0-1.1-0.9-2-2-2zM5 10h3.13c0.21 0.78 0.67 1.47 1.27 2H5v-2zm14 2h-4.4c0.6-0.53 1.06-1.22 1.27-2H19v2zm0-4h-5v1c0 1.07-0.93 2-2 2s-2-0.93-2-2V8H5V5h14v3zm-2 7h-3v1c0 0.47-0.19 0.9 -0.48 1.25-0.37 0.45 -0.92 0.75 -1.52 0.75 s-1.15-0.3-1.52-0.75c-0.29-0.35-0.48-0.78-0.48-1.25v-1H3v4c0 1.1 0.9 2 2 2h14c1.1 0 2-0.9 2-2v-4h-4zM5 17h3.13c0.02 0.09 0.06 0.17 0.09 0.25 0.24 0.68 0.65 1.28 1.18 1.75H5v-2zm14 2h-4.4c0.54-0.47 0.95 -1.07 1.18-1.75 0.03 -0.08 0.07 -0.16 0.09 -0.25H19v2z" />
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-anydpi/ic_android_sdk.xml b/app/src/main/res/drawable-anydpi/ic_android_sdk.xml
index c18ee4fd..cda79a9a 100644
--- a/app/src/main/res/drawable-anydpi/ic_android_sdk.xml
+++ b/app/src/main/res/drawable-anydpi/ic_android_sdk.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="32dp"
-    android:height="32dp"
+    android:width="24dp"
+    android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="?android:textColorPrimary"
+        android:fillColor="?attr/colorSecondary"
         android:pathData="M17.6 9.48l1.84-3.18c0.16-0.31 0.04-0.69-0.26-0.85-0.29-0.15-0.65-0.06-0.83 0.22l-1.88 3.24c-2.86-1.21-6.08-1.21-8.94 0L5.65 5.67c-0.19-0.29-0.58-0.38-0.87-0.2C4.5 5.65 4.41 6.01 4.56 6.3L6.4 9.48C3.3 11.25 1.28 14.44 1 18h22c-0.28-3.56-2.3-6.75-5.4-8.52zM7 15.25c-0.69 0-1.25-0.56-1.25-1.25S6.31 12.75 7 12.75 8.25 13.31 8.25 14 7.69 15.25 7 15.25zm10 0c-0.69 0-1.25-0.56-1.25-1.25s0.56-1.25 1.25-1.25 1.25 0.56 1.25 1.25-0.56 1.25-1.25 1.25z" />
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-anydpi/ic_app_shortcuts.xml b/app/src/main/res/drawable-anydpi/ic_app_shortcuts.xml
index 8703bcab..38aee023 100644
--- a/app/src/main/res/drawable-anydpi/ic_app_shortcuts.xml
+++ b/app/src/main/res/drawable-anydpi/ic_app_shortcuts.xml
@@ -1,12 +1,12 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="32dp"
-    android:height="32dp"
+    android:width="24dp"
+    android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="?android:textColorPrimary"
+        android:fillColor="?attr/colorSecondary"
         android:pathData="M17 18H7V6h10v1h2V3c0-1.1-0.9-2-2-2H7C5.9 1 5 1.9 5 3v18c0 1.1 0.9 2 2 2h10c1.1 0 2-0.9 2-2v-4h-2v1zM7 3h10v1H7V3zm10 18H7v-1h10v1zm3.38-11.38L21 11l0.62-1.38L23 9l-1.38-0.62L21 7l-0.62 1.38L19 9z" />
     <path
-        android:fillColor="?android:textColorPrimary"
+        android:fillColor="?attr/colorSecondary"
         android:pathData="M16 8l-1.25 2.75L12 12l2.75 1.25L16 16l1.25-2.75L20 12l-2.75-1.25zm5 5l-0.62 1.38L19 15l1.38 0.62L21 17l0.62-1.38L23 15l-1.38-0.62z" />
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-anydpi/ic_bottom_bar.xml b/app/src/main/res/drawable-anydpi/ic_bottom_bar.xml
index f1de5c7f..ff6c635c 100644
--- a/app/src/main/res/drawable-anydpi/ic_bottom_bar.xml
+++ b/app/src/main/res/drawable-anydpi/ic_bottom_bar.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="32dp"
-    android:height="32dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960">
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
     <path
-        android:fillColor="?android:textColorPrimary"
-        android:pathData="M200,840Q167,840 143.5,816.5Q120,793 120,760L120,200Q120,167 143.5,143.5Q167,120 200,120L760,120Q793,120 816.5,143.5Q840,167 840,200L840,760Q840,793 816.5,816.5Q793,840 760,840L200,840ZM200,600L760,600L760,200Q760,200 760,200Q760,200 760,200L200,200Q200,200 200,200Q200,200 200,200L200,600ZM200,680L200,760Q200,760 200,760Q200,760 200,760L760,760Q760,760 760,760Q760,760 760,760L760,680L200,680ZM200,680L200,680L200,760Q200,760 200,760Q200,760 200,760L200,760Q200,760 200,760Q200,760 200,760L200,680Z" />
+        android:fillColor="?attr/colorSecondary"
+        android:pathData="M5,21Q4.17,21 3.59,20.41Q3,19.82 3,19L3,5Q3,4.17 3.59,3.59Q4.17,3 5,3L19,3Q19.82,3 20.41,3.59Q21,4.17 21,5L21,19Q21,19.82 20.41,20.41Q19.82,21 19,21L5,21ZM5,15L19,15L19,5Q19,5 19,5Q19,5 19,5L5,5Q5,5 5,5Q5,5 5,5L5,15ZM5,17L5,19Q5,19 5,19Q5,19 5,19L19,19Q19,19 19,19Q19,19 19,19L19,17L5,17ZM5,17L5,17L5,19Q5,19 5,19Q5,19 5,19L5,19Q5,19 5,19Q5,19 5,19L5,17Z" />
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-anydpi/ic_category_navigation_tinted.xml b/app/src/main/res/drawable-anydpi/ic_category_navigation_tinted.xml
index 246bbb0d..36f11bfc 100644
--- a/app/src/main/res/drawable-anydpi/ic_category_navigation_tinted.xml
+++ b/app/src/main/res/drawable-anydpi/ic_category_navigation_tinted.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960">
+    android:viewportWidth="24"
+    android:viewportHeight="24">
     <path
         android:fillColor="?attr/colorSecondary"
-        android:pathData="M120,720L120,640L840,640L840,720L120,720ZM120,520L120,440L840,440L840,520L120,520ZM120,320L120,240L840,240L840,320L120,320Z" />
+        android:pathData="M3,18L3,16L21,16L21,18L3,18ZM3,13L3,11L21,11L21,13L3,13ZM3,8L3,6L21,6L21,8L3,8Z" />
 </vector>
diff --git a/app/src/main/res/drawable-anydpi/ic_changelog.xml b/app/src/main/res/drawable-anydpi/ic_changelog.xml
index ce8f711a..b7b429cc 100644
--- a/app/src/main/res/drawable-anydpi/ic_changelog.xml
+++ b/app/src/main/res/drawable-anydpi/ic_changelog.xml
@@ -4,9 +4,9 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="?android:textColorPrimary"
+        android:fillColor="?attr/colorSecondary"
         android:pathData="M23 12l-2.44-2.78 0.34 -3.68-3.61-0.82-1.89-3.18L12 3 8.6 1.54 6.71 4.72l-3.61 0.81 0.34 3.68L1 12l2.44 2.78-0.34 3.69 3.61 0.82 1.89 3.18L12 21l3.4 1.46 1.89-3.18 3.61-0.82-0.34-3.68L23 12zm-4.51 2.11l0.26 2.79-2.74 0.62 -1.43 2.41L12 18.82l-2.58 1.11-1.43-2.41-2.74-0.62 0.26 -2.8L3.66 12l1.85-2.12-0.26-2.78 2.74-0.61 1.43-2.41L12 5.18l2.58-1.11 1.43 2.41 2.74 0.62 -0.26 2.79L20.34 12l-1.85 2.11z" />
     <path
-        android:fillColor="?android:textColorPrimary"
+        android:fillColor="?attr/colorSecondary"
         android:pathData="M11 15h2v2h-2zm0-8h2v6h-2z" />
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-anydpi/ic_clock.xml b/app/src/main/res/drawable-anydpi/ic_clock.xml
index 6e9c5a76..95b75822 100644
--- a/app/src/main/res/drawable-anydpi/ic_clock.xml
+++ b/app/src/main/res/drawable-anydpi/ic_clock.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="32dp"
-    android:height="32dp"
+    android:width="24dp"
+    android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="?android:textColorPrimary"
+        android:fillColor="?attr/colorSecondary"
         android:pathData="M12.5 8H11v6l4.75 2.85 0.75-1.23-4-2.37zm4.837-6.19l4.607 3.845-1.28 1.535-4.61-3.843zm-10.674 0l1.282 1.536L3.337 7.19l-1.28-1.536zM12 4c-4.97 0-9 4.03-9 9s4.03 9 9 9 9-4.03 9-9-4.03-9-9-9zm0 16c-3.86 0-7-3.14-7-7s3.14-7 7-7 7 3.14 7 7-3.14 7-7 7z" />
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-anydpi/ic_code.xml b/app/src/main/res/drawable-anydpi/ic_code.xml
index 76e6bac5..2f4bbba7 100644
--- a/app/src/main/res/drawable-anydpi/ic_code.xml
+++ b/app/src/main/res/drawable-anydpi/ic_code.xml
@@ -4,9 +4,9 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="?android:textColorPrimary"
+        android:fillColor="?attr/colorSecondary"
         android:pathData="M17 6l-1.41 1.41L20.17 12l-4.58 4.59L17 18l6-6zM8.41 7.41L7 6l-6 6 6 6 1.41-1.41L3.83 12z" />
     <path
-        android:fillColor="?android:textColorPrimary"
+        android:fillColor="?attr/colorSecondary"
         android:pathData="M8 11c0.552 0 1 0.448 1 1s-0.448 1-1 1-1-0.448-1-1 0.448-1 1-1zm4 0c0.552 0 1 0.448 1 1s-0.448 1-1 1-1-0.448-1-1 0.448-1 1-1zm4 0c0.552 0 1 0.448 1 1s-0.448 1-1 1-1-0.448-1-1 0.448-1 1-1z" />
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-anydpi/ic_code_binding.xml b/app/src/main/res/drawable-anydpi/ic_code_binding.xml
index a62fb0b0..efad76bc 100644
--- a/app/src/main/res/drawable-anydpi/ic_code_binding.xml
+++ b/app/src/main/res/drawable-anydpi/ic_code_binding.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="32dp"
-    android:height="32dp"
+    android:width="24dp"
+    android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="?android:textColorPrimary"
+        android:fillColor="?attr/colorSecondary"
         android:pathData="M17 6l-1.41 1.41L20.17 12l-4.58 4.59L17 18l6-6zM8.41 7.41L7 6l-6 6 6 6 1.41-1.41L3.83 12z" />
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-anydpi/ic_code_of_conduct.xml b/app/src/main/res/drawable-anydpi/ic_code_of_conduct.xml
index 3a73d9bc..255c8ae7 100644
--- a/app/src/main/res/drawable-anydpi/ic_code_of_conduct.xml
+++ b/app/src/main/res/drawable-anydpi/ic_code_of_conduct.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="?android:textColorPrimary"
+        android:fillColor="?attr/colorSecondary"
         android:pathData="M12 1L3 5v6c0 5.55 3.84 10.74 9 12 5.16-1.26 9-6.45 9-12V5l-9-4zm7 10c0 4.52-2.98 8.69-7 9.93-4.02-1.24-7-5.41-7-9.93V6.3l7-3.11 7 3.11V11zM7.41 11.59L6 13l4 4 8-8-1.41-1.42L10 14.17z" />
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-anydpi/ic_data_thresholding.xml b/app/src/main/res/drawable-anydpi/ic_data_thresholding.xml
index 6b47ec73..6a7da86e 100644
--- a/app/src/main/res/drawable-anydpi/ic_data_thresholding.xml
+++ b/app/src/main/res/drawable-anydpi/ic_data_thresholding.xml
@@ -1,10 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:tint="?attr/colorControlNormal">
+    android:viewportWidth="24"
+    android:viewportHeight="24">
   <path
-      android:fillColor="@android:color/white"
-      android:pathData="M200,840Q167,840 143.5,816.5Q120,793 120,760L120,200Q120,167 143.5,143.5Q167,120 200,120L760,120Q793,120 816.5,143.5Q840,167 840,200L840,760Q840,793 816.5,816.5Q793,840 760,840L200,840ZM691,760L760,760Q760,760 760,760Q760,760 760,760L760,691L691,760ZM234,760L307,760L427,640L512,640L392,760L456,760L576,640L661,640L541,760L606,760L726,640L760,640L760,200Q760,200 760,200Q760,200 760,200L200,200Q200,200 200,200Q200,200 200,200L200,709L269,640L354,640L234,760ZM306,560L250,504L427,327L507,407L654,260L710,316L507,520L427,440L306,560ZM200,760L200,200Q200,200 200,200Q200,200 200,200L200,200Q200,200 200,200Q200,200 200,200L200,760Q200,760 200,760Q200,760 200,760L200,760Q200,760 200,760Q200,760 200,760Z"/>
+      android:fillColor="?attr/colorSecondary"
+      android:pathData="M5,21Q4.17,21 3.59,20.41Q3,19.82 3,19L3,5Q3,4.17 3.59,3.59Q4.17,3 5,3L19,3Q19.82,3 20.41,3.59Q21,4.17 21,5L21,19Q21,19.82 20.41,20.41Q19.82,21 19,21L5,21ZM17.27,19L19,19Q19,19 19,19Q19,19 19,19L19,17.27L17.27,19ZM5.85,19L7.67,19L10.68,16L12.8,16L9.8,19L11.4,19L14.4,16L16.52,16L13.53,19L15.15,19L18.15,16L19,16L19,5Q19,5 19,5Q19,5 19,5L5,5Q5,5 5,5Q5,5 5,5L5,17.73L6.72,16L8.85,16L5.85,19ZM7.65,14L6.25,12.6L10.68,8.18L12.68,10.18L16.35,6.5L17.75,7.9L12.68,13L10.68,11L7.65,14ZM5,19L5,5Q5,5 5,5Q5,5 5,5L5,5Q5,5 5,5Q5,5 5,5L5,19Q5,19 5,19Q5,19 5,19L5,19Q5,19 5,19Q5,19 5,19Z"/>
 </vector>
diff --git a/app/src/main/res/drawable-anydpi/ic_edit_notifications.xml b/app/src/main/res/drawable-anydpi/ic_edit_notifications.xml
index 95664449..059fbfcc 100644
--- a/app/src/main/res/drawable-anydpi/ic_edit_notifications.xml
+++ b/app/src/main/res/drawable-anydpi/ic_edit_notifications.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="?android:textColorPrimary"
+        android:fillColor="?attr/colorSecondary"
         android:pathData="M17.58,6.25l1.77,1.77L14.37,13H12.6v-1.77L17.58,6.25z M20.85,5.81l-1.06-1.06c-0.2-0.2-0.51-0.2-0.71,0l-0.85,0.85 l1.77,1.77l0.85-0.85C21.05,6.32,21.05,6,20.85,5.81z M18,12.2V17h2v2H4v-2h2v-7c0-2.79,1.91-5.14,4.5-5.8V3.5 C10.5,2.67,11.17,2,12,2s1.5,0.67,1.5,1.5v0.7c0.82,0.21,1.57,0.59,2.21,1.09l-1.43,1.43C13.64,6.26,12.85,6,12,6 c-2.21,0-4,1.79-4,4v7h8v-2.8L18,12.2z M10,20h4c0,1.1-0.9,2-2,2S10,21.1,10,20z" />
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-anydpi/ic_event.xml b/app/src/main/res/drawable-anydpi/ic_event.xml
index 4f999a77..e18355c2 100644
--- a/app/src/main/res/drawable-anydpi/ic_event.xml
+++ b/app/src/main/res/drawable-anydpi/ic_event.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="32dp"
-    android:height="32dp"
+    android:width="24dp"
+    android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="?android:textColorPrimary"
+        android:fillColor="?attr/colorSecondary"
         android:pathData="M19 4h-1V2h-2v2H8V2H6v2H5C3.89 4 3.01 4.9 3.01 6L3 20c0 1.1 0.89 2 2 2h14c1.1 0 2-0.9 2-2V6c0-1.1-0.9-2-2-2zm0 16H5V10h14v10zm0-12H5V6h14v2zm-7 5h5v5h-5z" />
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-anydpi/ic_feedback.xml b/app/src/main/res/drawable-anydpi/ic_feedback.xml
index 526e4c93..51da1f7f 100644
--- a/app/src/main/res/drawable-anydpi/ic_feedback.xml
+++ b/app/src/main/res/drawable-anydpi/ic_feedback.xml
@@ -4,9 +4,9 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="?android:textColorPrimary"
+        android:fillColor="?attr/colorSecondary"
         android:pathData="M20 2H4c-1.1 0-1.99 0.9 -1.99 2L2 22l4-4h14c1.1 0 2-0.9 2-2V4c0-1.1-0.9-2-2-2zm0 14H5.17l-0.59 0.59 -0.58 0.58 V4h16v12z" />
     <path
-        android:fillColor="?android:textColorPrimary"
+        android:fillColor="?attr/colorSecondary"
         android:pathData="M11 12h2v2h-2zm0-6h2v4h-2z" />
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-anydpi/ic_firebase.xml b/app/src/main/res/drawable-anydpi/ic_firebase.xml
index 4843ba26..eba8c1c2 100644
--- a/app/src/main/res/drawable-anydpi/ic_firebase.xml
+++ b/app/src/main/res/drawable-anydpi/ic_firebase.xml
@@ -4,9 +4,9 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="?android:textColorPrimary"
+        android:fillColor="?attr/colorSecondary"
         android:pathData="M17.4,6.9c0-0.4-0.3-0.7-0.6-0.7c-0.3-0.1-0.7,0-1,0.2l-1.3,1.3L12.9,5c-0.1-0.3-0.5-0.5-0.9-0.5 c-0.3,0-0.6,0.2-0.9,0.5l-0.4,0.8L9.2,3C9,2.6,8.5,2.3,8.1,2.5C7.7,2.6,7.4,2.9,7.4,3.3L4.8,17.4c0,0,0,0,0,0c0,0,0,0,0,0 c0,0,0,0.1,0,0.2c0,0,0,0,0,0c0,0,0,0.1,0,0.1c0,0,0,0.1,0.1,0.1C5,18,5.1,18.1,5.1,18.1c0.1,0.1,0.1,0.1,0.2,0.1l5.6,3.1 c0.4,0.2,0.7,0.3,1.2,0.3c0.4,0,0.7-0.1,1.1-0.2l5.7-3.2c0.2-0.1,0.3-0.4,0.3-0.6L17.4,6.9z M11.2,7.7C11.2,7.7,11.2,7.7,11.2,7.7 c0.3-0.2,0.4-0.4,0.3-0.6L12.1,6l1.5,2.7l-5.8,5.8L11.2,7.7z M8.4,4l1.7,3l-3.3,6.5L8.4,4z M12.6,20.2c-0.4,0.2-0.9,0.2-1.2,0 l-5-2.8l8-8.1c0.1,0,0.1,0,0.2-0.1c0.2-0.1,0.3-0.2,0.3-0.4l1.4-1.4l1.6,9.8L12.6,20.2z"
         android:strokeWidth="0.8"
-        android:strokeColor="?android:textColorPrimary"
+        android:strokeColor="?attr/colorSecondary"
         android:strokeMiterLimit="10" />
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-anydpi/ic_flag.xml b/app/src/main/res/drawable-anydpi/ic_flag.xml
index e97804ee..1cde46b9 100644
--- a/app/src/main/res/drawable-anydpi/ic_flag.xml
+++ b/app/src/main/res/drawable-anydpi/ic_flag.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="32dp"
-    android:height="32dp"
+    android:width="24dp"
+    android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="?android:textColorPrimary"
+        android:fillColor="?attr/colorSecondary"
         android:pathData="M12.36 6l0.4 2H18v6h-3.36l-0.4-2H7V6h5.36M14 4H5v17h2v-7h5.6l0.4 2h7V6h-5.6L14 4z" />
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-anydpi/ic_font_download.xml b/app/src/main/res/drawable-anydpi/ic_font_download.xml
index d588c105..344c7496 100644
--- a/app/src/main/res/drawable-anydpi/ic_font_download.xml
+++ b/app/src/main/res/drawable-anydpi/ic_font_download.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="?android:textColorPrimary"
+        android:fillColor="?attr/colorSecondary"
         android:pathData="M9.17 15.5h5.64l1.14 3h2.09l-5.11-13h-1.86l-5.11 13h2.09l1.12-3zM12 7.98l2.07 5.52H9.93L12 7.98zM20 2H4c-1.1 0-2 0.9-2 2v16c0 1.1 0.9 2 2 2h16c1.1 0 2-0.9 2-2V4c0-1.1-0.9-2-2-2zm0 18H4V4h16v16z" />
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-anydpi/ic_github.xml b/app/src/main/res/drawable-anydpi/ic_github.xml
index 9d0b9ed6..59eebc49 100644
--- a/app/src/main/res/drawable-anydpi/ic_github.xml
+++ b/app/src/main/res/drawable-anydpi/ic_github.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="?android:textColorPrimary"
+        android:fillColor="?attr/colorSecondary"
         android:pathData="M12 2A10 10 0 0 0 2 12c0 4.42 2.87 8.17 6.84 9.5 0.5 0.08 0.66-0.23 0.66-0.5v-1.69c-2.77 0.6-3.36-1.34-3.36-1.34-0.46-1.16-1.11-1.47-1.11-1.47-0.91-0.62 0.07-0.6 0.07-0.6 1 0.07 1.53 1.03 1.53 1.03 0.87 1.52 2.34 1.07 2.91 0.83 0.09-0.65 0.35-1.09 0.63-1.34-2.22-0.25-4.55-1.11-4.55-4.92 0-1.11 0.38-2 1.03-2.71-0.1-0.25-0.45-1.29 0.1-2.64 0 0 0.84-0.27 2.75 1.02 0.79-0.22 1.65-0.33 2.5-0.33 0.85 0 1.71 0.11 2.5 0.33 1.91-1.29 2.75-1.02 2.75-1.02 0.55 1.35 0.2 2.39 0.1 2.64 0.65 0.71 1.03 1.6 1.03 2.71 0 3.82-2.34 4.66-4.57 4.91 0.36 0.31 0.69 0.92 0.69 1.85V21c0 0.27 0.16 0.59 0.67 0.5C19.14 20.16 22 16.42 22 12A10 10 0 0 0 12 2z" />
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-anydpi/ic_google_dev.xml b/app/src/main/res/drawable-anydpi/ic_google_dev.xml
index bba53774..8fef22fa 100644
--- a/app/src/main/res/drawable-anydpi/ic_google_dev.xml
+++ b/app/src/main/res/drawable-anydpi/ic_google_dev.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="?android:textColorPrimary"
+        android:fillColor="?attr/colorSecondary"
         android:pathData="M12 13.9v-3.72h9.36c0.14 0.63 0.25 1.22 0.25 2.05 0 5.71-3.83 9.77-9.6 9.77C6.48 22 2 17.52 2 12S6.48 2 12 2c2.7 0 4.96 0.99 6.69 2.61l-2.84 2.76C15.13 6.69 13.88 5.88 12 5.88c-3.31 0-6.01 2.75-6.01 6.12s2.7 6.12 6.01 6.12c3.83 0 5.24-2.65 5.5-4.22H12z" />
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-anydpi/ic_grid_view.xml b/app/src/main/res/drawable-anydpi/ic_grid_view.xml
index f4779550..f8158e0c 100644
--- a/app/src/main/res/drawable-anydpi/ic_grid_view.xml
+++ b/app/src/main/res/drawable-anydpi/ic_grid_view.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="32dp"
-    android:height="32dp"
+    android:width="24dp"
+    android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="?android:textColorPrimary"
+        android:fillColor="?attr/colorSecondary"
         android:pathData="M3,3v8h8V3H3z M9,9H5V5h4V9z M3,13v8h8v-8H3z M9,19H5v-4h4V19z M13,3v8h8V3H13z M19,9h-4V5h4V9z M13,13v8h8v-8H13z M19,19h-4v-4h4V19z" />
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-anydpi/ic_help.xml b/app/src/main/res/drawable-anydpi/ic_help.xml
index c4ad29d1..ecaf2378 100644
--- a/app/src/main/res/drawable-anydpi/ic_help.xml
+++ b/app/src/main/res/drawable-anydpi/ic_help.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="?android:textColorPrimary"
+        android:fillColor="?attr/colorSecondary"
         android:pathData="M11 18h2v-2h-2v2zm1-16C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm0 18c-4.41 0-8-3.59-8-8s3.59-8 8-8 8 3.59 8 8-3.59 8-8 8zm0-14c-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-5 0-2.21-1.79-4-4-4z" />
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-anydpi/ic_history_edu.xml b/app/src/main/res/drawable-anydpi/ic_history_edu.xml
index 5adaa2f1..47a227ad 100644
--- a/app/src/main/res/drawable-anydpi/ic_history_edu.xml
+++ b/app/src/main/res/drawable-anydpi/ic_history_edu.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="32dp"
-    android:height="32dp"
+    android:width="24dp"
+    android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="?android:textColorPrimary"
+        android:fillColor="?attr/colorSecondary"
         android:pathData="M9,4v1.38c-0.83-0.33-1.72-0.5-2.61-0.5c-1.79,0-3.58,0.68-4.95,2.05l3.33,3.33h1.11v1.11c0.86,0.86,1.98,1.31,3.11,1.36 V15H6v3c0,1.1,0.9,2,2,2h10c1.66,0,3-1.34,3-3V4H9z M7.89,10.41V8.26H5.61L4.57,7.22C5.14,7,5.76,6.88,6.39,6.88 c1.34,0,2.59,0.52,3.54,1.46l1.41,1.41l-0.2,0.2c-0.51,0.51-1.19,0.8-1.92,0.8C8.75,10.75,8.29,10.63,7.89,10.41z M19,17 c0,0.55-0.45,1-1,1s-1-0.45-1-1v-2h-6v-2.59c0.57-0.23,1.1-0.57,1.56-1.03l0.2-0.2L15.59,14H17v-1.41l-6-5.97V6h8V17z" />
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-anydpi/ic_home.xml b/app/src/main/res/drawable-anydpi/ic_home.xml
index 7999b5cf..ac198d0a 100644
--- a/app/src/main/res/drawable-anydpi/ic_home.xml
+++ b/app/src/main/res/drawable-anydpi/ic_home.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="?android:textColorPrimary"
+        android:fillColor="?attr/colorSecondary"
         android:pathData="M12 3L4 9v12h16V9l-8-6zm6 16h-3v-6H9v6H6v-9l6-4.5 6 4.5v9z" />
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-anydpi/ic_image.xml b/app/src/main/res/drawable-anydpi/ic_image.xml
index 4073fb2f..fb23687c 100644
--- a/app/src/main/res/drawable-anydpi/ic_image.xml
+++ b/app/src/main/res/drawable-anydpi/ic_image.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="32dp"
-    android:height="32dp"
+    android:width="24dp"
+    android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="?android:textColorPrimary"
+        android:fillColor="?attr/colorSecondary"
         android:pathData="M19 5v14H5V5h14m0-2H5c-1.1 0-2 0.9-2 2v14c0 1.1 0.9 2 2 2h14c1.1 0 2-0.9 2-2V5c0-1.1-0.9-2-2-2zm-4.86 8.86l-3 3.87L9 13.14 6 17h12l-3.86-5.14z" />
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-anydpi/ic_label.xml b/app/src/main/res/drawable-anydpi/ic_label.xml
index 12882d1e..10c4d201 100644
--- a/app/src/main/res/drawable-anydpi/ic_label.xml
+++ b/app/src/main/res/drawable-anydpi/ic_label.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="?android:textColorPrimary"
+        android:fillColor="?attr/colorSecondary"
         android:pathData="M17.63 5.84C17.27 5.33 16.67 5 16 5L5 5.01C3.9 5.01 3 5.9 3 7v10c0 1.1 0.9 1.99 2 1.99L16 19c0.67 0 1.27-0.33 1.63-0.84L22 12l-4.37-6.16zM16 17H5V7h11l3.55 5L16 17z" />
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-anydpi/ic_language.xml b/app/src/main/res/drawable-anydpi/ic_language.xml
index 670141fd..6e16adc7 100644
--- a/app/src/main/res/drawable-anydpi/ic_language.xml
+++ b/app/src/main/res/drawable-anydpi/ic_language.xml
@@ -5,7 +5,7 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="?android:textColorPrimary"
+        android:fillColor="?attr/colorSecondary"
         android:pathData="M11.99 2C6.47 2 2 6.48 2 12s4.47 10 9.99 10C17.52 22 22 17.52 22 12S17.52 2 11.99 2zm6.93 6h-2.95c-0.32-1.25-0.78-2.45-1.38-3.56 1.84 0.63 3.37 1.91 4.33 3.56zM12 4.04c0.83 1.2 1.48 2.53 1.91 3.96h-3.82c0.43-1.43 1.08-2.76 1.91-3.96zM4.26 14C4.1 13.36 4 12.69 4 12s0.1-1.36 0.26 -2h3.38c-0.08 0.66 -0.14 1.32-0.14 2s0.06 1.34 0.14 2H4.26zm0.82 2h2.95c0.32 1.25 0.78 2.45 1.38 3.56-1.84-0.63-3.37-1.9-4.33-3.56zm2.95-8H5.08c0.96-1.66 2.49-2.93 4.33-3.56C8.81 5.55 8.35 6.75 8.03 8zM12 19.96c-0.83-1.2-1.48-2.53-1.91-3.96h3.82c-0.43 1.43-1.08 2.76-1.91 3.96zM14.34 14H9.66c-0.09-0.66-0.16-1.32-0.16-2s0.07-1.35 0.16 -2h4.68c0.09 0.65 0.16 1.32 0.16 2s-0.07 1.34-0.16 2zm0.25 5.56c0.6-1.11 1.06-2.31 1.38-3.56h2.95c-0.96 1.65-2.49 2.93-4.33 3.56zM16.36 14c0.08-0.66 0.14 -1.32 0.14 -2s-0.06-1.34-0.14-2h3.38c0.16 0.64 0.26 1.31 0.26 2s-0.1 1.36-0.26 2h-3.38z"
         tools:ignore="VectorPath" />
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-anydpi/ic_language_preference.xml b/app/src/main/res/drawable-anydpi/ic_language_preference.xml
index 2ff706b9..6e16adc7 100644
--- a/app/src/main/res/drawable-anydpi/ic_language_preference.xml
+++ b/app/src/main/res/drawable-anydpi/ic_language_preference.xml
@@ -1,11 +1,11 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    android:width="32dp"
-    android:height="32dp"
+    android:width="24dp"
+    android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="?android:textColorPrimary"
+        android:fillColor="?attr/colorSecondary"
         android:pathData="M11.99 2C6.47 2 2 6.48 2 12s4.47 10 9.99 10C17.52 22 22 17.52 22 12S17.52 2 11.99 2zm6.93 6h-2.95c-0.32-1.25-0.78-2.45-1.38-3.56 1.84 0.63 3.37 1.91 4.33 3.56zM12 4.04c0.83 1.2 1.48 2.53 1.91 3.96h-3.82c0.43-1.43 1.08-2.76 1.91-3.96zM4.26 14C4.1 13.36 4 12.69 4 12s0.1-1.36 0.26 -2h3.38c-0.08 0.66 -0.14 1.32-0.14 2s0.06 1.34 0.14 2H4.26zm0.82 2h2.95c0.32 1.25 0.78 2.45 1.38 3.56-1.84-0.63-3.37-1.9-4.33-3.56zm2.95-8H5.08c0.96-1.66 2.49-2.93 4.33-3.56C8.81 5.55 8.35 6.75 8.03 8zM12 19.96c-0.83-1.2-1.48-2.53-1.91-3.96h3.82c-0.43 1.43-1.08 2.76-1.91 3.96zM14.34 14H9.66c-0.09-0.66-0.16-1.32-0.16-2s0.07-1.35 0.16 -2h4.68c0.09 0.65 0.16 1.32 0.16 2s-0.07 1.34-0.16 2zm0.25 5.56c0.6-1.11 1.06-2.31 1.38-3.56h2.95c-0.96 1.65-2.49 2.93-4.33 3.56zM16.36 14c0.08-0.66 0.14 -1.32 0.14 -2s-0.06-1.34-0.14-2h3.38c0.16 0.64 0.26 1.31 0.26 2s-0.1 1.36-0.26 2h-3.38z"
         tools:ignore="VectorPath" />
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-anydpi/ic_libraries.xml b/app/src/main/res/drawable-anydpi/ic_libraries.xml
index c9e51701..a29402ed 100644
--- a/app/src/main/res/drawable-anydpi/ic_libraries.xml
+++ b/app/src/main/res/drawable-anydpi/ic_libraries.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="?android:textColorPrimary"
+        android:fillColor="?attr/colorSecondary"
         android:pathData="M18 2a2 2 0 0 1 2 2v16a2 2 0 0 1-2 2H6a2 2 0 0 1-2-2V4a2 2 0 0 1 2-2h12m0 2h-5v8l-2.5-2.25L8 12V4H6v16h12V4z" />
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-anydpi/ic_license.xml b/app/src/main/res/drawable-anydpi/ic_license.xml
index d08de0b9..702d8a9a 100644
--- a/app/src/main/res/drawable-anydpi/ic_license.xml
+++ b/app/src/main/res/drawable-anydpi/ic_license.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="?android:textColorPrimary"
+        android:fillColor="?attr/colorSecondary"
         android:pathData="M20 10c0-4.42-3.58-8-8-8s-8 3.58-8 8c0 2.03 0.76 3.87 2 5.28V23l6-2 6 2v-7.72c1.24-1.41 2-3.25 2-5.28zm-8-6c3.31 0 6 2.69 6 6s-2.69 6-6 6-6-2.69-6-6 2.69-6 6-6zm0 15l-4 1.02v-3.1c1.18 0.68 2.54 1.08 4 1.08s2.82-0.4 4-1.08v3.1L12 19zm-3-9c0-1.66 1.34-3 3-3s3 1.34 3 3-1.34 3-3 3-3-1.34-3-3z" />
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-anydpi/ic_linear_scale.xml b/app/src/main/res/drawable-anydpi/ic_linear_scale.xml
index bead13b7..345cfb68 100644
--- a/app/src/main/res/drawable-anydpi/ic_linear_scale.xml
+++ b/app/src/main/res/drawable-anydpi/ic_linear_scale.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="32dp"
-    android:height="32dp"
+    android:width="24dp"
+    android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="?android:textColorPrimary"
+        android:fillColor="?attr/colorSecondary"
         android:pathData="M19.5 9.5c-1.03 0-1.9 0.62 -2.29 1.5h-2.92c-0.39-0.88-1.26-1.5-2.29-1.5s-1.9 0.62 -2.29 1.5H6.79c-0.39-0.88-1.26-1.5-2.29-1.5C3.12 9.5 2 10.62 2 12s1.12 2.5 2.5 2.5c1.03 0 1.9-0.62 2.29-1.5h2.92c0.39 0.88 1.26 1.5 2.29 1.5s1.9-0.62 2.29-1.5h2.92c0.39 0.88 1.26 1.5 2.29 1.5 1.38 0 2.5-1.12 2.5-2.5s-1.12-2.5-2.5-2.5z" />
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-anydpi/ic_menu.xml b/app/src/main/res/drawable-anydpi/ic_menu.xml
index b33cfc1f..36f11bfc 100644
--- a/app/src/main/res/drawable-anydpi/ic_menu.xml
+++ b/app/src/main/res/drawable-anydpi/ic_menu.xml
@@ -1,10 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="?attr/colorControlNormal"
-    android:viewportWidth="960"
-    android:viewportHeight="960">
+    android:viewportWidth="24"
+    android:viewportHeight="24">
     <path
-        android:fillColor="@android:color/white"
-        android:pathData="M120,720L120,640L840,640L840,720L120,720ZM120,520L120,440L840,440L840,520L120,520ZM120,320L120,240L840,240L840,320L120,320Z" />
+        android:fillColor="?attr/colorSecondary"
+        android:pathData="M3,18L3,16L21,16L21,18L3,18ZM3,13L3,11L21,11L21,13L3,13ZM3,8L3,6L21,6L21,8L3,8Z" />
 </vector>
diff --git a/app/src/main/res/drawable-anydpi/ic_newsmode.xml b/app/src/main/res/drawable-anydpi/ic_newsmode.xml
index f682a2c7..9da3e37a 100644
--- a/app/src/main/res/drawable-anydpi/ic_newsmode.xml
+++ b/app/src/main/res/drawable-anydpi/ic_newsmode.xml
@@ -2,10 +2,9 @@
     android:width="24dp"
     android:height="24dp"
     android:autoMirrored="true"
-    android:tint="?attr/colorControlNormal"
-    android:viewportWidth="960"
-    android:viewportHeight="960">
+    android:viewportWidth="24"
+    android:viewportHeight="24">
     <path
-        android:fillColor="@android:color/white"
-        android:pathData="M160,840Q127,840 103.5,816.5Q80,793 80,760L80,200Q80,167 103.5,143.5Q127,120 160,120L800,120Q833,120 856.5,143.5Q880,167 880,200L880,760Q880,793 856.5,816.5Q833,840 800,840L160,840ZM160,760L800,760Q800,760 800,760Q800,760 800,760L800,200Q800,200 800,200Q800,200 800,200L160,200Q160,200 160,200Q160,200 160,200L160,760Q160,760 160,760Q160,760 160,760ZM240,680L720,680L720,600L240,600L240,680ZM240,520L400,520L400,280L240,280L240,520ZM480,520L720,520L720,440L480,440L480,520ZM480,360L720,360L720,280L480,280L480,360ZM160,760Q160,760 160,760Q160,760 160,760L160,200Q160,200 160,200Q160,200 160,200L160,200Q160,200 160,200Q160,200 160,200L160,760Q160,760 160,760Q160,760 160,760Z" />
+        android:fillColor="?attr/colorSecondary"
+        android:pathData="M4,21Q3.17,21 2.59,20.41Q2,19.82 2,19L2,5Q2,4.17 2.59,3.59Q3.17,3 4,3L20,3Q20.82,3 21.41,3.59Q22,4.17 22,5L22,19Q22,19.82 21.41,20.41Q20.82,21 20,21L4,21ZM4,19L20,19Q20,19 20,19Q20,19 20,19L20,5Q20,5 20,5Q20,5 20,5L4,5Q4,5 4,5Q4,5 4,5L4,19Q4,19 4,19Q4,19 4,19ZM6,17L18,17L18,15L6,15L6,17ZM6,13L10,13L10,7L6,7L6,13ZM12,13L18,13L18,11L12,11L12,13ZM12,9L18,9L18,7L12,7L12,9ZM4,19Q4,19 4,19Q4,19 4,19L4,5Q4,5 4,5Q4,5 4,5L4,5Q4,5 4,5Q4,5 4,5L4,19Q4,19 4,19Q4,19 4,19Z" />
 </vector>
diff --git a/app/src/main/res/drawable-anydpi/ic_newsmode_filled.xml b/app/src/main/res/drawable-anydpi/ic_newsmode_filled.xml
index b6a7b72f..84f64ceb 100644
--- a/app/src/main/res/drawable-anydpi/ic_newsmode_filled.xml
+++ b/app/src/main/res/drawable-anydpi/ic_newsmode_filled.xml
@@ -2,10 +2,9 @@
     android:width="24dp"
     android:height="24dp"
     android:autoMirrored="true"
-    android:tint="?attr/colorControlNormal"
-    android:viewportWidth="960"
-    android:viewportHeight="960">
+    android:viewportWidth="24"
+    android:viewportHeight="24">
     <path
-        android:fillColor="@android:color/white"
-        android:pathData="M160,840Q127,840 103.5,816.5Q80,793 80,760L80,200Q80,167 103.5,143.5Q127,120 160,120L800,120Q833,120 856.5,143.5Q880,167 880,200L880,760Q880,793 856.5,816.5Q833,840 800,840L160,840ZM240,680L720,680L720,600L240,600L240,680ZM240,520L400,520L400,280L240,280L240,520ZM480,520L720,520L720,440L480,440L480,520ZM480,360L720,360L720,280L480,280L480,360Z" />
+        android:fillColor="?attr/colorSecondary"
+        android:pathData="M4,21Q3.17,21 2.59,20.41Q2,19.82 2,19L2,5Q2,4.17 2.59,3.59Q3.17,3 4,3L20,3Q20.82,3 21.41,3.59Q22,4.17 22,5L22,19Q22,19.82 21.41,20.41Q20.82,21 20,21L4,21ZM6,17L18,17L18,15L6,15L6,17ZM6,13L10,13L10,7L6,7L6,13ZM12,13L18,13L18,11L12,11L12,13ZM12,9L18,9L18,7L12,7L12,9Z" />
 </vector>
diff --git a/app/src/main/res/drawable-anydpi/ic_password.xml b/app/src/main/res/drawable-anydpi/ic_password.xml
index 0a429a3c..f4c687de 100644
--- a/app/src/main/res/drawable-anydpi/ic_password.xml
+++ b/app/src/main/res/drawable-anydpi/ic_password.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="32dp"
-    android:height="32dp"
+    android:width="24dp"
+    android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="?android:textColorPrimary"
+        android:fillColor="?attr/colorSecondary"
         android:pathData="M2,17h20v2H2V17z M3.15,12.95L4,11.47l0.85,1.48l1.3-0.75L5.3,10.72H7v-1.5H5.3l0.85-1.47L4.85,7L4,8.47L3.15,7l-1.3,0.75 L2.7,9.22H1v1.5h1.7L1.85,12.2L3.15,12.95z M9.85,12.2l1.3,0.75L12,11.47l0.85,1.48l1.3-0.75l-0.85-1.48H15v-1.5h-1.7l0.85-1.47 L12.85,7L12,8.47L11.15,7l-1.3,0.75l0.85,1.47H9v1.5h1.7L9.85,12.2z M23,9.22h-1.7l0.85-1.47L20.85,7L20,8.47L19.15,7l-1.3,0.75 l0.85,1.47H17v1.5h1.7l-0.85,1.48l1.3,0.75L20,11.47l0.85,1.48l1.3-0.75l-0.85-1.48H23V9.22z" />
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-anydpi/ic_perm_device_information.xml b/app/src/main/res/drawable-anydpi/ic_perm_device_information.xml
index 9c811fa6..01891b3f 100644
--- a/app/src/main/res/drawable-anydpi/ic_perm_device_information.xml
+++ b/app/src/main/res/drawable-anydpi/ic_perm_device_information.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="?android:textColorPrimary"
+        android:fillColor="?attr/colorSecondary"
         android:pathData="M11 7h2v2h-2zm0 4h2v6h-2zm6-9.99L7 1c-1.1 0-2 0.9-2 2v18c0 1.1 0.9 2 2 2h10c1.1 0 2-0.9 2-2V3c0-1.1-0.9-1.99-2-1.99zM17 21H7v-1h10v1zm0-3H7V6h10v12zM7 4V3h10v1H7z" />
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-anydpi/ic_permissions.xml b/app/src/main/res/drawable-anydpi/ic_permissions.xml
index 2b095136..6077cdc5 100644
--- a/app/src/main/res/drawable-anydpi/ic_permissions.xml
+++ b/app/src/main/res/drawable-anydpi/ic_permissions.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="?android:textColorPrimary"
+        android:fillColor="?attr/colorSecondary"
         android:pathData="M12 3.19l7 3.11V11c0 4.52-2.98 8.69-7 9.93-4.02-1.24-7-5.41-7-9.93V6.3l7-3.11M12 1L3 5v6c0 5.55 3.84 10.74 9 12 5.16-1.26 9-6.45 9-12V5l-9-4zm-1 6h2v2h-2V7zm0 4h2v6h-2v-6z" />
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-anydpi/ic_permissions_tutorial.xml b/app/src/main/res/drawable-anydpi/ic_permissions_tutorial.xml
index 065be11b..c11a7c76 100644
--- a/app/src/main/res/drawable-anydpi/ic_permissions_tutorial.xml
+++ b/app/src/main/res/drawable-anydpi/ic_permissions_tutorial.xml
@@ -1,14 +1,14 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="32dp"
-    android:height="32dp"
+    android:width="24dp"
+    android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="?android:textColorPrimary"
+        android:fillColor="?attr/colorSecondary"
         android:fillType="evenOdd"
         android:pathData="M20 3H4C2.9 3 2 3.9 2 5v14c0 1.1 0.9 2 2 2h16c1.1 0 2-0.9 2-2V5c0-1.1-0.9-2-2-2zm0 16H4V5h16v14z" />
     <path
-        android:fillColor="?android:textColorPrimary"
+        android:fillColor="?attr/colorSecondary"
         android:fillType="evenOdd"
         android:pathData="M19.41 10.42L17.99 9l-3.17 3.17-1.41-1.42L12 12.16 14.82 15zM5 7h5v2H5V7zm0 4h5v2H5v-2zm0 4h5v2H5v-2z" />
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-anydpi/ic_privacy_policy.xml b/app/src/main/res/drawable-anydpi/ic_privacy_policy.xml
index 24f55c0d..5afc6876 100644
--- a/app/src/main/res/drawable-anydpi/ic_privacy_policy.xml
+++ b/app/src/main/res/drawable-anydpi/ic_privacy_policy.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="?android:textColorPrimary"
+        android:fillColor="?attr/colorSecondary"
         android:pathData="M12 1L3 5v6c0 5.55 3.84 10.74 9 12 5.16-1.26 9-6.45 9-12V5l-9-4zm7 10c0 1.85-0.51 3.65-1.38 5.21l-1.45-1.45c1.29-1.94 1.07-4.58-0.64-6.29-1.95-1.95-5.12-1.95-7.07 0-1.95 1.95-1.95 5.12 0 7.07 1.71 1.71 4.35 1.92 6.29 0.64l1.72 1.72c-1.19 1.42-2.73 2.51-4.47 3.04-4.02-1.25-7-5.42-7-9.94V6.3l7-3.11 7 3.11V11zm-7 4c-1.66 0-3-1.34-3-3s1.34-3 3-3 3 1.34 3 3-1.34 3-3 3z" />
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-anydpi/ic_progress_bar.xml b/app/src/main/res/drawable-anydpi/ic_progress_bar.xml
index d12c4000..2a5c237b 100644
--- a/app/src/main/res/drawable-anydpi/ic_progress_bar.xml
+++ b/app/src/main/res/drawable-anydpi/ic_progress_bar.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="32dp"
-    android:height="32dp"
+    android:width="24dp"
+    android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="?android:textColorPrimary"
+        android:fillColor="?attr/colorSecondary"
         android:pathData="M12 22C6.49 22 2 17.51 2 12S6.49 2 12 2c0.55 0 1 0.45 1 1s-0.45 1-1 1c-4.41 0-8 3.59-8 8s3.59 8 8 8 8-3.59 8-8c0-0.55 0.45 -1 1-1s1 0.45 1 1c0 5.51-4.49 10-10 10z" />
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-anydpi/ic_radio_button.xml b/app/src/main/res/drawable-anydpi/ic_radio_button.xml
index 8baf27ea..0ed34d7a 100644
--- a/app/src/main/res/drawable-anydpi/ic_radio_button.xml
+++ b/app/src/main/res/drawable-anydpi/ic_radio_button.xml
@@ -1,12 +1,12 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="32dp"
-    android:height="32dp"
+    android:width="24dp"
+    android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="?android:textColorPrimary"
+        android:fillColor="?attr/colorSecondary"
         android:pathData="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm0 18c-4.42 0-8-3.58-8-8s3.58-8 8-8 8 3.58 8 8-3.58 8-8 8z" />
     <path
-        android:fillColor="?android:textColorPrimary"
+        android:fillColor="?attr/colorSecondary"
         android:pathData="M 12 7 C 14.7614237492 7 17 9.23857625085 17 12 C 17 14.7614237492 14.7614237492 17 12 17 C 9.23857625085 17 7 14.7614237492 7 12 C 7 9.23857625085 9.23857625085 7 12 7 Z" />
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-anydpi/ic_rate_review.xml b/app/src/main/res/drawable-anydpi/ic_rate_review.xml
index 41992d5b..f5c0c11a 100644
--- a/app/src/main/res/drawable-anydpi/ic_rate_review.xml
+++ b/app/src/main/res/drawable-anydpi/ic_rate_review.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="32dp"
-    android:height="32dp"
+    android:width="24dp"
+    android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="?android:textColorPrimary"
+        android:fillColor="?attr/colorSecondary"
         android:pathData="M20 2H4c-1.1 0-1.99 0.9 -1.99 2L2 22l4-4h14c1.1 0 2-0.9 2-2V4c0-1.1-0.9-2-2-2zm0 14H5.17l-0.59 0.59 -0.58 0.58 V4h16v12zm-9.5-2H18v-2h-5.5zm3.86-5.87c0.2-0.2 0.2 -0.51 0-0.71l-1.77-1.77c-0.2-0.2-0.51-0.2-0.71 0L6 11.53V14h2.47l5.89-5.87z" />
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-anydpi/ic_search.xml b/app/src/main/res/drawable-anydpi/ic_search.xml
index dc5f602c..24324c85 100644
--- a/app/src/main/res/drawable-anydpi/ic_search.xml
+++ b/app/src/main/res/drawable-anydpi/ic_search.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="?android:textColorPrimary"
+        android:fillColor="?attr/colorSecondary"
         android:pathData="M15.5,14h-0.79l-0.28,-0.27C15.41,12.59,16,11.11,16,9.5 16,5.91,13.09,3,9.5,3 5.91,3,3,5.91,3,9.5 3,13.09,5.91,16,9.5,16c1.61,0,3.09,-0.59,4.23,-1.57l0.27,0.28v0.79l5,4.99L20.49,19l-4.99,-5zM9.5,14c-2.49,0,-4.5,-2.01,-4.5,-4.5S7.01,5,9.5,5 14,7.01,14,9.5 11.99,14,9.5,14z"/>
 </vector>
diff --git a/app/src/main/res/drawable-anydpi/ic_settings.xml b/app/src/main/res/drawable-anydpi/ic_settings.xml
index e75b43da..3541a2e6 100644
--- a/app/src/main/res/drawable-anydpi/ic_settings.xml
+++ b/app/src/main/res/drawable-anydpi/ic_settings.xml
@@ -5,10 +5,10 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="?android:textColorPrimary"
+        android:fillColor="?attr/colorSecondary"
         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.46 0-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.46L8.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.91c-0.1 0.68-0.72 1.22-1.46 1.22zm-3.23-2h2.76l0.37-2.55 0.53-0.22c0.44-0.18 0.88-0.44 1.34-0.78l0.45-0.34 2.38 0.96 1.38-2.4-2.03-1.58 0.07-0.56c0.03-0.26 0.06-0.51 0.06-0.78s-0.03-0.53-0.06-0.78l-0.07-0.56 2.03-1.58-1.39-2.4-2.39 0.96-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.3 9.72 6.51C9.28 6.7 8.84 6.95 8.38 7.3L7.93 7.63 5.55 6.68 4.16 9.07l2.03 1.58-0.07 0.56A7 7 0 0 0 6.06 12c0 0.26 0.02 0.53 0.06 0.78l0.07 0.56-2.03 1.58 1.38 2.4 2.39-0.96 0.45 0.35c0.43 0.33 0.86 0.58 1.33 0.77l0.53 0.22 0.38 2.55z"
         tools:ignore="VectorPath" />
     <path
-        android:fillColor="?android:textColorPrimary"
+        android:fillColor="?attr/colorSecondary"
         android:pathData="M12 8.5c1.933 0 3.5 1.567 3.5 3.5s-1.567 3.5-3.5 3.5-3.5-1.567-3.5-3.5 1.567-3.5 3.5-3.5z" />
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-anydpi/ic_share.xml b/app/src/main/res/drawable-anydpi/ic_share.xml
index 1cbfac3c..39e50ad8 100644
--- a/app/src/main/res/drawable-anydpi/ic_share.xml
+++ b/app/src/main/res/drawable-anydpi/ic_share.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="?android:textColorPrimary"
+        android:fillColor="?attr/colorSecondary"
         android:pathData="M18 16c-0.79 0-1.5 0.31-2.03 0.81L8.91 12.7C8.96 12.47 9 12.24 9 12s-0.04-0.47-0.09-0.7l7.05-4.11C16.49 7.69 17.21 8 18 8c1.66 0 3-1.34 3-3s-1.34-3-3-3-3 1.34-3 3c0 0.24 0.04 0.48 0.09 0.7L8.04 9.81C7.5 9.31 6.79 9 6 9c-1.66 0-3 1.34-3 3s1.34 3 3 3c0.79 0 1.5-0.31 2.04-0.81l7.05 4.12C15.04 18.53 15 18.76 15 19c0 1.66 1.34 3 3 3s3-1.34 3-3-1.34-3-3-3zm0-12c0.55 0 1 0.45 1 1s-0.45 1-1 1-1-0.45-1-1 0.45-1 1-1zM6 13c-0.55 0-1-0.45-1-1s0.45-1 1-1 1 0.45 1 1-0.45 1-1 1zm12 7c-0.55 0-1-0.45-1-1s0.45-1 1-1 1 0.45 1 1-0.45 1-1 1z" />
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-anydpi/ic_shop.xml b/app/src/main/res/drawable-anydpi/ic_shop.xml
index f2054eb9..8f65be60 100644
--- a/app/src/main/res/drawable-anydpi/ic_shop.xml
+++ b/app/src/main/res/drawable-anydpi/ic_shop.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="?android:textColorPrimary"
+        android:fillColor="?attr/colorSecondary"
         android:pathData="M16 6V4c0-1.11-0.89-2-2-2h-4C8.89 2 8 2.89 8 4v2H2v13c0 1.11 0.89 2 2 2h16c1.11 0 2-0.89 2-2V6h-6zm-6-2h4v2h-4V4zm10 15H4V8h16v11zM9 18l7.5-5L9 9z" />
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-anydpi/ic_shortcut.xml b/app/src/main/res/drawable-anydpi/ic_shortcut.xml
index 8ee5d417..fda8cbd5 100644
--- a/app/src/main/res/drawable-anydpi/ic_shortcut.xml
+++ b/app/src/main/res/drawable-anydpi/ic_shortcut.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="32dp"
-    android:height="32dp"
+    android:width="24dp"
+    android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="?android:textColorPrimary"
+        android:fillColor="?attr/colorSecondary"
         android:pathData="M15 5l-1.41 1.41L15 7.83 17.17 10H8c-2.76 0-5 2.24-5 5v4h2v-4c0-1.65 1.35-3 3-3h9.17L15 14.17l-1.41 1.41L15 17l6-6-6-6z" />
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-anydpi/ic_signal_cellular.xml b/app/src/main/res/drawable-anydpi/ic_signal_cellular.xml
index 0f67a4b5..487195ba 100644
--- a/app/src/main/res/drawable-anydpi/ic_signal_cellular.xml
+++ b/app/src/main/res/drawable-anydpi/ic_signal_cellular.xml
@@ -1,10 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:tint="?attr/colorControlNormal">
+    android:viewportWidth="24"
+    android:viewportHeight="24">
   <path
-      android:fillColor="@android:color/white"
-      android:pathData="M260,800Q235,800 217.5,782.5Q200,765 200,740L200,620Q200,595 217.5,577.5Q235,560 260,560Q285,560 302.5,577.5Q320,595 320,620L320,740Q320,765 302.5,782.5Q285,800 260,800ZM500,800Q475,800 457.5,782.5Q440,765 440,740L440,420Q440,395 457.5,377.5Q475,360 500,360Q525,360 542.5,377.5Q560,395 560,420L560,740Q560,765 542.5,782.5Q525,800 500,800ZM740,800Q715,800 697.5,782.5Q680,765 680,740L680,220Q680,195 697.5,177.5Q715,160 740,160Q765,160 782.5,177.5Q800,195 800,220L800,740Q800,765 782.5,782.5Q765,800 740,800Z"/>
+      android:fillColor="?attr/colorSecondary"
+      android:pathData="M6.5,20Q5.88,20 5.44,19.56Q5,19.12 5,18.5L5,15.5Q5,14.88 5.44,14.44Q5.88,14 6.5,14Q7.12,14 7.56,14.44Q8,14.88 8,15.5L8,18.5Q8,19.12 7.56,19.56Q7.12,20 6.5,20ZM12.5,20Q11.88,20 11.44,19.56Q11,19.12 11,18.5L11,10.5Q11,9.88 11.44,9.44Q11.88,9 12.5,9Q13.12,9 13.56,9.44Q14,9.88 14,10.5L14,18.5Q14,19.12 13.56,19.56Q13.12,20 12.5,20ZM18.5,20Q17.88,20 17.44,19.56Q17,19.12 17,18.5L17,5.5Q17,4.88 17.44,4.44Q17.88,4 18.5,4Q19.12,4 19.56,4.44Q20,4.88 20,5.5L20,18.5Q20,19.12 19.56,19.56Q19.12,20 18.5,20Z"/>
 </vector>
diff --git a/app/src/main/res/drawable-anydpi/ic_simple_notification.xml b/app/src/main/res/drawable-anydpi/ic_simple_notification.xml
index 6d8c9f07..8321af88 100644
--- a/app/src/main/res/drawable-anydpi/ic_simple_notification.xml
+++ b/app/src/main/res/drawable-anydpi/ic_simple_notification.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="32dp"
-    android:height="32dp"
+    android:width="24dp"
+    android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="?android:textColorPrimary"
+        android:fillColor="?attr/colorSecondary"
         android:pathData="M12 22c1.1 0 2-0.9 2-2h-4c0 1.1 0.9 2 2 2zm6-6v-5c0-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 11v5l-2 2v1h16v-1l-2-2zm-2 1H8v-6c0-2.48 1.51-4.5 4-4.5s4 2.02 4 4.5v6z" />
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-anydpi/ic_star.xml b/app/src/main/res/drawable-anydpi/ic_star.xml
index c3577f8c..965cc86a 100644
--- a/app/src/main/res/drawable-anydpi/ic_star.xml
+++ b/app/src/main/res/drawable-anydpi/ic_star.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="32dp"
-    android:height="32dp"
+    android:width="24dp"
+    android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="?android:textColorPrimary"
+        android:fillColor="?attr/colorSecondary"
         android:pathData="M22 9.24l-7.19-0.62L12 2 9.19 8.63 2 9.24l5.46 4.73L5.82 21 12 17.27 18.18 21l-1.63-7.03L22 9.24zM12 15.4l-3.76 2.27 1-4.28-3.32-2.88 4.38-0.38L12 6.1l1.71 4.04 4.38 0.38 -3.32 2.88 1 4.28L12 15.4z" />
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-anydpi/ic_support.xml b/app/src/main/res/drawable-anydpi/ic_support.xml
index 748ead18..f1acabd1 100644
--- a/app/src/main/res/drawable-anydpi/ic_support.xml
+++ b/app/src/main/res/drawable-anydpi/ic_support.xml
@@ -4,9 +4,9 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="?android:textColorPrimary"
+        android:fillColor="?attr/colorSecondary"
         android:pathData="M16,13c3.09-2.81,6-5.44,6-7.7C22,3.45,20.55,2,18.7,2c-1.04,0-2.05,0.49-2.7,1.25C15.34,2.49,14.34,2,13.3,2 C11.45,2,10,3.45,10,5.3C10,7.56,12.91,10.19,16,13z M13.3,4c0.44,0,0.89,0.21,1.18,0.55L16,6.34l1.52-1.79 C17.81,4.21,18.26,4,18.7,4C19.44,4,20,4.56,20,5.3c0,1.12-2.04,3.17-4,4.99c-1.96-1.82-4-3.88-4-4.99C12,4.56,12.56,4,13.3,4z" />
     <path
-        android:fillColor="?android:textColorPrimary"
+        android:fillColor="?attr/colorSecondary"
         android:pathData="M19,16h-2c0-1.2-0.75-2.28-1.87-2.7L8.97,11H1v11h6v-1.44l7,1.94l8-2.5v-1C22,17.34,20.66,16,19,16z M3,20v-7h2v7H3z M13.97,20.41L7,18.48V13h1.61l5.82,2.17C14.77,15.3,15,15.63,15,16c0,0-1.99-0.05-2.3-0.15l-2.38-0.79l-0.63,1.9l2.38,0.79 c0.51,0.17,1.04,0.26,1.58,0.26H19c0.39,0,0.74,0.23,0.9,0.56L13.97,20.41z" />
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-anydpi/ic_swap_driving_apps_wheel.xml b/app/src/main/res/drawable-anydpi/ic_swap_driving_apps_wheel.xml
index ac23f3bb..44ad6dad 100644
--- a/app/src/main/res/drawable-anydpi/ic_swap_driving_apps_wheel.xml
+++ b/app/src/main/res/drawable-anydpi/ic_swap_driving_apps_wheel.xml
@@ -2,11 +2,10 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:width="24dp"
     android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:tint="?attr/colorControlNormal">
+    android:viewportWidth="24"
+    android:viewportHeight="24">
   <path
-      android:fillColor="@android:color/white"
-      android:pathData="M480,880Q398,880 325,848.5Q252,817 197.5,762.5Q143,708 111.5,635Q80,562 80,480Q80,397 111.5,324.5Q143,252 197.5,197.5Q252,143 325,111.5Q398,80 480,80Q563,80 635.5,111.5Q708,143 762.5,197.5Q817,252 848.5,324.5Q880,397 880,480Q880,562 848.5,635Q817,708 762.5,762.5Q708,817 635.5,848.5Q563,880 480,880ZM480,640Q540,640 597,657.5Q654,675 704,708Q750,662 775,603.5Q800,545 800,480Q800,346 707,253Q614,160 480,160Q346,160 253,253Q160,346 160,480Q160,545 184.5,604Q209,663 256,708Q306,675 363,657.5Q420,640 480,640ZM480,720Q439,720 400,730Q361,740 326,760Q361,780 400,790Q439,800 480,800Q521,800 560,790Q599,780 634,760Q599,740 560,730Q521,720 480,720ZM280,440Q297,440 308.5,428.5Q320,417 320,400Q320,383 308.5,371.5Q297,360 280,360Q263,360 251.5,371.5Q240,383 240,400Q240,417 251.5,428.5Q263,440 280,440ZM400,320Q417,320 428.5,308.5Q440,297 440,280Q440,263 428.5,251.5Q417,240 400,240Q383,240 371.5,251.5Q360,263 360,280Q360,297 371.5,308.5Q383,320 400,320ZM680,440Q697,440 708.5,428.5Q720,417 720,400Q720,383 708.5,371.5Q697,360 680,360Q663,360 651.5,371.5Q640,383 640,400Q640,417 651.5,428.5Q663,440 680,440ZM480,560Q513,560 536.5,536.5Q560,513 560,480Q560,467 556,454.5Q552,442 544,432L598,296Q605,280 598.5,264.5Q592,249 576,242Q561,235 545.5,241.5Q530,248 524,264L470,400Q440,405 420,427.5Q400,450 400,480Q400,513 423.5,536.5Q447,560 480,560ZM480,640Q480,640 480,640Q480,640 480,640Q480,640 480,640Q480,640 480,640L480,640Q480,640 480,640Q480,640 480,640Q480,640 480,640Q480,640 480,640ZM480,434Q480,434 480,434Q480,434 480,434Q480,434 480,434Q480,434 480,434Q480,434 480,434Q480,434 480,434Q480,434 480,434Q480,434 480,434Q480,434 480,434Q480,434 480,434Q480,434 480,434Q480,434 480,434ZM480,720Q480,720 480,720Q480,720 480,720Q480,720 480,720Q480,720 480,720Q480,720 480,720Q480,720 480,720Q480,720 480,720Q480,720 480,720Z"
+      android:fillColor="?attr/colorSecondary"
+      android:pathData="M12,22Q9.95,22 8.12,21.21Q6.3,20.43 4.94,19.06Q3.58,17.7 2.79,15.88Q2,14.05 2,12Q2,9.93 2.79,8.11Q3.58,6.3 4.94,4.94Q6.3,3.58 8.12,2.79Q9.95,2 12,2Q14.07,2 15.89,2.79Q17.7,3.58 19.06,4.94Q20.43,6.3 21.21,8.11Q22,9.93 22,12Q22,14.05 21.21,15.88Q20.43,17.7 19.06,19.06Q17.7,20.43 15.89,21.21Q14.07,22 12,22ZM12,16Q13.5,16 14.93,16.44Q16.35,16.88 17.6,17.7Q18.75,16.55 19.38,15.09Q20,13.62 20,12Q20,8.65 17.68,6.33Q15.35,4 12,4Q8.65,4 6.33,6.33Q4,8.65 4,12Q4,13.62 4.61,15.1Q5.22,16.57 6.4,17.7Q7.65,16.88 9.07,16.44Q10.5,16 12,16ZM12,18Q10.97,18 10,18.25Q9.03,18.5 8.15,19Q9.03,19.5 10,19.75Q10.97,20 12,20Q13.03,20 14,19.75Q14.97,19.5 15.85,19Q14.97,18.5 14,18.25Q13.03,18 12,18ZM7,11Q7.42,11 7.71,10.71Q8,10.43 8,10Q8,9.57 7.71,9.29Q7.42,9 7,9Q6.58,9 6.29,9.29Q6,9.57 6,10Q6,10.43 6.29,10.71Q6.58,11 7,11ZM10,8Q10.43,8 10.71,7.71Q11,7.42 11,7Q11,6.58 10.71,6.29Q10.43,6 10,6Q9.57,6 9.29,6.29Q9,6.58 9,7Q9,7.42 9.29,7.71Q9.57,8 10,8ZM17,11Q17.43,11 17.71,10.71Q18,10.43 18,10Q18,9.57 17.71,9.29Q17.43,9 17,9Q16.57,9 16.29,9.29Q16,9.57 16,10Q16,10.43 16.29,10.71Q16.57,11 17,11ZM12,14Q12.82,14 13.41,13.41Q14,12.82 14,12Q14,11.68 13.9,11.36Q13.8,11.05 13.6,10.8L14.95,7.4Q15.12,7 14.96,6.61Q14.8,6.22 14.4,6.05Q14.03,5.88 13.64,6.04Q13.25,6.2 13.1,6.6L11.75,10Q11,10.12 10.5,10.69Q10,11.25 10,12Q10,12.82 10.59,13.41Q11.18,14 12,14ZM12,16Q12,16 12,16Q12,16 12,16Q12,16 12,16Q12,16 12,16L12,16Q12,16 12,16Q12,16 12,16Q12,16 12,16Q12,16 12,16ZM12,10.85Q12,10.85 12,10.85Q12,10.85 12,10.85Q12,10.85 12,10.85Q12,10.85 12,10.85Q12,10.85 12,10.85Q12,10.85 12,10.85Q12,10.85 12,10.85Q12,10.85 12,10.85Q12,10.85 12,10.85Q12,10.85 12,10.85Q12,10.85 12,10.85Q12,10.85 12,10.85ZM12,18Q12,18 12,18Q12,18 12,18Q12,18 12,18Q12,18 12,18Q12,18 12,18Q12,18 12,18Q12,18 12,18Q12,18 12,18Z"
       tools:ignore="VectorPath" />
 </vector>
diff --git a/app/src/main/res/drawable-anydpi/ic_swipe_black.xml b/app/src/main/res/drawable-anydpi/ic_swipe_black.xml
index 4b1f8392..031659eb 100644
--- a/app/src/main/res/drawable-anydpi/ic_swipe_black.xml
+++ b/app/src/main/res/drawable-anydpi/ic_swipe_black.xml
@@ -1,12 +1,12 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="32dp"
-    android:height="32dp"
+    android:width="24dp"
+    android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="?android:textColorPrimary"
+        android:fillColor="?attr/colorSecondary"
         android:pathData="M20.5,2v2.02C18.18,2.13,15.22,1,12,1S5.82,2.13,3.5,4.02V2H2v3.5V7h1.5H7V5.5H4.09c2.11-1.86,4.88-3,7.91-3 s5.79,1.14,7.91,3H17V7h3.5H22V5.5V2H20.5z" />
     <path
-        android:fillColor="?android:textColorPrimary"
+        android:fillColor="?attr/colorSecondary"
         android:pathData="M18.89,13.77l-3.8-1.67C14.96,12.04,14.81,12,14.65,12H14l0-4.37c0-1.32-0.96-2.5-2.27-2.62C10.25,4.88,9,6.05,9,7.5 v8.15l-1.87-0.4c-0.19-0.03-1.02-0.15-1.73,0.56L4,17.22l5.12,5.19C9.49,22.79,10,23,10.53,23h6.55c0.98,0,1.81-0.7,1.97-1.67 l0.92-5.44C20.12,15.03,19.68,14.17,18.89,13.77z M18,15.56L17.08,21h-6.55l-3.7-3.78L11,18.11V7.5C11,7.22,11.22,7,11.5,7 S12,7.22,12,7.5v6.18h1.76L18,15.56z" />
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-anydpi/ic_table_view.xml b/app/src/main/res/drawable-anydpi/ic_table_view.xml
index 32969195..78cbb3c2 100644
--- a/app/src/main/res/drawable-anydpi/ic_table_view.xml
+++ b/app/src/main/res/drawable-anydpi/ic_table_view.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="32dp"
-    android:height="32dp"
+    android:width="24dp"
+    android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="?android:textColorPrimary"
+        android:fillColor="?attr/colorSecondary"
         android:pathData="M19,7H9C7.9,7,7,7.9,7,9v10c0,1.1,0.9,2,2,2h10c1.1,0,2-0.9,2-2V9C21,7.9,20.1,7,19,7z M19,9v2H9V9H19z M13,15v-2h2v2H13z M15,17v2h-2v-2H15z M11,15H9v-2h2V15z M17,13h2v2h-2V13z M9,17h2v2H9V17z M17,19v-2h2v2H17z M6,17H5c-1.1,0-2-0.9-2-2V5 c0-1.1,0.9-2,2-2h10c1.1,0,2,0.9,2,2v1h-2V5H5v10h1V17z" />
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-anydpi/ic_terms_of_service.xml b/app/src/main/res/drawable-anydpi/ic_terms_of_service.xml
index 992e8218..fe4b46fd 100644
--- a/app/src/main/res/drawable-anydpi/ic_terms_of_service.xml
+++ b/app/src/main/res/drawable-anydpi/ic_terms_of_service.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="?android:textColorPrimary"
+        android:fillColor="?attr/colorSecondary"
         android:pathData="M12 1L3 5v6c0 5.55 3.84 10.74 9 12 5.16-1.26 9-6.45 9-12V5l-9-4zm0 10.99h7c-0.53 4.12-3.28 7.79-7 8.94V12H5V6.3l7-3.11v8.8z" />
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-anydpi/ic_text.xml b/app/src/main/res/drawable-anydpi/ic_text.xml
index 5d2894df..e2590733 100644
--- a/app/src/main/res/drawable-anydpi/ic_text.xml
+++ b/app/src/main/res/drawable-anydpi/ic_text.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="32dp"
-    android:height="32dp"
+    android:width="24dp"
+    android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="?android:textColorPrimary"
+        android:fillColor="?attr/colorSecondary"
         android:pathData="M9 4v3h5v12h3V7h5V4H9zm-6 8h3v7h3v-7h3V9H3v3z" />
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-anydpi/ic_theme.xml b/app/src/main/res/drawable-anydpi/ic_theme.xml
index 28150036..e04014eb 100644
--- a/app/src/main/res/drawable-anydpi/ic_theme.xml
+++ b/app/src/main/res/drawable-anydpi/ic_theme.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="?android:textColorPrimary"
+        android:fillColor="?attr/colorSecondary"
         android:pathData="M20 8.69V4h-4.69L12 0.69 8.69 4H4v4.69L0.69 12 4 15.31V20h4.69L12 23.31 15.31 20H20v-4.69L23.31 12 20 8.69zm-2 5.79V18h-3.52L12 20.48 9.52 18H6v-3.52L3.52 12 6 9.52V6h3.52L12 3.52 14.48 6H18v3.52L20.48 12 18 14.48zM12.29 7c-0.74 0-1.45 0.17-2.08 0.46 1.72 0.79 2.92 2.53 2.92 4.54s-1.2 3.75-2.92 4.54c0.63 0.29 1.34 0.46 2.08 0.46 2.76 0 5-2.24 5-5s-2.24-5-5-5z" />
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-anydpi/ic_time.xml b/app/src/main/res/drawable-anydpi/ic_time.xml
index 1435106d..0d0b4d6f 100644
--- a/app/src/main/res/drawable-anydpi/ic_time.xml
+++ b/app/src/main/res/drawable-anydpi/ic_time.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="32dp"
-    android:height="32dp"
+    android:width="24dp"
+    android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="?android:textColorPrimary"
+        android:fillColor="?attr/colorSecondary"
         android:pathData="M11.99 2C6.47 2 2 6.48 2 12s4.47 10 9.99 10C17.52 22 22 17.52 22 12S17.52 2 11.99 2zM12 20c-4.42 0-8-3.58-8-8s3.58-8 8-8 8 3.58 8 8-3.58 8-8 8zm0.5-13H11v6l5.25 3.15 0.75-1.23-4.5-2.67z" />
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-anydpi/ic_timer.xml b/app/src/main/res/drawable-anydpi/ic_timer.xml
index e75091df..dde285f1 100644
--- a/app/src/main/res/drawable-anydpi/ic_timer.xml
+++ b/app/src/main/res/drawable-anydpi/ic_timer.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="32dp"
-    android:height="32dp"
+    android:width="24dp"
+    android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="?android:textColorPrimary"
+        android:fillColor="?attr/colorSecondary"
         android:pathData="M15,1H9v2h6V1z M11,14h2V8h-2V14z M19.03,7.39l1.42-1.42c-0.43-0.51-0.9-0.99-1.41-1.41l-1.42,1.42 C16.07,4.74,14.12,4,12,4c-4.97,0-9,4.03-9,9s4.02,9,9,9s9-4.03,9-9C21,10.88,20.26,8.93,19.03,7.39z M12,20c-3.87,0-7-3.13-7-7 s3.13-7,7-7s7,3.13,7,7S15.87,20,12,20z" />
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-anydpi/ic_tips_and_updates.xml b/app/src/main/res/drawable-anydpi/ic_tips_and_updates.xml
index 15ff8374..45fb04e0 100644
--- a/app/src/main/res/drawable-anydpi/ic_tips_and_updates.xml
+++ b/app/src/main/res/drawable-anydpi/ic_tips_and_updates.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="32dp"
-    android:height="32dp"
+    android:width="24dp"
+    android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="?android:textColorPrimary"
+        android:fillColor="?attr/colorSecondary"
         android:pathData="M7,20h4c0,1.1-0.9,2-2,2S7,21.1,7,20z M5,19h8v-2H5V19z M16.5,9.5c0,3.82-2.66,5.86-3.77,6.5H5.27 C4.16,15.36,1.5,13.32,1.5,9.5C1.5,5.36,4.86,2,9,2S16.5,5.36,16.5,9.5z M14.5,9.5C14.5,6.47,12.03,4,9,4S3.5,6.47,3.5,9.5 c0,2.47,1.49,3.89,2.35,4.5h6.3C13.01,13.39,14.5,11.97,14.5,9.5z M21.37,7.37L20,8l1.37,0.63L22,10l0.63-1.37L24,8l-1.37-0.63L22,6 L21.37,7.37z M19,6l0.94-2.06L22,3l-2.06-0.94L19,0l-0.94,2.06L16,3l2.06,0.94L19,6z" />
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-anydpi/ic_toggle.xml b/app/src/main/res/drawable-anydpi/ic_toggle.xml
index c446562e..6786b044 100644
--- a/app/src/main/res/drawable-anydpi/ic_toggle.xml
+++ b/app/src/main/res/drawable-anydpi/ic_toggle.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="32dp"
-    android:height="32dp"
+    android:width="24dp"
+    android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="?android:textColorPrimary"
+        android:fillColor="?attr/colorSecondary"
         android:pathData="M17 6H7c-3.31 0-6 2.69-6 6s2.69 6 6 6h10c3.31 0 6-2.69 6-6s-2.69-6-6-6zm0 10H7c-2.21 0-4-1.79-4-4s1.79-4 4-4h10c2.21 0 4 1.79 4 4s-1.79 4-4 4zm0-7c-1.66 0-3 1.34-3 3s1.34 3 3 3 3-1.34 3-3-1.34-3-3-3z" />
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-anydpi/ic_touch_button.xml b/app/src/main/res/drawable-anydpi/ic_touch_button.xml
index 4d51bf19..6e5f566d 100644
--- a/app/src/main/res/drawable-anydpi/ic_touch_button.xml
+++ b/app/src/main/res/drawable-anydpi/ic_touch_button.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="32dp"
-    android:height="32dp"
+    android:width="24dp"
+    android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="?android:textColorPrimary"
+        android:fillColor="?attr/colorSecondary"
         android:pathData="M18.19 12.44l-3.24-1.62c1.29-1 2.12-2.56 2.12-4.32 0-3.03-2.47-5.5-5.5-5.5s-5.5 2.47-5.5 5.5c0 2.13 1.22 3.98 3 4.89v3.26c-2.15-0.46-2.02-0.44-2.26-0.44-0.53 0-1.03 0.21-1.41 0.59L4 16.22l5.09 5.09C9.52 21.75 10.12 22 10.74 22h6.3c0.98 0 1.81-0.7 1.97-1.67l0.8-4.71c0.22-1.3-0.43-2.58-1.62-3.18zm-0.35 2.85L17.04 20h-6.3c-0.09 0-0.17-0.04-0.24-0.1l-3.68-3.68 4.25 0.89V6.5c0-0.28 0.22-0.5 0.5-0.5s0.5 0.22 0.5 0.5v6h1.76l3.46 1.73c0.4 0.2 0.62 0.63 0.55 1.06zM8.07 6.5c0-1.93 1.57-3.5 3.5-3.5s3.5 1.57 3.5 3.5c0 0.95-0.38 1.81-1 2.44V6.5c0-1.38-1.12-2.5-2.5-2.5s-2.5 1.12-2.5 2.5v2.44c-0.62-0.63-1-1.49-1-2.44z" />
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-anydpi/ic_twitter.xml b/app/src/main/res/drawable-anydpi/ic_twitter.xml
index 1c6235e4..09e20ec8 100644
--- a/app/src/main/res/drawable-anydpi/ic_twitter.xml
+++ b/app/src/main/res/drawable-anydpi/ic_twitter.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="?android:textColorPrimary"
+        android:fillColor="?attr/colorSecondary"
         android:pathData="M22.46 6c-0.77 0.35-1.6 0.58-2.46 0.69 0.88-0.53 1.56-1.37 1.88-2.38-0.83 0.5-1.75 0.85-2.72 1.05C18.37 4.5 17.26 4 16 4c-2.35 0-4.27 1.92-4.27 4.29 0 0.34 0.04 0.67 0.11 0.98C8.28 9.09 5.11 7.38 3 4.79 2.63 5.42 2.42 6.16 2.42 6.94c0 1.49 0.75 2.81 1.91 3.56-0.71 0-1.37-0.2-1.95-0.5v0.03c0 2.08 1.48 3.82 3.44 4.21-0.36 0.1-0.74 0.15-1.13 0.15-0.27 0-0.54-0.03-0.8-0.08 0.54 1.69 2.11 2.95 4 2.98-1.46 1.16-3.31 1.84-5.33 1.84-0.34 0-0.68-0.02-1.02-0.06C3.44 20.29 5.7 21 8.12 21 16 21 20.33 14.46 20.33 8.79c0-0.19 0-0.37-0.01-0.56 0.84-0.6 1.56-1.36 2.14-2.23z" />
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-anydpi/ic_view_quilt.xml b/app/src/main/res/drawable-anydpi/ic_view_quilt.xml
index d2c35453..2129b188 100644
--- a/app/src/main/res/drawable-anydpi/ic_view_quilt.xml
+++ b/app/src/main/res/drawable-anydpi/ic_view_quilt.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="32dp"
-    android:height="32dp"
+    android:width="24dp"
+    android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="?android:textColorPrimary"
+        android:fillColor="?attr/colorSecondary"
         android:pathData="M3,5v14h18V5H3z M8.33,17H5V7h3.33V17z M13.67,17h-3.33v-4h3.33V17z M19,17h-3.33v-4H19V17z M19,11h-8.67V7H19V11z" />
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-anydpi/ic_wallpaper.xml b/app/src/main/res/drawable-anydpi/ic_wallpaper.xml
index 289ce99b..f0431b21 100644
--- a/app/src/main/res/drawable-anydpi/ic_wallpaper.xml
+++ b/app/src/main/res/drawable-anydpi/ic_wallpaper.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="32dp"
-    android:height="32dp"
+    android:width="24dp"
+    android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="?android:textColorPrimary"
+        android:fillColor="?attr/colorSecondary"
         android:pathData="M4 4h7V2H4c-1.1 0-2 0.9-2 2v7h2V4zm6 9l-4 5h12l-3-4-2.03 2.71L10 13zm7-4.5c0-0.83-0.67-1.5-1.5-1.5S14 7.67 14 8.5s0.67 1.5 1.5 1.5S17 9.33 17 8.5zM20 2h-7v2h7v7h2V4c0-1.1-0.9-2-2-2zm0 18h-7v2h7c1.1 0 2-0.9 2-2v-7h-2v7zM4 13H2v7c0 1.1 0.9 2 2 2h7v-2H4v-7z" />
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-anydpi/ic_warning.xml b/app/src/main/res/drawable-anydpi/ic_warning.xml
index 58dc308d..935c6ac7 100644
--- a/app/src/main/res/drawable-anydpi/ic_warning.xml
+++ b/app/src/main/res/drawable-anydpi/ic_warning.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="32dp"
-    android:height="32dp"
+    android:width="24dp"
+    android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="?android:textColorPrimary"
+        android:fillColor="?attr/colorSecondary"
         android:pathData="M12 5.99L19.53 19H4.47L12 5.99M12 2L1 21h22L12 2zm1 14h-2v2h2v-2zm0-6h-2v4h2v-4z" />
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-anydpi/ic_warning_filled.xml b/app/src/main/res/drawable-anydpi/ic_warning_filled.xml
index 5fbf58f8..e8dedf0b 100644
--- a/app/src/main/res/drawable-anydpi/ic_warning_filled.xml
+++ b/app/src/main/res/drawable-anydpi/ic_warning_filled.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="32dp"
-    android:height="32dp"
+    android:width="24dp"
+    android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="?android:textColorPrimary"
+        android:fillColor="?attr/colorSecondary"
         android:pathData="M1 21h22L12 2 1 21zm12-3h-2v-2h2v2zm0-4h-2v-4h2v4z" />
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-anydpi/ic_webview.xml b/app/src/main/res/drawable-anydpi/ic_webview.xml
index 4dd0a24f..af6361e0 100644
--- a/app/src/main/res/drawable-anydpi/ic_webview.xml
+++ b/app/src/main/res/drawable-anydpi/ic_webview.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="32dp"
-    android:height="32dp"
+    android:width="24dp"
+    android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="?android:textColorPrimary"
+        android:fillColor="?attr/colorSecondary"
         android:pathData="M20 4H4C2.9 4 2.01 4.9 2.01 6L2 18c0 1.1 0.9 2 2 2h16c1.1 0 2-0.9 2-2V6c0-1.1-0.9-2-2-2zM4 9h10.5v3.5H4V9zm0 5.5h10.5V18H4v-3.5zM20 18h-3.5V9H20v9z" />
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-anydpi/ic_xda.xml b/app/src/main/res/drawable-anydpi/ic_xda.xml
index 5aea8672..4cd2222e 100644
--- a/app/src/main/res/drawable-anydpi/ic_xda.xml
+++ b/app/src/main/res/drawable-anydpi/ic_xda.xml
@@ -5,16 +5,16 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="?android:textColorPrimary"
+        android:fillColor="?attr/colorSecondary"
         android:pathData="M8.242 9.254L8.29 9.195l0.23-0.261H7.177L5.27 11.207 3.352 8.934 2.008 8.945 2.246 9.2 4.594 12l-2.348 2.8-0.238 0.266h1.344l1.918-2.273 1.906 2.273 1.344-0.011L8.29 14.8 5.93 12zm0 0"
         android:strokeWidth="1" />
     <path
-        android:fillColor="?android:textColorPrimary"
+        android:fillColor="?attr/colorSecondary"
         android:pathData="M14.059 8.934H9.082v6.132h4.977c0.304 0.004 0.601-0.12 0.812-0.336 0.223-0.21 0.34-0.507 0.336-0.812V10.09c0.004-0.309-0.117-0.602-0.336-0.813-0.21-0.222-0.508-0.347-0.812-0.343zm-3.954 1.156c0-0.035 0.012-0.067 0.036-0.09 0.023-0.023 0.054-0.043 0.09-0.043h3.828c0.035 0 0.066 0.012 0.09 0.043 0.023 0.023 0.035 0.055 0.035 0.09v3.828c0 0.035-0.012 0.062-0.036 0.09-0.023 0.023-0.054 0.035-0.09 0.035H10.23c-0.035 0-0.066-0.012-0.09-0.035-0.023-0.028-0.035-0.055-0.035-0.09zm0 0"
         android:strokeWidth="1"
         tools:ignore="VectorPath" />
     <path
-        android:fillColor="?android:textColorPrimary"
+        android:fillColor="?attr/colorSecondary"
         android:pathData="M21.664 9.277c-0.21-0.218-0.504-0.343-0.812-0.336H17.02c-0.31-0.007-0.602 0.118-0.813 0.336-0.219 0.211-0.344 0.504-0.336 0.813v4.976h1.024v-2.101h4.082v2.101H22V10.09c0-0.309-0.117-0.602-0.336-0.813zm-4.777 0.813c0-0.035 0.011-0.067 0.043-0.09 0.023-0.023 0.05-0.043 0.082-0.043h3.836c0.027 0 0.062 0.02 0.082 0.043 0.027 0.023 0.039 0.055 0.039 0.09v1.851h-4.082zm0 0"
         android:strokeWidth="1" />
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-anydpi/ic_youtube.xml b/app/src/main/res/drawable-anydpi/ic_youtube.xml
index a7bb6afc..91a81aac 100644
--- a/app/src/main/res/drawable-anydpi/ic_youtube.xml
+++ b/app/src/main/res/drawable-anydpi/ic_youtube.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="?android:textColorPrimary"
+        android:fillColor="?attr/colorSecondary"
         android:pathData="M21.58 7.19c-0.23-0.86-0.91-1.54-1.77-1.77C18.25 5 12 5 12 5S5.75 5 4.19 5.42C3.33 5.65 2.65 6.33 2.42 7.19 2 8.75 2 12 2 12s0 3.25 0.42 4.81c0.23 0.86 0.91 1.54 1.77 1.77C5.75 19 12 19 12 19s6.25 0 7.81-0.42c0.86-0.23 1.54-0.91 1.77-1.77C22 15.25 22 12 22 12s0-3.25-0.42-4.81zM10 15V9l5.2 3-5.2 3z" />
 </vector>
\ No newline at end of file