diff --git a/res/drawable/back.xml b/res/drawable/back.xml
index ed46a9fc855bce5f16fe3d3695da8990b77721fa..7c43a9e80241c70fa5254871b6492de51d6653f8 100644
--- a/res/drawable/back.xml
+++ b/res/drawable/back.xml
@@ -34,5 +34,5 @@
         android:viewportHeight="24.0">
     <path
         android:pathData="M20,11H7.83l5.59,-5.59L12,4l-8,8l8,8l1.41,-1.41L7.83,13H20V11z"
-        android:fillColor="@color/accent"/>
+        android:fillColor="@color/color_default_primary_text"/>
 </vector>
diff --git a/res/drawable/beautify.xml b/res/drawable/beautify.xml
index 275d225f9708f2b99f29b98bdd65be3fa13bd0d5..9453d6d8c211f5612b8d9266da8a3c319839972a 100644
--- a/res/drawable/beautify.xml
+++ b/res/drawable/beautify.xml
@@ -34,5 +34,5 @@
         android:viewportHeight="32.0">
     <path
         android:pathData="M26.305,8.769c-0.433,0.9 -0.486,2.1 -0.486,2.1s-0.175,-1.205 -0.619,-2.128c-0.395,-0.822 -1.93,-1.111 -1.93,-1.111s1.492,-0.138 1.879,-0.938c0.451,-0.939 0.623,-2.139 0.623,-2.139s0.107,1.136 0.571,2.103c0.366,0.758 1.854,0.98 1.854,0.98S26.714,7.919 26.305,8.769zM24.283,18.035c0,0 0.081,-1.424 -0.418,-3.219c-1.354,-4.873 -3.568,-6.139 -3.568,-6.139s2.77,0.869 4.727,5.355C26.087,16.468 24.283,18.035 24.283,18.035zM23.139,17.76c0,0 0.488,1.772 -0.889,4.784c-1.379,3.017 -4.73,4.065 -4.73,4.065s2.842,-1.843 4.154,-4.443C22.706,20.119 23.139,17.76 23.139,17.76zM14.925,13.241c-2.487,1.971 -3.536,4.087 -3.536,7.08c0,3.931 5.176,7.127 5.176,7.127s-6.6,-2.607 -6.6,-7.426c0,-2.614 0.661,-5.133 1.835,-7.062c-0.72,0.654 -1.383,1.438 -1.868,2.416c-1.315,2.659 -0.804,6.175 -0.804,6.175c-2.54,-2.602 -3.533,-6.776 -2.229,-10.197c1.196,-3.136 3.49,-5.457 5.399,-6.058c3.968,-1.25 4.969,0.568 4.969,0.568s0.031,0.09 0.07,0.244c0.045,-0.37 -0.014,-0.573 -0.014,-0.573S21.336,8.16 14.925,13.241zM5.774,23.086c-0.294,0.622 -0.372,1.321 -0.372,1.321s-0.078,-0.701 -0.381,-1.34c-0.269,-0.566 -1.251,-0.704 -1.251,-0.704s0.954,-0.158 1.216,-0.711c0.307,-0.649 0.424,-1.481 0.424,-1.481s0.073,0.789 0.39,1.456C6.049,22.152 7,22.351 7,22.351S6.053,22.501 5.774,23.086zM24.859,22.814c0.478,-1.109 0.659,-2.631 0.659,-2.631s0.112,1.447 0.605,2.59c0.384,0.895 2.104,0.973 2.104,0.973s-1.716,0.152 -2.145,1.155c-0.459,1.063 -0.622,2.521 -0.622,2.521s-0.08,-1.464 -0.549,-2.553c-0.418,-0.972 -2.063,-1.146 -2.063,-1.146l-0.028,-0.004C22.822,23.72 24.451,23.762 24.859,22.814z"
-        android:fillColor="@color/color_default_primary_text"/>
+        android:fillColor="@color/color_default_secondary_text"/>
 </vector>
diff --git a/res/drawable/camera.xml b/res/drawable/camera.xml
index e26b05c5f2f8ea6af482fa7f0d1f14e91fb78488..a142ebffed705deea896f29902c81c735d7190c1 100644
--- a/res/drawable/camera.xml
+++ b/res/drawable/camera.xml
@@ -37,10 +37,10 @@
     <path
         android:pathData="M0,0h24v24H0V0z" />
     <path
-        android:fillColor="@color/accent"
+        android:fillColor="@color/color_default_secondary_text"
         android:pathData="M 12 9.799 C 13.7673111995 9.799 15.2 11.2316888005 15.2 12.999 C 15.2 14.7663111995 13.7673111995 16.199 12 16.199 C 10.2326888005 16.199 8.8 14.7663111995 8.8 12.999 C 8.8 11.2316888005 10.2326888005 9.799 12 9.799 Z" />
     <path
-        android:fillColor="@color/accent"
+        android:fillColor="@color/color_default_secondary_text"
         android:pathData="M9,3L7.17,5H4c-1.1,0-2,0.9-2,2v12c0,1.1,0.9,2,2,2h16c1.1,0,2-0.9,2-2V7c0-1.1-0.9-2-2-2h-3.17L15,3H9z
 M12,18c-2.76,0-5-2.24-5-5c0-2.76,2.24-5,5-5s5,2.24,5,5C17,15.76,14.76,18,12,18z" />
 </vector>
\ No newline at end of file
diff --git a/res/drawable/cancel.xml b/res/drawable/cancel.xml
index dd87ea0131ceb6fc7df13896ca83f9d298469ec8..4f8aae7c222d451bd71252b6a1455b6fc0da1c54 100644
--- a/res/drawable/cancel.xml
+++ b/res/drawable/cancel.xml
@@ -34,5 +34,5 @@
         android:viewportHeight="24.0">
     <path
         android:pathData="M19.205,6.41L17.795,5l-5.59,5.59L6.615,5l-1.41,1.41l5.59,5.59l-5.59,5.59L6.615,19l5.59,-5.59l5.59,5.59l1.41,-1.41L13.615,12L19.205,6.41z"
-        android:fillColor="@color/accent"/>
+        android:fillColor="@color/color_default_primary_text"/>
 </vector>
diff --git a/res/drawable/color.xml b/res/drawable/color.xml
index 072f892fdd1c65790d1d5fb51d2c987a089d101a..65a139fd73e2daaf5d42f296b21df783aa0b4f47 100644
--- a/res/drawable/color.xml
+++ b/res/drawable/color.xml
@@ -34,5 +34,5 @@
         android:viewportHeight="32.0">
     <path
         android:pathData="M16,4.951C9.898,4.951 4.951,9.898 4.951,16c0,6.102 4.947,11.049 11.049,11.049c1.02,0 1.842,-0.822 1.842,-1.842c0,-0.479 -0.178,-0.908 -0.479,-1.232c-0.289,-0.326 -0.461,-0.75 -0.461,-1.223c0,-1.02 0.822,-1.842 1.842,-1.842h2.166c3.389,0 6.139,-2.75 6.139,-6.138C27.049,9.347 22.102,4.951 16,4.951zM9.248,16c-1.02,0 -1.842,-0.822 -1.842,-1.842c0,-1.019 0.822,-1.841 1.842,-1.841s1.842,0.822 1.842,1.841C11.09,15.178 10.268,16 9.248,16zM12.932,11.09c-1.02,0 -1.842,-0.822 -1.842,-1.842c0,-1.019 0.822,-1.842 1.842,-1.842c1.018,0 1.84,0.823 1.84,1.842C14.771,10.268 13.949,11.09 12.932,11.09zM19.068,11.09c-1.021,0 -1.842,-0.822 -1.842,-1.842c0,-1.019 0.821,-1.842 1.842,-1.842c1.02,0 1.842,0.823 1.842,1.842C20.91,10.268 20.088,11.09 19.068,11.09zM22.752,16c-1.02,0 -1.842,-0.822 -1.842,-1.842c0,-1.019 0.822,-1.841 1.842,-1.841s1.842,0.822 1.842,1.841C24.594,15.178 23.771,16 22.752,16z"
-        android:fillColor="@color/color_default_primary_text"/>
+        android:fillColor="@color/color_default_secondary_text"/>
 </vector>
diff --git a/res/drawable/crop.xml b/res/drawable/crop.xml
index d0ce475e94a9313989347978c72bc725a5fcd56f..53dbd3ee6d0aac3baf27e666a4cf5476eecd8d7e 100644
--- a/res/drawable/crop.xml
+++ b/res/drawable/crop.xml
@@ -34,5 +34,5 @@
         android:viewportHeight="32.0">
     <path
         android:pathData="M20.911,19.324h2.28v-8.26c0,-1.127 -0.945,-2.438 -2.073,-2.438h-8.262v2.312h8.055V19.324zM11.117,21.008v-16.4H8.809v4.019h-4.02l-0.031,2.315l4.051,-0.004V21.27c0,1.127 0.914,2.041 2.041,2.041h10.03v4.082h2.312v-4.082h4.052v-2.303H11.117z"
-        android:fillColor="@color/color_default_primary_text"/>
+        android:fillColor="@color/color_default_secondary_text"/>
 </vector>
diff --git a/res/drawable/crop_1_1.xml b/res/drawable/crop_1_1.xml
index be3c39176381bed7f61b0cd0970eb112b1e82b7d..78aa893f06699cc130656a88a2c3b484419908cb 100644
--- a/res/drawable/crop_1_1.xml
+++ b/res/drawable/crop_1_1.xml
@@ -30,5 +30,5 @@
 
 <vector android:height="24dp" android:viewportHeight="90.0"
     android:viewportWidth="90.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@color/color_default_primary_text" android:pathData="M3,3L3,87L87,87L87,3L3,3ZM78.99,78.99L11.01,78.99L11.01,11.01L78.99,11.01L78.99,78.99Z"/>
+    <path android:fillColor="@color/color_default_secondary_text" android:pathData="M3,3L3,87L87,87L87,3L3,3ZM78.99,78.99L11.01,78.99L11.01,11.01L78.99,11.01L78.99,78.99Z"/>
 </vector>
diff --git a/res/drawable/crop_crop.xml b/res/drawable/crop_crop.xml
index ec0d3d59f1e8c29ed019f1f5d5301408a8af7347..7ad3c523e9ef9d5652e537ea9c25f40472670b88 100644
--- a/res/drawable/crop_crop.xml
+++ b/res/drawable/crop_crop.xml
@@ -30,5 +30,5 @@
 
 <vector android:height="24dp" android:viewportHeight="90.0"
     android:viewportWidth="90.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@color/accent" android:pathData="M15,67C15,71.42 18.58,75 23,75L23,75L67,75L67,87L75,87L75,75L87,75L87,67L23,67L23,3L15,3L15,15L3,15L3,23L15,23L15,67ZM67,59L75,59L75,23C75,18.58 71.42,15 67,15L31,15L31,23L67,23L67,59Z"/>
+    <path android:fillColor="@color/color_default_secondary_text" android:pathData="M15,67C15,71.42 18.58,75 23,75L23,75L67,75L67,87L75,87L75,75L87,75L87,67L23,67L23,3L15,3L15,15L3,15L3,23L15,23L15,67ZM67,59L75,59L75,23C75,18.58 71.42,15 67,15L31,15L31,23L67,23L67,59Z"/>
 </vector>
diff --git a/res/drawable/crop_free.xml b/res/drawable/crop_free.xml
index a04c854d88743c14aaea270a87a029538222057d..c21948468b13cb4f90c1d2efa8871af69cddb044 100644
--- a/res/drawable/crop_free.xml
+++ b/res/drawable/crop_free.xml
@@ -30,5 +30,5 @@
 
 <vector android:height="24dp" android:viewportHeight="90.0"
     android:viewportWidth="90.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@color/color_default_primary_text" android:pathData="M11,62L3,62L3,87L28,87L28,79L11,79L11,62ZM79,79L62,79L62,87L87,87L87,62L79,62L79,79ZM3,28L11,28L11,11L28,11L28,3L3,3L3,28ZM62,3L62,11L79,11L79,28L87,28L87,3L62,3Z"/>
+    <path android:fillColor="@color/color_default_secondary_text" android:pathData="M11,62L3,62L3,87L28,87L28,79L11,79L11,62ZM79,79L62,79L62,87L87,87L87,62L79,62L79,79ZM3,28L11,28L11,11L28,11L28,3L3,3L3,28ZM62,3L62,11L79,11L79,28L87,28L87,3L62,3Z"/>
 </vector>
diff --git a/res/drawable/crop_original.xml b/res/drawable/crop_original.xml
index dce12c276f876cea3b4c9bd74299941027d882e2..eb6ae9bdc4ce4b22470b6b6d0ebd3077257727af 100644
--- a/res/drawable/crop_original.xml
+++ b/res/drawable/crop_original.xml
@@ -30,5 +30,5 @@
 
 <vector android:height="24dp" android:viewportHeight="90.0"
     android:viewportWidth="90.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@color/color_default_primary_text" android:pathData="M9,1L9,89L81,89L81,1L9,1ZM17,46L44,46L44,81L17,81L17,46ZM73,81L48,81L48,42L17,42L17,9L73,9L73,81Z"/>
+    <path android:fillColor="@color/color_default_secondary_text" android:pathData="M9,1L9,89L81,89L81,1L9,1ZM17,46L44,46L44,81L17,81L17,46ZM73,81L48,81L48,42L17,42L17,9L73,9L73,81Z"/>
 </vector>
diff --git a/res/drawable/crop_rotate.xml b/res/drawable/crop_rotate.xml
index 801339dd14df6e76673dddea1dab502e42084c62..6d924bdbd850b9c910241d3f37d623aaa120a5f8 100644
--- a/res/drawable/crop_rotate.xml
+++ b/res/drawable/crop_rotate.xml
@@ -30,5 +30,5 @@
 
 <vector android:height="24dp" android:viewportHeight="90.0"
     android:viewportWidth="90.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@color/color_default_primary_text" android:pathData="M45,5C32.42,5 21.21,10.81 13.88,19.88L5,11L5.01,33.99L6.55,33.99C6.55,33.99 6.55,34 6.54,34L14.94,34C14.94,34 14.94,33.99 14.95,33.99L27.99,33.99L19.57,25.57C25.42,17.93 34.63,13 45,13C62.67,13 77,27.33 77,45C77,62.67 62.67,77 45,77C27.33,77 13,62.67 13,45L5,45C5,67.09 22.91,85 45,85C67.09,85 85,67.09 85,45C85,22.91 67.09,5 45,5Z"/>
+    <path android:fillColor="@color/color_default_secondary_text" android:pathData="M45,5C32.42,5 21.21,10.81 13.88,19.88L5,11L5.01,33.99L6.55,33.99C6.55,33.99 6.55,34 6.54,34L14.94,34C14.94,34 14.94,33.99 14.95,33.99L27.99,33.99L19.57,25.57C25.42,17.93 34.63,13 45,13C62.67,13 77,27.33 77,45C77,62.67 62.67,77 45,77C27.33,77 13,62.67 13,45L5,45C5,67.09 22.91,85 45,85C67.09,85 85,67.09 85,45C85,22.91 67.09,5 45,5Z"/>
 </vector>
diff --git a/res/drawable/crop_straighten.xml b/res/drawable/crop_straighten.xml
index c66441ffb7a08ffd756ff7759f63e6e8da0be301..22d6f4017cc04f46aeba6746b03e56df2f78d8f3 100644
--- a/res/drawable/crop_straighten.xml
+++ b/res/drawable/crop_straighten.xml
@@ -30,5 +30,5 @@
 
 <vector android:height="24dp" android:viewportHeight="90.0"
     android:viewportWidth="89.844" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@color/color_default_primary_text" android:pathData="M87.85,22.54L73.87,22.54L73.87,29.53L82.86,29.53L82.86,75.44L48.91,75.44L48.91,82.43L87.85,82.43C88.95,82.43 89.84,81.53 89.84,80.43L89.84,24.54C89.84,23.44 88.95,22.54 87.85,22.54ZM74.82,64.32L65.09,9.23C64.9,8.15 63.86,7.42 62.77,7.61L1.66,18.37C0.57,18.56 -0.16,19.6 0.03,20.68L9.77,75.77C9.96,76.86 11,77.59 12.09,77.39L73.2,66.64C74.29,66.45 75.01,65.41 74.82,64.32ZM44.55,36.57L31.7,61L21.53,51.79L14.88,64.43L7.8,24.39L59.06,15.37L66.28,56.22L44.55,36.57Z"/>
+    <path android:fillColor="@color/color_default_secondary_text" android:pathData="M87.85,22.54L73.87,22.54L73.87,29.53L82.86,29.53L82.86,75.44L48.91,75.44L48.91,82.43L87.85,82.43C88.95,82.43 89.84,81.53 89.84,80.43L89.84,24.54C89.84,23.44 88.95,22.54 87.85,22.54ZM74.82,64.32L65.09,9.23C64.9,8.15 63.86,7.42 62.77,7.61L1.66,18.37C0.57,18.56 -0.16,19.6 0.03,20.68L9.77,75.77C9.96,76.86 11,77.59 12.09,77.39L73.2,66.64C74.29,66.45 75.01,65.41 74.82,64.32ZM44.55,36.57L31.7,61L21.53,51.79L14.88,64.43L7.8,24.39L59.06,15.37L66.28,56.22L44.55,36.57Z"/>
 </vector>
diff --git a/res/drawable/delete.xml b/res/drawable/delete.xml
index 55c8ecd453668716ce5c14e9e7b3b9bc3c9a18c2..665b95415424774020eb7b5e15934128d0ba0e9e 100644
--- a/res/drawable/delete.xml
+++ b/res/drawable/delete.xml
@@ -34,5 +34,5 @@
         android:viewportHeight="24.0">
     <path
         android:pathData="M5.999,19.001c0,1.1 0.9,2 2,2h8c1.1,0 2,-0.9 2,-2v-12h-12V19.001zM18.999,4.001h-3.5l-1,-1h-5l-1,1h-3.5v2h14V4.001z"
-        android:fillColor="@color/accent"/>
+        android:fillColor="@color/color_default_secondary_text"/>
 </vector>
diff --git a/res/drawable/done.xml b/res/drawable/done.xml
index 6eb431bb347607749a88af9ff35a1d4f0808fc10..7c7de6cdd7b8ef6b661b89ba49afd69d9bac51ea 100644
--- a/res/drawable/done.xml
+++ b/res/drawable/done.xml
@@ -34,5 +34,5 @@
         android:viewportHeight="24.0">
     <path
         android:pathData="M8.795,15.875l-4.17,-4.17l-1.42,1.41l5.59,5.59l12,-12l-1.41,-1.41L8.795,15.875z"
-        android:fillColor="@color/accent"/>
+        android:fillColor="@color/color_default_secondary_text"/>
 </vector>
diff --git a/res/drawable/dualcamera.xml b/res/drawable/dualcamera.xml
index 255181f44084cb76d44c45de7a598c41426bc98f..5ccb8fbd1ed6856ee8f3c3e645231e06c1b0a3b8 100644
--- a/res/drawable/dualcamera.xml
+++ b/res/drawable/dualcamera.xml
@@ -5,17 +5,17 @@
         android:viewportHeight="32.0">
     <path
         android:pathData="M19.794,10.447H12.36c-1.152,0 -2.165,0.887 -2.165,2.04v7.912c0,1.153 1.012,2.086 2.165,2.086h7.434c1.154,0 2.011,-0.933 2.011,-2.086v-7.912C21.805,11.334 20.948,10.447 19.794,10.447zM19.865,20.57h-7.692v-8.175h7.692V20.57z"
-        android:fillColor="@color/color_default_primary_text"/>
+        android:fillColor="@color/color_default_secondary_text"/>
     <path
         android:pathData="M21,7h4v5h2V7.713C27,6.341 26.156,5 24.783,5H21V7z"
-        android:fillColor="@color/color_default_primary_text"/>
+        android:fillColor="@color/color_default_secondary_text"/>
     <path
         android:pathData="M7,12V7h4V5H7.399C6.027,5 5,6.341 5,7.713V12H7z"
-        android:fillColor="@color/color_default_primary_text"/>
+        android:fillColor="@color/color_default_secondary_text"/>
     <path
         android:pathData="M11,26H7v-5H5v4.098C5,26.471 6.027,28 7.399,28H11V26z"
-        android:fillColor="@color/color_default_primary_text"/>
+        android:fillColor="@color/color_default_secondary_text"/>
     <path
         android:pathData="M25,21v5h-4v2h3.783C26.156,28 27,26.471 27,25.098V21H25z"
-        android:fillColor="@color/color_default_primary_text"/>
+        android:fillColor="@color/color_default_secondary_text"/>
 </vector>
diff --git a/res/drawable/edit.xml b/res/drawable/edit.xml
index cd8fe38c79120bb9abceaa7071652931942ac8a2..56151dbd7d06ae3fb6caebd8550d85624492099a 100644
--- a/res/drawable/edit.xml
+++ b/res/drawable/edit.xml
@@ -34,5 +34,5 @@
         android:viewportHeight="24.0">
     <path
         android:pathData="M2.999,17.252v3.75h3.75l11.061,-11.06l-3.75,-3.75L2.999,17.252zM20.708,7.042c0.39,-0.39 0.39,-1.02 0,-1.41l-2.34,-2.34c-0.39,-0.39 -1.021,-0.39 -1.41,0l-1.83,1.83l3.75,3.75L20.708,7.042z"
-        android:fillColor="@color/accent"/>
+        android:fillColor="@color/color_default_secondary_text"/>
 </vector>
diff --git a/res/drawable/exposure.xml b/res/drawable/exposure.xml
index 1c9353d3f663c5f5221d65209f45d02ca4c8c3e8..a08e12b6a729480992b4e70b9b8175fe8bdcb5be 100644
--- a/res/drawable/exposure.xml
+++ b/res/drawable/exposure.xml
@@ -34,5 +34,5 @@
         android:viewportHeight="32.0">
     <path
         android:pathData="M19.514,21.201v2.357h1.644l0.045,-2.357h2.313v-1.688h-2.357V17.2h-1.643v2.313h-2.357v1.688H19.514zM24.85,4.793H7.061c-1.228,0 -2.223,0.995 -2.223,2.224v17.788c0,1.229 0.995,2.402 2.223,2.402H24.85c1.229,0 2.313,-1.174 2.313,-2.402V7.017C27.161,5.789 26.077,4.793 24.85,4.793zM8.173,8.173h6.671v2H8.173V8.173zM25.161,25.162h-18.1l18.1,-18.541V25.162z"
-        android:fillColor="@color/color_default_primary_text"/>
+        android:fillColor="@color/color_default_secondary_text"/>
 </vector>
diff --git a/res/drawable/frames.xml b/res/drawable/frames.xml
index 1c9975c31b7045e636b3180ff174bc9aca222de2..e4962622192a6fec2096c58594dd479aaf05da01 100644
--- a/res/drawable/frames.xml
+++ b/res/drawable/frames.xml
@@ -34,11 +34,11 @@
         android:viewportHeight="32.0">
     <path
         android:pathData="M24.934,8.228h-4.467L16,3.761l-4.468,4.467H7.065c-1.234,0 -2.233,1 -2.233,2.233v15.441c0,1.232 0.999,2.338 2.233,2.338h17.869c1.233,0 2.233,-1.104 2.233,-2.338V10.461C27.168,9.228 26.168,8.228 24.934,8.228zM25.178,26.25H6.822V10.252h5.285l3.932,-3.699l3.886,3.699h5.253V26.25z"
-        android:fillColor="@color/color_default_primary_text"/>
+        android:fillColor="@color/color_default_secondary_text"/>
     <path
         android:pathData="M23.143,12.216"
-        android:fillColor="@color/color_default_primary_text"/>
+        android:fillColor="@color/color_default_secondary_text"/>
     <path
         android:pathData="M8.923,12.216h14.153v11.966h-14.153z"
-        android:fillColor="@color/color_default_primary_text"/>
+        android:fillColor="@color/color_default_secondary_text"/>
 </vector>
diff --git a/res/drawable/hazebuster.xml b/res/drawable/hazebuster.xml
index 0979048590e9a8cfbccbca48566a6f116dbf3be5..914a5c72270c81f849bb8240f2ae93911da32436 100644
--- a/res/drawable/hazebuster.xml
+++ b/res/drawable/hazebuster.xml
@@ -34,26 +34,26 @@
     android:viewportHeight="32">
 
     <path
-        android:fillColor="@color/color_default_primary_text"
+        android:fillColor="@color/color_default_secondary_text"
         android:pathData="M29,20.9c-0.9-0.5-2.1-0.5-3.1,0l-0.4,0.2c-0.7,0.4-1.7,0.4-2.3-0.1c-0.2-0.1-0.5-0.3-0.7-0.3
 c-0.2,0.3-0.5,0.5-0.8,0.7c0.4,0,0.8,0.1,1.1,0.3c0.9,0.6,2.3,0.7,3.2,0.1l0.4-0.2c0.7-0.4,1.6-0.4,2.2,0c0.2,0.1,0.5,0,0.6-0.2
 C29.3,21.3,29.2,21,29,20.9z" />
     <path
-        android:fillColor="@color/color_default_primary_text"
+        android:fillColor="@color/color_default_secondary_text"
         android:pathData="M29,16.2c-0.9-0.5-2.1-0.5-3.1,0l-0.4,0.2c-0.4,0.2-0.9,0.3-1.4,0.3c0,0,0,0,0,0.1c0,0.3,0,0.5-0.1,0.8
 c0.6,0.1,1.3-0.1,1.9-0.4l0.4-0.2c0.7-0.4,1.6-0.4,2.2,0c0.2,0.1,0.5,0,0.6-0.2C29.3,16.6,29.2,16.3,29,16.2z" />
     <path
-        android:fillColor="@color/color_default_primary_text"
+        android:fillColor="@color/color_default_secondary_text"
         android:pathData="M29,23.2c-0.9-0.5-2.1-0.5-3.1,0l-0.4,0.2c-0.7,0.4-1.7,0.4-2.3-0.1c-0.9-0.6-2.2-0.7-3.2-0.1l-0.3,0.2
 c-0.7,0.4-1.7,0.4-2.3-0.1c-0.9-0.6-2.2-0.7-3.2-0.1c-0.2,0.1-0.3,0.4-0.2,0.6c0.1,0.2,0.4,0.3,0.6,0.2c0.7-0.4,1.7-0.4,2.3,0.1
 c0.5,0.3,1.1,0.5,1.7,0.5c0.5,0,1.1-0.1,1.5-0.4l0.3-0.2c0.7-0.4,1.7-0.4,2.3,0.1c0.9,0.6,2.3,0.7,3.2,0.1l0.4-0.2
 c0.7-0.4,1.6-0.4,2.2,0c0.2,0.1,0.5,0,0.6-0.2C29.3,23.6,29.2,23.4,29,23.2z" />
     <path
-        android:fillColor="@color/color_default_primary_text"
+        android:fillColor="@color/color_default_secondary_text"
         android:pathData="M29,18.5c-0.9-0.5-2.1-0.5-3.1,0l-0.4,0.2c-0.5,0.3-1.2,0.4-1.8,0.2c-0.1,0.3-0.2,0.5-0.4,0.8
 c0.9,0.3,1.9,0.3,2.7-0.2l0.4-0.2c0.7-0.4,1.6-0.4,2.2,0c0.2,0.1,0.5,0,0.6-0.2C29.3,18.9,29.2,18.7,29,18.5z" />
     <path
-        android:fillColor="@color/color_default_primary_text"
+        android:fillColor="@color/color_default_secondary_text"
         android:pathData="M17.1,22.3c-1.1,0-2.2-0.2-3.2-0.7c-1.1,0.5-2.3,0.7-3.5,0.7c-4.2,0-7.7-2.9-7.7-6.5c0-2.6,1.8-5,4.6-6
 c0.9-1.9,3.2-3.2,5.6-3.2c3.2,0,5.9,2.1,6.1,4.8c2.7,0.7,4.6,2.9,4.6,5.3C23.6,19.8,20.7,22.3,17.1,22.3z
 M13.9,19.7l0.4,0.2
diff --git a/res/drawable/ic_selection.xml b/res/drawable/ic_selection.xml
index 64948ac708d6ab1fee0314d6e9f2750aa2ac7494..1f8c99e3fe61a8995812dfc7735b350765a88b82 100644
--- a/res/drawable/ic_selection.xml
+++ b/res/drawable/ic_selection.xml
@@ -6,7 +6,7 @@
     android:viewportHeight="24">
 
     <path
-        android:fillColor="@color/accent"
+        android:fillColor="@color/color_default_secondary_text"
         android:pathData="M3,5 L5,5 L5,3 C3.9,3,3,3.9,3,5 Z M3,13 L5,13 L5,11 L3,11 L3,13 Z M7,21 L9,21
 L9,19 L7,19 L7,21 Z M3,9 L5,9 L5,7 L3,7 L3,9 Z M13,3 L11,3 L11,5 L13,5 L13,3 Z
 M19,3 L19,5 L21,5 C21,3.9,20.1,3,19,3 Z M5,21 L5,19 L3,19 C3,20.1,3.9,21,5,21 Z
diff --git a/res/drawable/ic_watermark.xml b/res/drawable/ic_watermark.xml
index 40f4d0b1f66d7d1c52655b7361ccfd8e0805d9f7..f73dd555cee802f41995cd2a7e9767d42e26911f 100644
--- a/res/drawable/ic_watermark.xml
+++ b/res/drawable/ic_watermark.xml
@@ -34,7 +34,7 @@
     android:viewportHeight="27">
 
     <path
-        android:strokeColor="@color/color_default_primary_text"
+        android:strokeColor="@color/color_default_secondary_text"
         android:strokeWidth="2.13350288"
         android:pathData="M14.9362,15.8471 L14.9362,11.5098
 C16.5957,10.3574,18.5791,8.83929,18.5791,6.57669
@@ -42,7 +42,7 @@ C18.5791,3.01208,15.8574,2,12.5,2 C9.14256,2,6.42093,3.01208,6.42093,6.57669
 C6.42093,8.83929,8.40383,10.3574,10.0633,11.5098 L10.0633,15.8471 L2,17.49 L2,25
 L11.3331,25 L13.6669,25 L23,25 L23,17.49 L14.9362,15.8471 L14.9362,15.8471 Z" />
     <path
-        android:strokeColor="@color/color_default_primary_text"
+        android:strokeColor="@color/color_default_secondary_text"
         android:strokeWidth="0.9482235"
         android:pathData="M3,21 L23,21" />
 </vector>
\ No newline at end of file
diff --git a/res/drawable/more.xml b/res/drawable/more.xml
index c64abf3dba458f22420689cdf097300439fd5237..84301579d088cbae850720299eb7ec5ef93d6b49 100644
--- a/res/drawable/more.xml
+++ b/res/drawable/more.xml
@@ -34,5 +34,5 @@
         android:viewportHeight="24.0">
     <path
         android:pathData="M12,8c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2c-1.1,0 -2,0.9 -2,2S10.9,8 12,8zM12,10c-1.1,0 -2,0.9 -2,2c0,1.1 0.9,2 2,2c1.1,0 2,-0.9 2,-2C14,10.9 13.1,10 12,10zM12,16c-1.1,0 -2,0.9 -2,2s0.9,2 2,2c1.1,0 2,-0.9 2,-2S13.1,16 12,16z"
-        android:fillColor="@color/accent"/>
+        android:fillColor="@color/color_default_secondary_text"/>
 </vector>
diff --git a/res/drawable/more2.xml b/res/drawable/more2.xml
index 1337277ee3aafc5b82b9c9c56a3987161a7efb30..854a679bb4f30d2b083009eb824d6831bc2d3c34 100644
--- a/res/drawable/more2.xml
+++ b/res/drawable/more2.xml
@@ -34,5 +34,5 @@
         android:viewportHeight="36.0">
     <path
         android:pathData="M18,13c1.381,0 2.5,-1.119 2.5,-2.5S19.381,8 18,8s-2.5,1.119 -2.5,2.5S16.619,13 18,13zM18,15.5c-1.381,0 -2.5,1.119 -2.5,2.5s1.119,2.5 2.5,2.5s2.5,-1.119 2.5,-2.5S19.381,15.5 18,15.5zM18,23c-1.381,0 -2.5,1.119 -2.5,2.5S16.619,28 18,28s2.5,-1.119 2.5,-2.5S19.381,23 18,23z"
-        android:fillColor="@color/accent"/>
+        android:fillColor="@color/color_default_secondary_text"/>
 </vector>
diff --git a/res/drawable/overflow.xml b/res/drawable/overflow.xml
index 387bd43f7132d08a814d84bb0a018be69d13754b..f6bd30d1fb41db0148eff180872d837775e5b977 100644
--- a/res/drawable/overflow.xml
+++ b/res/drawable/overflow.xml
@@ -37,7 +37,7 @@
     <path
         android:pathData="M0,0h24v24H0V0z" />
     <path
-        android:fillColor="@color/accent"
+        android:fillColor="@color/color_default_secondary_text"
         android:pathData="M12,8c1.1,0,2-0.9,2-2s-0.9-2-2-2c-1.1,0-2,0.9-2,2S10.9,8,12,8z
 M12,10c-1.1,0-2,0.9-2,2c0,1.1,0.9,2,2,2 c1.1,0,2-0.9,2-2C14,10.9,13.1,10,12,10z
 M12,16c-1.1,0-2,0.9-2,2s0.9,2,2,2c1.1,0,2-0.9,2-2S13.1,16,12,16z" />
diff --git a/res/drawable/seestraight.xml b/res/drawable/seestraight.xml
index 74dc30997d460514fcd8c1545abbcc41a4f141bf..d44d5b22e092f1aa3845c61372c3f5fd6b36f540 100644
--- a/res/drawable/seestraight.xml
+++ b/res/drawable/seestraight.xml
@@ -34,29 +34,29 @@
     android:viewportHeight="32">
 
     <path
-        android:fillColor="@color/color_default_primary_text"
+        android:fillColor="@color/color_default_secondary_text"
         android:pathData="M 7.2 23.3 L 5.5 23.3 L 5.5 7.1 L 13.3 4.8 L 14.1 4.8 L 21.7 7.1 L 21.7 11.9 L 20 11.9 L 20 8.3 L 13.7 6.5 L 13.4 6.5 L 7.2 8.3 Z" />
     <path
-        android:fillColor="@color/color_default_primary_text"
+        android:fillColor="@color/color_default_secondary_text"
         android:pathData="M 8.6 7 L 8 7 L 8 5.3 L 13.5 3.5 L 19.1 5.3 L 19.1 7 L 18.6 7 L 18.6 5.7 L 13.5 4.1 L 8.6 5.7 Z" />
     <path
-        android:fillColor="@color/color_default_primary_text"
+        android:fillColor="@color/color_default_secondary_text"
         android:pathData="M 13.4 3.8 H 13.7 V 5.6 H 13.4 V 3.8 Z" />
     <path
-        android:fillColor="@color/color_default_primary_text"
+        android:fillColor="@color/color_default_secondary_text"
         android:pathData="M 13 23.3 L 12.7 23.3 L 12.7 8.4 L 6.5 10.2 L 6.5 9.9 L 13 8.1 Z" />
     <path
-        android:fillColor="@color/color_default_primary_text"
+        android:fillColor="@color/color_default_secondary_text"
         android:pathData="M 14.4 23.3 L 14.1 23.3 L 14.1 8 L 20.7 9.8 L 20.6 10.1 L 14.4 8.3 Z" />
     <path
-        android:fillColor="@color/color_default_primary_text"
+        android:fillColor="@color/color_default_secondary_text"
         android:pathData="M29.8,27h-1.7v-1.4h1.7V27z M26.3,27h-1.8v-1.4h1.8V27z M22.6,27h-1.8v-1.4h1.8V27z
 M18.9,27h-1.8v-1.4 h1.8V27z M15.3,27h-1.8v-1.4h1.8V27z M11.6,27H9.8v-1.4h1.8V27z
 M8,27H6.2v-1.4H8V27z M4.3,27H2.5v-1.4h1.8V27z" />
     <path
-        android:fillColor="@color/color_default_primary_text"
+        android:fillColor="@color/color_default_secondary_text"
         android:pathData="M 26.7 23.3 L 25 23.3 L 25 13.4 L 22.3 12.3 L 19.6 13.4 L 19.6 23.3 L 17.8 23.3 L 17.8 12.2 L 22 10.6 L 22.6 10.6 L 26.7 12.2 Z" />
     <path
-        android:fillColor="@color/color_default_primary_text"
+        android:fillColor="@color/color_default_secondary_text"
         android:pathData="M 22.2 11.6 H 22.5 V 23.3 H 22.2 V 11.6 Z" />
 </vector>
diff --git a/res/drawable/share.xml b/res/drawable/share.xml
index f7d435ec3095fb00aebec3e5cc433f56257a2e60..c4aea7b29809066f4606227c2ef70f8a6b3abdc2 100644
--- a/res/drawable/share.xml
+++ b/res/drawable/share.xml
@@ -34,5 +34,5 @@
         android:viewportHeight="24.0">
     <path
         android:pathData="M17.999,16.121c-0.76,0 -1.439,0.3 -1.96,0.77L8.91,12.741C8.959,12.512 9,12.281 9,12.041s-0.04,-0.471 -0.09,-0.7l7.049,-4.11c0.54,0.5 1.25,0.81 2.04,0.81c1.66,0 3,-1.34 3,-3s-1.34,-3 -3,-3s-3,1.34 -3,3c0,0.24 0.04,0.47 0.09,0.7L8.04,9.851C7.5,9.351 6.79,9.041 6,9.041c-1.66,0 -3,1.34 -3,3c0,1.661 1.34,3 3,3c0.79,0 1.5,-0.311 2.04,-0.811l7.12,4.16c-0.051,0.211 -0.08,0.43 -0.08,0.65c0,1.609 1.311,2.92 2.92,2.92s2.92,-1.311 2.92,-2.92S19.608,16.121 17.999,16.121z"
-        android:fillColor="@color/accent"/>
+        android:fillColor="@color/color_default_secondary_text"/>
 </vector>
diff --git a/res/drawable/slideshow.xml b/res/drawable/slideshow.xml
index 95d361f5a32e419327155c211e8aa3d16da09bb1..59027ad3024d29f44c3ee6e26c2f53c714f589b3 100644
--- a/res/drawable/slideshow.xml
+++ b/res/drawable/slideshow.xml
@@ -34,5 +34,5 @@
         android:viewportHeight="24.0">
     <path
         android:pathData="M10,8v8l5,-4L10,8zM19,3H5C3.9,3 3,3.9 3,5v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2V5C21,3.9 20.1,3 19,3zM19,19H5V5h14V19z"
-        android:fillColor="@color/accent"/>
+        android:fillColor="@color/color_default_secondary_text"/>
 </vector>
diff --git a/res/drawable/truescanner.xml b/res/drawable/truescanner.xml
index 23f7792e080839e2f2b32f5cfda7114943e49680..93cf52df68f47054eb872eb05cd3f8b151c9876c 100644
--- a/res/drawable/truescanner.xml
+++ b/res/drawable/truescanner.xml
@@ -33,31 +33,31 @@
     android:viewportHeight="32">
 
     <path
-        android:fillColor="@color/color_default_primary_text"
+        android:fillColor="@color/color_default_secondary_text"
         android:pathData="M15.1,23.4c0,0.8,0,1.6,0,2.3c-4,0-7.9,0-11.9,0c0-6.7,0-13.4,0-20c4,0,7.9,0,11.9,0c0,0.8,0,1.5,0,2.3
 c-3.2,0-6.4,0-9.6,0c0,5.1,0,10.2,0,15.4C8.7,23.4,11.9,23.4,15.1,23.4z" />
     <path
-        android:fillColor="@color/color_default_primary_text"
+        android:fillColor="@color/color_default_secondary_text"
         android:pathData="M15.1,10c0,0,0,0.1,0,0.1c0,1.9,0,3.7,0,5.6c0,0.1,0,0.2-0.1,0.3c-0.1,0.2-0.2,0.4-0.3,0.6c0,0,0,0.1,0,0.1
 c0.1,0,0.3,0,0.4,0c0,0.8,0,1.5,0,2.2c-0.1,0-0.2,0-0.3,0c-0.3,0-0.7,0-1,0c-0.1,0-0.1,0-0.2,0.1c-0.4,0.8-0.7,1.6-1.1,2.4
 c0,0.1-0.1,0.1-0.1,0.1c-0.9,0-1.8,0-2.8,0c0,0,0,0-0.1,0C11.4,17.7,13.2,13.9,15.1,10C15.1,10,15.1,10,15.1,10z" />
     <path
-        android:fillColor="@color/color_default_primary_text"
+        android:fillColor="@color/color_default_secondary_text"
         android:pathData="M17,16.4c0,4.2,0,8.4,0,12.5c0,0.3-0.2,0.5-0.4,0.5c-0.3,0-0.5-0.2-0.5-0.4c0,0,0-0.1,0-0.1
 c0-8.3,0-16.7,0-25c0-0.1,0-0.2,0-0.2c0.1-0.2,0.3-0.4,0.5-0.3c0.2,0,0.4,0.2,0.4,0.5c0,0,0,0.1,0,0.1C17,8.1,17,12.3,17,16.4z" />
     <path
-        android:fillColor="@color/color_default_primary_text"
+        android:fillColor="@color/color_default_secondary_text"
         android:pathData="M28.7,6.5c0,6.1,0,12.2,0,18.3c-3.4,0-6.9,0-10.3,0c0-0.1,0-0.2,0-0.3c3.3,0,6.7,0,10,0
 c0-5.9,0-11.8,0-17.7c-3.3,0-6.6,0-9.9,0c0-0.1,0-0.2,0-0.3C21.9,6.5,25.3,6.5,28.7,6.5z" />
     <path
-        android:fillColor="@color/color_default_primary_text"
+        android:fillColor="@color/color_default_secondary_text"
         android:pathData="M18,9.6c1.9,4,3.8,8,5.7,12.1c-0.1,0-0.1,0-0.1,0c-1,0-2,0-3,0c-0.1,0-0.1,0-0.2-0.1
 c-0.4-0.8-0.7-1.6-1.1-2.4c0-0.1-0.1-0.1-0.2-0.1c-0.3,0-0.7,0-1,0c0,0-0.1,0-0.1,0c0-0.1,0-0.2,0-0.3c0,0,0.1,0,0.1,0
 c0.4,0,0.9,0,1.3,0c0.1,0,0.1,0,0.2,0.1c0.4,0.8,0.7,1.6,1.1,2.4c0,0.1,0.1,0.1,0.2,0.1c0.8,0,1.5,0,2.3,0c0,0,0.1,0,0.1,0
 c-0.1-0.2-0.2-0.5-0.3-0.7c-1.6-3.3-3.1-6.6-4.7-9.9c0,0,0-0.1,0-0.1C17.9,10.4,17.9,10,18,9.6C18,9.7,18,9.6,18,9.6
 C18,9.6,18,9.6,18,9.6z" />
     <path
-        android:fillColor="@color/color_default_primary_text"
+        android:fillColor="@color/color_default_secondary_text"
         android:pathData="M18.6,16.8c-0.2,0-0.4,0-0.6,0c0-0.1,0-0.2,0-0.3c0,0,0.1,0,0.1,0c-0.2-0.3-0.1-0.7-0.1-1
 C18.2,15.9,18.4,16.4,18.6,16.8z" />
 </vector>
diff --git a/res/menu/operation.xml b/res/menu/operation.xml
index 195f5763e64cf41a9a09853af57bd82cfcc9f560..b5af3154f3ed0b5945ba7db9a41a13616875f07b 100644
--- a/res/menu/operation.xml
+++ b/res/menu/operation.xml
@@ -35,16 +35,12 @@
     </item>
     <item android:id="@+id/action_share"
             android:icon="@drawable/multiselect_share"
-            android:iconTint="@color/accent"
-            android:iconTintMode="src_atop"
             android:title="@string/share"
             android:visible="false"
             android:showAsAction="ifRoom">
     </item>
     <item android:id="@+id/action_delete"
             android:icon="@drawable/multiselect_delete"
-            android:iconTint="@color/accent"
-            android:iconTintMode="src_atop"
             android:title="@string/delete"
             android:visible="false"
             android:showAsAction="ifRoom" />
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 5335828f335c38093248dbe0a2f851dcd342bbb1..265c63f3c6d1a2b5a9b49505e56ac164800a6281 100755
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -85,10 +85,10 @@
     <color name="timeline_title_number_text_color">@color/color_default_primary_text</color>
     <color name="timeline_title_background_color">@color/color_default_background</color>
 
-    <color name="navigation_accent_disabled">@color/disable_tab_color</color>
+    <color name="navigation_accent_disabled">@color/color_default_secondary_text</color>
     <color name="navigation_accent_enabled">@color/accent</color>
 
     <color name="details_text_color">@color/color_default_primary_text</color>
     <color name="multiselect_action_text_color">@color/color_default_primary_text</color>
-    <color name="multiselect_icon_color">@color/accent</color>
+    <color name="multiselect_icon_color">@color/color_default_secondary_text</color>
 </resources>