diff --git a/app/src/main/res/layout/fragment_md3_player.xml b/app/src/main/res/layout/fragment_md3_player.xml
index d42cd56b1..060a79e04 100644
--- a/app/src/main/res/layout/fragment_md3_player.xml
+++ b/app/src/main/res/layout/fragment_md3_player.xml
@@ -7,7 +7,6 @@
     android:background="?attr/colorSurface"
     android:clickable="true"
     android:focusable="true">
-    <include layout="@layout/shadow_statusbar_toolbar" />
 
     <FrameLayout
         android:id="@+id/statusBarContainer"
@@ -20,18 +19,16 @@
         <include layout="@layout/status_bar" />
     </FrameLayout>
 
-
     <androidx.fragment.app.FragmentContainerView
         android:id="@+id/playerAlbumCoverFragment"
         android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
         android:layout_width="0dp"
         android:layout_height="0dp"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHeight_percent="0.5"
+        app:layout_constraintHeight_percent="0.45"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/statusBarContainer" />
 
-
     <androidx.fragment.app.FragmentContainerView
         android:id="@+id/playbackControlsFragment"
         android:name="code.name.monkey.retromusic.fragments.player.md3.MD3PlaybackControlsFragment"
diff --git a/app/src/main/res/layout/fragment_md3_player_playback_controls.xml b/app/src/main/res/layout/fragment_md3_player_playback_controls.xml
index 473c5de51..a1ac4c979 100644
--- a/app/src/main/res/layout/fragment_md3_player_playback_controls.xml
+++ b/app/src/main/res/layout/fragment_md3_player_playback_controls.xml
@@ -30,7 +30,6 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
         android:maxHeight="2dp"
-        android:paddingVertical="@dimen/seekbar_padding"
         android:progressDrawable="@drawable/color_progress_seek"
         app:layout_constraintEnd_toStartOf="@id/songTotalTime"
         app:layout_constraintStart_toEndOf="@id/songCurrentProgress"
@@ -93,7 +92,6 @@
             android:gravity="center"
             android:marqueeRepeatLimit="marquee_forever"
             android:paddingHorizontal="16dp"
-            android:paddingVertical="8dp"
             android:scrollHorizontally="true"
             android:singleLine="true"
             android:textAppearance="@style/TextViewBody1"
@@ -109,14 +107,13 @@
         android:ellipsize="end"
         android:maxLines="2"
         android:paddingHorizontal="16dp"
-        android:paddingBottom="8dp"
         android:textColor="?android:attr/textColorSecondary"
         android:textSize="12sp"
         app:layout_constraintBottom_toTopOf="@+id/volumeFragmentContainer"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/repeatButton"
+        app:layout_constraintTop_toBottomOf="@id/playPauseCard"
         tools:text="@tools:sample/full_names" />
 
     <androidx.appcompat.widget.AppCompatImageButton
@@ -128,7 +125,7 @@
         android:scaleType="fitCenter"
         app:layout_constraintBottom_toBottomOf="@+id/playPauseCard"
         app:layout_constraintEnd_toStartOf="@id/playPauseCard"
-        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintStart_toEndOf="@+id/repeatButton"
         app:layout_constraintTop_toTopOf="@+id/playPauseCard"
         app:srcCompat="@drawable/ic_skip_previous_outline"
         tools:backgroundTint="?colorPrimaryDark"
@@ -141,7 +138,7 @@
         android:layout_height="wrap_content"
         app:cardBackgroundColor="?colorSecondary"
         app:cardCornerRadius="40dp"
-        app:layout_constraintBottom_toTopOf="@+id/repeatButton"
+        app:layout_constraintBottom_toTopOf="@id/songInfo"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintStart_toStartOf="parent"
@@ -153,7 +150,7 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:background="@color/transparent"
-            android:padding="32dp"
+            android:padding="28dp"
             app:srcCompat="@drawable/ic_pause_outline_small"
             tools:tint="@color/md_black_1000" />
     </com.google.android.material.card.MaterialCardView>
@@ -166,7 +163,7 @@
         android:padding="16dp"
         android:scaleType="fitCenter"
         app:layout_constraintBottom_toBottomOf="@+id/playPauseCard"
-        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintEnd_toStartOf="@+id/shuffleButton"
         app:layout_constraintStart_toEndOf="@+id/playPauseCard"
         app:layout_constraintTop_toTopOf="@+id/playPauseCard"
         app:srcCompat="@drawable/ic_skip_next_outline"
@@ -176,33 +173,35 @@
 
     <ImageButton
         android:id="@+id/shuffleButton"
-        android:layout_width="0dp"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginHorizontal="16dp"
         android:background="@null"
+        android:padding="16dp"
         android:paddingVertical="16dp"
         android:src="@drawable/ic_shuffle"
-        app:layout_constraintBottom_toBottomOf="@+id/repeatButton"
+        app:layout_constraintBottom_toBottomOf="@+id/nextButton"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@id/repeatButton"
-        app:layout_constraintTop_toTopOf="@+id/repeatButton"
+        app:layout_constraintTop_toTopOf="@+id/nextButton"
         tools:ignore="MissingPrefix"
         tools:tint="@color/md_black_1000" />
 
     <ImageButton
         android:id="@+id/repeatButton"
-        android:layout_width="0dp"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginHorizontal="16dp"
         android:background="@null"
+        android:padding="16dp"
         android:paddingVertical="16dp"
         android:src="@drawable/ic_repeat"
-        app:layout_constraintBottom_toTopOf="@+id/songInfo"
+        app:layout_constraintBottom_toBottomOf="@+id/previousButton"
         app:layout_constraintEnd_toStartOf="@id/shuffleButton"
         app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintHorizontal_chainStyle="spread_inside"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/playPauseCard"
+        app:layout_constraintTop_toTopOf="@+id/previousButton"
         tools:ignore="MissingPrefix"
         tools:tint="@color/md_black_1000" />