diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/base/AbsSlidingMusicPanelActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/base/AbsSlidingMusicPanelActivity.kt
index 203b9ca6d..87a2391c8 100644
--- a/app/src/main/java/code/name/monkey/retromusic/activities/base/AbsSlidingMusicPanelActivity.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/activities/base/AbsSlidingMusicPanelActivity.kt
@@ -200,7 +200,18 @@ abstract class AbsSlidingMusicPanelActivity : AbsMusicServiceActivity(),
             TOGGLE_ADD_CONTROLS -> {
                 miniPlayerFragment?.setUpButtons()
             }
-            NOW_PLAYING_SCREEN_ID, ALBUM_COVER_TRANSFORM, CAROUSEL_EFFECT,
+            NOW_PLAYING_SCREEN_ID -> {
+                binding.slidingPanel.updateLayoutParams<ViewGroup.LayoutParams> {
+                    height = if (nowPlayingScreen != Peek) {
+                        ViewGroup.LayoutParams.MATCH_PARENT
+                    } else {
+                        ViewGroup.LayoutParams.WRAP_CONTENT
+                    }
+                    chooseFragmentForTheme()
+                    onServiceConnected()
+                }
+            }
+            ALBUM_COVER_TRANSFORM, CAROUSEL_EFFECT,
             ALBUM_COVER_STYLE, TOGGLE_VOLUME, EXTRA_SONG_INFO, CIRCLE_PLAY_BUTTON,
             -> {
                 chooseFragmentForTheme()
@@ -458,7 +469,8 @@ abstract class AbsSlidingMusicPanelActivity : AbsMusicServiceActivity(),
                     } else {
                         bottomSheetBehavior.peekHeight = heightOfBarWithTabs
                     }
-                    libraryViewModel.setFabMargin(this, dip(R.dimen.mini_player_height_expanded))
+                    libraryViewModel.setFabMargin(this,
+                        dip(R.dimen.mini_player_height_expanded))
                 } else {
                     logD("Details")
                     if (animate) {
diff --git a/app/src/main/res/layout-land/activity_album_tag_editor.xml b/app/src/main/res/layout-land/activity_album_tag_editor.xml
index 8db003e24..3e7f89a8c 100644
--- a/app/src/main/res/layout-land/activity_album_tag_editor.xml
+++ b/app/src/main/res/layout-land/activity_album_tag_editor.xml
@@ -14,6 +14,11 @@
         <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/toolbar"
             style="@style/Toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
             app:navigationIcon="@drawable/ic_keyboard_backspace_black"
             app:title="@string/action_tag_editor" />
 
diff --git a/app/src/main/res/layout-land/activity_song_tag_editor.xml b/app/src/main/res/layout-land/activity_song_tag_editor.xml
index 482f18305..8cc5618bd 100644
--- a/app/src/main/res/layout-land/activity_song_tag_editor.xml
+++ b/app/src/main/res/layout-land/activity_song_tag_editor.xml
@@ -1,8 +1,8 @@
 <androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    xmlns:tools="http://schemas.android.com/tools"
     android:fitsSystemWindows="true"
     android:focusable="true"
     android:focusableInTouchMode="true">
@@ -16,6 +16,8 @@
         <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/toolbar"
             style="@style/Toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
             app:navigationIcon="@drawable/ic_keyboard_backspace_black"
             app:title="@string/action_tag_editor" />
 
diff --git a/app/src/main/res/layout-land/fragment_album_details.xml b/app/src/main/res/layout-land/fragment_album_details.xml
index b53a9137e..bc8d67593 100644
--- a/app/src/main/res/layout-land/fragment_album_details.xml
+++ b/app/src/main/res/layout-land/fragment_album_details.xml
@@ -6,9 +6,9 @@
     android:layout_height="match_parent"
     android:fitsSystemWindows="true"
     android:orientation="vertical"
+    android:transitionGroup="true"
     android:transitionName="@string/transition_album_art"
-    tools:ignore="UnusedAttribute"
-    android:transitionGroup="true">
+    tools:ignore="UnusedAttribute">
 
     <FrameLayout
         android:id="@+id/toolbar_container"
@@ -21,6 +21,8 @@
         <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/toolbar"
             style="@style/Toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
             app:navigationIcon="@drawable/ic_keyboard_backspace_black" />
     </FrameLayout>
 
diff --git a/app/src/main/res/layout-land/fragment_artist_details.xml b/app/src/main/res/layout-land/fragment_artist_details.xml
index 4bd023275..d59a83fcb 100644
--- a/app/src/main/res/layout-land/fragment_artist_details.xml
+++ b/app/src/main/res/layout-land/fragment_artist_details.xml
@@ -19,10 +19,11 @@
         <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/toolbar"
             style="@style/Toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
             app:navigationIcon="@drawable/ic_keyboard_backspace_black" />
     </FrameLayout>
 
-
     <com.google.android.material.card.MaterialCardView
         android:id="@+id/artistCoverContainer"
         android:layout_width="0dp"
diff --git a/app/src/main/res/layout-land/fragment_blur.xml b/app/src/main/res/layout-land/fragment_blur.xml
index 4014ba939..432c4bb94 100644
--- a/app/src/main/res/layout-land/fragment_blur.xml
+++ b/app/src/main/res/layout-land/fragment_blur.xml
@@ -14,13 +14,6 @@
         android:scaleType="centerCrop"
         app:srcCompat="@color/black_color" />
 
-    <View
-        android:id="@+id/mask"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="@color/md_black_1000"
-        android:visibility="gone" />
-
     <View
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -70,18 +63,13 @@
                     android:layout_height="match_parent"
                     android:layout_weight="1" />
 
-                <FrameLayout
+                <com.google.android.material.appbar.MaterialToolbar
+                    android:id="@+id/playerToolbar"
+                    style="@style/Toolbar"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="0">
-
-                    <com.google.android.material.appbar.MaterialToolbar
-                        android:id="@+id/playerToolbar"
-                        style="@style/Toolbar"
-                        android:layout_height="48dp"
-                        android:navigationIcon="@drawable/ic_keyboard_arrow_down_black"
-                        app:navigationIcon="@drawable/ic_keyboard_arrow_down_black" />
-                </FrameLayout>
+                    android:layout_height="48dp"
+                    android:layout_weight="0"
+                    app:navigationIcon="@drawable/ic_keyboard_arrow_down_black" />
             </LinearLayout>
         </LinearLayout>
     </LinearLayout>
diff --git a/app/src/main/res/layout-land/fragment_card_blur_player.xml b/app/src/main/res/layout-land/fragment_card_blur_player.xml
index dddb02628..d3d152cc6 100644
--- a/app/src/main/res/layout-land/fragment_card_blur_player.xml
+++ b/app/src/main/res/layout-land/fragment_card_blur_player.xml
@@ -35,24 +35,20 @@
             <include layout="@layout/status_bar" />
         </FrameLayout>
 
-        <FrameLayout
+        <com.google.android.material.appbar.MaterialToolbar
+            android:id="@+id/playerToolbar"
+            style="@style/Toolbar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_weight="0">
-
-            <com.google.android.material.appbar.MaterialToolbar
-                android:id="@+id/playerToolbar"
-                style="@style/Toolbar"
-                android:navigationIcon="@drawable/ic_keyboard_arrow_down_black"
-                app:contentInsetLeft="0dp"
-                app:contentInsetStart="0dp"
-                app:contentInsetStartWithNavigation="0dp"
-                app:navigationIcon="@drawable/ic_keyboard_arrow_down_black"
-                app:subtitleTextAppearance="@style/TextAppearance.AppCompat.Caption"
-                app:titleMargin="0dp"
-                app:titleMarginStart="0dp"
-                app:titleTextAppearance="@style/TextAppearance.AppCompat.Subhead" />
-        </FrameLayout>
+            android:layout_weight="0"
+            app:contentInsetLeft="0dp"
+            app:contentInsetStart="0dp"
+            app:contentInsetStartWithNavigation="0dp"
+            app:navigationIcon="@drawable/ic_keyboard_arrow_down_black"
+            app:subtitleTextAppearance="@style/TextAppearance.AppCompat.Caption"
+            app:titleMargin="0dp"
+            app:titleMarginStart="0dp"
+            app:titleTextAppearance="@style/TextAppearance.AppCompat.Subhead" />
 
         <FrameLayout
 
@@ -72,19 +68,14 @@
 
     </LinearLayout>
 
-    <FrameLayout
+    <androidx.fragment.app.FragmentContainerView
+        android:id="@+id/playbackControlsFragment"
+        android:name="code.name.monkey.retromusic.fragments.player.cardblur.CardBlurPlaybackControlsFragment"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="bottom"
         android:layout_marginStart="96dp"
-        android:layout_marginEnd="96dp">
-
-        <androidx.fragment.app.FragmentContainerView
-            android:id="@+id/playbackControlsFragment"
-            android:name="code.name.monkey.retromusic.fragments.player.cardblur.CardBlurPlaybackControlsFragment"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            tools:layout="@layout/fragment_card_blur_player_playback_controls" />
-    </FrameLayout>
+        android:layout_marginEnd="96dp"
+        tools:layout="@layout/fragment_card_blur_player_playback_controls" />
 
 </FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout-land/fragment_card_player.xml b/app/src/main/res/layout-land/fragment_card_player.xml
index cb20a148a..bfecea0dd 100644
--- a/app/src/main/res/layout-land/fragment_card_player.xml
+++ b/app/src/main/res/layout-land/fragment_card_player.xml
@@ -38,6 +38,8 @@
             <com.google.android.material.appbar.MaterialToolbar
                 android:id="@+id/playerToolbar"
                 style="@style/Toolbar"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
                 android:background="@android:color/transparent"
                 app:navigationIcon="@drawable/ic_keyboard_arrow_down_black" />
         </LinearLayout>
diff --git a/app/src/main/res/layout-land/fragment_circle_player.xml b/app/src/main/res/layout-land/fragment_circle_player.xml
index ef1ceb2b9..71f388878 100644
--- a/app/src/main/res/layout-land/fragment_circle_player.xml
+++ b/app/src/main/res/layout-land/fragment_circle_player.xml
@@ -47,7 +47,8 @@
     <com.google.android.material.appbar.MaterialToolbar
         android:id="@+id/playerToolbar"
         style="@style/Toolbar"
-        android:navigationIcon="@drawable/ic_keyboard_arrow_down_black"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/statusBarContainer"
@@ -180,9 +181,9 @@
 
     <com.google.android.material.slider.Slider
         android:id="@+id/progressSlider"
+        style="@style/Widget.Retro.Slider"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        style="@style/Widget.Retro.Slider"
         app:layout_constraintBottom_toTopOf="@id/songInfo"
         app:layout_constraintEnd_toStartOf="@id/songTotalTime"
         app:layout_constraintStart_toEndOf="@id/songCurrentProgress"
diff --git a/app/src/main/res/layout-land/fragment_color_player.xml b/app/src/main/res/layout-land/fragment_color_player.xml
index e8485613f..b4bac24a2 100644
--- a/app/src/main/res/layout-land/fragment_color_player.xml
+++ b/app/src/main/res/layout-land/fragment_color_player.xml
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="?android:attr/windowBackground">
+    android:background="?colorSurface">
 
     <View
         android:id="@+id/colorGradientBackground"
@@ -13,18 +13,12 @@
 
     <include layout="@layout/shadow_statusbar_toolbar" />
 
-
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:orientation="vertical">
 
-        <FrameLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
-
-            <include layout="@layout/status_bar" />
-        </FrameLayout>
+        <include layout="@layout/status_bar" />
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -48,30 +42,21 @@
                 android:layout_height="match_parent"
                 android:orientation="vertical">
 
-                <FrameLayout
+                <androidx.fragment.app.FragmentContainerView
+                    android:id="@+id/playbackControlsFragment"
+                    android:name="code.name.monkey.retromusic.fragments.player.color.ColorPlaybackControlsFragment"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1"
+                    tools:layout="@layout/fragment_player_playback_controls" />
+
+                <com.google.android.material.appbar.MaterialToolbar
+                    android:id="@+id/playerToolbar"
+                    style="@style/Toolbar"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_weight="1">
-
-                    <androidx.fragment.app.FragmentContainerView
-                        android:id="@+id/playbackControlsFragment"
-                        android:name="code.name.monkey.retromusic.fragments.player.color.ColorPlaybackControlsFragment"
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        tools:layout="@layout/fragment_player_playback_controls" />
-                </FrameLayout>
-
-                <FrameLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="0">
-
-                    <com.google.android.material.appbar.MaterialToolbar
-                        android:id="@+id/playerToolbar"
-                        style="@style/Toolbar"
-                        android:navigationIcon="@drawable/ic_keyboard_arrow_down_black"
-                        app:navigationIcon="@drawable/ic_keyboard_arrow_down_black" />
-                </FrameLayout>
+                    android:layout_weight="0"
+                    app:navigationIcon="@drawable/ic_keyboard_arrow_down_black" />
             </LinearLayout>
         </LinearLayout>
     </LinearLayout>
diff --git a/app/src/main/res/layout-land/fragment_flat_player.xml b/app/src/main/res/layout-land/fragment_flat_player.xml
index 37ca72b13..65ab0a0bc 100644
--- a/app/src/main/res/layout-land/fragment_flat_player.xml
+++ b/app/src/main/res/layout-land/fragment_flat_player.xml
@@ -4,15 +4,11 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="?attr/colorSurface"
     android:clickable="true"
     android:focusable="true"
     android:orientation="vertical">
 
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="?attr/colorSurface" />
-
     <View
         android:id="@+id/colorGradientBackground"
         android:layout_width="match_parent"
@@ -20,18 +16,12 @@
 
     <include layout="@layout/shadow_statusbar_toolbar" />
 
-
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:orientation="vertical">
 
-        <FrameLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
-
-            <include layout="@layout/status_bar" />
-        </FrameLayout>
+        <include layout="@layout/status_bar" />
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -50,23 +40,18 @@
                     tools:layout="@layout/fragment_album_flat_cover" />
             </code.name.monkey.retromusic.views.HeightFitSquareLayout>
 
-
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:orientation="vertical">
 
-                <FrameLayout
+                <com.google.android.material.appbar.MaterialToolbar
+                    android:id="@+id/playerToolbar"
+                    style="@style/Toolbar"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_weight="0">
-
-                    <com.google.android.material.appbar.MaterialToolbar
-                        android:id="@+id/playerToolbar"
-                        style="@style/Toolbar"
-                        android:navigationIcon="@drawable/ic_keyboard_arrow_down_black"
-                        app:navigationIcon="@drawable/ic_keyboard_arrow_down_black" />
-                </FrameLayout>
+                    android:layout_weight="0"
+                    app:navigationIcon="@drawable/ic_keyboard_arrow_down_black" />
 
                 <androidx.fragment.app.FragmentContainerView
                     android:id="@+id/playbackControlsFragment"
diff --git a/app/src/main/res/layout-land/fragment_material.xml b/app/src/main/res/layout-land/fragment_material.xml
index 357ddd717..328a2d6ac 100644
--- a/app/src/main/res/layout-land/fragment_material.xml
+++ b/app/src/main/res/layout-land/fragment_material.xml
@@ -78,8 +78,9 @@
                     <com.google.android.material.appbar.MaterialToolbar
                         android:id="@+id/playerToolbar"
                         style="@style/Toolbar"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
                         android:layout_gravity="bottom"
-                        android:navigationIcon="@drawable/ic_keyboard_arrow_down_black"
                         app:navigationIcon="@drawable/ic_keyboard_arrow_down_black" />
                 </FrameLayout>
             </LinearLayout>
diff --git a/app/src/main/res/layout-land/fragment_md3_player.xml b/app/src/main/res/layout-land/fragment_md3_player.xml
index f67be7aaa..9be0da583 100644
--- a/app/src/main/res/layout-land/fragment_md3_player.xml
+++ b/app/src/main/res/layout-land/fragment_md3_player.xml
@@ -4,20 +4,10 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="?attr/colorSurface"
     android:clickable="true"
     android:focusable="true">
 
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="?attr/colorSurface" />
-
-    <View
-        android:id="@+id/colorGradientBackground"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" />
-
-
     <include layout="@layout/shadow_statusbar_toolbar" />
 
     <LinearLayout
@@ -25,12 +15,7 @@
         android:layout_height="match_parent"
         android:orientation="vertical">
 
-        <FrameLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
-
-            <include layout="@layout/status_bar" />
-        </FrameLayout>
+        <include layout="@layout/status_bar" />
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -55,17 +40,13 @@
                 android:layout_height="match_parent"
                 android:orientation="vertical">
 
-                <FrameLayout
+                <com.google.android.material.appbar.MaterialToolbar
+                    android:id="@+id/playerToolbar"
+                    style="@style/Toolbar"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_weight="0">
-
-                    <com.google.android.material.appbar.MaterialToolbar
-                        android:id="@+id/playerToolbar"
-                        style="@style/Toolbar"
-                        android:navigationIcon="@drawable/ic_keyboard_arrow_down_black"
-                        app:navigationIcon="@drawable/ic_keyboard_arrow_down_black" />
-                </FrameLayout>
+                    android:layout_weight="0"
+                    app:navigationIcon="@drawable/ic_keyboard_arrow_down_black" />
 
                 <androidx.fragment.app.FragmentContainerView
                     android:id="@+id/playbackControlsFragment"
diff --git a/app/src/main/res/layout-land/fragment_plain_player.xml b/app/src/main/res/layout-land/fragment_plain_player.xml
index d79a83780..51142820b 100644
--- a/app/src/main/res/layout-land/fragment_plain_player.xml
+++ b/app/src/main/res/layout-land/fragment_plain_player.xml
@@ -4,28 +4,18 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="?attr/colorSurface"
     android:clickable="true"
     android:focusable="true">
 
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="?attr/colorSurface" />
-
     <include layout="@layout/shadow_statusbar_toolbar" />
 
-
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:orientation="vertical">
 
-        <FrameLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
-
-            <include layout="@layout/status_bar" />
-        </FrameLayout>
+        <include layout="@layout/status_bar" />
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -88,30 +78,21 @@
                         tools:text="Text" />
                 </LinearLayout>
 
-                <FrameLayout
+                <androidx.fragment.app.FragmentContainerView
+                    android:id="@+id/playbackControlsFragment"
+                    android:name="code.name.monkey.retromusic.fragments.player.plain.PlainPlaybackControlsFragment"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
-                    android:layout_weight="1">
+                    android:layout_weight="1"
+                    tools:layout="@layout/fragment_plain_controls_fragment" />
 
-                    <androidx.fragment.app.FragmentContainerView
-                        android:id="@+id/playbackControlsFragment"
-                        android:name="code.name.monkey.retromusic.fragments.player.plain.PlainPlaybackControlsFragment"
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        tools:layout="@layout/fragment_plain_controls_fragment" />
-                </FrameLayout>
-
-                <FrameLayout
+                <com.google.android.material.appbar.MaterialToolbar
+                    android:id="@+id/playerToolbar"
+                    style="@style/Toolbar"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_weight="0">
-
-                    <com.google.android.material.appbar.MaterialToolbar
-                        android:id="@+id/playerToolbar"
-                        style="@style/Toolbar"
-                        android:navigationIcon="@drawable/ic_keyboard_arrow_down_black"
-                        app:navigationIcon="@drawable/ic_keyboard_arrow_down_black" />
-                </FrameLayout>
+                    android:layout_weight="0"
+                    app:navigationIcon="@drawable/ic_keyboard_arrow_down_black" />
             </LinearLayout>
 
         </LinearLayout>
diff --git a/app/src/main/res/layout-land/fragment_player.xml b/app/src/main/res/layout-land/fragment_player.xml
index 7b3931a8d..a678dcb69 100755
--- a/app/src/main/res/layout-land/fragment_player.xml
+++ b/app/src/main/res/layout-land/fragment_player.xml
@@ -4,9 +4,9 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="?attr/colorSurface"
     android:clickable="true"
-    android:focusable="true"
-    android:background="?attr/colorSurface">
+    android:focusable="true">
 
     <View
         android:id="@+id/colorGradientBackground"
@@ -66,7 +66,8 @@
                     <com.google.android.material.appbar.MaterialToolbar
                         android:id="@+id/playerToolbar"
                         style="@style/Toolbar"
-                        android:navigationIcon="@drawable/ic_keyboard_arrow_down_black"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
                         app:navigationIcon="@drawable/ic_keyboard_arrow_down_black" />
                 </FrameLayout>
 
diff --git a/app/src/main/res/layout-land/fragment_simple_player.xml b/app/src/main/res/layout-land/fragment_simple_player.xml
index b38a90b55..3d738f551 100644
--- a/app/src/main/res/layout-land/fragment_simple_player.xml
+++ b/app/src/main/res/layout-land/fragment_simple_player.xml
@@ -4,22 +4,11 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="?attr/colorSurface"
     android:clickable="true"
     android:focusable="true"
     android:orientation="vertical">
 
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="?attr/colorSurface"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" />
-
-
     <include layout="@layout/shadow_statusbar_toolbar" />
 
     <LinearLayout
@@ -27,12 +16,7 @@
         android:layout_height="match_parent"
         android:orientation="vertical">
 
-        <FrameLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
-
-            <include layout="@layout/status_bar" />
-        </FrameLayout>
+        <include layout="@layout/status_bar" />
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -66,17 +50,13 @@
                     android:layout_weight="1"
                     tools:layout="@layout/fragment_simple_controls_fragment" />
 
-                <FrameLayout
+                <com.google.android.material.appbar.MaterialToolbar
+                    android:id="@+id/playerToolbar"
+                    style="@style/Toolbar"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_weight="0">
-
-                    <com.google.android.material.appbar.MaterialToolbar
-                        android:id="@+id/playerToolbar"
-                        style="@style/Toolbar"
-                        android:navigationIcon="@drawable/ic_keyboard_arrow_down_black"
-                        app:navigationIcon="@drawable/ic_keyboard_arrow_down_black" />
-                </FrameLayout>
+                    android:layout_weight="0"
+                    app:navigationIcon="@drawable/ic_keyboard_arrow_down_black" />
             </LinearLayout>
         </LinearLayout>
     </LinearLayout>
diff --git a/app/src/main/res/layout-land/fragment_user_info.xml b/app/src/main/res/layout-land/fragment_user_info.xml
index 05d9a3ef8..6cfe84bd5 100644
--- a/app/src/main/res/layout-land/fragment_user_info.xml
+++ b/app/src/main/res/layout-land/fragment_user_info.xml
@@ -16,6 +16,7 @@
         <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/toolbar"
             style="@style/Toolbar"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             app:navigationIcon="@drawable/ic_keyboard_backspace_black"
             app:title="@string/profile"
diff --git a/app/src/main/res/layout-xlarge-land/fragment_blur.xml b/app/src/main/res/layout-xlarge-land/fragment_blur.xml
deleted file mode 100644
index 2dd353075..000000000
--- a/app/src/main/res/layout-xlarge-land/fragment_blur.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:clickable="true"
-    android:focusable="true">
-
-    <androidx.appcompat.widget.AppCompatImageView
-        android:id="@+id/colorBackground"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:scaleType="centerCrop"
-        app:srcCompat="@color/black_color" />
-
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="@drawable/shadow_up" />
-
-    <FrameLayout
-        android:id="@+id/statusBarContainer"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
-
-        <include layout="@layout/status_bar" />
-    </FrameLayout>
-
-    <FrameLayout
-        android:id="@+id/albumCoverContainer"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        android:layout_gravity="center_horizontal"
-        android:layout_weight="0"
-        app:layout_constraintBottom_toTopOf="@id/playerContent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/statusBarContainer">
-
-        <androidx.fragment.app.FragmentContainerView
-            android:id="@+id/playerAlbumCoverFragment"
-            android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            tools:layout="@layout/fragment_album_cover" />
-    </FrameLayout>
-
-    <FrameLayout
-        android:id="@+id/playerContent"
-        android:layout_width="400dp"
-        android:layout_height="0dp"
-        android:layout_above="@id/playerToolbar"
-        app:layout_constraintBottom_toTopOf="@+id/playerToolbar"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/albumCoverContainer">
-
-        <androidx.fragment.app.FragmentContainerView
-            android:id="@+id/playbackControlsFragment"
-            android:name="code.name.monkey.retromusic.fragments.player.blur.BlurPlaybackControlsFragment"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent" />
-    </FrameLayout>
-
-
-    <com.google.android.material.appbar.MaterialToolbar
-        android:id="@+id/playerToolbar"
-        style="@style/Toolbar"
-        android:layout_height="48dp"
-        android:navigationIcon="@drawable/ic_keyboard_arrow_down_black"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:navigationIcon="@drawable/ic_keyboard_arrow_down_black" />
-
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_album_tag_editor.xml b/app/src/main/res/layout/activity_album_tag_editor.xml
index ee7a664c8..43184934c 100755
--- a/app/src/main/res/layout/activity_album_tag_editor.xml
+++ b/app/src/main/res/layout/activity_album_tag_editor.xml
@@ -17,6 +17,8 @@
         <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/toolbar"
             style="@style/Toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
             app:navigationIcon="@drawable/ic_keyboard_backspace_black"
             app:title="@string/action_tag_editor" />
 
@@ -26,8 +28,8 @@
         android:id="@+id/content"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior"
-        android:overScrollMode="@integer/overScrollMode">
+        android:overScrollMode="@integer/overScrollMode"
+        app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior">
 
         <LinearLayout
             android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_bug_report.xml b/app/src/main/res/layout/activity_bug_report.xml
index 4028b7a06..04f5b3568 100644
--- a/app/src/main/res/layout/activity_bug_report.xml
+++ b/app/src/main/res/layout/activity_bug_report.xml
@@ -14,6 +14,8 @@
         <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/toolbar"
             style="@style/Toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
             app:layout_collapseMode="pin"
             app:navigationIcon="@drawable/ic_keyboard_backspace_black"
             app:title="@string/report_bug"
diff --git a/app/src/main/res/layout/activity_donation.xml b/app/src/main/res/layout/activity_donation.xml
index 8fafdadc7..9f2db5c0c 100644
--- a/app/src/main/res/layout/activity_donation.xml
+++ b/app/src/main/res/layout/activity_donation.xml
@@ -16,6 +16,8 @@
         <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/toolbar"
             style="@style/Toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
             app:layout_collapseMode="pin"
             app:navigationIcon="@drawable/ic_keyboard_backspace_black"
             app:title="@string/support_development"
diff --git a/app/src/main/res/layout/activity_license.xml b/app/src/main/res/layout/activity_license.xml
index 4dec97bb3..f362cad08 100644
--- a/app/src/main/res/layout/activity_license.xml
+++ b/app/src/main/res/layout/activity_license.xml
@@ -16,6 +16,8 @@
         <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/toolbar"
             style="@style/Toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
             app:layout_collapseMode="pin"
             app:navigationIcon="@drawable/ic_keyboard_backspace_black"
             app:title="@string/licenses"
diff --git a/app/src/main/res/layout/activity_pro_version.xml b/app/src/main/res/layout/activity_pro_version.xml
index e336c23ab..2f4dd01b6 100644
--- a/app/src/main/res/layout/activity_pro_version.xml
+++ b/app/src/main/res/layout/activity_pro_version.xml
@@ -40,6 +40,8 @@
         <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/toolbar"
             style="@style/Toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
             app:layout_collapseMode="pin"
             app:navigationIcon="@drawable/ic_keyboard_backspace_black"
             app:title="@string/retro_music_pro"
diff --git a/app/src/main/res/layout/activity_song_tag_editor.xml b/app/src/main/res/layout/activity_song_tag_editor.xml
index dacd1ce84..4d074c89a 100755
--- a/app/src/main/res/layout/activity_song_tag_editor.xml
+++ b/app/src/main/res/layout/activity_song_tag_editor.xml
@@ -17,6 +17,8 @@
         <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/toolbar"
             style="@style/Toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
             app:navigationIcon="@drawable/ic_keyboard_backspace_black"
             app:title="@string/action_tag_editor"
             app:titleTextAppearance="@style/ToolbarTextAppearanceNormal" />
diff --git a/app/src/main/res/layout/collapsing_appbar_layout.xml b/app/src/main/res/layout/collapsing_appbar_layout.xml
index 82a06383c..e836228a6 100644
--- a/app/src/main/res/layout/collapsing_appbar_layout.xml
+++ b/app/src/main/res/layout/collapsing_appbar_layout.xml
@@ -16,6 +16,7 @@
     <com.google.android.material.appbar.MaterialToolbar
         android:id="@+id/toolbar"
         style="@style/Toolbar"
+        android:layout_width="match_parent"
         android:layout_height="?actionBarSize"
         app:layout_collapseMode="pin"
         app:navigationIcon="@drawable/ic_search"
@@ -25,5 +26,5 @@
     <FrameLayout
         android:id="@+id/toolbar_container"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"/>
+        android:layout_height="wrap_content" />
 </com.google.android.material.appbar.CollapsingToolbarLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_adaptive_player.xml b/app/src/main/res/layout/fragment_adaptive_player.xml
index 5dd0db60d..3e0c27f1b 100644
--- a/app/src/main/res/layout/fragment_adaptive_player.xml
+++ b/app/src/main/res/layout/fragment_adaptive_player.xml
@@ -3,12 +3,8 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="?attr/colorSurface" />
+    android:layout_height="match_parent"
+    android:background="?colorSurface">
 
     <include layout="@layout/shadow_statusbar_toolbar" />
 
@@ -24,27 +20,23 @@
             <include layout="@layout/status_bar" />
         </FrameLayout>
 
-        <FrameLayout
+
+        <com.google.android.material.appbar.MaterialToolbar
+            android:id="@+id/playerToolbar"
+            style="@style/Toolbar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_weight="0">
-
-            <com.google.android.material.appbar.MaterialToolbar
-                android:id="@+id/playerToolbar"
-                style="@style/Toolbar"
-                android:navigationIcon="@drawable/ic_keyboard_arrow_down_black"
+            android:layout_weight="0"
                 app:contentInsetLeft="0dp"
-                app:contentInsetStart="0dp"
-                app:contentInsetStartWithNavigation="0dp"
-                app:navigationIcon="@drawable/ic_keyboard_arrow_down_black"
-                app:subtitleTextAppearance="@style/TextViewCaption"
-                app:titleMargin="0dp"
-                app:titleMarginStart="0dp"
-                app:titleTextAppearance="@style/TextViewSubtitle1"
-                tools:subtitle="@tools:sample/full_names"
-                tools:title="@tools:sample/full_names" />
-
-        </FrameLayout>
+            app:contentInsetStart="0dp"
+            app:contentInsetStartWithNavigation="0dp"
+            app:navigationIcon="@drawable/ic_keyboard_arrow_down_black"
+            app:subtitleTextAppearance="@style/TextViewCaption"
+            app:titleMargin="0dp"
+            app:titleMarginStart="0dp"
+            app:titleTextAppearance="@style/TextViewSubtitle1"
+            tools:subtitle="@tools:sample/full_names"
+            tools:title="@tools:sample/full_names" />
 
         <FrameLayout
             android:layout_width="match_parent"
@@ -67,18 +59,13 @@
                 android:elevation="20dp" />
         </FrameLayout>
 
-        <FrameLayout
+        <androidx.fragment.app.FragmentContainerView
+            android:id="@+id/playbackControlsFragment"
+            android:name="code.name.monkey.retromusic.fragments.player.adaptive.AdaptivePlaybackControlsFragment"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_weight="0">
-
-            <androidx.fragment.app.FragmentContainerView
-                android:id="@+id/playbackControlsFragment"
-                android:name="code.name.monkey.retromusic.fragments.player.adaptive.AdaptivePlaybackControlsFragment"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                tools:layout="@layout/fragment_adaptive_player_playback_controls" />
-        </FrameLayout>
+            android:layout_weight="0"
+            tools:layout="@layout/fragment_adaptive_player_playback_controls" />
 
     </LinearLayout>
 </FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_album_details.xml b/app/src/main/res/layout/fragment_album_details.xml
index 91713d0e7..57aff3242 100644
--- a/app/src/main/res/layout/fragment_album_details.xml
+++ b/app/src/main/res/layout/fragment_album_details.xml
@@ -11,8 +11,8 @@
         android:id="@+id/appBarLayout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        app:liftOnScroll="true"
-        android:fitsSystemWindows="true">
+        android:fitsSystemWindows="true"
+        app:liftOnScroll="true">
 
         <FrameLayout
             android:id="@+id/toolbar_container"
@@ -22,6 +22,8 @@
             <com.google.android.material.appbar.MaterialToolbar
                 android:id="@+id/toolbar"
                 style="@style/Toolbar"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
                 app:navigationIcon="@drawable/ic_keyboard_backspace_black" />
         </FrameLayout>
 
diff --git a/app/src/main/res/layout/fragment_artist_details.xml b/app/src/main/res/layout/fragment_artist_details.xml
index 4fe2ee7f2..b1642849e 100644
--- a/app/src/main/res/layout/fragment_artist_details.xml
+++ b/app/src/main/res/layout/fragment_artist_details.xml
@@ -11,8 +11,8 @@
         android:id="@+id/appBarLayout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        app:liftOnScroll="true"
-        android:fitsSystemWindows="true">
+        android:fitsSystemWindows="true"
+        app:liftOnScroll="true">
 
         <FrameLayout
             android:id="@+id/toolbar_container"
@@ -22,6 +22,8 @@
             <com.google.android.material.appbar.MaterialToolbar
                 android:id="@+id/toolbar"
                 style="@style/Toolbar"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
                 app:navigationIcon="@drawable/ic_keyboard_backspace_black" />
         </FrameLayout>
     </com.google.android.material.appbar.AppBarLayout>
@@ -102,7 +104,6 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/text" />
 
-
         </androidx.constraintlayout.widget.ConstraintLayout>
     </androidx.core.widget.NestedScrollView>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_blur.xml b/app/src/main/res/layout/fragment_blur.xml
index 0baa6e7e6..bf0d569ad 100644
--- a/app/src/main/res/layout/fragment_blur.xml
+++ b/app/src/main/res/layout/fragment_blur.xml
@@ -65,8 +65,9 @@
     <com.google.android.material.appbar.MaterialToolbar
         android:id="@+id/playerToolbar"
         style="@style/Toolbar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
         android:layout_gravity="bottom"
-        android:navigationIcon="@drawable/ic_keyboard_arrow_down_black"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/fragment_card_blur_player.xml b/app/src/main/res/layout/fragment_card_blur_player.xml
index cb9a6855d..720a35c71 100644
--- a/app/src/main/res/layout/fragment_card_blur_player.xml
+++ b/app/src/main/res/layout/fragment_card_blur_player.xml
@@ -35,31 +35,22 @@
             android:layout_height="wrap_content"
             android:orientation="vertical">
 
-            <FrameLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content">
+            <include layout="@layout/status_bar" />
 
-                <include layout="@layout/status_bar" />
-            </FrameLayout>
-
-            <FrameLayout
+            <com.google.android.material.appbar.MaterialToolbar
+                android:id="@+id/playerToolbar"
+                style="@style/Toolbar"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_weight="0">
-
-                <com.google.android.material.appbar.MaterialToolbar
-                    android:id="@+id/playerToolbar"
-                    style="@style/Toolbar"
-                    android:navigationIcon="@drawable/ic_keyboard_arrow_down_black"
-                    app:contentInsetLeft="0dp"
-                    app:contentInsetStart="0dp"
-                    app:contentInsetStartWithNavigation="0dp"
-                    app:navigationIcon="@drawable/ic_keyboard_arrow_down_black"
-                    app:subtitleTextAppearance="@style/TextAppearance.AppCompat.Caption"
-                    app:titleMargin="0dp"
-                    app:titleMarginStart="0dp"
-                    app:titleTextAppearance="@style/TextAppearance.AppCompat.Subhead" />
-            </FrameLayout>
+                android:layout_weight="0"
+                        app:contentInsetLeft="0dp"
+                app:contentInsetStart="0dp"
+                app:contentInsetStartWithNavigation="0dp"
+                app:navigationIcon="@drawable/ic_keyboard_arrow_down_black"
+                app:subtitleTextAppearance="@style/TextAppearance.AppCompat.Caption"
+                app:titleMargin="0dp"
+                app:titleMarginStart="0dp"
+                app:titleTextAppearance="@style/TextAppearance.AppCompat.Subhead" />
 
             <FrameLayout
                 android:layout_width="match_parent"
@@ -85,18 +76,13 @@
 
         </LinearLayout>
 
-        <FrameLayout
+        <androidx.fragment.app.FragmentContainerView
+            android:id="@+id/playbackControlsFragment"
+            android:name="code.name.monkey.retromusic.fragments.player.cardblur.CardBlurPlaybackControlsFragment"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_gravity="bottom">
-
-            <androidx.fragment.app.FragmentContainerView
-                android:id="@+id/playbackControlsFragment"
-                android:name="code.name.monkey.retromusic.fragments.player.cardblur.CardBlurPlaybackControlsFragment"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                tools:layout="@layout/fragment_card_blur_player_playback_controls" />
-        </FrameLayout>
+            android:layout_gravity="bottom"
+            tools:layout="@layout/fragment_card_blur_player_playback_controls" />
     </FrameLayout>
 
 </FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_card_player.xml b/app/src/main/res/layout/fragment_card_player.xml
index 294ee5b1c..394284b81 100644
--- a/app/src/main/res/layout/fragment_card_player.xml
+++ b/app/src/main/res/layout/fragment_card_player.xml
@@ -26,6 +26,7 @@
         android:layout_height="match_parent"
         android:layout_gravity="center"
         android:elevation="20dp" />
+
     <include layout="@layout/shadow_statusbar_toolbar" />
 
     <FrameLayout
@@ -46,6 +47,8 @@
             <com.google.android.material.appbar.MaterialToolbar
                 android:id="@+id/playerToolbar"
                 style="@style/Toolbar"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
                 android:background="@android:color/transparent"
                 app:navigationIcon="@drawable/ic_keyboard_arrow_down_black" />
         </LinearLayout>
diff --git a/app/src/main/res/layout/fragment_circle_player.xml b/app/src/main/res/layout/fragment_circle_player.xml
index 702b26ca3..520700261 100644
--- a/app/src/main/res/layout/fragment_circle_player.xml
+++ b/app/src/main/res/layout/fragment_circle_player.xml
@@ -22,24 +22,17 @@
     android:focusable="true"
     android:orientation="vertical">
 
-    <FrameLayout
-        android:id="@+id/statusBarContainer"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
-
-        <include layout="@layout/status_bar" />
-    </FrameLayout>
+    <include layout="@layout/status_bar" />
 
     <com.google.android.material.appbar.MaterialToolbar
         android:id="@+id/playerToolbar"
         style="@style/Toolbar"
-        android:navigationIcon="@drawable/ic_keyboard_arrow_down_black"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/statusBarContainer"
+        app:layout_constraintTop_toBottomOf="@id/status_bar"
         app:navigationIcon="@drawable/ic_keyboard_arrow_down_black"
         tools:layout_editor_absoluteY="24dp" />
 
@@ -121,12 +114,13 @@
         android:id="@+id/playPauseButton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:src="@drawable/ic_pause"
         app:backgroundTint="?attr/colorSurface"
+        android:scaleType="centerCrop"
         app:layout_constraintBottom_toBottomOf="@id/volumeSeekBar"
         app:layout_constraintEnd_toEndOf="@id/volumeSeekBar"
         app:layout_constraintStart_toStartOf="@id/volumeSeekBar"
         app:layout_constraintTop_toTopOf="@id/volumeSeekBar"
-        android:src="@drawable/ic_pause"
         tools:tint="@color/md_black_1000" />
 
     <ImageButton
@@ -168,12 +162,11 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/volumeSeekBar" />
 
-
     <com.google.android.material.slider.Slider
         android:id="@+id/progressSlider"
+        style="@style/Widget.Retro.Slider"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        style="@style/Widget.Retro.Slider"
         app:layout_constraintBottom_toTopOf="@+id/songInfo"
         app:layout_constraintEnd_toStartOf="@id/songTotalTime"
         app:layout_constraintStart_toEndOf="@id/songCurrentProgress"
@@ -183,8 +176,9 @@
         android:id="@+id/songCurrentProgress"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:gravity="center_vertical|left|end"
-        android:paddingLeft="16dp"
+        android:gravity="center_vertical|start|end"
+        android:paddingStart="16dp"
+        android:paddingEnd="0dp"
         android:singleLine="true"
         android:textColor="?android:attr/textColorSecondary"
         app:layout_constraintBottom_toBottomOf="@+id/progressSlider"
@@ -196,8 +190,9 @@
         android:id="@+id/songTotalTime"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:gravity="center_vertical|right|end"
-        android:paddingRight="16dp"
+        android:gravity="center_vertical|end"
+        android:paddingStart="0dp"
+        android:paddingEnd="16dp"
         android:singleLine="true"
         android:textColor="?android:attr/textColorSecondary"
         app:layout_constraintBottom_toBottomOf="@+id/progressSlider"
diff --git a/app/src/main/res/layout/fragment_classic_player.xml b/app/src/main/res/layout/fragment_classic_player.xml
index 049309aab..b43982b12 100644
--- a/app/src/main/res/layout/fragment_classic_player.xml
+++ b/app/src/main/res/layout/fragment_classic_player.xml
@@ -12,37 +12,22 @@
         android:layout_height="match_parent"
         android:orientation="vertical">
 
-        <FrameLayout
-            android:id="@+id/albumCoverContainer"
-            android:layout_width="0dp"
+        <androidx.fragment.app.FragmentContainerView
+            android:id="@+id/playerAlbumCoverFragment"
+            android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
+            android:layout_width="match_parent"
             android:layout_height="0dp"
             app:layout_constraintDimensionRatio="1:1"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent">
-
-            <androidx.fragment.app.FragmentContainerView
-                android:id="@+id/playerAlbumCoverFragment"
-                android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                tools:layout="@layout/fragment_album_cover" />
-        </FrameLayout>
-
-
-        <View
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:background="@drawable/shadow_down_strong"
-            app:layout_constraintBottom_toBottomOf="@id/toolbarContainer"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="@id/toolbarContainer" />
+            app:layout_constraintTop_toTopOf="parent"
+            tools:layout="@layout/fragment_album_cover" />
 
         <LinearLayout
             android:id="@+id/toolbarContainer"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:background="@drawable/shadow_down_strong"
             android:orientation="vertical"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
@@ -56,12 +41,12 @@
             <com.google.android.material.appbar.MaterialToolbar
                 android:id="@+id/playerToolbar"
                 style="@style/Toolbar"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
                 android:layout_gravity="bottom"
-                android:navigationIcon="@drawable/ic_keyboard_arrow_down_black"
-                app:navigationIcon="@drawable/ic_keyboard_arrow_down_black" />
+                        app:navigationIcon="@drawable/ic_keyboard_arrow_down_black" />
         </LinearLayout>
 
-
         <include
             android:id="@+id/playerControlsContainer"
             layout="@layout/fragment_classic_controls"
@@ -70,7 +55,7 @@
             android:elevation="24dp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/albumCoverContainer" />
+            app:layout_constraintTop_toBottomOf="@id/playerAlbumCoverFragment" />
     </androidx.constraintlayout.widget.ConstraintLayout>
 
     <com.google.android.material.card.MaterialCardView
@@ -78,8 +63,7 @@
         style="@style/BottomSheetStyle"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:gravity="bottom"
-        android:theme="@style/TopCornerCardView"
+        app:shapeAppearanceOverlay="@style/TopCornerCardView"
         app:behavior_hideable="false"
         app:cardElevation="24dp"
         app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior"
diff --git a/app/src/main/res/layout/fragment_color_player.xml b/app/src/main/res/layout/fragment_color_player.xml
index 8bb06719e..e8b4c6fb6 100644
--- a/app/src/main/res/layout/fragment_color_player.xml
+++ b/app/src/main/res/layout/fragment_color_player.xml
@@ -19,17 +19,7 @@
 
     <include layout="@layout/shadow_statusbar_toolbar" />
 
-    <FrameLayout
-        android:id="@+id/statusBarContainer"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
-
-        <include layout="@layout/status_bar" />
-    </FrameLayout>
-
+    <include layout="@layout/status_bar" />
 
     <androidx.fragment.app.FragmentContainerView
         android:id="@+id/playerAlbumCoverFragment"
@@ -39,7 +29,7 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHeight_percent="0.5"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/statusBarContainer" />
+        app:layout_constraintTop_toBottomOf="@id/status_bar" />
 
     <androidx.fragment.app.FragmentContainerView
         android:id="@+id/playbackControlsFragment"
@@ -52,12 +42,12 @@
         app:layout_constraintTop_toBottomOf="@id/playerAlbumCoverFragment"
         tools:layout="@layout/fragment_player_playback_controls" />
 
-
     <com.google.android.material.appbar.MaterialToolbar
         android:id="@+id/playerToolbar"
         style="@style/Toolbar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
         android:layout_gravity="bottom"
-        android:navigationIcon="@drawable/ic_keyboard_arrow_down_black"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/fragment_fit.xml b/app/src/main/res/layout/fragment_fit.xml
index 5f056adca..0fde206e1 100644
--- a/app/src/main/res/layout/fragment_fit.xml
+++ b/app/src/main/res/layout/fragment_fit.xml
@@ -4,14 +4,10 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="?attr/colorSurface"
     android:clickable="true"
     android:focusable="true">
 
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="?attr/colorSurface" />
-
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
@@ -29,7 +25,6 @@
                 android:layout_height="match_parent"
                 tools:layout="@layout/fragment_album_full_cover" />
 
-            <include layout="@layout/shadow_statusbar_toolbar" />
 
             <androidx.fragment.app.FragmentContainerView
                 android:id="@+id/cover_lyrics"
@@ -41,33 +36,22 @@
                 android:elevation="20dp" />
         </FrameLayout>
 
-        <FrameLayout
+        <androidx.fragment.app.FragmentContainerView
+            android:id="@+id/playbackControlsFragment"
+            android:name="code.name.monkey.retromusic.fragments.player.fit.FitPlaybackControlsFragment"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_weight="0">
+            android:layout_weight="0"
+            tools:layout="@layout/fragment_gradient_controls" />
 
-            <androidx.fragment.app.FragmentContainerView
-                android:id="@+id/playbackControlsFragment"
-                android:name="code.name.monkey.retromusic.fragments.player.fit.FitPlaybackControlsFragment"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                tools:layout="@layout/fragment_gradient_controls" />
-
-        </FrameLayout>
-
-        <FrameLayout
+        <com.google.android.material.appbar.MaterialToolbar
+            android:id="@+id/playerToolbar"
+            style="@style/Toolbar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_weight="0">
-
-            <com.google.android.material.appbar.MaterialToolbar
-                android:id="@+id/playerToolbar"
-                style="@style/Toolbar"
-                android:layout_gravity="bottom"
-                android:navigationIcon="@drawable/ic_keyboard_arrow_down_black"
+            android:layout_gravity="bottom"
+            android:layout_weight="0"
                 app:navigationIcon="@drawable/ic_keyboard_arrow_down_black" />
-
-        </FrameLayout>
     </LinearLayout>
 
     <include layout="@layout/shadow_statusbar_toolbar" />
diff --git a/app/src/main/res/layout/fragment_flat_player.xml b/app/src/main/res/layout/fragment_flat_player.xml
index e7c9a4601..1812a18ce 100644
--- a/app/src/main/res/layout/fragment_flat_player.xml
+++ b/app/src/main/res/layout/fragment_flat_player.xml
@@ -18,20 +18,9 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-    <include
-        android:id="@+id/include"
-        layout="@layout/shadow_statusbar_toolbar" />
+    <include layout="@layout/shadow_statusbar_toolbar" />
 
-    <FrameLayout
-        android:id="@+id/statusBarContainer"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
-
-        <include layout="@layout/status_bar" />
-    </FrameLayout>
+    <include layout="@layout/status_bar" />
 
     <androidx.fragment.app.FragmentContainerView
         android:id="@+id/playerAlbumCoverFragment"
@@ -41,10 +30,9 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHeight_percent="0.5"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/statusBarContainer"
+        app:layout_constraintTop_toBottomOf="@+id/status_bar"
         tools:layout="@layout/fragment_album_flat_cover" />
 
-
     <androidx.fragment.app.FragmentContainerView
         android:id="@+id/playbackControlsFragment"
         android:name="code.name.monkey.retromusic.fragments.player.flat.FlatPlaybackControlsFragment"
@@ -60,7 +48,8 @@
     <com.google.android.material.appbar.MaterialToolbar
         android:id="@+id/playerToolbar"
         style="@style/Toolbar"
-        android:navigationIcon="@drawable/ic_keyboard_arrow_down_black"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/fragment_full.xml b/app/src/main/res/layout/fragment_full.xml
index 130b4f068..39fbd0acb 100644
--- a/app/src/main/res/layout/fragment_full.xml
+++ b/app/src/main/res/layout/fragment_full.xml
@@ -7,6 +7,8 @@
     android:clickable="true"
     android:focusable="true">
 
+    <include layout="@layout/status_bar" />
+
     <androidx.fragment.app.FragmentContainerView
         android:id="@+id/playerAlbumCoverFragment"
         android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
@@ -29,7 +31,6 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-
     <androidx.fragment.app.FragmentContainerView
         android:id="@+id/playbackControlsFragment"
         android:name="code.name.monkey.retromusic.fragments.player.full.FullPlaybackControlsFragment"
@@ -49,31 +50,19 @@
         app:layout_constraintBottom_toBottomOf="@id/playerToolbar"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="@id/statusBarContainer" />
-
-    <FrameLayout
-        android:id="@+id/statusBarContainer"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
-
-        <include layout="@layout/status_bar" />
-    </FrameLayout>
+        app:layout_constraintTop_toTopOf="@id/status_bar" />
 
     <com.google.android.material.appbar.MaterialToolbar
         android:id="@+id/playerToolbar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:navigationIcon="@drawable/ic_keyboard_arrow_down_black"
         android:paddingBottom="24dp"
         app:contentInsetEndWithActions="0dp"
         app:contentInsetStart="0dp"
         app:contentInsetStartWithNavigation="0dp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/statusBarContainer"
+        app:layout_constraintTop_toBottomOf="@id/status_bar"
         app:navigationIcon="@drawable/ic_keyboard_arrow_down_black"
         app:titleMargin="0dp"
         app:titleMargins="0dp">
diff --git a/app/src/main/res/layout/fragment_gradient_player.xml b/app/src/main/res/layout/fragment_gradient_player.xml
index d68ac7675..e4d569733 100644
--- a/app/src/main/res/layout/fragment_gradient_player.xml
+++ b/app/src/main/res/layout/fragment_gradient_player.xml
@@ -14,6 +14,8 @@
         android:layout_height="match_parent"
         android:paddingBottom="48dp">
 
+        <include android:id="@+id/status_bar_layout" layout="@layout/status_bar" />
+
         <androidx.fragment.app.FragmentContainerView
             android:id="@+id/playerAlbumCoverFragment"
             android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
@@ -47,19 +49,6 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/playerAlbumCoverFragment" />
 
-        <FrameLayout
-            android:id="@+id/statusBarContainer"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent">
-
-            <include
-                android:id="@+id/status_bar_layout"
-                layout="@layout/status_bar" />
-        </FrameLayout>
-
         <androidx.fragment.app.FragmentContainerView
             android:id="@+id/cover_lyrics"
             android:name="code.name.monkey.retromusic.fragments.player.CoverLyricsFragment"
@@ -69,7 +58,7 @@
             app:layout_constraintBottom_toBottomOf="@+id/playerAlbumCoverFragment"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/statusBarContainer" />
+            app:layout_constraintTop_toBottomOf="@+id/status_bar" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
diff --git a/app/src/main/res/layout/fragment_home_player.xml b/app/src/main/res/layout/fragment_home_player.xml
index 653b005ee..00c940a9a 100644
--- a/app/src/main/res/layout/fragment_home_player.xml
+++ b/app/src/main/res/layout/fragment_home_player.xml
@@ -15,7 +15,6 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-
     <com.google.android.material.textview.MaterialTextView
         android:id="@+id/songTotalTime"
         android:layout_width="wrap_content"
@@ -94,7 +93,8 @@
         <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/playerToolbar"
             style="@style/Toolbar"
-            android:navigationIcon="@drawable/ic_keyboard_arrow_down_black"
-            app:navigationIcon="@drawable/ic_keyboard_arrow_down_black" />
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+                app:navigationIcon="@drawable/ic_keyboard_arrow_down_black" />
     </LinearLayout>
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_lyrics.xml b/app/src/main/res/layout/fragment_lyrics.xml
index bb118a02c..00645d23c 100644
--- a/app/src/main/res/layout/fragment_lyrics.xml
+++ b/app/src/main/res/layout/fragment_lyrics.xml
@@ -28,8 +28,7 @@
             android:layout_height="match_parent"
             android:background="?attr/colorSurface"
             android:gravity="start"
-            android:navigationIcon="@drawable/ic_keyboard_arrow_down_black"
-            app:contentInsetLeft="0dp"
+                app:contentInsetLeft="0dp"
             app:contentInsetStart="0dp"
             app:contentInsetStartWithNavigation="0dp"
             app:navigationIcon="@drawable/ic_keyboard_backspace_black"
diff --git a/app/src/main/res/layout/fragment_material.xml b/app/src/main/res/layout/fragment_material.xml
index a2df79d3a..7222c0cc6 100644
--- a/app/src/main/res/layout/fragment_material.xml
+++ b/app/src/main/res/layout/fragment_material.xml
@@ -19,17 +19,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-    <FrameLayout
-        android:id="@+id/statusBarContainer"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
-
-        <include layout="@layout/status_bar" />
-    </FrameLayout>
-
+    <include layout="@layout/status_bar" />
 
     <androidx.fragment.app.FragmentContainerView
         android:id="@+id/playerAlbumCoverFragment"
@@ -39,7 +29,7 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHeight_percent="0.5"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/statusBarContainer" />
+        app:layout_constraintTop_toBottomOf="@id/status_bar" />
 
     <androidx.fragment.app.FragmentContainerView
         android:id="@+id/playbackControlsFragment"
@@ -52,12 +42,12 @@
         app:layout_constraintTop_toBottomOf="@id/playerAlbumCoverFragment"
         tools:layout="@layout/fragment_player_playback_controls" />
 
-
     <com.google.android.material.appbar.MaterialToolbar
         android:id="@+id/playerToolbar"
         style="@style/Toolbar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
         android:layout_gravity="bottom"
-        android:navigationIcon="@drawable/ic_keyboard_arrow_down_black"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/fragment_material_playback_controls.xml b/app/src/main/res/layout/fragment_material_playback_controls.xml
index 70b920e90..2722c6e9c 100644
--- a/app/src/main/res/layout/fragment_material_playback_controls.xml
+++ b/app/src/main/res/layout/fragment_material_playback_controls.xml
@@ -50,7 +50,6 @@
         app:layout_constraintTop_toTopOf="@id/progressSlider"
         tools:text="@tools:sample/date/hhmmss" />
 
-
     <com.google.android.material.textview.MaterialTextView
         android:id="@+id/title"
         android:layout_width="wrap_content"
@@ -185,7 +184,6 @@
         tools:ignore="MissingPrefix"
         tools:tint="@color/md_black_1000" />
 
-
     <FrameLayout
         android:id="@+id/volumeFragmentContainer"
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/fragment_md3_player.xml b/app/src/main/res/layout/fragment_md3_player.xml
index 060a79e04..3aa1a970d 100644
--- a/app/src/main/res/layout/fragment_md3_player.xml
+++ b/app/src/main/res/layout/fragment_md3_player.xml
@@ -8,16 +8,9 @@
     android:clickable="true"
     android:focusable="true">
 
-    <FrameLayout
-        android:id="@+id/statusBarContainer"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
+    <include layout="@layout/shadow_statusbar_toolbar" />
 
-        <include layout="@layout/status_bar" />
-    </FrameLayout>
+    <include layout="@layout/status_bar" />
 
     <androidx.fragment.app.FragmentContainerView
         android:id="@+id/playerAlbumCoverFragment"
@@ -27,7 +20,7 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHeight_percent="0.45"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/statusBarContainer" />
+        app:layout_constraintTop_toBottomOf="@id/status_bar" />
 
     <androidx.fragment.app.FragmentContainerView
         android:id="@+id/playbackControlsFragment"
@@ -44,8 +37,9 @@
     <com.google.android.material.appbar.MaterialToolbar
         android:id="@+id/playerToolbar"
         style="@style/Toolbar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
         android:layout_gravity="bottom"
-        android:navigationIcon="@drawable/ic_keyboard_arrow_down_black"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/fragment_peek_player.xml b/app/src/main/res/layout/fragment_peek_player.xml
index 4cb5e1577..490da7df6 100644
--- a/app/src/main/res/layout/fragment_peek_player.xml
+++ b/app/src/main/res/layout/fragment_peek_player.xml
@@ -21,23 +21,16 @@
     android:focusable="true"
     android:orientation="vertical">
 
-    <FrameLayout
-        android:id="@+id/toolbarContainer"
+    <com.google.android.material.appbar.MaterialToolbar
+        android:id="@+id/playerToolbar"
+        style="@style/Toolbar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_weight="0"
+        android:layout_gravity="bottom"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
-
-        <com.google.android.material.appbar.MaterialToolbar
-            android:id="@+id/playerToolbar"
-            style="@style/Toolbar"
-            android:layout_gravity="bottom"
-            android:navigationIcon="@drawable/ic_keyboard_arrow_down_black"
-            app:navigationIcon="@drawable/ic_keyboard_arrow_down_black" />
-    </FrameLayout>
-
+        app:layout_constraintTop_toTopOf="parent"
+        app:navigationIcon="@drawable/ic_keyboard_arrow_down_black" />
 
     <androidx.fragment.app.FragmentContainerView
         android:id="@+id/playerAlbumCoverFragment"
@@ -47,7 +40,7 @@
         android:layout_marginStart="16dp"
         app:layout_constraintHeight_percent="0.5"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/toolbarContainer" />
+        app:layout_constraintTop_toBottomOf="@id/playerToolbar" />
 
     <com.google.android.material.textview.MaterialTextView
         android:id="@+id/title"
@@ -65,7 +58,7 @@
         app:layout_constraintBottom_toTopOf="@+id/text"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@id/playerAlbumCoverFragment"
-        app:layout_constraintTop_toBottomOf="@+id/toolbarContainer"
+        app:layout_constraintTop_toBottomOf="@+id/playerToolbar"
         tools:text="@tools:sample/lorem/random" />
 
     <com.google.android.material.textview.MaterialTextView
diff --git a/app/src/main/res/layout/fragment_plain_player.xml b/app/src/main/res/layout/fragment_plain_player.xml
index cfbc8f26c..607638706 100644
--- a/app/src/main/res/layout/fragment_plain_player.xml
+++ b/app/src/main/res/layout/fragment_plain_player.xml
@@ -10,16 +10,7 @@
 
     <include layout="@layout/shadow_statusbar_toolbar" />
 
-    <FrameLayout
-        android:id="@+id/statusBarContainer"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
-
-        <include layout="@layout/status_bar" />
-    </FrameLayout>
+    <include layout="@layout/status_bar" />
 
     <LinearLayout
         android:id="@+id/titleContainer"
@@ -27,17 +18,15 @@
         android:layout_height="wrap_content"
         android:clickable="false"
         android:orientation="vertical"
-        android:paddingStart="16dp"
-        android:paddingEnd="16dp"
+        android:padding="16dp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/statusBarContainer">
+        app:layout_constraintTop_toBottomOf="@id/status_bar">
 
         <com.google.android.material.textview.MaterialTextView
             android:id="@+id/title"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:paddingTop="8dp"
             android:singleLine="true"
             android:textAppearance="@style/TextViewHeadline6"
             android:textStyle="bold"
@@ -80,8 +69,9 @@
     <com.google.android.material.appbar.MaterialToolbar
         android:id="@+id/playerToolbar"
         style="@style/Toolbar"
-        android:layout_gravity="bottom"
-        android:navigationIcon="@drawable/ic_keyboard_arrow_down_black"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_weight="0"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/fragment_player.xml b/app/src/main/res/layout/fragment_player.xml
index c6e35f223..3cc950014 100644
--- a/app/src/main/res/layout/fragment_player.xml
+++ b/app/src/main/res/layout/fragment_player.xml
@@ -65,13 +65,14 @@
     <com.google.android.material.appbar.MaterialToolbar
         android:id="@+id/playerToolbar"
         style="@style/Toolbar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
         android:layout_gravity="bottom"
-        app:title="@null"
-        tools:menu="@menu/menu_player"
-        android:navigationIcon="@drawable/ic_keyboard_arrow_down_black"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/playbackControlsFragment" />
+        app:layout_constraintTop_toBottomOf="@id/playbackControlsFragment"
+        app:title="@null"
+        tools:menu="@menu/menu_player" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_settings.xml b/app/src/main/res/layout/fragment_settings.xml
index 6a93de59d..6654599ab 100644
--- a/app/src/main/res/layout/fragment_settings.xml
+++ b/app/src/main/res/layout/fragment_settings.xml
@@ -38,6 +38,7 @@
             <com.google.android.material.appbar.MaterialToolbar
                 android:id="@+id/toolbar"
                 style="@style/Toolbar"
+                android:layout_width="match_parent"
                 android:layout_height="?actionBarSize"
                 app:layout_collapseMode="pin"
                 app:navigationIcon="@drawable/ic_keyboard_backspace_black"
diff --git a/app/src/main/res/layout/fragment_simple_player.xml b/app/src/main/res/layout/fragment_simple_player.xml
index ff6892a2b..6e3e35e9a 100644
--- a/app/src/main/res/layout/fragment_simple_player.xml
+++ b/app/src/main/res/layout/fragment_simple_player.xml
@@ -9,21 +9,10 @@
     android:focusable="true"
     android:orientation="vertical">
 
-
     <include layout="@layout/shadow_statusbar_toolbar" />
 
-
-    <FrameLayout
-        android:id="@+id/statusBarContainer"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
-
-        <include layout="@layout/status_bar" />
-    </FrameLayout>
-
+    <include
+        layout="@layout/status_bar" />
 
     <androidx.fragment.app.FragmentContainerView
         android:id="@+id/playerAlbumCoverFragment"
@@ -33,7 +22,7 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHeight_percent="0.5"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/statusBarContainer" />
+        app:layout_constraintTop_toBottomOf="@id/status_bar" />
 
     <androidx.fragment.app.FragmentContainerView
         android:id="@+id/playbackControlsFragment"
@@ -46,12 +35,12 @@
         app:layout_constraintTop_toBottomOf="@id/playerAlbumCoverFragment"
         tools:layout="@layout/fragment_player_playback_controls" />
 
-
     <com.google.android.material.appbar.MaterialToolbar
         android:id="@+id/playerToolbar"
         style="@style/Toolbar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
         android:layout_gravity="bottom"
-        android:navigationIcon="@drawable/ic_keyboard_arrow_down_black"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/fragment_tiny_player.xml b/app/src/main/res/layout/fragment_tiny_player.xml
index d3de24334..6ae6b5697 100644
--- a/app/src/main/res/layout/fragment_tiny_player.xml
+++ b/app/src/main/res/layout/fragment_tiny_player.xml
@@ -34,16 +34,7 @@
         android:progressDrawable="@drawable/progress_drawable_vertical"
         android:secondaryProgress="100" />
 
-    <FrameLayout
-        android:id="@+id/status_bar"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
-
-        <include layout="@layout/status_bar" />
-    </FrameLayout>
+    <include layout="@layout/status_bar" />
 
     <code.name.monkey.retromusic.views.VerticalTextView
         android:id="@+id/playerSongTotalTime"
@@ -74,45 +65,32 @@
         android:paddingTop="8dp"
         android:paddingEnd="16dp"
         app:layout_constrainedWidth="true"
-        app:layout_constraintBottom_toTopOf="@+id/playbackControlsFragmentContainer"
+        app:layout_constraintBottom_toTopOf="@+id/playbackControlsFragment"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toBottomOf="@id/status_bar"
         app:layout_constraintVertical_bias="0"
         tools:ignore="MissingPrefix"
         tools:text="@tools:sample/lorem" />
 
-    <FrameLayout
-        android:id="@+id/toolbarContainer"
+    <com.google.android.material.appbar.MaterialToolbar
+        android:id="@+id/playerToolbar"
+        style="@style/Toolbar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent">
+        app:layout_constraintStart_toStartOf="parent"
+        app:navigationIcon="@drawable/ic_keyboard_arrow_down_black" />
 
-        <com.google.android.material.appbar.MaterialToolbar
-            android:id="@+id/playerToolbar"
-            style="@style/Toolbar"
-            android:navigationIcon="@drawable/ic_keyboard_arrow_down_black"
-            app:navigationIcon="@drawable/ic_keyboard_arrow_down_black" />
-    </FrameLayout>
-
-    <LinearLayout
-        android:id="@+id/playbackControlsFragmentContainer"
+    <androidx.fragment.app.FragmentContainerView
+        android:id="@+id/playbackControlsFragment"
+        android:name="code.name.monkey.retromusic.fragments.player.tiny.TinyPlaybackControlsFragment"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="bottom"
-        android:orientation="vertical"
-        app:layout_constraintBottom_toTopOf="@id/toolbarContainer"
-        app:layout_constraintEnd_toEndOf="parent">
-
-        <androidx.fragment.app.FragmentContainerView
-            android:id="@+id/playbackControlsFragment"
-            android:name="code.name.monkey.retromusic.fragments.player.tiny.TinyPlaybackControlsFragment"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            tools:layout="@layout/fragment_tiny_controls_fragment" />
-
-    </LinearLayout>
+        app:layout_constraintBottom_toTopOf="@id/playerToolbar"
+        app:layout_constraintEnd_toEndOf="parent"
+        tools:layout="@layout/fragment_tiny_controls_fragment" />
 
     <code.name.monkey.retromusic.views.VerticalTextView
         android:id="@+id/title"
diff --git a/app/src/main/res/layout/fragment_user_info.xml b/app/src/main/res/layout/fragment_user_info.xml
index ac0193df6..8f1e3184e 100644
--- a/app/src/main/res/layout/fragment_user_info.xml
+++ b/app/src/main/res/layout/fragment_user_info.xml
@@ -16,6 +16,7 @@
         <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/toolbar"
             style="@style/Toolbar"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             app:navigationIcon="@drawable/ic_keyboard_backspace_black"
             app:title="@string/profile"
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 60e2b5662..f56973e14 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -36,8 +36,6 @@
     </style>
 
     <style name="Toolbar" parent="Widget.Material3.Toolbar">
-        <item name="android:layout_width">match_parent</item>
-        <item name="android:layout_height">wrap_content</item>
         <item name="popupTheme">?toolbarPopupTheme</item>
         <item name="android:transitionName" tools:ignore="NewApi">toolbar</item>
         <item name="layout_collapseMode">pin</item>