diff --git a/app/src/main/res/drawable/ic_action_new_folder.xml b/app/src/main/res/drawable/ic_action_new_folder.xml
index 48035373b..10abe071b 100644
--- a/app/src/main/res/drawable/ic_action_new_folder.xml
+++ b/app/src/main/res/drawable/ic_action_new_folder.xml
@@ -6,9 +6,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
   android:width="24dp"
   android:height="24dp"
+  android:tint="?attr/colorControlNormal"
   android:viewportWidth="24"
   android:viewportHeight="24">
   <path
-    android:fillColor="?attr/colorOnPrimary"
+    android:fillColor="#FFFFFF"
     android:pathData="M20,18H4V8H20M20,6H12L10,4H4C2.89,4 2,4.89 2,6V18A2,2 0,0 0,4 20H20A2,2 0,0 0,22 18V8C22,6.89 21.1,6 20,6Z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_action_new_password.xml b/app/src/main/res/drawable/ic_action_new_password.xml
index f3c3aacca..2d2daea3c 100644
--- a/app/src/main/res/drawable/ic_action_new_password.xml
+++ b/app/src/main/res/drawable/ic_action_new_password.xml
@@ -6,9 +6,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
   android:width="24dp"
   android:height="24dp"
+  android:tint="?attr/colorControlNormal"
   android:viewportWidth="24"
   android:viewportHeight="24">
   <path
-    android:fillColor="?attr/colorOnPrimary"
+    android:fillColor="#FFFFFF"
     android:pathData="M14,2H6A2,2 0,0 0,4 4V20A2,2 0,0 0,6 22H18A2,2 0,0 0,20 20V8L14,2M18,20H6V4H13V9H18M12.83,15A3,3 0,1 0,12.83 17H14V19H16V17H17V15M10,17A1,1 0,1 1,11 16A1,1 0,0 1,10 17Z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_action_secure_24dp.xml b/app/src/main/res/drawable/ic_action_secure_24dp.xml
index 313bbbdcc..1e0b2e0b6 100644
--- a/app/src/main/res/drawable/ic_action_secure_24dp.xml
+++ b/app/src/main/res/drawable/ic_action_secure_24dp.xml
@@ -6,10 +6,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
   android:width="24dp"
   android:height="24dp"
-  android:tint="?attr/colorOnPrimary"
+  android:tint="?attr/colorControlNormal"
   android:viewportWidth="24"
   android:viewportHeight="24">
   <path
-    android:fillColor="#FFFFFFFF"
+    android:fillColor="#FFFFFF"
     android:pathData="M18,8h-1L17,6c0,-2.76 -2.24,-5 -5,-5S7,3.24 7,6v2L6,8c-1.1,0 -2,0.9 -2,2v10c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L20,10c0,-1.1 -0.9,-2 -2,-2zM9,6c0,-1.66 1.34,-3 3,-3s3,1.34 3,3v2L9,8L9,6zM18,20L6,20L6,10h12v10zM12,17c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_add_48dp.xml b/app/src/main/res/drawable/ic_add_48dp.xml
index 2f4d88206..4ca180fe0 100644
--- a/app/src/main/res/drawable/ic_add_48dp.xml
+++ b/app/src/main/res/drawable/ic_add_48dp.xml
@@ -6,9 +6,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
   android:width="24dp"
   android:height="24dp"
+  android:tint="?attr/colorControlNormal"
   android:viewportWidth="24"
   android:viewportHeight="24">
   <path
-    android:fillColor="?attr/colorOnPrimary"
+    android:fillColor="#FFFFFF"
     android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_autofill_sms.xml b/app/src/main/res/drawable/ic_autofill_sms.xml
index d43fa385d..0ae294c78 100644
--- a/app/src/main/res/drawable/ic_autofill_sms.xml
+++ b/app/src/main/res/drawable/ic_autofill_sms.xml
@@ -10,6 +10,6 @@
   android:viewportWidth="24"
   android:viewportHeight="24">
   <path
-    android:fillColor="@android:color/white"
+    android:fillColor="#FFFFFF"
     android:pathData="M20,2L4,2c-1.1,0 -1.99,0.9 -1.99,2L2,22l4,-4h14c1.1,0 2,-0.9 2,-2L22,4c0,-1.1 -0.9,-2 -2,-2zM9,11L7,11L7,9h2v2zM13,11h-2L11,9h2v2zM17,11h-2L15,9h2v2z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_content_copy.xml b/app/src/main/res/drawable/ic_content_copy.xml
index e2075dac6..8afc9846d 100644
--- a/app/src/main/res/drawable/ic_content_copy.xml
+++ b/app/src/main/res/drawable/ic_content_copy.xml
@@ -6,9 +6,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
   android:width="24dp"
   android:height="24dp"
+  android:tint="?attr/colorControlNormal"
   android:viewportWidth="24"
   android:viewportHeight="24">
   <path
-    android:fillColor="?attr/colorOnPrimary"
+    android:fillColor="#FFFFFF"
     android:pathData="M16,1L4,1c-1.1,0 -2,0.9 -2,2v14h2L4,3h12L16,1zM15,5L8,5c-1.1,0 -1.99,0.9 -1.99,2L6,21c0,1.1 0.89,2 1.99,2L19,23c1.1,0 2,-0.9 2,-2L21,11l-6,-6zM8,21L8,7h6v5h5v9L8,21z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_delete_24dp.xml b/app/src/main/res/drawable/ic_delete_24dp.xml
index 82bac9d35..b945c8367 100644
--- a/app/src/main/res/drawable/ic_delete_24dp.xml
+++ b/app/src/main/res/drawable/ic_delete_24dp.xml
@@ -6,9 +6,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
   android:width="24dp"
   android:height="24dp"
+  android:tint="?attr/colorControlNormal"
   android:viewportWidth="24"
   android:viewportHeight="24">
   <path
-    android:fillColor="?attr/colorOnPrimary"
+    android:fillColor="#FFFFFF"
     android:pathData="M16,9v10H8V9h8m-1.5,-6h-5l-1,1H5v2h14V4h-3.5l-1,-1zM18,7H6v12c0,1.1 0.9,2 2,2h8c1.1,0 2,-0.9 2,-2V7z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_done_24dp.xml b/app/src/main/res/drawable/ic_done_24dp.xml
index 687f853f1..2dbf4ebfc 100644
--- a/app/src/main/res/drawable/ic_done_24dp.xml
+++ b/app/src/main/res/drawable/ic_done_24dp.xml
@@ -6,9 +6,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
   android:width="24dp"
   android:height="24dp"
+  android:tint="?attr/colorControlNormal"
   android:viewportWidth="24"
   android:viewportHeight="24">
   <path
-    android:fillColor="?attr/colorOnPrimary"
+    android:fillColor="#FFFFFF"
     android:pathData="M9,16.2L4.8,12l-1.4,1.4L9,19 21,7l-1.4,-1.4L9,16.2z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_edit_24dp.xml b/app/src/main/res/drawable/ic_edit_24dp.xml
index 592f22668..a8fc0d852 100644
--- a/app/src/main/res/drawable/ic_edit_24dp.xml
+++ b/app/src/main/res/drawable/ic_edit_24dp.xml
@@ -6,9 +6,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
   android:width="24dp"
   android:height="24dp"
+  android:tint="?attr/colorControlNormal"
   android:viewportWidth="24"
   android:viewportHeight="24">
   <path
-    android:fillColor="?attr/colorOnPrimary"
+    android:fillColor="#FFFFFF"
     android:pathData="M14.06,9.02l0.92,0.92L5.92,19L5,19v-0.92l9.06,-9.06M17.66,3c-0.25,0 -0.51,0.1 -0.7,0.29l-1.83,1.83 3.75,3.75 1.83,-1.83c0.39,-0.39 0.39,-1.02 0,-1.41l-2.34,-2.34c-0.2,-0.2 -0.45,-0.29 -0.71,-0.29zM14.06,6.19L3,17.25L3,21h3.75L17.81,9.94l-3.75,-3.75z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_keyboard_arrow_right_24dp.xml b/app/src/main/res/drawable/ic_keyboard_arrow_right_24dp.xml
index 0f1122fa8..a526cd994 100644
--- a/app/src/main/res/drawable/ic_keyboard_arrow_right_24dp.xml
+++ b/app/src/main/res/drawable/ic_keyboard_arrow_right_24dp.xml
@@ -6,7 +6,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
   android:width="24dp"
   android:height="24dp"
-  android:tint="?attr/colorOnPrimary"
+  android:tint="?attr/colorControlNormal"
   android:viewportWidth="24"
   android:viewportHeight="24">
   <path
diff --git a/app/src/main/res/drawable/ic_move_folder_24dp.xml b/app/src/main/res/drawable/ic_move_folder_24dp.xml
index 037ca200d..4b65bc7ad 100644
--- a/app/src/main/res/drawable/ic_move_folder_24dp.xml
+++ b/app/src/main/res/drawable/ic_move_folder_24dp.xml
@@ -6,9 +6,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
   android:width="24dp"
   android:height="24dp"
+  android:tint="?attr/colorControlNormal"
   android:viewportWidth="24"
   android:viewportHeight="24">
   <path
-    android:fillColor="?attr/colorOnPrimary"
+    android:fillColor="#FFFFFF"
     android:pathData="M20,6L12,6L10,4L4,4A2,2 0,0 0,2 6L2,18a2,2 0,0 0,2 2L20,20a2,2 0,0 0,2 -2L22,8A2,2 0,0 0,20 6ZM20,18L4,18L4,8L20,8ZM13,12L7,12v2h6v2l4,-3 -4,-3Z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_push_pin_24dp.xml b/app/src/main/res/drawable/ic_push_pin_24dp.xml
index f1e14a868..af5ac554e 100644
--- a/app/src/main/res/drawable/ic_push_pin_24dp.xml
+++ b/app/src/main/res/drawable/ic_push_pin_24dp.xml
@@ -1,11 +1,11 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
+  android:width="24dp"
+  android:height="24dp"
+  android:tint="?attr/colorControlNormal"
+  android:viewportWidth="24"
+  android:viewportHeight="24">
   <path
-      android:fillColor="@android:color/white"
-      android:pathData="M16,9V4l1,0c0.55,0 1,-0.45 1,-1v0c0,-0.55 -0.45,-1 -1,-1H7C6.45,2 6,2.45 6,3v0c0,0.55 0.45,1 1,1l1,0v5c0,1.66 -1.34,3 -3,3h0v2h5.97v7l1,1l1,-1v-7H19v-2h0C17.34,12 16,10.66 16,9z"
-      android:fillType="evenOdd"/>
+    android:fillColor="#FFFFFF"
+    android:fillType="evenOdd"
+    android:pathData="M16,9V4l1,0c0.55,0 1,-0.45 1,-1v0c0,-0.55 -0.45,-1 -1,-1H7C6.45,2 6,2.45 6,3v0c0,0.55 0.45,1 1,1l1,0v5c0,1.66 -1.34,3 -3,3h0v2h5.97v7l1,1l1,-1v-7H19v-2h0C17.34,12 16,10.66 16,9z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_round_import_export.xml b/app/src/main/res/drawable/ic_round_import_export.xml
index 78f1d1c13..79b37c48e 100644
--- a/app/src/main/res/drawable/ic_round_import_export.xml
+++ b/app/src/main/res/drawable/ic_round_import_export.xml
@@ -10,6 +10,6 @@
   android:viewportWidth="24"
   android:viewportHeight="24">
   <path
-    android:fillColor="@android:color/white"
+    android:fillColor="#FFFFFF"
     android:pathData="M8.65,3.35L5.86,6.14c-0.32,0.31 -0.1,0.85 0.35,0.85H8V13c0,0.55 0.45,1 1,1s1,-0.45 1,-1V6.99h1.79c0.45,0 0.67,-0.54 0.35,-0.85L9.35,3.35c-0.19,-0.19 -0.51,-0.19 -0.7,0zM16,17.01V11c0,-0.55 -0.45,-1 -1,-1s-1,0.45 -1,1v6.01h-1.79c-0.45,0 -0.67,0.54 -0.35,0.85l2.79,2.78c0.2,0.19 0.51,0.19 0.71,0l2.79,-2.78c0.32,-0.31 0.09,-0.85 -0.35,-0.85H16z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_save_24dp.xml b/app/src/main/res/drawable/ic_save_24dp.xml
index 09a0191bf..e77f7a80a 100644
--- a/app/src/main/res/drawable/ic_save_24dp.xml
+++ b/app/src/main/res/drawable/ic_save_24dp.xml
@@ -6,9 +6,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
   android:width="24dp"
   android:height="24dp"
+  android:tint="?attr/colorControlNormal"
   android:viewportWidth="24"
   android:viewportHeight="24">
   <path
-    android:fillColor="?attr/colorOnPrimary"
+    android:fillColor="#FFFFFF"
     android:pathData="M17,3L5,3c-1.11,0 -2,0.9 -2,2v14c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2L21,7l-4,-4zM19,19L5,19L5,5h11.17L19,7.83L19,19zM12,12c-1.66,0 -3,1.34 -3,3s1.34,3 3,3 3,-1.34 3,-3 -1.34,-3 -3,-3zM6,6h9v4L6,10z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_save_copy_24dp.xml b/app/src/main/res/drawable/ic_save_copy_24dp.xml
index a288450d6..1ba273a22 100644
--- a/app/src/main/res/drawable/ic_save_copy_24dp.xml
+++ b/app/src/main/res/drawable/ic_save_copy_24dp.xml
@@ -6,9 +6,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
   android:width="24dp"
   android:height="24dp"
+  android:tint="?attr/colorControlNormal"
   android:viewportWidth="24"
   android:viewportHeight="24">
   <path
-    android:fillColor="?attr/colorOnPrimary"
+    android:fillColor="#FFFFFF"
     android:pathData="M19,5L7,5A2,2 0,0 0,5 7L5,21a2,2 0,0 0,2 2L21,23a2,2 0,0 0,2 -2L23,9ZM21,21L7,21L7,7L18.17,7L21,9.83ZM14,14a3,3 0,1 0,3 3A3,3 0,0 0,14 14ZM8,8h9v4L8,12ZM15,1L3,1A2,2 0,0 0,1 3L1,17L3,17L3,3L15,3Z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_search_24dp.xml b/app/src/main/res/drawable/ic_search_24dp.xml
index 2901b5ab7..621f2b6a2 100644
--- a/app/src/main/res/drawable/ic_search_24dp.xml
+++ b/app/src/main/res/drawable/ic_search_24dp.xml
@@ -6,9 +6,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
   android:width="24dp"
   android:height="24dp"
+  android:tint="?attr/colorControlNormal"
   android:viewportWidth="24"
   android:viewportHeight="24">
   <path
-    android:fillColor="?attr/colorOnPrimary"
+    android:fillColor="#FFFFFF"
     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,3S3,5.91 3,9.5 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,14C7.01,14 5,11.99 5,9.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/ic_share_24dp.xml b/app/src/main/res/drawable/ic_share_24dp.xml
index 433bcce39..a71b1d1eb 100644
--- a/app/src/main/res/drawable/ic_share_24dp.xml
+++ b/app/src/main/res/drawable/ic_share_24dp.xml
@@ -6,9 +6,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
   android:width="24dp"
   android:height="24dp"
+  android:tint="?attr/colorControlNormal"
   android:viewportWidth="24"
   android:viewportHeight="24">
   <path
-    android:fillColor="?attr/colorOnPrimary"
+    android:fillColor="#FFFFFF"
     android:pathData="M18,16.08c-0.76,0 -1.44,0.3 -1.96,0.77L8.91,12.7c0.05,-0.23 0.09,-0.46 0.09,-0.7s-0.04,-0.47 -0.09,-0.7l7.05,-4.11c0.54,0.5 1.25,0.81 2.04,0.81 1.66,0 3,-1.34 3,-3s-1.34,-3 -3,-3 -3,1.34 -3,3c0,0.24 0.04,0.47 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.12,4.16c-0.05,0.21 -0.08,0.43 -0.08,0.65 0,1.61 1.31,2.92 2.92,2.92s2.92,-1.31 2.92,-2.92c0,-1.61 -1.31,-2.92 -2.92,-2.92zM18,4c0.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,1zM18,20.02c-0.55,0 -1,-0.45 -1,-1s0.45,-1 1,-1 1,0.45 1,1 -0.45,1 -1,1z" />
 </vector>