From 55bc378f0ebf9eb63bb62d7fe6c8040f5f6fedcc Mon Sep 17 00:00:00 2001
From: NekoInverter <7741672-NekoInverter@users.noreply.gitlab.com>
Date: Mon, 28 Dec 2020 19:26:53 +0800
Subject: [PATCH] Colorize drawables properly

---
 .../ehviewer/ui/scene/FavoritesScene.java     |  2 +-
 .../ehviewer/ui/scene/GalleryListScene.java   |  6 ++---
 .../res/drawable-xhdpi/v_folder_move_x24.xml  |  6 ++---
 app/src/main/res/drawable/big_download.xml    |  5 ++--
 app/src/main/res/drawable/big_filter.xml      |  5 ++--
 app/src/main/res/drawable/big_history.xml     |  5 ++--
 .../main/res/drawable/big_sad_pandroid.xml    |  9 ++++---
 .../drawable/ic_baseline_brightness_2_24.xml  |  4 +--
 .../ic_baseline_format_list_numbered_24.xml   |  6 ++---
 .../res/drawable/ic_baseline_label_24.xml     |  6 ++---
 .../res/drawable/ic_baseline_pause_24.xml     |  6 ++---
 .../res/drawable/ic_baseline_reorder_24.xml   |  6 ++---
 .../res/drawable/ic_baseline_warning_24.xml   |  6 ++---
 .../res/drawable/ic_launcher_foreground.xml   | 27 ++++++++++---------
 app/src/main/res/drawable/image_failed.xml    |  6 ++---
 .../main/res/drawable/v_adb_primary_x24.xml   |  5 ++--
 app/src/main/res/drawable/v_alert_red_x48.xml |  5 ++--
 .../res/drawable/v_archive_primary_x48.xml    |  5 ++--
 .../res/drawable/v_arrow_left_dark_x24.xml    |  5 ++--
 .../res/drawable/v_book_open_primary_x24.xml  |  5 ++--
 app/src/main/res/drawable/v_book_open_x24.xml |  6 ++---
 .../main/res/drawable/v_chart_accent_x48.xml  |  5 ++--
 .../res/drawable/v_check_all_dark_x24.xml     |  6 ++---
 .../main/res/drawable/v_check_dark_x24.xml    |  6 ++---
 .../res/drawable/v_clear_all_dark_x24.xml     |  6 ++---
 .../main/res/drawable/v_close_dark_x24.xml    |  6 ++---
 .../main/res/drawable/v_cookie_brown_x48.xml  |  6 ++---
 app/src/main/res/drawable/v_delete_x24.xml    |  6 ++---
 .../v_dots_vertical_secondary_dark_x24.xml    |  6 ++---
 .../res/drawable/v_download_black_x24.xml     | 27 -------------------
 .../res/drawable/v_download_box_dark_x24.xml  |  6 ++---
 .../main/res/drawable/v_download_dark_x24.xml | 27 -------------------
 .../res/drawable/v_download_primary_x24.xml   |  5 ++--
 app/src/main/res/drawable/v_download_x16.xml  |  5 ++--
 app/src/main/res/drawable/v_download_x24.xml  |  6 ++---
 .../drawable/v_eh_subscription_black_x24.xml  |  6 ++---
 .../res/drawable/v_file_find_primary_x48.xml  |  5 ++--
 .../main/res/drawable/v_filter_dark_x24.xml   |  6 +++--
 .../main/res/drawable/v_fire_black_x24.xml    |  5 ++--
 .../res/drawable/v_folder_move_dark_x24.xml   | 27 -------------------
 .../main/res/drawable/v_go_to_dark_x24.xml    |  5 ++--
 .../main/res/drawable/v_heart_black_x24.xml   | 27 -------------------
 .../res/drawable/v_heart_box_dark_x24.xml     |  5 ++--
 .../main/res/drawable/v_heart_broken_x24.xml  |  6 ++---
 .../drawable/v_heart_outline_primary_x48.xml  |  5 ++--
 .../main/res/drawable/v_heart_primary_x48.xml |  5 ++--
 app/src/main/res/drawable/v_heart_x16.xml     |  5 ++--
 app/src/main/res/drawable/v_heart_x24.xml     |  6 ++---
 .../main/res/drawable/v_help_circle_x24.xml   |  6 ++---
 .../main/res/drawable/v_history_black_x24.xml |  5 ++--
 .../res/drawable/v_homepage_black_x24.xml     |  5 ++--
 .../res/drawable/v_info_outline_dark_x24.xml  |  5 ++--
 .../main/res/drawable/v_info_primary_x24.xml  |  5 ++--
 .../main/res/drawable/v_magnify_dark_x24.xml  | 27 -------------------
 app/src/main/res/drawable/v_magnify_x24.xml   |  6 ++---
 .../main/res/drawable/v_pause_dark_x24.xml    | 27 -------------------
 app/src/main/res/drawable/v_pause_x24.xml     |  6 ++---
 .../main/res/drawable/v_pencil_dark_x24.xml   |  5 ++--
 app/src/main/res/drawable/v_play_dark_x24.xml | 27 -------------------
 app/src/main/res/drawable/v_play_x24.xml      |  6 ++---
 app/src/main/res/drawable/v_plus_dark_x24.xml |  5 ++--
 .../main/res/drawable/v_refresh_dark_x24.xml  |  5 ++--
 .../main/res/drawable/v_reply_dark_x24.xml    |  5 ++--
 .../res/drawable/v_sad_panda_primary_x24.xml  |  5 ++--
 .../main/res/drawable/v_sec_primary_x24.xml   |  6 +++--
 app/src/main/res/drawable/v_send_dark_x24.xml |  5 ++--
 .../res/drawable/v_settings_black_x24.xml     |  5 ++--
 .../main/res/drawable/v_share_primary_x48.xml |  5 ++--
 .../res/drawable/v_similar_primary_x48.xml    |  5 ++--
 app/src/main/res/drawable/v_slider_bubble.xml |  5 ++--
 app/src/main/res/drawable/v_star_half_x16.xml |  5 ++--
 .../main/res/drawable/v_star_outline_x16.xml  |  5 ++--
 app/src/main/res/drawable/v_star_x16.xml      |  5 ++--
 .../res/drawable/v_utorrent_primary_x48.xml   |  5 ++--
 .../main/res/layout/gallery_detail_header.xml |  1 +
 app/src/main/res/layout/nav_header_main.xml   |  1 +
 app/src/main/res/layout/scene_favorites.xml   |  4 +--
 .../res/layout/scene_gallery_comments.xml     |  3 ++-
 .../main/res/layout/scene_gallery_list.xml    |  4 +--
 .../main/res/menu/download_label_option.xml   |  4 +--
 app/src/main/res/menu/drawer_download.xml     |  4 +--
 app/src/main/res/menu/nav_drawer_main.xml     |  4 +--
 app/src/main/res/menu/quicksearch_option.xml  |  2 +-
 app/src/main/res/menu/scene_download.xml      |  4 +--
 .../res/mipmap-anydpi-v26/ic_launcher.xml     |  4 +--
 .../mipmap-anydpi-v26/ic_launcher_round.xml   |  4 +--
 .../mipmap-night-anydpi-v26/ic_launcher.xml   |  4 +--
 .../ic_launcher_round.xml                     |  4 +--
 app/src/main/res/values-night/themes.xml      |  6 +++--
 app/src/main/res/values/attrs.xml             |  8 ++----
 app/src/main/res/values/themes.xml            |  4 +--
 91 files changed, 246 insertions(+), 392 deletions(-)
 delete mode 100644 app/src/main/res/drawable/v_download_black_x24.xml
 delete mode 100644 app/src/main/res/drawable/v_download_dark_x24.xml
 delete mode 100644 app/src/main/res/drawable/v_folder_move_dark_x24.xml
 delete mode 100644 app/src/main/res/drawable/v_heart_black_x24.xml
 delete mode 100644 app/src/main/res/drawable/v_magnify_dark_x24.xml
 delete mode 100644 app/src/main/res/drawable/v_pause_dark_x24.xml
 delete mode 100644 app/src/main/res/drawable/v_play_dark_x24.xml

diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/FavoritesScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/FavoritesScene.java
index a55d85a53..518834bd6 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/scene/FavoritesScene.java
+++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/FavoritesScene.java
@@ -279,7 +279,7 @@ public class FavoritesScene extends BaseScene implements
         fastScroller.setPadding(fastScroller.getPaddingLeft(), fastScroller.getPaddingTop() + paddingTopSB,
                 fastScroller.getPaddingRight(), fastScroller.getPaddingBottom());
 
-        mLeftDrawable = new DrawerArrowDrawable(context, AttrResources.getAttrColor(context, R.attr.drawableColorPrimary));
+        mLeftDrawable = new DrawerArrowDrawable(context, AttrResources.getAttrColor(context, android.R.attr.colorControlNormal));
         mSearchBar.setLeftDrawable(mLeftDrawable);
         mSearchBar.setRightDrawable(DrawableManager.getVectorDrawable(context, R.drawable.v_magnify_x24));
         mSearchBar.setHelper(this);
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.java
index 620998806..84a982e60 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.java
+++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.java
@@ -493,7 +493,7 @@ public final class GalleryListScene extends BaseScene
         if (isTopList != mIsTopList) {
             mIsTopList = isTopList;
             recreateDrawerView();
-            mFabLayout.getSecondaryFabAt(0).setImageResource(isTopList ? R.drawable.ic_baseline_format_list_numbered_24 : R.drawable.v_magnify_dark_x24);
+            mFabLayout.getSecondaryFabAt(0).setImageResource(isTopList ? R.drawable.ic_baseline_format_list_numbered_24 : R.drawable.v_magnify_x24);
         }
 
         // Update normal search mode
@@ -579,8 +579,8 @@ public final class GalleryListScene extends BaseScene
         fastScroller.setPadding(fastScroller.getPaddingLeft(), fastScroller.getPaddingTop() + paddingTopSB,
                 fastScroller.getPaddingRight(), fastScroller.getPaddingBottom());
 
-        mLeftDrawable = new DrawerArrowDrawable(context, AttrResources.getAttrColor(context, R.attr.drawableColorPrimary));
-        mRightDrawable = new AddDeleteDrawable(context, AttrResources.getAttrColor(context, R.attr.drawableColorPrimary));
+        mLeftDrawable = new DrawerArrowDrawable(context, AttrResources.getAttrColor(context, android.R.attr.colorControlNormal));
+        mRightDrawable = new AddDeleteDrawable(context, AttrResources.getAttrColor(context, android.R.attr.colorControlNormal));
         mSearchBar.setLeftDrawable(mLeftDrawable);
         mSearchBar.setRightDrawable(mRightDrawable);
         mSearchBar.setHelper(this);
diff --git a/app/src/main/res/drawable-xhdpi/v_folder_move_x24.xml b/app/src/main/res/drawable-xhdpi/v_folder_move_x24.xml
index 3bed0eb36..922ee29b7 100644
--- a/app/src/main/res/drawable-xhdpi/v_folder_move_x24.xml
+++ b/app/src/main/res/drawable-xhdpi/v_folder_move_x24.xml
@@ -18,10 +18,10 @@
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="24"
-    android:viewportHeight="24">
-
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
     <path
-        android:fillColor="?attr/drawableColorPrimary"
+        android:fillColor="@android:color/white"
         android:pathData="@string/pd_folder_move" />
 
 </vector>
diff --git a/app/src/main/res/drawable/big_download.xml b/app/src/main/res/drawable/big_download.xml
index a6670bfcd..bb0c5cb54 100644
--- a/app/src/main/res/drawable/big_download.xml
+++ b/app/src/main/res/drawable/big_download.xml
@@ -18,10 +18,11 @@
     android:width="120dp"
     android:height="120dp"
     android:viewportWidth="24"
-    android:viewportHeight="24">
+    android:viewportHeight="24"
+    android:tint="?drawableColorSecondary">
 
     <path
-        android:fillColor="?attr/drawableColorSecondary"
+        android:fillColor="@android:color/white"
         android:pathData="@string/pd_big_download" />
 
 </vector>
diff --git a/app/src/main/res/drawable/big_filter.xml b/app/src/main/res/drawable/big_filter.xml
index e7606559a..049172a70 100644
--- a/app/src/main/res/drawable/big_filter.xml
+++ b/app/src/main/res/drawable/big_filter.xml
@@ -18,10 +18,11 @@
     android:width="120dp"
     android:height="120dp"
     android:viewportWidth="24"
-    android:viewportHeight="24">
+    android:viewportHeight="24"
+    android:tint="?drawableColorSecondary">
 
     <path
-        android:fillColor="?attr/drawableColorSecondary"
+        android:fillColor="@android:color/white"
         android:pathData="@string/pd_big_filter" />
 
 </vector>
diff --git a/app/src/main/res/drawable/big_history.xml b/app/src/main/res/drawable/big_history.xml
index 888b994db..083ed8f63 100644
--- a/app/src/main/res/drawable/big_history.xml
+++ b/app/src/main/res/drawable/big_history.xml
@@ -18,10 +18,11 @@
     android:width="120dp"
     android:height="120dp"
     android:viewportWidth="24"
-    android:viewportHeight="24">
+    android:viewportHeight="24"
+    android:tint="?drawableColorSecondary">
 
     <path
-        android:fillColor="?attr/drawableColorSecondary"
+        android:fillColor="@android:color/white"
         android:pathData="@string/pd_big_history" />
 
 </vector>
diff --git a/app/src/main/res/drawable/big_sad_pandroid.xml b/app/src/main/res/drawable/big_sad_pandroid.xml
index 4c5f09819..dbcb305aa 100644
--- a/app/src/main/res/drawable/big_sad_pandroid.xml
+++ b/app/src/main/res/drawable/big_sad_pandroid.xml
@@ -18,18 +18,19 @@
     android:width="120dp"
     android:height="120dp"
     android:viewportWidth="24"
-    android:viewportHeight="24">
+    android:viewportHeight="24"
+    android:tint="?drawableColorSecondary">
 
     <path
-        android:fillColor="?attr/drawableColorSecondary"
+        android:fillColor="@android:color/white"
         android:pathData="M16.5,10.8c-0.61,0-1.1,0.49-1.1,1.1c0,0.61,0.49,1.1,1.1,1.1s1.1-0.49,1.1-1.1C17.6,11.29,17.11,10.8,16.5,10.8z" />
 
     <path
-        android:fillColor="?attr/drawableColorSecondary"
+        android:fillColor="@android:color/white"
         android:pathData="M8.2,10.1c-0.61,0-1.1,0.49-1.1,1.1s0.49,1.1,1.1,1.1s1.1-0.49,1.1-1.1S8.81,10.1,8.2,10.1z" />
 
     <path
-        android:fillColor="?attr/drawableColorSecondary"
+        android:fillColor="@android:color/white"
         android:pathData="M22.1,16.4c-0.46-3.33-2.24-5.93-4.81-7.45L19.5,6.3c0.1-0.1,0.1-0.3,0-0.4c-0.1-0.1-0.3-0.1-0.4,0l-2.27,2.79c-1.26-0.66-2.69-1.07-4.23-1.19c-1.4-0.15-2.77-0.01-4.05,0.37L6.7,4.7C6.6,4.6,6.4,4.5,6.3,4.6C6.2,4.7,6.1,4.9,6.2,5l1.79,3.05c-2.83,1.02-5.12,3.3-6.19,6.55l15.44,1.37c0,0.02-0.01,0.04-0.01,0.05c0,0.59,0.48,1.07,1.07,1.07c0.54,0,0.97-0.41,1.04-0.93L22.1,16.4z M2.63,14.07c1.51-3.74,4.83-6.03,8.84-6.03c0.35,0,0.71,0.02,1.07,0.06c4.55,0.36,7.94,3.33,8.84,7.64l-2.12-0.19c-0.27-0.68-0.95-1.46-0.95-1.46s-0.58,0.66-0.89,1.29L2.63,14.07z" />
 
 </vector>
diff --git a/app/src/main/res/drawable/ic_baseline_brightness_2_24.xml b/app/src/main/res/drawable/ic_baseline_brightness_2_24.xml
index 70ffd09c7..47bd03a65 100644
--- a/app/src/main/res/drawable/ic_baseline_brightness_2_24.xml
+++ b/app/src/main/res/drawable/ic_baseline_brightness_2_24.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="#FFFFFF"
     android:viewportWidth="24"
-    android:viewportHeight="24">
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
     <path
         android:fillColor="@android:color/white"
         android:pathData="M10,2c-1.82,0 -3.53,0.5 -5,1.35C7.99,5.08 10,8.3 10,12s-2.01,6.92 -5,8.65C6.47,21.5 8.18,22 10,22c5.52,0 10,-4.48 10,-10S15.52,2 10,2z" />
diff --git a/app/src/main/res/drawable/ic_baseline_format_list_numbered_24.xml b/app/src/main/res/drawable/ic_baseline_format_list_numbered_24.xml
index c089156f5..363544e16 100644
--- a/app/src/main/res/drawable/ic_baseline_format_list_numbered_24.xml
+++ b/app/src/main/res/drawable/ic_baseline_format_list_numbered_24.xml
@@ -4,7 +4,7 @@
     android:viewportWidth="24"
     android:viewportHeight="24"
     android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M2,17h2v0.5L3,17.5v1h1v0.5L2,19v1h3v-4L2,16v1zM3,8h1L4,4L2,4v1h1v3zM2,11h1.8L2,13.1v0.9h3v-1L3.2,13L5,10.9L5,10L2,10v1zM7,5v2h14L21,5L7,5zM7,19h14v-2L7,17v2zM7,13h14v-2L7,11v2z"/>
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M2,17h2v0.5L3,17.5v1h1v0.5L2,19v1h3v-4L2,16v1zM3,8h1L4,4L2,4v1h1v3zM2,11h1.8L2,13.1v0.9h3v-1L3.2,13L5,10.9L5,10L2,10v1zM7,5v2h14L21,5L7,5zM7,19h14v-2L7,17v2zM7,13h14v-2L7,11v2z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_baseline_label_24.xml b/app/src/main/res/drawable/ic_baseline_label_24.xml
index f23f1b693..4e39f0505 100644
--- a/app/src/main/res/drawable/ic_baseline_label_24.xml
+++ b/app/src/main/res/drawable/ic_baseline_label_24.xml
@@ -4,7 +4,7 @@
     android:viewportWidth="24"
     android:viewportHeight="24"
     android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      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.16z"/>
+    <path
+        android:fillColor="@android:color/white"
+        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.16z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_baseline_pause_24.xml b/app/src/main/res/drawable/ic_baseline_pause_24.xml
index 13d6d2ec0..7e8a3e2ad 100644
--- a/app/src/main/res/drawable/ic_baseline_pause_24.xml
+++ b/app/src/main/res/drawable/ic_baseline_pause_24.xml
@@ -4,7 +4,7 @@
     android:viewportWidth="24"
     android:viewportHeight="24"
     android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M6,19h4L10,5L6,5v14zM14,5v14h4L18,5h-4z"/>
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M6,19h4L10,5L6,5v14zM14,5v14h4L18,5h-4z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_baseline_reorder_24.xml b/app/src/main/res/drawable/ic_baseline_reorder_24.xml
index 57af84b58..def7bf60b 100644
--- a/app/src/main/res/drawable/ic_baseline_reorder_24.xml
+++ b/app/src/main/res/drawable/ic_baseline_reorder_24.xml
@@ -4,7 +4,7 @@
     android:viewportWidth="24"
     android:viewportHeight="24"
     android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M3,15h18v-2L3,13v2zM3,19h18v-2L3,17v2zM3,11h18L21,9L3,9v2zM3,5v2h18L21,5L3,5z"/>
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M3,15h18v-2L3,13v2zM3,19h18v-2L3,17v2zM3,11h18L21,9L3,9v2zM3,5v2h18L21,5L3,5z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_baseline_warning_24.xml b/app/src/main/res/drawable/ic_baseline_warning_24.xml
index a02bc138c..7abb7f51b 100644
--- a/app/src/main/res/drawable/ic_baseline_warning_24.xml
+++ b/app/src/main/res/drawable/ic_baseline_warning_24.xml
@@ -4,7 +4,7 @@
     android:viewportWidth="24"
     android:viewportHeight="24"
     android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M1,21h22L12,2 1,21zM13,18h-2v-2h2v2zM13,14h-2v-4h2v4z"/>
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M1,21h22L12,2 1,21zM13,18h-2v-2h2v2zM13,14h-2v-4h2v4z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_launcher_foreground.xml b/app/src/main/res/drawable/ic_launcher_foreground.xml
index 47f5498f6..a1b273b1c 100644
--- a/app/src/main/res/drawable/ic_launcher_foreground.xml
+++ b/app/src/main/res/drawable/ic_launcher_foreground.xml
@@ -3,17 +3,18 @@
     android:height="108dp"
     android:viewportWidth="108"
     android:viewportHeight="108">
-  <group android:scaleX="0.37947997"
-      android:scaleY="0.37947997"
-      android:translateX="35.1"
-      android:translateY="39.584126">
-    <path
-        android:pathData="M39.893,68.066L39.893,75.977L0,75.977L0,4.59L39.893,4.59L39.893,12.5L8.984,12.5L8.984,34.766L38.086,34.766L38.086,42.578L8.984,42.578L8.984,68.066L39.893,68.066Z"
-        android:fillColor="@color/ic_launcher_foreground"
-        android:fillType="evenOdd"/>
-    <path
-        android:pathData="M99.609,75.977L90.918,75.977L90.918,41.699A23.436,23.436 0,0 0,90.662 38.109Q90.055,34.207 88.013,31.958Q85.629,29.334 81.028,28.863A20.84,20.84 0,0 0,78.906 28.76A23.134,23.134 0,0 0,74.45 29.16Q71.926,29.656 69.994,30.767A11.122,11.122 0,0 0,66.968 33.301A13.32,13.32 0,0 0,64.756 37.276Q63.399,40.971 63.213,46.495A53.517,53.517 0,0 0,63.184 48.291L63.184,75.977L54.395,75.977L54.395,0L63.184,0L63.184,22.266A66.935,66.935 0,0 1,63.115 25.383Q63.043,26.914 62.897,28.251A33.547,33.547 0,0 1,62.695 29.785L63.281,29.785A16.11,16.11 0,0 1,69.394 24.035A19.448,19.448 0,0 1,70.068 23.682A20.88,20.88 0,0 1,77.292 21.622A25.763,25.763 0,0 1,79.98 21.484A32.643,32.643 0,0 1,85.483 21.917Q91.249,22.905 94.678,26.147Q98.472,29.735 99.347,36.631A35.274,35.274 0,0 1,99.609 41.064L99.609,75.977Z"
-        android:fillColor="@color/ic_launcher_foreground"
-        android:fillType="evenOdd"/>
-  </group>
+    <group
+        android:scaleX="0.37947997"
+        android:scaleY="0.37947997"
+        android:translateX="35.1"
+        android:translateY="39.584126">
+        <path
+            android:pathData="M39.893,68.066L39.893,75.977L0,75.977L0,4.59L39.893,4.59L39.893,12.5L8.984,12.5L8.984,34.766L38.086,34.766L38.086,42.578L8.984,42.578L8.984,68.066L39.893,68.066Z"
+            android:fillColor="@color/ic_launcher_foreground"
+            android:fillType="evenOdd" />
+        <path
+            android:pathData="M99.609,75.977L90.918,75.977L90.918,41.699A23.436,23.436 0,0 0,90.662 38.109Q90.055,34.207 88.013,31.958Q85.629,29.334 81.028,28.863A20.84,20.84 0,0 0,78.906 28.76A23.134,23.134 0,0 0,74.45 29.16Q71.926,29.656 69.994,30.767A11.122,11.122 0,0 0,66.968 33.301A13.32,13.32 0,0 0,64.756 37.276Q63.399,40.971 63.213,46.495A53.517,53.517 0,0 0,63.184 48.291L63.184,75.977L54.395,75.977L54.395,0L63.184,0L63.184,22.266A66.935,66.935 0,0 1,63.115 25.383Q63.043,26.914 62.897,28.251A33.547,33.547 0,0 1,62.695 29.785L63.281,29.785A16.11,16.11 0,0 1,69.394 24.035A19.448,19.448 0,0 1,70.068 23.682A20.88,20.88 0,0 1,77.292 21.622A25.763,25.763 0,0 1,79.98 21.484A32.643,32.643 0,0 1,85.483 21.917Q91.249,22.905 94.678,26.147Q98.472,29.735 99.347,36.631A35.274,35.274 0,0 1,99.609 41.064L99.609,75.977Z"
+            android:fillColor="@color/ic_launcher_foreground"
+            android:fillType="evenOdd" />
+    </group>
 </vector>
diff --git a/app/src/main/res/drawable/image_failed.xml b/app/src/main/res/drawable/image_failed.xml
index 0838f864f..d780b5478 100644
--- a/app/src/main/res/drawable/image_failed.xml
+++ b/app/src/main/res/drawable/image_failed.xml
@@ -18,10 +18,10 @@
     android:width="48dp"
     android:height="48dp"
     android:viewportWidth="24"
-    android:viewportHeight="24">
-
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
     <path
-        android:fillColor="?attr/drawableColorPrimary"
+        android:fillColor="@android:color/white"
         android:pathData="@string/pd_file_image" />
 
 </vector>
diff --git a/app/src/main/res/drawable/v_adb_primary_x24.xml b/app/src/main/res/drawable/v_adb_primary_x24.xml
index 0f5751542..e27646efb 100644
--- a/app/src/main/res/drawable/v_adb_primary_x24.xml
+++ b/app/src/main/res/drawable/v_adb_primary_x24.xml
@@ -18,10 +18,11 @@
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="24"
-    android:viewportHeight="24">
+    android:viewportHeight="24"
+    android:tint="?drawableColorThemePrimary">
 
     <path
-        android:fillColor="?attr/drawableColorThemePrimary"
+        android:fillColor="@android:color/white"
         android:pathData="@string/pd_adb" />
 
 </vector>
diff --git a/app/src/main/res/drawable/v_alert_red_x48.xml b/app/src/main/res/drawable/v_alert_red_x48.xml
index 7643fa1bc..f28dfd4ac 100644
--- a/app/src/main/res/drawable/v_alert_red_x48.xml
+++ b/app/src/main/res/drawable/v_alert_red_x48.xml
@@ -18,10 +18,11 @@
     android:width="48dp"
     android:height="48dp"
     android:viewportWidth="24"
-    android:viewportHeight="24">
+    android:viewportHeight="24"
+    android:tint="@color/red_500">
 
     <path
-        android:fillColor="@color/red_500"
+        android:fillColor="@android:color/white"
         android:pathData="@string/pd_alert" />
 
 </vector>
diff --git a/app/src/main/res/drawable/v_archive_primary_x48.xml b/app/src/main/res/drawable/v_archive_primary_x48.xml
index e1725fac0..76d027848 100644
--- a/app/src/main/res/drawable/v_archive_primary_x48.xml
+++ b/app/src/main/res/drawable/v_archive_primary_x48.xml
@@ -18,10 +18,11 @@
     android:width="48dp"
     android:height="48dp"
     android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
+    android:viewportHeight="24.0"
+    android:tint="?drawableColorThemePrimary">
 
     <path
-        android:fillColor="?attr/drawableColorThemePrimary"
+        android:fillColor="@android:color/white"
         android:pathData="@string/pd_archive" />
 
 </vector>
diff --git a/app/src/main/res/drawable/v_arrow_left_dark_x24.xml b/app/src/main/res/drawable/v_arrow_left_dark_x24.xml
index 0ecc29887..4ca6a3596 100644
--- a/app/src/main/res/drawable/v_arrow_left_dark_x24.xml
+++ b/app/src/main/res/drawable/v_arrow_left_dark_x24.xml
@@ -18,10 +18,11 @@
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="24"
-    android:viewportHeight="24">
+    android:viewportHeight="24"
+    android:tint="?colorControlNormal">
 
     <path
-        android:fillColor="@color/primary_drawable_dark"
+        android:fillColor="@android:color/white"
         android:pathData="@string/pd_arrow_left" />
 
 </vector>
diff --git a/app/src/main/res/drawable/v_book_open_primary_x24.xml b/app/src/main/res/drawable/v_book_open_primary_x24.xml
index 26234ae9d..8134a263f 100644
--- a/app/src/main/res/drawable/v_book_open_primary_x24.xml
+++ b/app/src/main/res/drawable/v_book_open_primary_x24.xml
@@ -18,10 +18,11 @@
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="24"
-    android:viewportHeight="24">
+    android:viewportHeight="24"
+    android:tint="?drawableColorThemePrimary">
 
     <path
-        android:fillColor="?attr/drawableColorThemePrimary"
+        android:fillColor="@android:color/white"
         android:pathData="@string/pd_book_open" />
 
 </vector>
diff --git a/app/src/main/res/drawable/v_book_open_x24.xml b/app/src/main/res/drawable/v_book_open_x24.xml
index b57825b76..45aea6c90 100644
--- a/app/src/main/res/drawable/v_book_open_x24.xml
+++ b/app/src/main/res/drawable/v_book_open_x24.xml
@@ -18,10 +18,10 @@
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="24"
-    android:viewportHeight="24">
-
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
     <path
-        android:fillColor="?attr/drawableColorPrimary"
+        android:fillColor="@android:color/white"
         android:pathData="@string/pd_book_open" />
 
 </vector>
diff --git a/app/src/main/res/drawable/v_chart_accent_x48.xml b/app/src/main/res/drawable/v_chart_accent_x48.xml
index 82c75fe66..564e23a6e 100644
--- a/app/src/main/res/drawable/v_chart_accent_x48.xml
+++ b/app/src/main/res/drawable/v_chart_accent_x48.xml
@@ -18,10 +18,11 @@
     android:width="48dp"
     android:height="48dp"
     android:viewportWidth="24"
-    android:viewportHeight="24">
+    android:viewportHeight="24"
+    android:tint="?colorAccent">
 
     <path
-        android:fillColor="?attr/colorAccent"
+        android:fillColor="@android:color/white"
         android:pathData="@string/pd_chart" />
 
 </vector>
diff --git a/app/src/main/res/drawable/v_check_all_dark_x24.xml b/app/src/main/res/drawable/v_check_all_dark_x24.xml
index 4ea678b09..3fb84169c 100644
--- a/app/src/main/res/drawable/v_check_all_dark_x24.xml
+++ b/app/src/main/res/drawable/v_check_all_dark_x24.xml
@@ -18,10 +18,10 @@
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="24"
-    android:viewportHeight="24">
-
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
     <path
-        android:fillColor="@color/primary_drawable_dark"
+        android:fillColor="@android:color/white"
         android:pathData="@string/pd_check_all" />
 
 </vector>
diff --git a/app/src/main/res/drawable/v_check_dark_x24.xml b/app/src/main/res/drawable/v_check_dark_x24.xml
index a5a310ba3..b1639b6d2 100644
--- a/app/src/main/res/drawable/v_check_dark_x24.xml
+++ b/app/src/main/res/drawable/v_check_dark_x24.xml
@@ -18,10 +18,10 @@
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="24"
-    android:viewportHeight="24">
-
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
     <path
-        android:fillColor="@color/primary_drawable_dark"
+        android:fillColor="@android:color/white"
         android:pathData="@string/pd_check" />
 
 </vector>
diff --git a/app/src/main/res/drawable/v_clear_all_dark_x24.xml b/app/src/main/res/drawable/v_clear_all_dark_x24.xml
index f0870a228..981792991 100644
--- a/app/src/main/res/drawable/v_clear_all_dark_x24.xml
+++ b/app/src/main/res/drawable/v_clear_all_dark_x24.xml
@@ -18,10 +18,10 @@
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="24"
-    android:viewportHeight="24">
-
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
     <path
-        android:fillColor="@color/primary_drawable_dark"
+        android:fillColor="@android:color/white"
         android:pathData="@string/pd_clear_all" />
 
 </vector>
diff --git a/app/src/main/res/drawable/v_close_dark_x24.xml b/app/src/main/res/drawable/v_close_dark_x24.xml
index ddcedea03..b3e6c976b 100644
--- a/app/src/main/res/drawable/v_close_dark_x24.xml
+++ b/app/src/main/res/drawable/v_close_dark_x24.xml
@@ -18,10 +18,10 @@
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="24"
-    android:viewportHeight="24">
-
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
     <path
-        android:fillColor="@color/primary_drawable_dark"
+        android:fillColor="@android:color/white"
         android:pathData="@string/pd_close" />
 
 </vector>
diff --git a/app/src/main/res/drawable/v_cookie_brown_x48.xml b/app/src/main/res/drawable/v_cookie_brown_x48.xml
index 75cf870fd..9ef7d6f38 100644
--- a/app/src/main/res/drawable/v_cookie_brown_x48.xml
+++ b/app/src/main/res/drawable/v_cookie_brown_x48.xml
@@ -18,10 +18,10 @@
     android:width="48dp"
     android:height="48dp"
     android:viewportWidth="24"
-    android:viewportHeight="24">
-
+    android:viewportHeight="24"
+    android:tint="@color/brown_500">
     <path
-        android:fillColor="@color/brown_500"
+        android:fillColor="@android:color/white"
         android:pathData="@string/pd_cookie" />
 
 </vector>
diff --git a/app/src/main/res/drawable/v_delete_x24.xml b/app/src/main/res/drawable/v_delete_x24.xml
index ba0fc0339..a6a58b6ce 100644
--- a/app/src/main/res/drawable/v_delete_x24.xml
+++ b/app/src/main/res/drawable/v_delete_x24.xml
@@ -18,10 +18,10 @@
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="24"
-    android:viewportHeight="24">
-
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
     <path
-        android:fillColor="?attr/drawableColorPrimary"
+        android:fillColor="@android:color/white"
         android:pathData="@string/pd_delete" />
 
 </vector>
diff --git a/app/src/main/res/drawable/v_dots_vertical_secondary_dark_x24.xml b/app/src/main/res/drawable/v_dots_vertical_secondary_dark_x24.xml
index 7efbe1a17..3eeb971a3 100644
--- a/app/src/main/res/drawable/v_dots_vertical_secondary_dark_x24.xml
+++ b/app/src/main/res/drawable/v_dots_vertical_secondary_dark_x24.xml
@@ -18,10 +18,10 @@
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="24"
-    android:viewportHeight="24">
-
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
     <path
-        android:fillColor="@color/primary_drawable_black"
+        android:fillColor="@android:color/white"
         android:pathData="@string/pd_dots_vertical" />
 
 </vector>
diff --git a/app/src/main/res/drawable/v_download_black_x24.xml b/app/src/main/res/drawable/v_download_black_x24.xml
deleted file mode 100644
index ef22beb11..000000000
--- a/app/src/main/res/drawable/v_download_black_x24.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright 2016 Hippo Seven
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-
-    <path
-        android:fillColor="@android:color/black"
-        android:pathData="@string/pd_download" />
-
-</vector>
diff --git a/app/src/main/res/drawable/v_download_box_dark_x24.xml b/app/src/main/res/drawable/v_download_box_dark_x24.xml
index b213eedf4..b3e0e2f22 100644
--- a/app/src/main/res/drawable/v_download_box_dark_x24.xml
+++ b/app/src/main/res/drawable/v_download_box_dark_x24.xml
@@ -18,10 +18,10 @@
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="24"
-    android:viewportHeight="24">
-
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
     <path
-        android:fillColor="@color/primary_drawable_dark"
+        android:fillColor="@android:color/white"
         android:pathData="@string/pd_download_box" />
 
 </vector>
diff --git a/app/src/main/res/drawable/v_download_dark_x24.xml b/app/src/main/res/drawable/v_download_dark_x24.xml
deleted file mode 100644
index 5cfa1c88a..000000000
--- a/app/src/main/res/drawable/v_download_dark_x24.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright 2019 Hippo Seven
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-
-    <path
-        android:fillColor="@color/primary_drawable_dark"
-        android:pathData="@string/pd_download" />
-
-</vector>
diff --git a/app/src/main/res/drawable/v_download_primary_x24.xml b/app/src/main/res/drawable/v_download_primary_x24.xml
index d0ae5dde5..89b16a645 100644
--- a/app/src/main/res/drawable/v_download_primary_x24.xml
+++ b/app/src/main/res/drawable/v_download_primary_x24.xml
@@ -18,10 +18,11 @@
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="24"
-    android:viewportHeight="24">
+    android:viewportHeight="24"
+    android:tint="?drawableColorThemePrimary">
 
     <path
-        android:fillColor="?attr/drawableColorThemePrimary"
+        android:fillColor="@android:color/white"
         android:pathData="@string/pd_download" />
 
 </vector>
diff --git a/app/src/main/res/drawable/v_download_x16.xml b/app/src/main/res/drawable/v_download_x16.xml
index 152d23a8e..e0731fb9d 100644
--- a/app/src/main/res/drawable/v_download_x16.xml
+++ b/app/src/main/res/drawable/v_download_x16.xml
@@ -18,10 +18,11 @@
     android:width="16dp"
     android:height="16dp"
     android:viewportWidth="24"
-    android:viewportHeight="24">
+    android:viewportHeight="24"
+    android:tint="?android:attr/textColorSecondary">
 
     <path
-        android:fillColor="?android:attr/textColorSecondary"
+        android:fillColor="@android:color/white"
         android:pathData="@string/pd_download" />
 
 </vector>
diff --git a/app/src/main/res/drawable/v_download_x24.xml b/app/src/main/res/drawable/v_download_x24.xml
index 8ea7e1dd9..3adee657a 100644
--- a/app/src/main/res/drawable/v_download_x24.xml
+++ b/app/src/main/res/drawable/v_download_x24.xml
@@ -18,10 +18,10 @@
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="24"
-    android:viewportHeight="24">
-
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
     <path
-        android:fillColor="?attr/drawableColorPrimary"
+        android:fillColor="@android:color/white"
         android:pathData="@string/pd_download" />
 
 </vector>
diff --git a/app/src/main/res/drawable/v_eh_subscription_black_x24.xml b/app/src/main/res/drawable/v_eh_subscription_black_x24.xml
index df04d90df..04312475b 100644
--- a/app/src/main/res/drawable/v_eh_subscription_black_x24.xml
+++ b/app/src/main/res/drawable/v_eh_subscription_black_x24.xml
@@ -18,10 +18,10 @@
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="24"
-    android:viewportHeight="24">
-
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
     <path
-        android:fillColor="@android:color/black"
+        android:fillColor="@android:color/white"
         android:pathData="@string/pd_eh_subscription" />
 
 </vector>
diff --git a/app/src/main/res/drawable/v_file_find_primary_x48.xml b/app/src/main/res/drawable/v_file_find_primary_x48.xml
index 94be89d8f..a421f871c 100644
--- a/app/src/main/res/drawable/v_file_find_primary_x48.xml
+++ b/app/src/main/res/drawable/v_file_find_primary_x48.xml
@@ -18,10 +18,11 @@
     android:width="48dp"
     android:height="48dp"
     android:viewportWidth="24"
-    android:viewportHeight="24">
+    android:viewportHeight="24"
+    android:tint="?drawableColorThemePrimary">
 
     <path
-        android:fillColor="?attr/drawableColorThemePrimary"
+        android:fillColor="@android:color/white"
         android:pathData="@string/pd_file_find" />
 
 </vector>
diff --git a/app/src/main/res/drawable/v_filter_dark_x24.xml b/app/src/main/res/drawable/v_filter_dark_x24.xml
index c0a535546..883a41dbc 100644
--- a/app/src/main/res/drawable/v_filter_dark_x24.xml
+++ b/app/src/main/res/drawable/v_filter_dark_x24.xml
@@ -2,8 +2,10 @@
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="24"
-    android:viewportHeight="24">
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+
     <path
-        android:fillColor="@color/primary_drawable_dark"
+        android:fillColor="@android:color/white"
         android:pathData="M10,18h4v-2h-4v2zM3,6v2h18L21,6L3,6zM6,13h12v-2L6,11v2z" />
 </vector>
diff --git a/app/src/main/res/drawable/v_fire_black_x24.xml b/app/src/main/res/drawable/v_fire_black_x24.xml
index 586f0d3c1..1a4feaa2f 100644
--- a/app/src/main/res/drawable/v_fire_black_x24.xml
+++ b/app/src/main/res/drawable/v_fire_black_x24.xml
@@ -18,10 +18,11 @@
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="24"
-    android:viewportHeight="24">
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
 
     <path
-        android:fillColor="@android:color/black"
+        android:fillColor="@android:color/white"
         android:pathData="@string/pd_fire" />
 
 </vector>
diff --git a/app/src/main/res/drawable/v_folder_move_dark_x24.xml b/app/src/main/res/drawable/v_folder_move_dark_x24.xml
deleted file mode 100644
index 3f9d3087f..000000000
--- a/app/src/main/res/drawable/v_folder_move_dark_x24.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright 2016 Hippo Seven
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-
-    <path
-        android:fillColor="@color/primary_drawable_dark"
-        android:pathData="@string/pd_folder_move" />
-
-</vector>
diff --git a/app/src/main/res/drawable/v_go_to_dark_x24.xml b/app/src/main/res/drawable/v_go_to_dark_x24.xml
index 6d6a97ac2..594d9a548 100644
--- a/app/src/main/res/drawable/v_go_to_dark_x24.xml
+++ b/app/src/main/res/drawable/v_go_to_dark_x24.xml
@@ -18,10 +18,11 @@
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="24"
-    android:viewportHeight="24">
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
 
     <path
-        android:fillColor="@color/primary_drawable_dark"
+        android:fillColor="@android:color/white"
         android:pathData="@string/pd_go_to" />
 
 </vector>
diff --git a/app/src/main/res/drawable/v_heart_black_x24.xml b/app/src/main/res/drawable/v_heart_black_x24.xml
deleted file mode 100644
index b7bca5cca..000000000
--- a/app/src/main/res/drawable/v_heart_black_x24.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright 2016 Hippo Seven
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-
-    <path
-        android:fillColor="@android:color/black"
-        android:pathData="@string/pd_heart" />
-
-</vector>
diff --git a/app/src/main/res/drawable/v_heart_box_dark_x24.xml b/app/src/main/res/drawable/v_heart_box_dark_x24.xml
index a7606e0aa..7dab192c0 100644
--- a/app/src/main/res/drawable/v_heart_box_dark_x24.xml
+++ b/app/src/main/res/drawable/v_heart_box_dark_x24.xml
@@ -18,10 +18,11 @@
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="24"
-    android:viewportHeight="24">
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
 
     <path
-        android:fillColor="@color/primary_drawable_dark"
+        android:fillColor="@android:color/white"
         android:pathData="@string/pd_heart_box" />
 
 </vector>
diff --git a/app/src/main/res/drawable/v_heart_broken_x24.xml b/app/src/main/res/drawable/v_heart_broken_x24.xml
index da8b8cb14..59d371cb8 100644
--- a/app/src/main/res/drawable/v_heart_broken_x24.xml
+++ b/app/src/main/res/drawable/v_heart_broken_x24.xml
@@ -18,10 +18,10 @@
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="24"
-    android:viewportHeight="24">
-
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
     <path
-        android:fillColor="?attr/drawableColorPrimary"
+        android:fillColor="@android:color/white"
         android:pathData="@string/pd_heart_broken" />
 
 </vector>
diff --git a/app/src/main/res/drawable/v_heart_outline_primary_x48.xml b/app/src/main/res/drawable/v_heart_outline_primary_x48.xml
index d38ad2a43..43bb8848b 100644
--- a/app/src/main/res/drawable/v_heart_outline_primary_x48.xml
+++ b/app/src/main/res/drawable/v_heart_outline_primary_x48.xml
@@ -18,10 +18,11 @@
     android:width="48dp"
     android:height="48dp"
     android:viewportWidth="24"
-    android:viewportHeight="24">
+    android:viewportHeight="24"
+    android:tint="?drawableColorThemePrimary">
 
     <path
-        android:fillColor="?attr/drawableColorThemePrimary"
+        android:fillColor="@android:color/white"
         android:pathData="@string/pd_heart_outline" />
 
 </vector>
diff --git a/app/src/main/res/drawable/v_heart_primary_x48.xml b/app/src/main/res/drawable/v_heart_primary_x48.xml
index 428b2ed66..f5f174e4e 100644
--- a/app/src/main/res/drawable/v_heart_primary_x48.xml
+++ b/app/src/main/res/drawable/v_heart_primary_x48.xml
@@ -18,10 +18,11 @@
     android:width="48dp"
     android:height="48dp"
     android:viewportWidth="24"
-    android:viewportHeight="24">
+    android:viewportHeight="24"
+    android:tint="?drawableColorThemePrimary">
 
     <path
-        android:fillColor="?attr/drawableColorThemePrimary"
+        android:fillColor="@android:color/white"
         android:pathData="@string/pd_heart" />
 
 </vector>
diff --git a/app/src/main/res/drawable/v_heart_x16.xml b/app/src/main/res/drawable/v_heart_x16.xml
index 47c2d3822..c2511f933 100644
--- a/app/src/main/res/drawable/v_heart_x16.xml
+++ b/app/src/main/res/drawable/v_heart_x16.xml
@@ -18,10 +18,11 @@
     android:width="16dp"
     android:height="16dp"
     android:viewportWidth="24"
-    android:viewportHeight="24">
+    android:viewportHeight="24"
+    android:tint="?android:attr/textColorSecondary">
 
     <path
-        android:fillColor="?android:attr/textColorSecondary"
+        android:fillColor="@android:color/white"
         android:pathData="@string/pd_heart" />
 
 </vector>
diff --git a/app/src/main/res/drawable/v_heart_x24.xml b/app/src/main/res/drawable/v_heart_x24.xml
index 68235c0cc..133096fb9 100644
--- a/app/src/main/res/drawable/v_heart_x24.xml
+++ b/app/src/main/res/drawable/v_heart_x24.xml
@@ -18,10 +18,10 @@
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="24"
-    android:viewportHeight="24">
-
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
     <path
-        android:fillColor="?attr/drawableColorPrimary"
+        android:fillColor="@android:color/white"
         android:pathData="@string/pd_heart" />
 
 </vector>
diff --git a/app/src/main/res/drawable/v_help_circle_x24.xml b/app/src/main/res/drawable/v_help_circle_x24.xml
index ef907bab6..bf44deccd 100644
--- a/app/src/main/res/drawable/v_help_circle_x24.xml
+++ b/app/src/main/res/drawable/v_help_circle_x24.xml
@@ -18,10 +18,10 @@
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="24"
-    android:viewportHeight="24">
-
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
     <path
-        android:fillColor="?attr/drawableColorPrimary"
+        android:fillColor="@android:color/white"
         android:pathData="@string/pd_help_circle" />
 
 </vector>
diff --git a/app/src/main/res/drawable/v_history_black_x24.xml b/app/src/main/res/drawable/v_history_black_x24.xml
index de23ae3fc..83c1014d0 100644
--- a/app/src/main/res/drawable/v_history_black_x24.xml
+++ b/app/src/main/res/drawable/v_history_black_x24.xml
@@ -18,10 +18,11 @@
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="24"
-    android:viewportHeight="24">
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
 
     <path
-        android:fillColor="@android:color/black"
+        android:fillColor="@android:color/white"
         android:pathData="@string/pd_history" />
 
 </vector>
diff --git a/app/src/main/res/drawable/v_homepage_black_x24.xml b/app/src/main/res/drawable/v_homepage_black_x24.xml
index 50a4fa48c..5ae1d36c8 100644
--- a/app/src/main/res/drawable/v_homepage_black_x24.xml
+++ b/app/src/main/res/drawable/v_homepage_black_x24.xml
@@ -18,10 +18,11 @@
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="24"
-    android:viewportHeight="24">
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
 
     <path
-        android:fillColor="@android:color/black"
+        android:fillColor="@android:color/white"
         android:pathData="@string/pd_homepage" />
 
 </vector>
diff --git a/app/src/main/res/drawable/v_info_outline_dark_x24.xml b/app/src/main/res/drawable/v_info_outline_dark_x24.xml
index fff15243d..731a2f8c6 100644
--- a/app/src/main/res/drawable/v_info_outline_dark_x24.xml
+++ b/app/src/main/res/drawable/v_info_outline_dark_x24.xml
@@ -18,10 +18,11 @@
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="24"
-    android:viewportHeight="24">
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
 
     <path
-        android:fillColor="@color/primary_drawable_dark"
+        android:fillColor="@android:color/white"
         android:pathData="@string/pd_info_outline" />
 
 </vector>
diff --git a/app/src/main/res/drawable/v_info_primary_x24.xml b/app/src/main/res/drawable/v_info_primary_x24.xml
index c55d16d43..beaa0c928 100644
--- a/app/src/main/res/drawable/v_info_primary_x24.xml
+++ b/app/src/main/res/drawable/v_info_primary_x24.xml
@@ -18,10 +18,11 @@
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="24"
-    android:viewportHeight="24">
+    android:viewportHeight="24"
+    android:tint="?drawableColorThemePrimary">
 
     <path
-        android:fillColor="?attr/drawableColorThemePrimary"
+        android:fillColor="@android:color/white"
         android:pathData="@string/pd_info" />
 
 </vector>
diff --git a/app/src/main/res/drawable/v_magnify_dark_x24.xml b/app/src/main/res/drawable/v_magnify_dark_x24.xml
deleted file mode 100644
index 9a7749694..000000000
--- a/app/src/main/res/drawable/v_magnify_dark_x24.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright 2016 Hippo Seven
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-
-    <path
-        android:fillColor="@color/primary_drawable_dark"
-        android:pathData="@string/pd_magnify" />
-
-</vector>
diff --git a/app/src/main/res/drawable/v_magnify_x24.xml b/app/src/main/res/drawable/v_magnify_x24.xml
index 53c95c4ff..c527b4134 100644
--- a/app/src/main/res/drawable/v_magnify_x24.xml
+++ b/app/src/main/res/drawable/v_magnify_x24.xml
@@ -18,10 +18,10 @@
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="24"
-    android:viewportHeight="24">
-
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
     <path
-        android:fillColor="?attr/drawableColorPrimary"
+        android:fillColor="@android:color/white"
         android:pathData="@string/pd_magnify" />
 
 </vector>
diff --git a/app/src/main/res/drawable/v_pause_dark_x24.xml b/app/src/main/res/drawable/v_pause_dark_x24.xml
deleted file mode 100644
index 61d37d41a..000000000
--- a/app/src/main/res/drawable/v_pause_dark_x24.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright 2016 Hippo Seven
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-
-    <path
-        android:fillColor="@color/primary_drawable_dark"
-        android:pathData="@string/pd_pause" />
-
-</vector>
diff --git a/app/src/main/res/drawable/v_pause_x24.xml b/app/src/main/res/drawable/v_pause_x24.xml
index 0b5f9e7ea..452036a08 100644
--- a/app/src/main/res/drawable/v_pause_x24.xml
+++ b/app/src/main/res/drawable/v_pause_x24.xml
@@ -18,10 +18,10 @@
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="24"
-    android:viewportHeight="24">
-
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
     <path
-        android:fillColor="?attr/drawableColorPrimary"
+        android:fillColor="@android:color/white"
         android:pathData="@string/pd_pause" />
 
 </vector>
diff --git a/app/src/main/res/drawable/v_pencil_dark_x24.xml b/app/src/main/res/drawable/v_pencil_dark_x24.xml
index e7547d6a8..6fd4aaedd 100644
--- a/app/src/main/res/drawable/v_pencil_dark_x24.xml
+++ b/app/src/main/res/drawable/v_pencil_dark_x24.xml
@@ -18,10 +18,11 @@
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="24"
-    android:viewportHeight="24">
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
 
     <path
-        android:fillColor="@color/primary_drawable_dark"
+        android:fillColor="@android:color/white"
         android:pathData="@string/pd_pencil" />
 
 </vector>
diff --git a/app/src/main/res/drawable/v_play_dark_x24.xml b/app/src/main/res/drawable/v_play_dark_x24.xml
deleted file mode 100644
index 66b0dfa9b..000000000
--- a/app/src/main/res/drawable/v_play_dark_x24.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright 2016 Hippo Seven
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-
-    <path
-        android:fillColor="@color/primary_drawable_dark"
-        android:pathData="@string/pd_play" />
-
-</vector>
diff --git a/app/src/main/res/drawable/v_play_x24.xml b/app/src/main/res/drawable/v_play_x24.xml
index 3c38482c9..93d6ce962 100644
--- a/app/src/main/res/drawable/v_play_x24.xml
+++ b/app/src/main/res/drawable/v_play_x24.xml
@@ -18,10 +18,10 @@
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="24"
-    android:viewportHeight="24">
-
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
     <path
-        android:fillColor="?attr/drawableColorPrimary"
+        android:fillColor="@android:color/white"
         android:pathData="@string/pd_play" />
 
 </vector>
diff --git a/app/src/main/res/drawable/v_plus_dark_x24.xml b/app/src/main/res/drawable/v_plus_dark_x24.xml
index 72569ac8d..df4dab603 100644
--- a/app/src/main/res/drawable/v_plus_dark_x24.xml
+++ b/app/src/main/res/drawable/v_plus_dark_x24.xml
@@ -18,10 +18,11 @@
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="24"
-    android:viewportHeight="24">
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
 
     <path
-        android:fillColor="@color/primary_drawable_dark"
+        android:fillColor="@android:color/white"
         android:pathData="@string/pd_plus" />
 
 </vector>
diff --git a/app/src/main/res/drawable/v_refresh_dark_x24.xml b/app/src/main/res/drawable/v_refresh_dark_x24.xml
index 495872630..232dc814d 100644
--- a/app/src/main/res/drawable/v_refresh_dark_x24.xml
+++ b/app/src/main/res/drawable/v_refresh_dark_x24.xml
@@ -18,10 +18,11 @@
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="24"
-    android:viewportHeight="24">
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
 
     <path
-        android:fillColor="@color/primary_drawable_dark"
+        android:fillColor="@android:color/white"
         android:pathData="@string/pd_refresh" />
 
 </vector>
diff --git a/app/src/main/res/drawable/v_reply_dark_x24.xml b/app/src/main/res/drawable/v_reply_dark_x24.xml
index c50ddfe63..041384cc1 100644
--- a/app/src/main/res/drawable/v_reply_dark_x24.xml
+++ b/app/src/main/res/drawable/v_reply_dark_x24.xml
@@ -18,10 +18,11 @@
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="24"
-    android:viewportHeight="24">
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
 
     <path
-        android:fillColor="@color/primary_drawable_dark"
+        android:fillColor="@android:color/white"
         android:pathData="@string/pd_reply" />
 
 </vector>
diff --git a/app/src/main/res/drawable/v_sad_panda_primary_x24.xml b/app/src/main/res/drawable/v_sad_panda_primary_x24.xml
index c276d31cd..7d5b7c984 100644
--- a/app/src/main/res/drawable/v_sad_panda_primary_x24.xml
+++ b/app/src/main/res/drawable/v_sad_panda_primary_x24.xml
@@ -18,10 +18,11 @@
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="24"
-    android:viewportHeight="24">
+    android:viewportHeight="24"
+    android:tint="?drawableColorThemePrimary">
 
     <path
-        android:fillColor="?attr/drawableColorThemePrimary"
+        android:fillColor="@android:color/white"
         android:pathData="@string/pd_sad_panda" />
 
 </vector>
diff --git a/app/src/main/res/drawable/v_sec_primary_x24.xml b/app/src/main/res/drawable/v_sec_primary_x24.xml
index 3751e97e5..c0fa684bc 100644
--- a/app/src/main/res/drawable/v_sec_primary_x24.xml
+++ b/app/src/main/res/drawable/v_sec_primary_x24.xml
@@ -2,8 +2,10 @@
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
+    android:viewportHeight="24.0"
+    android:tint="?drawableColorThemePrimary">
+
     <path
-        android:fillColor="?attr/drawableColorThemePrimary"
+        android:fillColor="@android:color/white"
         android:pathData="M12,1L3,5v6c0,5.55 3.84,10.74 9,12 5.16,-1.26 9,-6.45 9,-12L21,5l-9,-4zM12,11.99h7c-0.53,4.12 -3.28,7.79 -7,8.94L12,12L5,12L5,6.3l7,-3.11v8.8z" />
 </vector>
diff --git a/app/src/main/res/drawable/v_send_dark_x24.xml b/app/src/main/res/drawable/v_send_dark_x24.xml
index 3bdbb30cf..bde65c2ef 100644
--- a/app/src/main/res/drawable/v_send_dark_x24.xml
+++ b/app/src/main/res/drawable/v_send_dark_x24.xml
@@ -18,10 +18,11 @@
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="24"
-    android:viewportHeight="24">
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
 
     <path
-        android:fillColor="@color/primary_drawable_dark"
+        android:fillColor="@android:color/white"
         android:pathData="@string/pd_send" />
 
 </vector>
diff --git a/app/src/main/res/drawable/v_settings_black_x24.xml b/app/src/main/res/drawable/v_settings_black_x24.xml
index 1793bb043..3c7261e4b 100644
--- a/app/src/main/res/drawable/v_settings_black_x24.xml
+++ b/app/src/main/res/drawable/v_settings_black_x24.xml
@@ -18,10 +18,11 @@
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="24"
-    android:viewportHeight="24">
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
 
     <path
-        android:fillColor="@android:color/black"
+        android:fillColor="@android:color/white"
         android:pathData="@string/pd_settings" />
 
 </vector>
diff --git a/app/src/main/res/drawable/v_share_primary_x48.xml b/app/src/main/res/drawable/v_share_primary_x48.xml
index 04f8b960e..9a004ae57 100644
--- a/app/src/main/res/drawable/v_share_primary_x48.xml
+++ b/app/src/main/res/drawable/v_share_primary_x48.xml
@@ -18,10 +18,11 @@
     android:width="48dp"
     android:height="48dp"
     android:viewportWidth="24"
-    android:viewportHeight="24">
+    android:viewportHeight="24"
+    android:tint="?drawableColorThemePrimary">
 
     <path
-        android:fillColor="?attr/drawableColorThemePrimary"
+        android:fillColor="@android:color/white"
         android:pathData="@string/pd_share" />
 
 </vector>
diff --git a/app/src/main/res/drawable/v_similar_primary_x48.xml b/app/src/main/res/drawable/v_similar_primary_x48.xml
index 9c5d318e0..da84b16d3 100644
--- a/app/src/main/res/drawable/v_similar_primary_x48.xml
+++ b/app/src/main/res/drawable/v_similar_primary_x48.xml
@@ -18,10 +18,11 @@
     android:width="48dp"
     android:height="48dp"
     android:viewportWidth="24"
-    android:viewportHeight="24">
+    android:viewportHeight="24"
+    android:tint="?drawableColorThemePrimary">
 
     <path
-        android:fillColor="?attr/drawableColorThemePrimary"
+        android:fillColor="@android:color/white"
         android:pathData="@string/pd_similar" />
 
 </vector>
diff --git a/app/src/main/res/drawable/v_slider_bubble.xml b/app/src/main/res/drawable/v_slider_bubble.xml
index abd2b768a..4c8955a64 100644
--- a/app/src/main/res/drawable/v_slider_bubble.xml
+++ b/app/src/main/res/drawable/v_slider_bubble.xml
@@ -18,10 +18,11 @@
     android:width="@dimen/slider_bubble_width"
     android:height="@dimen/slider_bubble_height"
     android:viewportWidth="26"
-    android:viewportHeight="32">
+    android:viewportHeight="32"
+    android:tint="?attr/colorControlNormal">
 
     <path
-        android:fillColor="@android:color/black"
+        android:fillColor="@android:color/white"
         android:pathData="@string/pd_slider_bubble" />
 
 </vector>
diff --git a/app/src/main/res/drawable/v_star_half_x16.xml b/app/src/main/res/drawable/v_star_half_x16.xml
index 7e27fb388..e39247e78 100644
--- a/app/src/main/res/drawable/v_star_half_x16.xml
+++ b/app/src/main/res/drawable/v_star_half_x16.xml
@@ -18,10 +18,11 @@
     android:width="16dp"
     android:height="16dp"
     android:viewportWidth="24"
-    android:viewportHeight="24">
+    android:viewportHeight="24"
+    android:tint="@color/yellow_800">
 
     <path
-        android:fillColor="@color/yellow_800"
+        android:fillColor="@android:color/white"
         android:pathData="@string/pd_star_half" />
 
 </vector>
diff --git a/app/src/main/res/drawable/v_star_outline_x16.xml b/app/src/main/res/drawable/v_star_outline_x16.xml
index 451173522..a7f210ba6 100644
--- a/app/src/main/res/drawable/v_star_outline_x16.xml
+++ b/app/src/main/res/drawable/v_star_outline_x16.xml
@@ -18,10 +18,11 @@
     android:width="16dp"
     android:height="16dp"
     android:viewportWidth="24"
-    android:viewportHeight="24">
+    android:viewportHeight="24"
+    android:tint="@color/yellow_800">
 
     <path
-        android:fillColor="@color/yellow_800"
+        android:fillColor="@android:color/white"
         android:pathData="@string/pd_star_outline" />
 
 </vector>
diff --git a/app/src/main/res/drawable/v_star_x16.xml b/app/src/main/res/drawable/v_star_x16.xml
index fa78b773f..90207b199 100644
--- a/app/src/main/res/drawable/v_star_x16.xml
+++ b/app/src/main/res/drawable/v_star_x16.xml
@@ -18,10 +18,11 @@
     android:width="16dp"
     android:height="16dp"
     android:viewportWidth="24"
-    android:viewportHeight="24">
+    android:viewportHeight="24"
+    android:tint="@color/yellow_800">
 
     <path
-        android:fillColor="@color/yellow_800"
+        android:fillColor="@android:color/white"
         android:pathData="@string/pd_star" />
 
 </vector>
diff --git a/app/src/main/res/drawable/v_utorrent_primary_x48.xml b/app/src/main/res/drawable/v_utorrent_primary_x48.xml
index 3f14c6f5a..90df6311c 100644
--- a/app/src/main/res/drawable/v_utorrent_primary_x48.xml
+++ b/app/src/main/res/drawable/v_utorrent_primary_x48.xml
@@ -18,10 +18,11 @@
     android:width="48dp"
     android:height="48dp"
     android:viewportWidth="24"
-    android:viewportHeight="24">
+    android:viewportHeight="24"
+    android:tint="?drawableColorThemePrimary">
 
     <path
-        android:fillColor="?attr/drawableColorThemePrimary"
+        android:fillColor="@android:color/white"
         android:pathData="@string/pd_utorrent" />
 
 </vector>
diff --git a/app/src/main/res/layout/gallery_detail_header.xml b/app/src/main/res/layout/gallery_detail_header.xml
index 5de3865ae..44ca7a5f0 100644
--- a/app/src/main/res/layout/gallery_detail_header.xml
+++ b/app/src/main/res/layout/gallery_detail_header.xml
@@ -114,6 +114,7 @@
                 android:paddingTop="16dp"
                 android:paddingRight="12dp"
                 android:paddingBottom="16dp"
+                app:tint="@color/primary_drawable_black"
                 app:srcCompat="@drawable/v_dots_vertical_secondary_dark_x24" />
 
         </RelativeLayout>
diff --git a/app/src/main/res/layout/nav_header_main.xml b/app/src/main/res/layout/nav_header_main.xml
index 715ad11ad..1ecaaa662 100644
--- a/app/src/main/res/layout/nav_header_main.xml
+++ b/app/src/main/res/layout/nav_header_main.xml
@@ -63,6 +63,7 @@
             android:clickable="true"
             android:focusable="true"
             android:padding="8dp"
+            app:tint="#fff"
             app:srcCompat="@drawable/ic_baseline_brightness_2_24" />
     </FrameLayout>
 
diff --git a/app/src/main/res/layout/scene_favorites.xml b/app/src/main/res/layout/scene_favorites.xml
index 07760a4ea..f710275d2 100644
--- a/app/src/main/res/layout/scene_favorites.xml
+++ b/app/src/main/res/layout/scene_favorites.xml
@@ -74,7 +74,7 @@
             android:visibility="gone"
             app:backgroundTint="?attr/widgetColorThemeAccent"
             app:fabSize="mini"
-            app:srcCompat="@drawable/v_download_dark_x24"
+            app:srcCompat="@drawable/v_download_x24"
             app:tint="#fff" />
 
         <com.google.android.material.floatingactionbutton.FloatingActionButton
@@ -94,7 +94,7 @@
             android:visibility="gone"
             app:backgroundTint="?attr/widgetColorThemeAccent"
             app:fabSize="mini"
-            app:srcCompat="@drawable/v_folder_move_dark_x24"
+            app:srcCompat="@drawable/v_folder_move_x24"
             app:tint="#fff" />
 
         <com.google.android.material.floatingactionbutton.FloatingActionButton
diff --git a/app/src/main/res/layout/scene_gallery_comments.xml b/app/src/main/res/layout/scene_gallery_comments.xml
index 686e0cd0c..0d1d64cde 100644
--- a/app/src/main/res/layout/scene_gallery_comments.xml
+++ b/app/src/main/res/layout/scene_gallery_comments.xml
@@ -81,7 +81,8 @@
                 android:background="?selectableItemBackgroundBorderless"
                 android:clickable="true"
                 android:focusable="true"
-                android:padding="16dp" />
+                android:padding="16dp"
+                app:tint="#fff" />
 
         </LinearLayout>
     </LinearLayout>
diff --git a/app/src/main/res/layout/scene_gallery_list.xml b/app/src/main/res/layout/scene_gallery_list.xml
index 8f83bfa11..1deb561e0 100644
--- a/app/src/main/res/layout/scene_gallery_list.xml
+++ b/app/src/main/res/layout/scene_gallery_list.xml
@@ -51,7 +51,7 @@
             android:layout_height="wrap_content"
             app:backgroundTint="?attr/widgetColorThemeAccent"
             app:fabSize="mini"
-            app:srcCompat="@drawable/v_magnify_dark_x24"
+            app:srcCompat="@drawable/v_magnify_x24"
             app:tint="#fff" />
 
         <com.google.android.material.floatingactionbutton.FloatingActionButton
@@ -96,7 +96,7 @@
             android:scaleY="0"
             android:visibility="invisible"
             app:backgroundTint="?attr/widgetColorThemeAccent"
-            app:srcCompat="@drawable/v_magnify_dark_x24"
+            app:srcCompat="@drawable/v_magnify_x24"
             app:tint="#fff" />
 
     </com.hippo.widget.FabLayout>
diff --git a/app/src/main/res/menu/download_label_option.xml b/app/src/main/res/menu/download_label_option.xml
index b73ec3101..cf6834593 100644
--- a/app/src/main/res/menu/download_label_option.xml
+++ b/app/src/main/res/menu/download_label_option.xml
@@ -5,10 +5,10 @@
         android:id="@+id/menu_label_rename"
         android:title="@string/rename_label"
         android:orderInCategory="100"
-        app:showAsAction="never"/>
+        app:showAsAction="never" />
     <item
         android:id="@+id/menu_label_remove"
         android:title="@string/delete"
         android:orderInCategory="101"
-        app:showAsAction="never"/>
+        app:showAsAction="never" />
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/drawer_download.xml b/app/src/main/res/menu/drawer_download.xml
index bd0ac99ee..6fa94a892 100644
--- a/app/src/main/res/menu/drawer_download.xml
+++ b/app/src/main/res/menu/drawer_download.xml
@@ -22,12 +22,12 @@
         android:id="@+id/action_add"
         android:icon="@drawable/v_plus_dark_x24"
         android:title="@string/settings"
-        app:showAsAction="always"/>
+        app:showAsAction="always" />
 
     <item
         android:id="@+id/action_default_download_label"
         android:icon="@drawable/v_download_box_dark_x24"
         android:title="@string/default_download_label"
-        app:showAsAction="ifRoom"/>
+        app:showAsAction="ifRoom" />
 
 </menu>
diff --git a/app/src/main/res/menu/nav_drawer_main.xml b/app/src/main/res/menu/nav_drawer_main.xml
index badd86d53..da3727f5d 100644
--- a/app/src/main/res/menu/nav_drawer_main.xml
+++ b/app/src/main/res/menu/nav_drawer_main.xml
@@ -39,7 +39,7 @@
 
         <item
             android:id="@+id/nav_favourite"
-            android:icon="@drawable/v_heart_black_x24"
+            android:icon="@drawable/v_heart_x24"
             android:title="@string/favourite" />
 
         <item
@@ -49,7 +49,7 @@
 
         <item
             android:id="@+id/nav_downloads"
-            android:icon="@drawable/v_download_black_x24"
+            android:icon="@drawable/v_download_x24"
             android:title="@string/downloads" />
 
         <item
diff --git a/app/src/main/res/menu/quicksearch_option.xml b/app/src/main/res/menu/quicksearch_option.xml
index 16a76ef4b..aff0632a7 100644
--- a/app/src/main/res/menu/quicksearch_option.xml
+++ b/app/src/main/res/menu/quicksearch_option.xml
@@ -5,5 +5,5 @@
         android:id="@+id/menu_qs_remove"
         android:title="@string/delete"
         android:orderInCategory="100"
-        app:showAsAction="never"/>
+        app:showAsAction="never" />
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/scene_download.xml b/app/src/main/res/menu/scene_download.xml
index 07f282722..751b40bf8 100644
--- a/app/src/main/res/menu/scene_download.xml
+++ b/app/src/main/res/menu/scene_download.xml
@@ -25,13 +25,13 @@
 
     <item
         android:id="@+id/action_start_all"
-        android:icon="@drawable/v_play_dark_x24"
+        android:icon="@drawable/v_play_x24"
         android:title="@string/download_start_all"
         app:showAsAction="ifRoom" />
 
     <item
         android:id="@+id/action_stop_all"
-        android:icon="@drawable/v_pause_dark_x24"
+        android:icon="@drawable/v_pause_x24"
         android:title="@string/download_stop_all"
         app:showAsAction="ifRoom" />
 
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
index 7353dbd1f..ac94b34f5 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/ic_launcher_background"/>
-    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+    <background android:drawable="@color/ic_launcher_background" />
+    <foreground android:drawable="@drawable/ic_launcher_foreground" />
 </adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
index 7353dbd1f..ac94b34f5 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/ic_launcher_background"/>
-    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+    <background android:drawable="@color/ic_launcher_background" />
+    <foreground android:drawable="@drawable/ic_launcher_foreground" />
 </adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-night-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-night-anydpi-v26/ic_launcher.xml
index 7353dbd1f..ac94b34f5 100644
--- a/app/src/main/res/mipmap-night-anydpi-v26/ic_launcher.xml
+++ b/app/src/main/res/mipmap-night-anydpi-v26/ic_launcher.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/ic_launcher_background"/>
-    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+    <background android:drawable="@color/ic_launcher_background" />
+    <foreground android:drawable="@drawable/ic_launcher_foreground" />
 </adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-night-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-night-anydpi-v26/ic_launcher_round.xml
index 7353dbd1f..ac94b34f5 100644
--- a/app/src/main/res/mipmap-night-anydpi-v26/ic_launcher_round.xml
+++ b/app/src/main/res/mipmap-night-anydpi-v26/ic_launcher_round.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/ic_launcher_background"/>
-    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+    <background android:drawable="@color/ic_launcher_background" />
+    <foreground android:drawable="@drawable/ic_launcher_foreground" />
 </adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
index 5257cb2e8..d06531e7a 100644
--- a/app/src/main/res/values-night/themes.xml
+++ b/app/src/main/res/values-night/themes.xml
@@ -1,4 +1,5 @@
 <resources>
+
     <style name="BaseTheme" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/grey_875</item>
@@ -15,7 +16,7 @@
         <item name="toolbarColor">?android:attr/colorBackground</item>
         <item name="textColorThemePrimary">?android:attr/textColorSecondary</item>
         <item name="textColorThemeAccent">?android:attr/textColorSecondary</item>
-        <item name="drawableColorPrimary">@color/primary_drawable</item>
+        <item name="colorControlNormal">@color/primary_drawable</item>
         <item name="drawableColorSecondary">@color/secondary_drawable</item>
         <item name="drawableColorThemePrimary">@color/primary_drawable</item>
         <item name="contentColorPrimary">@color/content</item>
@@ -32,7 +33,8 @@
         <item name="tagBackgroundColor">@color/tag_background</item>
         <item name="galleryDetailHeaderTitleColor">?android:attr/textColorPrimary</item>
         <item name="galleryDetailHeaderBackgroundColor">?attr/contentColorThemePrimary</item>
-        <item name="galleryDetailButtonBackgroundColor">@color/gallery_detail_button_background</item>
+        <item name="galleryDetailButtonBackgroundColor">@color/gallery_detail_button_background
+        </item>
 
         <item name="toolbarPopupTheme">@style/ThemeOverlay.MaterialComponents.Dark</item>
         <item name="galleryDetailDivider">@drawable/divider_gallery_detail_dark</item>
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index 69c9eda61..76294d1b6 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -25,10 +25,6 @@
         <attr name="textColorThemePrimary" format="color" />
         <attr name="textColorThemeAccent" format="color" />
 
-        <!-- For light theme, it's primary dark color -->
-        <!-- For dark theme, it's primary light color -->
-        <!-- For black theme, it's primary light color -->
-        <attr name="drawableColorPrimary" format="color" />
         <!-- For light theme, it's secondary dark color -->
         <!-- For dark theme, it's secondary light color -->
         <!-- For black theme, it's secondary light color -->
@@ -178,8 +174,8 @@
     </declare-styleable>
 
     <declare-styleable name="FastScroller">
-        <attr name="handler" format="reference"/>
-        <attr name="draggable" format="boolean"/>
+        <attr name="handler" format="reference" />
+        <attr name="draggable" format="boolean" />
     </declare-styleable>
 
 </resources>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 0c8a7a401..044b6aec2 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -31,7 +31,7 @@
         <item name="toolbarColor">@color/colorPrimary</item>
         <item name="textColorThemePrimary">@color/colorPrimary</item>
         <item name="textColorThemeAccent">@color/colorAccent</item>
-        <item name="drawableColorPrimary">@color/primary_drawable</item>
+        <item name="colorControlNormal">@color/primary_drawable</item>
         <item name="drawableColorSecondary">@color/secondary_drawable</item>
         <item name="drawableColorThemePrimary">@color/colorPrimary</item>
         <item name="contentColorPrimary">@color/content</item>
@@ -92,7 +92,7 @@
         <item name="colorEdgeEffect">@color/grey_500</item>
         <item name="dividerColor">@color/divider_black</item>
         <item name="toolbarColor">@android:color/black</item>
-        <item name="drawableColorPrimary">@color/primary_drawable_black</item>
+        <item name="colorControlNormal">@color/primary_drawable_black</item>
         <item name="drawableColorSecondary">@color/secondary_drawable_black</item>
         <item name="drawableColorThemePrimary">@color/primary_drawable_black</item>
         <item name="contentColorPrimary">@color/content_black</item>