diff --git a/app/src/main/res/layout-v23/activity_main.xml b/app/src/main/res/layout-v23/activity_main.xml
index a3321aa..9fa01d8 100644
--- a/app/src/main/res/layout-v23/activity_main.xml
+++ b/app/src/main/res/layout-v23/activity_main.xml
@@ -104,6 +104,8 @@
 			android:layout_height="wrap_content"
 			android:layout_marginStart="8dp"
 			android:fontFamily="@font/poppins"
+			android:paddingStart="4dp"
+			android:paddingEnd="4dp"
 			android:textColor="@color/textColorLight"
 			android:textSize="12sp"
 			app:layout_constraintBaseline_toBottomOf="@id/slider"
@@ -116,6 +118,8 @@
 			android:layout_height="wrap_content"
 			android:layout_marginEnd="8dp"
 			android:fontFamily="@font/poppins"
+			android:paddingStart="4dp"
+			android:paddingEnd="4dp"
 			android:textColor="@color/textColorLight"
 			android:textSize="12sp"
 			app:layout_constraintBaseline_toBottomOf="@id/slider"
@@ -126,7 +130,10 @@
 			android:id="@+id/playbackSpeedButton"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
-			android:layout_margin="4dp"
+			android:layout_marginStart="8dp"
+			android:layout_marginTop="4dp"
+			android:layout_marginEnd="4dp"
+			android:layout_marginBottom="4dp"
 			android:background="?attr/selectableItemBackgroundBorderless"
 			android:clickable="true"
 			android:focusable="true"
@@ -162,7 +169,10 @@
 			android:id="@+id/repeatButton"
 			android:layout_width="32dp"
 			android:layout_height="32dp"
-			android:layout_margin="4dp"
+			android:layout_marginStart="4dp"
+			android:layout_marginTop="4dp"
+			android:layout_marginEnd="8dp"
+			android:layout_marginBottom="4dp"
 			android:background="?attr/selectableItemBackgroundBorderless"
 			android:clickable="true"
 			android:contentDescription="@string/repeat_track_toggle"
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index c921383..2c60524 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -104,6 +104,8 @@
 			android:layout_height="wrap_content"
 			android:layout_marginStart="8dp"
 			android:fontFamily="@font/poppins"
+			android:paddingStart="4dp"
+			android:paddingEnd="4dp"
 			android:textColor="@color/textColorLight"
 			android:textSize="12sp"
 			app:layout_constraintBaseline_toBottomOf="@id/slider"
@@ -116,6 +118,8 @@
 			android:layout_height="wrap_content"
 			android:layout_marginEnd="8dp"
 			android:fontFamily="@font/poppins"
+			android:paddingStart="4dp"
+			android:paddingEnd="4dp"
 			android:textColor="@color/textColorLight"
 			android:textSize="12sp"
 			app:layout_constraintBaseline_toBottomOf="@id/slider"
@@ -147,7 +151,10 @@
 			android:id="@+id/playPauseButton"
 			android:layout_width="48dp"
 			android:layout_height="48dp"
-			android:layout_margin="4dp"
+			android:layout_marginStart="4dp"
+			android:layout_marginTop="4dp"
+			android:layout_marginEnd="8dp"
+			android:layout_marginBottom="4dp"
 			android:background="?attr/selectableItemBackgroundBorderless"
 			android:contentDescription="@string/play_pause_button"
 			android:padding="4dp"
@@ -162,7 +169,10 @@
 			android:id="@+id/repeatButton"
 			android:layout_width="32dp"
 			android:layout_height="32dp"
-			android:layout_margin="4dp"
+			android:layout_marginStart="8dp"
+			android:layout_marginTop="4dp"
+			android:layout_marginEnd="4dp"
+			android:layout_marginBottom="4dp"
 			android:background="?attr/selectableItemBackgroundBorderless"
 			android:clickable="true"
 			android:focusable="true"