Colorize drawables properly

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);

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);

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>

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>

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>

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>

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>

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" />

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

app/src/main/res/drawable/v_download_black_x24.xml

@@ -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>

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>

app/src/main/res/drawable/v_download_dark_x24.xml

@@ -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>

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>

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>

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>

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>

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>

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>

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>

app/src/main/res/drawable/v_folder_move_dark_x24.xml

@@ -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>

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>

app/src/main/res/drawable/v_heart_black_x24.xml

@@ -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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

app/src/main/res/drawable/v_magnify_dark_x24.xml

@@ -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>

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>

app/src/main/res/drawable/v_pause_dark_x24.xml

@@ -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>

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>

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>

app/src/main/res/drawable/v_play_dark_x24.xml

@@ -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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>
 

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

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>

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>

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>

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>

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

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>

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" />
 

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>

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>

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>

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>

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>

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>

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>