diff --git a/app/src/main/res/layout-h360dp/fragment_detail.xml b/app/src/main/res/layout-h360dp/fragment_detail.xml
index a04d23b7b..1defb7e9b 100644
--- a/app/src/main/res/layout-h360dp/fragment_detail.xml
+++ b/app/src/main/res/layout-h360dp/fragment_detail.xml
@@ -113,6 +113,7 @@
                     android:layout_marginEnd="@dimen/spacing_small"
                     android:layout_marginBottom="@dimen/spacing_mid_medium"
                     android:text="@string/lbl_play"
+                    app:icon="@drawable/ic_play_24"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toStartOf="@+id/detail_shuffle_button"
                     app:layout_constraintHorizontal_bias="0.5"
@@ -126,6 +127,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginStart="@dimen/spacing_small"
                     android:text="@string/lbl_shuffle"
+                    app:icon="@drawable/ic_shuffle_off_24"
                     app:layout_constraintBottom_toBottomOf="@+id/detail_play_button"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toEndOf="@+id/detail_play_button"
diff --git a/app/src/main/res/layout-h480dp/fragment_detail.xml b/app/src/main/res/layout-h480dp/fragment_detail.xml
index b219830c9..5f6aa1d25 100644
--- a/app/src/main/res/layout-h480dp/fragment_detail.xml
+++ b/app/src/main/res/layout-h480dp/fragment_detail.xml
@@ -97,6 +97,7 @@
                     android:layout_marginTop="@dimen/spacing_mid_medium"
                     android:layout_marginEnd="@dimen/spacing_small"
                     android:text="@string/lbl_play"
+                    app:icon="@drawable/ic_play_24"
                     app:layout_constraintEnd_toStartOf="@+id/detail_shuffle_button"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@+id/detail_info" />
@@ -108,6 +109,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginStart="@dimen/spacing_small"
                     android:text="@string/lbl_shuffle"
+                    app:icon="@drawable/ic_shuffle_off_24"
                     app:layout_constraintBottom_toBottomOf="@+id/detail_play_button"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toEndOf="@+id/detail_play_button"
diff --git a/app/src/main/res/layout-sw600dp/fragment_detail.xml b/app/src/main/res/layout-sw600dp/fragment_detail.xml
index df3e5dfeb..213852b74 100644
--- a/app/src/main/res/layout-sw600dp/fragment_detail.xml
+++ b/app/src/main/res/layout-sw600dp/fragment_detail.xml
@@ -110,6 +110,7 @@
                     android:layout_marginStart="@dimen/spacing_medium"
                     android:layout_marginEnd="@dimen/spacing_small"
                     android:text="@string/lbl_play"
+                    app:icon="@drawable/ic_play_24"
                     app:layout_constraintBottom_toBottomOf="@+id/detail_cover"
                     app:layout_constraintEnd_toStartOf="@+id/detail_shuffle_button"
                     app:layout_constraintHorizontal_bias="0.5"
@@ -123,6 +124,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginStart="@dimen/spacing_small"
                     android:text="@string/lbl_shuffle"
+                    app:icon="@drawable/ic_shuffle_off_24"
                     app:layout_constraintBottom_toBottomOf="@+id/detail_play_button"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toEndOf="@+id/detail_play_button"
diff --git a/app/src/main/res/layout-w600dp/fragment_detail.xml b/app/src/main/res/layout-w600dp/fragment_detail.xml
index a04d23b7b..1defb7e9b 100644
--- a/app/src/main/res/layout-w600dp/fragment_detail.xml
+++ b/app/src/main/res/layout-w600dp/fragment_detail.xml
@@ -113,6 +113,7 @@
                     android:layout_marginEnd="@dimen/spacing_small"
                     android:layout_marginBottom="@dimen/spacing_mid_medium"
                     android:text="@string/lbl_play"
+                    app:icon="@drawable/ic_play_24"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toStartOf="@+id/detail_shuffle_button"
                     app:layout_constraintHorizontal_bias="0.5"
@@ -126,6 +127,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginStart="@dimen/spacing_small"
                     android:text="@string/lbl_shuffle"
+                    app:icon="@drawable/ic_shuffle_off_24"
                     app:layout_constraintBottom_toBottomOf="@+id/detail_play_button"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toEndOf="@+id/detail_play_button"
diff --git a/app/src/main/res/values/styles_ui.xml b/app/src/main/res/values/styles_ui.xml
index 3e8f51a6e..dabb72a44 100644
--- a/app/src/main/res/values/styles_ui.xml
+++ b/app/src/main/res/values/styles_ui.xml
@@ -247,9 +247,13 @@
 
     <!-- BUTTON STYLES -->
 
-    <style name="Widget.Auxio.Button.Primary" parent="Widget.Material3.Button" />
+    <style name="Widget.Auxio.Button.Primary" parent="Widget.Material3.Button">
+        <item name="iconGravity">textStart</item>
+    </style>
 
-    <style name="Widget.Auxio.Button.Secondary" parent="Widget.Material3.Button.TonalButton" />
+    <style name="Widget.Auxio.Button.Secondary" parent="Widget.Material3.Button.TonalButton">
+        <item name="iconGravity">textStart</item>
+    </style>
 
     <style name="Widget.Auxio.Button.Icon.Base" parent="Widget.Material3.Button.IconButton">
         <item name="materialThemeOverlay">@style/ThemeOverlay.Auxio.UncheckableIconButton</item>