diff --git a/app/src/main/res/layout/bottom_sheet_song_dialog.xml b/app/src/main/res/layout/bottom_sheet_song_dialog.xml
index 6bb8ca99..a563dd5a 100644
--- a/app/src/main/res/layout/bottom_sheet_song_dialog.xml
+++ b/app/src/main/res/layout/bottom_sheet_song_dialog.xml
@@ -13,7 +13,8 @@
         android:layout_height="wrap_content"
         android:paddingTop="12dp"
         android:paddingStart="20dp"
-        android:paddingEnd="20dp">
+        android:paddingEnd="20dp"
+        android:clipChildren="false">
 
         <!-- Header -->
         <androidx.cardview.widget.CardView
@@ -43,15 +44,13 @@
             android:layout_width="24dp"
             android:layout_height="24dp"
             android:background="@drawable/button_favorite_selector"
+            android:foreground="?android:attr/selectableItemBackgroundBorderless"
             android:checked="false"
             android:gravity="center_vertical"
-            android:paddingStart="8dp"
-            android:paddingTop="4dp"
-            android:paddingEnd="20dp"
             android:text=""
             android:textOff=""
             android:textOn=""
-            app:layout_constraintBottom_toBottomOf="parent"
+            android:layout_marginTop="8dp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
@@ -62,7 +61,7 @@
             android:ellipsize="end"
             android:fontFamily="@font/open_sans_font_family"
             android:maxLines="1"
-            android:paddingTop="8dp"
+            android:layout_marginTop="8dp"
             android:paddingStart="12dp"
             android:paddingEnd="12dp"
             android:text="@string/label_placeholder"
diff --git a/app/src/main/res/layout/player_body_bottom_sheet.xml b/app/src/main/res/layout/player_body_bottom_sheet.xml
index 7ad0fb1b..3964ee0f 100644
--- a/app/src/main/res/layout/player_body_bottom_sheet.xml
+++ b/app/src/main/res/layout/player_body_bottom_sheet.xml
@@ -6,7 +6,8 @@
     android:layout_height="wrap_content"
     app:layout_constraintEnd_toEndOf="parent"
     app:layout_constraintStart_toStartOf="parent"
-    app:layout_constraintTop_toTopOf="parent">
+    app:layout_constraintTop_toTopOf="parent"
+    android:clipChildren="false">
 
     <TextView
         android:id="@+id/collapse_bottom_sheet_button"
@@ -78,43 +79,36 @@
             android:textSize="12sp" />
     </LinearLayout>
 
-
-    <LinearLayout
-        android:id="@+id/head_title_favorite_linear_layout"
-        android:layout_width="match_parent"
+    <TextView
+        android:id="@+id/player_song_title_label"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/player_big_timer"
+        android:layout_marginTop="12dp"
+        android:paddingStart="24dp"
+        android:paddingEnd="24dp"
+        android:text="@string/label_placeholder"
+        android:textColor="@color/titleTextColor"
+        android:textSize="22sp"
+        android:textStyle="bold"
+        app:layout_constraintEnd_toStartOf="@+id/button_favorite"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/player_big_timer" />
+
+    <ToggleButton
+        android:id="@+id/button_favorite"
+        android:layout_width="26dp"
+        android:layout_height="26dp"
+        android:background="@drawable/button_favorite_selector"
+        android:foreground="?android:attr/selectableItemBackgroundBorderless"
+        android:checked="false"
+        android:gravity="center_vertical"
+        android:layout_marginTop="16dp"
+        android:layout_marginEnd="24dp"
+        android:text=""
+        android:textOff=""
+        android:textOn=""
         app:layout_constraintEnd_toEndOf="parent"
-        android:orientation="horizontal">
-
-        <TextView
-            android:id="@+id/player_song_title_label"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:layout_marginTop="12dp"
-            android:paddingStart="24dp"
-            android:text="@string/label_placeholder"
-            android:textColor="@color/titleTextColor"
-            android:textSize="22sp"
-            android:textStyle="bold" />
-
-        <ToggleButton
-            android:id="@+id/button_favorite"
-            android:layout_width="26dp"
-            android:layout_height="26dp"
-            android:background="@drawable/button_favorite_selector"
-            android:checked="false"
-            android:gravity="center_vertical"
-            android:layout_marginTop="12dp"
-            android:layout_marginEnd="24dp"
-            android:text=""
-            android:textOff=""
-            android:textOn=""
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/player_big_progress_bar" />
-    </LinearLayout>
+        app:layout_constraintTop_toBottomOf="@+id/player_big_timer"/>
 
     <TextView
         android:id="@+id/player_artist_name_label"
@@ -127,7 +121,7 @@
         android:textColor="@color/subtitleTextColor"
         android:textSize="14sp"
         app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/head_title_favorite_linear_layout" />
+        app:layout_constraintTop_toBottomOf="@+id/player_song_title_label" />
 
     <View style="@style/Divider"
         android:id="@+id/player_divider"
diff --git a/app/src/main/res/layout/player_header_bottom_sheet.xml b/app/src/main/res/layout/player_header_bottom_sheet.xml
index 1c8340c5..2291b4e2 100644
--- a/app/src/main/res/layout/player_header_bottom_sheet.xml
+++ b/app/src/main/res/layout/player_header_bottom_sheet.xml
@@ -5,7 +5,8 @@
     android:layout_width="match_parent"
     android:layout_height="@dimen/bottom_sheet_peek_height"
     android:elevation="2dp"
-    android:background="@color/almostCardColor">
+    android:background="@color/almostCardColor"
+    android:clipChildren="false">
 
     <androidx.cardview.widget.CardView
         xmlns:card_view="http://schemas.android.com/apk/res-auto"
@@ -58,11 +59,12 @@
 
     <ToggleButton
         android:id="@+id/player_header_button"
-        android:layout_width="32dp"
-        android:layout_height="32dp"
+        android:layout_width="28dp"
+        android:layout_height="28dp"
         android:layout_marginStart="12dp"
         android:layout_marginEnd="12dp"
         android:background="@drawable/button_play_pause_selector"
+        android:foreground="?android:attr/selectableItemBackgroundBorderless"
         android:checked="true"
         android:text=""
         android:textOff=""
@@ -71,4 +73,17 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
+    <SeekBar
+        android:id="@+id/player_header_seek_bar"
+        android:layout_width="match_parent"
+        android:layout_height="2dp"
+        android:progressBackgroundTint="@color/colorAccentLight"
+        android:clickable="false"
+        android:thumb="@android:color/transparent"
+        android:paddingStart="0dp"
+        android:paddingEnd="0dp"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"/>
+
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file