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 5dfd7b873..cdd35fda7 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
@@ -274,7 +274,7 @@ public class FavoritesScene extends BaseScene implements
 
         refreshLayout.setHeaderTranslationY(paddingTopSB);
 
-        mLeftDrawable = new DrawerArrowDrawable(context, AttrResources.getAttrColor(context, R.attr.colorOppositeDrawable));
+        mLeftDrawable = new DrawerArrowDrawable(context, AttrResources.getAttrColor(context, R.attr.colorDrawableOpposite));
         mSearchBar.setLeftDrawable(mLeftDrawable);
         mSearchBar.setRightDrawable(DrawableManager.getDrawable(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 aea006414..7dd789973 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
@@ -425,8 +425,8 @@ public final class GalleryListScene extends BaseScene
 
         refreshLayout.setHeaderTranslationY(paddingTopSB);
 
-        mLeftDrawable = new DrawerArrowDrawable(context, AttrResources.getAttrColor(context, R.attr.colorOppositeDrawable));
-        mRightDrawable = new AddDeleteDrawable(context, AttrResources.getAttrColor(context, R.attr.colorOppositeDrawable));
+        mLeftDrawable = new DrawerArrowDrawable(context, AttrResources.getAttrColor(context, R.attr.colorDrawableOpposite));
+        mRightDrawable = new AddDeleteDrawable(context, AttrResources.getAttrColor(context, R.attr.colorDrawableOpposite));
         mSearchBar.setLeftDrawable(mLeftDrawable);
         mSearchBar.setRightDrawable(mRightDrawable);
         mSearchBar.setHelper(this);
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 569bdd0a6..3e7e935a7 100644
--- a/app/src/main/res/drawable/v_adb_primary_x24.xml
+++ b/app/src/main/res/drawable/v_adb_primary_x24.xml
@@ -23,7 +23,7 @@
     android:viewportHeight="24">
 
     <path
-        android:fillColor="?attr/colorPrimaryDrawable"
+        android:fillColor="?attr/colorDrawablePrimary"
         android:pathData="@string/pd_adb"/>
 
 </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 800ffc45c..b203afa0d 100644
--- a/app/src/main/res/drawable/v_archive_primary_x48.xml
+++ b/app/src/main/res/drawable/v_archive_primary_x48.xml
@@ -23,7 +23,7 @@
     android:viewportHeight="24.0">
 
     <path
-        android:fillColor="?attr/colorPrimaryDrawable"
+        android:fillColor="?attr/colorDrawablePrimary"
         android:pathData="@string/pd_archive"/>
 
 </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 a8cde5164..31b4e5a57 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
@@ -23,7 +23,7 @@
     android:viewportHeight="24">
 
     <path
-        android:fillColor="?attr/colorPrimaryDrawable"
+        android:fillColor="?attr/colorDrawablePrimary"
         android:pathData="@string/pd_book_open"/>
 
 </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 db1cd8d3c..ccd7f538d 100644
--- a/app/src/main/res/drawable/v_download_primary_x24.xml
+++ b/app/src/main/res/drawable/v_download_primary_x24.xml
@@ -23,7 +23,7 @@
     android:viewportHeight="24">
 
     <path
-        android:fillColor="?attr/colorPrimaryDrawable"
+        android:fillColor="?attr/colorDrawablePrimary"
         android:pathData="@string/pd_download"/>
 
 </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 d0e9fffa5..71c8e4dc4 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
@@ -23,7 +23,7 @@
     android:viewportHeight="24">
 
     <path
-        android:fillColor="?attr/colorPrimaryDrawable"
+        android:fillColor="?attr/colorDrawablePrimary"
         android:pathData="@string/pd_file_find"/>
 
 </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 c10ba02ed..bb60d8f0c 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
@@ -23,7 +23,7 @@
     android:viewportHeight="24">
 
     <path
-        android:fillColor="?attr/colorPrimaryDrawable"
+        android:fillColor="?attr/colorDrawablePrimary"
         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 964ffa5c8..d91045da7 100644
--- a/app/src/main/res/drawable/v_heart_primary_x48.xml
+++ b/app/src/main/res/drawable/v_heart_primary_x48.xml
@@ -23,7 +23,7 @@
     android:viewportHeight="24">
 
     <path
-        android:fillColor="?attr/colorPrimaryDrawable"
+        android:fillColor="?attr/colorDrawablePrimary"
         android:pathData="@string/pd_heart"/>
 
 </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 ba2e7c7f5..56311c15f 100644
--- a/app/src/main/res/drawable/v_info_primary_x24.xml
+++ b/app/src/main/res/drawable/v_info_primary_x24.xml
@@ -23,7 +23,7 @@
     android:viewportHeight="24">
 
     <path
-        android:fillColor="?attr/colorPrimaryDrawable"
+        android:fillColor="?attr/colorDrawablePrimary"
         android:pathData="@string/pd_info"/>
 
 </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 bc4c22998..ed9247754 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
@@ -23,7 +23,7 @@
     android:viewportHeight="24">
 
     <path
-        android:fillColor="?attr/colorPrimaryDrawable"
+        android:fillColor="?attr/colorDrawablePrimary"
         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 4e464dbd1..5c2d2ff42 100644
--- a/app/src/main/res/drawable/v_sec_primary_x24.xml
+++ b/app/src/main/res/drawable/v_sec_primary_x24.xml
@@ -4,6 +4,6 @@
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="?attr/colorPrimaryDrawable"
+        android:fillColor="?attr/colorDrawablePrimary"
         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_share_primary_x48.xml b/app/src/main/res/drawable/v_share_primary_x48.xml
index 64cebd9df..b40e79f77 100644
--- a/app/src/main/res/drawable/v_share_primary_x48.xml
+++ b/app/src/main/res/drawable/v_share_primary_x48.xml
@@ -23,7 +23,7 @@
     android:viewportHeight="24">
 
     <path
-        android:fillColor="?attr/colorPrimaryDrawable"
+        android:fillColor="?attr/colorDrawablePrimary"
         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 dc72db37b..2b7685082 100644
--- a/app/src/main/res/drawable/v_similar_primary_x48.xml
+++ b/app/src/main/res/drawable/v_similar_primary_x48.xml
@@ -23,7 +23,7 @@
     android:viewportHeight="24">
 
     <path
-        android:fillColor="?attr/colorPrimaryDrawable"
+        android:fillColor="?attr/colorDrawablePrimary"
         android:pathData="@string/pd_similar"/>
 
 </vector>
diff --git a/app/src/main/res/drawable/v_thumb_up_primary_x48.xml b/app/src/main/res/drawable/v_thumb_up_primary_x48.xml
index 48d19fdd1..ea95dd2cf 100644
--- a/app/src/main/res/drawable/v_thumb_up_primary_x48.xml
+++ b/app/src/main/res/drawable/v_thumb_up_primary_x48.xml
@@ -23,7 +23,7 @@
     android:viewportHeight="24">
 
     <path
-        android:fillColor="?attr/colorPrimaryDrawable"
+        android:fillColor="?attr/colorDrawablePrimary"
         android:pathData="@string/pd_thumb_up"/>
 
 </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 8b09a1545..afc44d299 100644
--- a/app/src/main/res/drawable/v_utorrent_primary_x48.xml
+++ b/app/src/main/res/drawable/v_utorrent_primary_x48.xml
@@ -23,7 +23,7 @@
     android:viewportHeight="24">
 
     <path
-        android:fillColor="?attr/colorPrimaryDrawable"
+        android:fillColor="?attr/colorDrawablePrimary"
         android:pathData="@string/pd_utorrent"/>
 
 </vector>
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index 64f0e4b60..bc7a5b11c 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -23,11 +23,11 @@
         <!-- 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="colorOppositeDrawable" format="color"/>
+        <attr name="colorDrawableOpposite" format="color"/>
         <!-- For light theme, it's primary color -->
         <!-- For dark theme, it's primary light color -->
         <!-- For black theme, it's primary light color -->
-        <attr name="colorPrimaryDrawable" format="color"/>
+        <attr name="colorDrawablePrimary" format="color"/>
         <attr name="toolbarPopupTheme" format="reference"/>
     </declare-styleable>
 
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index eec11d3da..c1f5d7e4f 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -29,8 +29,8 @@
 
         <item name="colorDivider">@color/divider_light</item>
         <item name="colorToolbar">@color/colorPrimary</item>
-        <item name="colorOppositeDrawable">@color/primary_drawable_light</item>
-        <item name="colorPrimaryDrawable">@color/colorPrimary</item>
+        <item name="colorDrawableOpposite">@color/primary_drawable_light</item>
+        <item name="colorDrawablePrimary">@color/colorPrimary</item>
     </style>
 
     <style name="AppTheme.NoActionBar">
@@ -52,8 +52,8 @@
 
         <item name="colorDivider">@color/divider_dark</item>
         <item name="colorToolbar">?android:attr/colorBackground</item>
-        <item name="colorOppositeDrawable">@color/primary_drawable_dark</item>
-        <item name="colorPrimaryDrawable">@color/primary_drawable_dark</item>
+        <item name="colorDrawableOpposite">@color/primary_drawable_dark</item>
+        <item name="colorDrawablePrimary">@color/primary_drawable_dark</item>
     </style>
 
     <style name="AppTheme.Dark.NoActionBar">
@@ -78,8 +78,8 @@
 
         <item name="colorDivider">@color/divider_dark</item>
         <item name="colorToolbar">?android:attr/colorBackground</item>
-        <item name="colorOppositeDrawable">@color/primary_drawable_dark</item>
-        <item name="colorPrimaryDrawable">@color/primary_drawable_dark</item>
+        <item name="colorDrawableOpposite">@color/primary_drawable_dark</item>
+        <item name="colorDrawablePrimary">@color/primary_drawable_dark</item>
     </style>
 
     <style name="AppTheme.Black.NoActionBar">