diff --git a/app/src/main/res/layout/fragment_song_list_page.xml b/app/src/main/res/layout/fragment_song_list_page.xml
index 9a0374d7..488bf5d4 100644
--- a/app/src/main/res/layout/fragment_song_list_page.xml
+++ b/app/src/main/res/layout/fragment_song_list_page.xml
@@ -44,16 +44,21 @@
                     app:layout_constraintEnd_toStartOf="@+id/song_list_shuffle_image_view"
                     app:layout_constraintStart_toStartOf="parent" />
 
-                <ImageView
+                <Button
                     android:id="@+id/song_list_shuffle_image_view"
-                    android:layout_width="24dp"
-                    android:layout_height="24dp"
+                    style="@style/Widget.Material3.Button.TonalButton.Icon"
+                    android:layout_width="52dp"
+                    android:layout_height="52dp"
                     android:layout_marginStart="16dp"
                     android:layout_marginTop="16dp"
                     android:layout_marginEnd="16dp"
-                    android:layout_marginBottom="24dp"
-                    android:background="@drawable/ic_shuffle"
-                    android:foreground="?android:attr/selectableItemBackgroundBorderless"
+                    android:layout_marginBottom="12dp"
+                    android:insetLeft="0dp"
+                    android:insetTop="0dp"
+                    android:insetRight="0dp"
+                    android:insetBottom="0dp"
+                    app:cornerRadius="30dp"
+                    app:icon="@drawable/ic_shuffle"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toEndOf="parent" />
             </androidx.constraintlayout.widget.ConstraintLayout>