diff --git a/.idea/misc.xml b/.idea/misc.xml
index 33b2e19b..61d0bd6a 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -114,7 +114,7 @@
         <entry key="app/src/main/res/layout/item_placeholder_year.xml" value="0.3229166666666667" />
         <entry key="app/src/main/res/layout/item_player_now_playing_song.xml" value="0.3229166666666667" />
         <entry key="app/src/main/res/layout/item_player_queue_song.xml" value="0.1" />
-        <entry key="app/src/main/res/layout/player_body_bottom_sheet.xml" value="0.1" />
+        <entry key="app/src/main/res/layout/player_body_bottom_sheet.xml" value="0.528125" />
         <entry key="app/src/main/res/layout/player_body_new_bottom_sheet.xml" value="0.528125" />
         <entry key="app/src/main/res/layout/player_header_bottom_sheet.xml" value="0.3229166666666667" />
         <entry key="app/src/main/res/menu/bottom_nav_menu.xml" value="0.3229166666666667" />
diff --git a/app/src/main/java/com/cappielloantonio/play/ui/activity/MainActivity.java b/app/src/main/java/com/cappielloantonio/play/ui/activity/MainActivity.java
index ce0b0e14..48deb2d0 100644
--- a/app/src/main/java/com/cappielloantonio/play/ui/activity/MainActivity.java
+++ b/app/src/main/java/com/cappielloantonio/play/ui/activity/MainActivity.java
@@ -159,7 +159,7 @@ public class MainActivity extends BaseActivity {
                             PlayerBottomSheetFragment playerBottomSheetFragment = (PlayerBottomSheetFragment) getSupportFragmentManager().findFragmentByTag("PlayerBottomSheet");
                             if (playerBottomSheetFragment != null) {
                                 playerBottomSheetFragment.scrollOnTop();
-                                playerBottomSheetFragment.setPlayerCommandViewVisibility(false);
+                                // playerBottomSheetFragment.setPlayerCommandViewVisibility(false);
                             }
                             break;
                         case BottomSheetBehavior.STATE_DRAGGING:
diff --git a/app/src/main/java/com/cappielloantonio/play/ui/fragment/PlayerBottomSheetFragment.java b/app/src/main/java/com/cappielloantonio/play/ui/fragment/PlayerBottomSheetFragment.java
index 3df6abd3..85d41fca 100644
--- a/app/src/main/java/com/cappielloantonio/play/ui/fragment/PlayerBottomSheetFragment.java
+++ b/app/src/main/java/com/cappielloantonio/play/ui/fragment/PlayerBottomSheetFragment.java
@@ -300,6 +300,7 @@ public class PlayerBottomSheetFragment extends Fragment implements MusicServiceE
 
     protected void updatePlayPauseState() {
         headerBind.playerHeaderButton.setChecked(!MusicPlayerRemote.isPlaying());
+        bodyBind.playerBigPlayPauseButton.setChecked(!MusicPlayerRemote.isPlaying());
     }
 
     private void setUpMusicControllers() {
diff --git a/app/src/main/res/layout/fragment_player_lyrics.xml b/app/src/main/res/layout/fragment_player_lyrics.xml
index 01aa9bd2..23004dea 100644
--- a/app/src/main/res/layout/fragment_player_lyrics.xml
+++ b/app/src/main/res/layout/fragment_player_lyrics.xml
@@ -7,6 +7,7 @@
         style="@style/LyricsTextView"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:paddingTop="16dp"
         android:paddingStart="24dp"
         android:paddingEnd="24dp"/>
 </androidx.core.widget.NestedScrollView>
\ No newline at end of file
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 9f38559a..394ae47d 100644
--- a/app/src/main/res/layout/player_body_bottom_sheet.xml
+++ b/app/src/main/res/layout/player_body_bottom_sheet.xml
@@ -186,7 +186,6 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:backgroundTint="@color/colorPrimary"
-        android:visibility="gone"
         app:cardElevation="0dp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -204,22 +203,22 @@
                 android:layout_marginEnd="24dp"
                 android:background="?attr/selectableItemBackgroundBorderless"
                 android:scaleType="fitCenter"
-                app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toStartOf="@+id/player_big_play_pause_button"
-                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintTop_toTopOf="@+id/player_big_play_pause_button"
+                app:layout_constraintBottom_toBottomOf="@+id/player_big_play_pause_button"
                 app:srcCompat="@drawable/ic_skip_previous" />
 
             <ToggleButton
                 android:id="@+id/player_big_play_pause_button"
                 android:layout_width="48dp"
                 android:layout_height="48dp"
+                android:layout_marginTop="4dp"
                 android:background="@drawable/button_play_pause_selector"
                 android:checked="true"
                 android:foreground="?android:attr/selectableItemBackgroundBorderless"
                 android:text=""
                 android:textOff=""
                 android:textOn=""
-                app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
@@ -231,17 +230,17 @@
                 android:layout_marginStart="24dp"
                 android:background="?attr/selectableItemBackgroundBorderless"
                 android:scaleType="fitCenter"
-                app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintStart_toEndOf="@+id/player_big_play_pause_button"
-                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintTop_toTopOf="@+id/player_big_play_pause_button"
+                app:layout_constraintBottom_toBottomOf="@+id/player_big_play_pause_button"
                 app:srcCompat="@drawable/ic_skip_next" />
 
             <View
                 android:id="@+id/player_divider_bottom"
                 style="@style/Divider"
                 android:layout_marginStart="18dp"
-                android:layout_marginTop="12dp"
                 android:layout_marginEnd="18dp"
+                android:layout_marginTop="12dp"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/player_big_play_pause_button" />