diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.java
index f1464e622..ba8965c48 100755
--- a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.java
+++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.java
@@ -203,8 +203,6 @@ public class GalleryDetailScene extends ToolbarScene implements View.OnClickList
     @Nullable
     private RatingBar mRating;
     @Nullable
-    private View mHeartGroup;
-    @Nullable
     private TextView mHeart;
     @Nullable
     private TextView mHeartOutline;
@@ -604,9 +602,8 @@ public class GalleryDetailScene extends ToolbarScene implements View.OnClickList
         mNewerVersion = (TextView) ViewUtils.$$(mActions, R.id.newerVersion);
         mRatingText = (TextView) ViewUtils.$$(mActions, R.id.rating_text);
         mRating = (RatingBar) ViewUtils.$$(mActions, R.id.rating);
-        mHeartGroup = ViewUtils.$$(mActions, R.id.heart_group);
-        mHeart = (TextView) ViewUtils.$$(mHeartGroup, R.id.heart);
-        mHeartOutline = (TextView) ViewUtils.$$(mHeartGroup, R.id.heart_outline);
+        mHeart = (TextView) ViewUtils.$$(mActions, R.id.heart);
+        mHeartOutline = (TextView) ViewUtils.$$(mActions, R.id.heart_outline);
         mTorrent = (TextView) ViewUtils.$$(mActions, R.id.torrent);
         mArchive = (TextView) ViewUtils.$$(mActions, R.id.archive);
         mShare = (TextView) ViewUtils.$$(mActions, R.id.share);
@@ -614,15 +611,14 @@ public class GalleryDetailScene extends ToolbarScene implements View.OnClickList
         mSimilar = (TextView) ViewUtils.$$(mActions, R.id.similar);
         mSearchCover = (TextView) ViewUtils.$$(mActions, R.id.search_cover);
         mNewerVersion.setOnClickListener(this);
-        mHeartGroup.setOnClickListener(this);
-        mHeartGroup.setOnLongClickListener(this);
+        mHeart.setOnClickListener(this);
+        mHeartOutline.setOnClickListener(this);
         mTorrent.setOnClickListener(this);
         mArchive.setOnClickListener(this);
         mShare.setOnClickListener(this);
         mRate.setOnClickListener(this);
         mSimilar.setOnClickListener(this);
         mSearchCover.setOnClickListener(this);
-        ensureActionDrawable();
 
         mTags = (LinearLayout) ViewUtils.$$(belowHeader, R.id.tags);
         mNoTags = (TextView) ViewUtils.$$(mTags, R.id.no_tags);
@@ -695,7 +691,6 @@ public class GalleryDetailScene extends ToolbarScene implements View.OnClickList
         mNewerVersion = null;
         mRatingText = null;
         mRating = null;
-        mHeartGroup = null;
         mHeart = null;
         mHeartOutline = null;
         mTorrent = null;
@@ -769,25 +764,6 @@ public class GalleryDetailScene extends ToolbarScene implements View.OnClickList
         return true;
     }
 
-    private void setActionDrawable(@Nullable TextView text, @DrawableRes int resId) {
-        if (text == null) return;
-        Context context = text.getContext();
-        Drawable drawable = ContextCompat.getDrawable(context, resId);
-        if (drawable == null) return;
-        drawable.setBounds(0, 0, drawable.getIntrinsicWidth(), drawable.getIntrinsicHeight());
-        text.setCompoundDrawables(null, drawable, null, null);
-    }
-
-    private void ensureActionDrawable() {
-        setActionDrawable(mHeart, R.drawable.v_heart_primary_x48);
-        setActionDrawable(mHeartOutline, R.drawable.v_heart_outline_primary_x48);
-        setActionDrawable(mTorrent, R.drawable.v_utorrent_primary_x48);
-        setActionDrawable(mArchive, R.drawable.v_archive_primary_x48);
-        setActionDrawable(mShare, R.drawable.v_share_primary_x48);
-        setActionDrawable(mSimilar, R.drawable.v_similar_primary_x48);
-        setActionDrawable(mSearchCover, R.drawable.v_file_find_primary_x48);
-    }
-
     private boolean createCircularReveal() {
         if (mColorBg == null) {
             return false;
@@ -1244,7 +1220,7 @@ public class GalleryDetailScene extends ToolbarScene implements View.OnClickList
             Bundle args = new Bundle();
             args.putParcelable(GalleryInfoScene.KEY_GALLERY_DETAIL, mGalleryDetail);
             startScene(new Announcer(GalleryInfoScene.class).setArgs(args));
-        } else if (mHeartGroup == v) {
+        } else if (mHeart == v || mHeartOutline == v) {
             if (mGalleryDetail != null && !mModifingFavorites) {
                 boolean remove = false;
                 if (EhDB.containLocalFavorites(mGalleryDetail.gid) || mGalleryDetail.isFavorited) {
@@ -1491,25 +1467,6 @@ public class GalleryDetailScene extends ToolbarScene implements View.OnClickList
                 CommonOperations.startDownload(activity, galleryInfo, true);
             }
             return true;
-        } else if (mHeartGroup == v) {
-            if (mGalleryDetail != null && !mModifingFavorites) {
-                boolean remove = false;
-                if (EhDB.containLocalFavorites(mGalleryDetail.gid) || mGalleryDetail.isFavorited) {
-                    mModifingFavorites = true;
-                    CommonOperations.removeFromFavorites(activity, mGalleryDetail,
-                            new ModifyFavoritesListener(activity,
-                                    activity.getStageId(), getTag(), true));
-                    remove = true;
-                }
-                if (!remove) {
-                    mModifingFavorites = true;
-                    CommonOperations.addToFavorites(activity, mGalleryDetail,
-                            new ModifyFavoritesListener(activity,
-                                    activity.getStageId(), getTag(), false), true);
-                }
-                // Update UI
-                updateFavoriteDrawable();
-            }
         } else {
             String tag = (String) v.getTag(R.id.tag);
             if (null != tag) {
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 d8c1df0db..205438146 100644
--- a/app/src/main/res/drawable/v_archive_primary_x48.xml
+++ b/app/src/main/res/drawable/v_archive_primary_x48.xml
@@ -17,7 +17,6 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="48dp"
     android:height="48dp"
-    android:tint="?drawableColorThemePrimary"
     android:viewportWidth="24.0"
     android:viewportHeight="24.0">
 
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 1b8cbad4c..db8b184db 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
@@ -17,7 +17,6 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="48dp"
     android:height="48dp"
-    android:tint="?drawableColorThemePrimary"
     android:viewportWidth="24"
     android:viewportHeight="24">
 
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 bb693162b..a6552156f 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
@@ -17,7 +17,6 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="48dp"
     android:height="48dp"
-    android:tint="?drawableColorThemePrimary"
     android:viewportWidth="24"
     android:viewportHeight="24">
 
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 98bd1d2cc..3df1b5627 100644
--- a/app/src/main/res/drawable/v_heart_primary_x48.xml
+++ b/app/src/main/res/drawable/v_heart_primary_x48.xml
@@ -17,7 +17,6 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="48dp"
     android:height="48dp"
-    android:tint="?drawableColorThemePrimary"
     android:viewportWidth="24"
     android:viewportHeight="24">
 
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 befb02a00..742b2c536 100644
--- a/app/src/main/res/drawable/v_share_primary_x48.xml
+++ b/app/src/main/res/drawable/v_share_primary_x48.xml
@@ -17,7 +17,6 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="48dp"
     android:height="48dp"
-    android:tint="?drawableColorThemePrimary"
     android:viewportWidth="24"
     android:viewportHeight="24">
 
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 f0d817e7b..5d1d12519 100644
--- a/app/src/main/res/drawable/v_similar_primary_x48.xml
+++ b/app/src/main/res/drawable/v_similar_primary_x48.xml
@@ -17,7 +17,6 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="48dp"
     android:height="48dp"
-    android:tint="?drawableColorThemePrimary"
     android:viewportWidth="24"
     android:viewportHeight="24">
 
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 e8d32bdb5..11d5a3906 100644
--- a/app/src/main/res/drawable/v_utorrent_primary_x48.xml
+++ b/app/src/main/res/drawable/v_utorrent_primary_x48.xml
@@ -17,7 +17,6 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="48dp"
     android:height="48dp"
-    android:tint="?drawableColorThemePrimary"
     android:viewportWidth="24"
     android:viewportHeight="24">
 
diff --git a/app/src/main/res/layout-television/gallery_detail_actions.xml b/app/src/main/res/layout-television/gallery_detail_actions.xml
deleted file mode 100644
index 92a897b73..000000000
--- a/app/src/main/res/layout-television/gallery_detail_actions.xml
+++ /dev/null
@@ -1,191 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright 2022 hathlife
-  ~
-  ~ This file is part of EhViewer
-  ~
-  ~ EhViewer is free software: you can redistribute it and/or
-  ~ modify it under the terms of the GNU General Public License as
-  ~ published by the Free Software Foundation, either version 3 of the
-  ~ License, or (at your option) any later version.
-  ~
-  ~ EhViewer is distributed in the hope that it will be useful, but
-  ~ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-  ~ or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along with EhViewer.
-  ~ If not, see <https://www.gnu.org/licenses/>.
-  ~
-  -->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/actions"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    android:paddingTop="@dimen/keyline_margin">
-
-    <TextView
-        android:id="@+id/newerVersion"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="?selectableItemBackground"
-        android:gravity="center"
-        android:padding="8dp"
-        android:text="@string/newer_version_avaliable"
-        android:visibility="gone" />
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:paddingLeft="@dimen/keyline_margin"
-        android:paddingRight="@dimen/keyline_margin">
-
-
-        <LinearLayout
-            android:id="@+id/rate"
-            android:layout_width="484dp"
-            android:layout_height="wrap_content"
-            android:background="?selectableItemBackground"
-            android:orientation="vertical"
-            android:paddingTop="8dp"
-            android:paddingBottom="8dp">
-
-            <androidx.appcompat.widget.AppCompatRatingBar
-                android:id="@+id/rating"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_horizontal"
-                android:layout_marginLeft="0dp"
-                android:layout_marginTop="0dp"
-
-                android:isIndicator="true"
-                android:theme="@style/RatingBarTheme" />
-
-            <TextView
-                android:id="@+id/rating_text"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_horizontal"
-                android:layout_marginLeft="0dp"
-                android:textColor="?android:attr/textColorPrimary" />
-
-        </LinearLayout>
-
-        <HorizontalScrollView
-            android:id="@+id/actions_scroll_view"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal"
-            android:clipToPadding="false"
-            android:paddingLeft="36dp"
-            android:paddingRight="@dimen/keyline_margin"
-            android:scrollbars="none">
-
-            <LinearLayout
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:divider="@drawable/spacer_keyline"
-                android:orientation="horizontal"
-                android:paddingTop="8dp"
-                android:paddingBottom="8dp"
-                android:showDividers="middle">
-
-                <FrameLayout
-                    android:id="@+id/heart_group"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:background="?selectableItemBackgroundBorderless"
-                    android:clickable="true"
-                    android:focusable="true"
-                    android:nextFocusUp="@+id/download">
-
-                    <TextView
-                        android:id="@+id/heart"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:drawablePadding="4dp"
-                        android:gravity="center_horizontal"
-                        android:text="@string/favorited"
-                        android:textColor="?android:attr/textColorPrimary" />
-
-                    <TextView
-                        android:id="@+id/heart_outline"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:drawablePadding="4dp"
-                        android:gravity="center_horizontal"
-                        android:text="@string/not_favorited"
-                        android:textColor="?android:attr/textColorPrimary" />
-
-                </FrameLayout>
-
-                <TextView
-                    android:id="@+id/share"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:background="?selectableItemBackgroundBorderless"
-                    android:clickable="true"
-                    android:drawablePadding="4dp"
-                    android:focusable="true"
-                    android:gravity="center_horizontal"
-                    android:nextFocusUp="@+id/download"
-                    android:text="@string/share"
-                    android:textColor="?android:attr/textColorPrimary" />
-
-                <TextView
-                    android:id="@+id/torrent"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:background="?selectableItemBackgroundBorderless"
-                    android:clickable="true"
-                    android:drawablePadding="4dp"
-                    android:focusable="true"
-                    android:gravity="center_horizontal"
-                    android:nextFocusUp="@+id/download"
-                    android:textColor="?android:attr/textColorPrimary" />
-
-                <TextView
-                    android:id="@+id/archive"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:background="?selectableItemBackgroundBorderless"
-                    android:clickable="true"
-                    android:drawablePadding="4dp"
-                    android:focusable="true"
-                    android:gravity="center_horizontal"
-                    android:nextFocusUp="@+id/download"
-                    android:text="@string/archive"
-                    android:textColor="?android:attr/textColorPrimary" />
-
-                <TextView
-                    android:id="@+id/similar"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:background="?selectableItemBackgroundBorderless"
-                    android:clickable="true"
-                    android:drawablePadding="4dp"
-                    android:focusable="true"
-                    android:gravity="center_horizontal"
-                    android:nextFocusUp="@+id/download"
-                    android:text="@string/similar_gallery"
-                    android:textColor="?android:attr/textColorPrimary" />
-
-                <TextView
-                    android:id="@+id/search_cover"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:background="?selectableItemBackgroundBorderless"
-                    android:clickable="true"
-                    android:drawablePadding="4dp"
-                    android:focusable="true"
-                    android:gravity="center_horizontal"
-                    android:nextFocusRight="@+id/search_cover"
-                    android:nextFocusUp="@+id/download"
-                    android:text="@string/search_cover"
-                    android:textColor="?android:attr/textColorPrimary" />
-
-            </LinearLayout>
-        </HorizontalScrollView>
-    </LinearLayout>
-
-</LinearLayout>
diff --git a/app/src/main/res/layout/gallery_detail_actions.xml b/app/src/main/res/layout/gallery_detail_actions.xml
index 97205d4fe..e24a36c0b 100644
--- a/app/src/main/res/layout/gallery_detail_actions.xml
+++ b/app/src/main/res/layout/gallery_detail_actions.xml
@@ -15,6 +15,7 @@
   -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/actions"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -44,96 +45,62 @@
         <LinearLayout
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:divider="@drawable/spacer_keyline"
-            android:orientation="horizontal"
-            android:showDividers="middle">
+            android:orientation="horizontal">
 
-            <FrameLayout
-                android:id="@+id/heart_group"
+            <Button
+                android:id="@+id/heart"
+                style="@style/Widget.Material3.Button.IconButton.Outlined"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:background="?selectableItemBackgroundBorderless"
-                android:clickable="true"
-                android:focusable="true">
+                android:text="@string/favorited"
+                app:icon="@drawable/v_heart_primary_x48" />
 
-                <TextView
-                    android:id="@+id/heart"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:drawablePadding="8dp"
-                    android:gravity="center_horizontal"
-                    android:text="@string/favorited"
-                    android:textColor="?android:attr/textColorPrimary" />
+            <Button
+                android:id="@+id/heart_outline"
+                style="@style/Widget.Material3.Button.IconButton.Outlined"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/not_favorited"
+                app:icon="@drawable/v_heart_outline_primary_x48" />
 
-                <TextView
-                    android:id="@+id/heart_outline"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:drawablePadding="8dp"
-                    android:gravity="center_horizontal"
-                    android:text="@string/not_favorited"
-                    android:textColor="?android:attr/textColorPrimary" />
-
-            </FrameLayout>
-
-            <TextView
+            <Button
                 android:id="@+id/share"
+                style="@style/Widget.Material3.Button.IconButton.Outlined"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:background="?selectableItemBackgroundBorderless"
-                android:clickable="true"
-                android:drawablePadding="8dp"
-                android:focusable="true"
-                android:gravity="center_horizontal"
                 android:text="@string/share"
-                android:textColor="?android:attr/textColorPrimary" />
+                app:icon="@drawable/v_share_primary_x48" />
 
-            <TextView
+            <Button
                 android:id="@+id/torrent"
+                style="@style/Widget.Material3.Button.IconButton.Outlined"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:background="?selectableItemBackgroundBorderless"
-                android:clickable="true"
-                android:drawablePadding="8dp"
-                android:focusable="true"
-                android:gravity="center_horizontal"
-                android:textColor="?android:attr/textColorPrimary" />
+                app:icon="@drawable/v_utorrent_primary_x48" />
 
-            <TextView
+            <Button
                 android:id="@+id/archive"
+                style="@style/Widget.Material3.Button.IconButton.Outlined"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:background="?selectableItemBackgroundBorderless"
-                android:clickable="true"
-                android:drawablePadding="8dp"
-                android:focusable="true"
-                android:gravity="center_horizontal"
                 android:text="@string/archive"
-                android:textColor="?android:attr/textColorPrimary" />
+                app:icon="@drawable/v_archive_primary_x48" />
 
-            <TextView
+            <Button
                 android:id="@+id/similar"
+                style="@style/Widget.Material3.Button.IconButton.Outlined"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:background="?selectableItemBackgroundBorderless"
-                android:clickable="true"
-                android:drawablePadding="8dp"
-                android:focusable="true"
-                android:gravity="center_horizontal"
                 android:text="@string/similar_gallery"
-                android:textColor="?android:attr/textColorPrimary" />
+                app:icon="@drawable/v_similar_primary_x48" />
 
-            <TextView
+            <Button
                 android:id="@+id/search_cover"
+                style="@style/Widget.Material3.Button.IconButton.Outlined"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:background="?selectableItemBackgroundBorderless"
-                android:clickable="true"
-                android:drawablePadding="8dp"
-                android:focusable="true"
-                android:gravity="center_horizontal"
                 android:text="@string/search_cover"
-                android:textColor="?android:attr/textColorPrimary" />
+                app:icon="@drawable/v_file_find_primary_x48" />
 
         </LinearLayout>
     </HorizontalScrollView>