diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsRecyclerViewFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsRecyclerViewFragment.kt
index 32e8e4b4a..c38c343a1 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsRecyclerViewFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsRecyclerViewFragment.kt
@@ -79,10 +79,13 @@ abstract class AbsRecyclerViewFragment<A : RecyclerView.Adapter<*>, LM : Recycle
 
                 }
             })
-            binding.shuffleButton.setOnClickListener {
-                onShuffleClicked()
+            binding.shuffleButton.apply {
+                setOnClickListener {
+                    onShuffleClicked()
+                }
+                accentColor()
+                hide()
             }
-            binding.shuffleButton.accentColor()
         } else {
             binding.shuffleButton.isVisible = false
         }
diff --git a/app/src/main/res/layout/fragment_album_content.xml b/app/src/main/res/layout/fragment_album_content.xml
index 1cf80e86d..6dc9c1b96 100644
--- a/app/src/main/res/layout/fragment_album_content.xml
+++ b/app/src/main/res/layout/fragment_album_content.xml
@@ -8,18 +8,14 @@
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/playAction"
-        style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+        style="@style/Widget.Material3.Button.OutlinedButton"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
         android:layout_marginEnd="4dp"
-        android:paddingTop="10dp"
-        android:paddingBottom="10dp"
         android:text="@string/action_play_all"
         android:textAppearance="@style/TextViewButton"
         android:textColor="?android:attr/textColorPrimary"
-        app:backgroundTint="?attr/colorSurface"
-        app:cornerRadius="8dp"
         app:icon="@drawable/ic_play_arrow"
         app:layout_constraintEnd_toStartOf="@+id/shuffleAction"
         app:layout_constraintHorizontal_bias="0.5"
@@ -28,18 +24,14 @@
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/shuffleAction"
-        style="@style/Widget.MaterialComponents.Button.TextButton"
+        style="@style/Widget.Material3.Button.Icon"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="4dp"
         android:layout_marginEnd="16dp"
-        android:paddingTop="10dp"
-        android:paddingBottom="10dp"
         android:text="@string/shuffle"
         android:textAppearance="@style/TextViewButton"
         android:textColor="?android:attr/textColorPrimary"
-        app:backgroundTint="?attr/colorSurface"
-        app:cornerRadius="8dp"
         app:icon="@drawable/ic_shuffle"
         app:layout_constraintBottom_toBottomOf="@+id/playAction"
         app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/fragment_artist_content.xml b/app/src/main/res/layout/fragment_artist_content.xml
index a1f76d182..e7b40a45d 100644
--- a/app/src/main/res/layout/fragment_artist_content.xml
+++ b/app/src/main/res/layout/fragment_artist_content.xml
@@ -8,18 +8,15 @@
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/playAction"
-        style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+        style="@style/Widget.Material3.Button.OutlinedButton"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
         android:layout_marginEnd="4dp"
-        android:paddingTop="10dp"
-        android:paddingBottom="10dp"
         android:text="@string/action_play_all"
         android:textAppearance="@style/TextViewButton"
         android:textColor="?android:attr/textColorPrimary"
         app:backgroundTint="?attr/colorSurface"
-        app:cornerRadius="8dp"
         app:icon="@drawable/ic_play_arrow"
         app:layout_constraintEnd_toStartOf="@+id/shuffleAction"
         app:layout_constraintHorizontal_bias="0.5"
@@ -28,18 +25,15 @@
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/shuffleAction"
-        style="@style/Widget.MaterialComponents.Button.TextButton"
+        style="@style/Widget.Material3.Button.Icon"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="4dp"
         android:layout_marginEnd="16dp"
-        android:paddingTop="10dp"
-        android:paddingBottom="10dp"
         android:text="@string/shuffle"
         android:textAppearance="@style/TextViewButton"
         android:textColor="?android:attr/textColorPrimary"
         app:backgroundTint="?attr/colorSurface"
-        app:cornerRadius="8dp"
         app:icon="@drawable/ic_shuffle"
         app:layout_constraintBottom_toBottomOf="@+id/playAction"
         app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/item_list_quick_actions.xml b/app/src/main/res/layout/item_list_quick_actions.xml
index 85e70c0a2..f49bfd436 100644
--- a/app/src/main/res/layout/item_list_quick_actions.xml
+++ b/app/src/main/res/layout/item_list_quick_actions.xml
@@ -12,52 +12,38 @@
   ~ See the GNU General Public License for more details.
   -->
 
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:gravity="center_vertical"
-    android:orientation="horizontal">
+    android:orientation="horizontal"
+    android:paddingHorizontal="16dp"
+    android:paddingVertical="10dp">
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/playAction"
-        style="@style/Widget.MaterialComponents.Button.OutlinedButton"
-        android:layout_width="0dp"
+        style="@style/Widget.Material3.Button.OutlinedButton"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
         android:layout_marginEnd="4dp"
-        android:paddingTop="10dp"
-        android:paddingBottom="10dp"
+        android:layout_weight="1"
         android:text="@string/action_play_all"
         android:textAppearance="@style/TextViewButton"
         android:textColor="?android:attr/textColorPrimary"
         app:backgroundTint="?attr/colorSurface"
-        app:cornerRadius="8dp"
-        app:icon="@drawable/ic_play_arrow"
-        app:layout_constraintEnd_toStartOf="@+id/shuffleAction"
-        app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:icon="@drawable/ic_play_arrow" />
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/shuffleAction"
-        style="@style/Widget.MaterialComponents.Button.TextButton"
-        android:layout_width="0dp"
+        style="@style/Widget.Material3.Button.Icon"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginStart="4dp"
-        android:layout_marginEnd="16dp"
-        android:paddingTop="10dp"
-        android:paddingBottom="10dp"
+        android:layout_weight="1"
         android:text="@string/shuffle"
         android:textAppearance="@style/TextViewButton"
         android:textColor="?android:attr/textColorPrimary"
-        app:backgroundTint="?attr/colorSurface"
-        app:cornerRadius="8dp"
-        app:icon="@drawable/ic_shuffle"
-        app:layout_constraintBottom_toBottomOf="@+id/playAction"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toEndOf="@+id/playAction"
-        app:layout_constraintTop_toTopOf="@+id/playAction" />
+        app:icon="@drawable/ic_shuffle" />
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</LinearLayout>
\ No newline at end of file