diff --git a/app/src/main/java/code/name/monkey/retromusic/dialogs/OptionsSheetDialogFragment.kt b/app/src/main/java/code/name/monkey/retromusic/dialogs/OptionsSheetDialogFragment.kt
index 354a073ea..a6da2d354 100644
--- a/app/src/main/java/code/name/monkey/retromusic/dialogs/OptionsSheetDialogFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/dialogs/OptionsSheetDialogFragment.kt
@@ -81,6 +81,7 @@ class OptionsSheetDialogFragment : DialogFragment(), View.OnClickListener {
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
         dialog?.window?.let {
+            (requireActivity() as MainActivity).setNavigationBarColorPrimary()
             (requireActivity() as MainActivity).setLightNavigationBar(true)
         }
 
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/folders/FoldersFragment.java b/app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/folders/FoldersFragment.java
index 7fe77211e..be2413e83 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/folders/FoldersFragment.java
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/folders/FoldersFragment.java
@@ -152,7 +152,7 @@ public class FoldersFragment extends AbsMainActivityFragment implements
 
     private void initViews(View view) {
         coordinatorLayout = view.findViewById(R.id.coordinatorLayout);
-
+        toolbarContainer = view.findViewById(R.id.toolbarContainer);
         recyclerView = view.findViewById(R.id.recyclerView);
         appBarLayout = view.findViewById(R.id.appBarLayout);
         breadCrumbs = view.findViewById(R.id.breadCrumbs);
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/classic/ClassicPlayerFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/classic/ClassicPlayerFragment.kt
index 717b48f21..cee3e46ca 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/classic/ClassicPlayerFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/classic/ClassicPlayerFragment.kt
@@ -40,7 +40,7 @@ import kotlinx.android.synthetic.main.fragment_classic_player_playback_controls.
 import kotlin.math.max
 
 
-class ClassicPlayerFragment : AbsPlayerFragment(),   SlidingUpPanelLayout.PanelSlideListener {
+class ClassicPlayerFragment : AbsPlayerFragment(), SlidingUpPanelLayout.PanelSlideListener {
     override fun onPanelSlide(p0: View?, p1: Float) {
 
     }
diff --git a/app/src/main/res/layout-land/fragment_banner_home.xml b/app/src/main/res/layout-land/fragment_banner_home.xml
index 94e4af700..b1c66473c 100644
--- a/app/src/main/res/layout-land/fragment_banner_home.xml
+++ b/app/src/main/res/layout-land/fragment_banner_home.xml
@@ -81,6 +81,7 @@
                         app:cardCornerRadius="8dp"
                         app:cardElevation="6dp"
                         app:cardUseCompatPadding="true"
+                        app:layout_collapseMode="pin"
                         app:layout_scrollFlags="scroll|enterAlways">
 
                         <com.google.android.material.appbar.MaterialToolbar
diff --git a/app/src/main/res/layout-land/fragment_classic_player.xml b/app/src/main/res/layout-land/fragment_classic_player.xml
index b13ff0da3..7ca062111 100644
--- a/app/src/main/res/layout-land/fragment_classic_player.xml
+++ b/app/src/main/res/layout-land/fragment_classic_player.xml
@@ -15,7 +15,7 @@
 
         <include layout="@layout/status_bar" />
 
-        <code.name.monkey.appthemehelper.common.views.ATEToolbar
+        <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/playerToolbar"
             style="@style/Toolbar"
             android:background="@android:color/transparent"
@@ -82,7 +82,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_marginBottom="-8dp"
-                        app:cardBackgroundColor="?cardBackgroundColor"
+                        app:cardBackgroundColor="?colorSurface"
                         app:cardElevation="@dimen/card_elevation"
                         app:cardUseCompatPadding="false"
                         sothree:cardCornerRadius="12dp">
@@ -106,7 +106,7 @@
                                 android:layout_height="wrap_content"
                                 android:orientation="vertical">
 
-                                <TextView
+                                <com.google.android.material.textview.MaterialTextView
                                     android:id="@+id/playerQueueSubHeader"
                                     android:layout_width="match_parent"
                                     android:layout_height="48dp"
diff --git a/app/src/main/res/layout-land/fragment_home.xml b/app/src/main/res/layout-land/fragment_home.xml
index 37883eeff..27762befe 100644
--- a/app/src/main/res/layout-land/fragment_home.xml
+++ b/app/src/main/res/layout-land/fragment_home.xml
@@ -35,9 +35,7 @@
         <com.google.android.material.appbar.AppBarLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="@android:color/transparent"
-            android:elevation="0dp"
-            app:elevation="0dp">
+            app:liftOnScroll="true">
 
             <com.google.android.material.card.MaterialCardView
                 android:id="@+id/toolbarContainer"
@@ -50,6 +48,7 @@
                 app:cardCornerRadius="8dp"
                 app:cardElevation="0dp"
                 app:cardUseCompatPadding="true"
+                app:layout_collapseMode="pin"
                 app:layout_scrollFlags="scroll|enterAlways"
                 app:strokeColor="?dividerColor"
                 app:strokeWidth="1dp">
@@ -73,8 +72,6 @@
         <androidx.core.widget.NestedScrollView
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:layout_marginStart="@dimen/horizontal_margin"
-            android:layout_marginEnd="@dimen/horizontal_margin"
             app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
             <include layout="@layout/home_content" />
diff --git a/app/src/main/res/layout-xlarge-land/fragment_banner_home.xml b/app/src/main/res/layout-xlarge-land/fragment_banner_home.xml
index 6396894c2..cdebf1f58 100644
--- a/app/src/main/res/layout-xlarge-land/fragment_banner_home.xml
+++ b/app/src/main/res/layout-xlarge-land/fragment_banner_home.xml
@@ -82,6 +82,7 @@
                         app:cardCornerRadius="8dp"
                         app:cardElevation="6dp"
                         app:cardUseCompatPadding="true"
+                        app:layout_collapseMode="pin"
                         app:layout_scrollFlags="scroll|enterAlways">
 
                         <code.name.monkey.appthemehelper.common.views.ATEToolbar
@@ -95,7 +96,7 @@
                             app:title="@string/search_hint"
                             app:titleMarginStart="0dp"
                             app:titleTextAppearance="@style/ToolbarTextAppearanceSearch"
-                            tools:ignore="UnusedAttribute"/>
+                            tools:ignore="UnusedAttribute" />
                     </com.google.android.material.card.MaterialCardView>
                 </LinearLayout>
             </com.google.android.material.appbar.CollapsingToolbarLayout>
diff --git a/app/src/main/res/layout-xlarge-land/fragment_home.xml b/app/src/main/res/layout-xlarge-land/fragment_home.xml
index d47f2c1af..aa2a71e99 100644
--- a/app/src/main/res/layout-xlarge-land/fragment_home.xml
+++ b/app/src/main/res/layout-xlarge-land/fragment_home.xml
@@ -37,8 +37,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:background="@android:color/transparent"
-            android:elevation="0dp"
-            app:elevation="0dp">
+            app:liftOnScroll="true">
 
             <com.google.android.material.card.MaterialCardView
                 android:id="@+id/toolbarContainer"
@@ -51,6 +50,7 @@
                 app:cardCornerRadius="8dp"
                 app:cardElevation="0dp"
                 app:cardUseCompatPadding="true"
+                app:layout_collapseMode="pin"
                 app:layout_scrollFlags="scroll|enterAlways"
                 app:strokeColor="?dividerColor"
                 app:strokeWidth="1dp">
diff --git a/app/src/main/res/layout-xlarge/fragment_banner_home.xml b/app/src/main/res/layout-xlarge/fragment_banner_home.xml
index 19065cc1b..3ec042e6c 100644
--- a/app/src/main/res/layout-xlarge/fragment_banner_home.xml
+++ b/app/src/main/res/layout-xlarge/fragment_banner_home.xml
@@ -82,6 +82,7 @@
                         app:cardCornerRadius="8dp"
                         app:cardElevation="6dp"
                         app:cardUseCompatPadding="true"
+                        app:layout_collapseMode="pin"
                         app:layout_scrollFlags="scroll|enterAlways">
 
                         <com.google.android.material.appbar.MaterialToolbar
diff --git a/app/src/main/res/layout-xlarge/fragment_home.xml b/app/src/main/res/layout-xlarge/fragment_home.xml
index b0baf09e4..ff6949d8a 100644
--- a/app/src/main/res/layout-xlarge/fragment_home.xml
+++ b/app/src/main/res/layout-xlarge/fragment_home.xml
@@ -38,8 +38,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:background="@android:color/transparent"
-            android:elevation="0dp"
-            app:elevation="0dp">
+            app:liftOnScroll="true">
 
             <com.google.android.material.card.MaterialCardView
                 android:id="@+id/toolbarContainer"
@@ -51,6 +50,7 @@
                 android:layout_marginBottom="@dimen/toolbar_margin_vertical"
                 app:cardCornerRadius="8dp"
                 app:cardElevation="0dp"
+                app:layout_collapseMode="pin"
                 app:cardUseCompatPadding="true"
                 app:layout_scrollFlags="scroll|enterAlways"
                 app:strokeColor="?dividerColor"
diff --git a/app/src/main/res/layout/activity_search.xml b/app/src/main/res/layout/activity_search.xml
index 6634771c9..c72718a5d 100755
--- a/app/src/main/res/layout/activity_search.xml
+++ b/app/src/main/res/layout/activity_search.xml
@@ -11,16 +11,18 @@
         android:id="@+id/appBarLayout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:elevation="0dp"
         android:fitsSystemWindows="true"
-        app:elevation="0dp">
+        app:liftOnScroll="true">
 
         <com.google.android.material.card.MaterialCardView
             android:id="@+id/searchContainer"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginStart="8dp"
-            android:layout_marginEnd="8dp"
+            android:layout_marginStart="@dimen/toolbar_margin_horizontal"
+            android:layout_marginTop="@dimen/toolbar_margin_vertical"
+            android:layout_marginEnd="@dimen/toolbar_margin_horizontal"
+            android:layout_marginBottom="@dimen/toolbar_margin_vertical"
+            app:cardBackgroundColor="?colorSurface"
             app:cardCornerRadius="8dp"
             app:cardElevation="0dp"
             app:cardUseCompatPadding="true"
@@ -33,12 +35,13 @@
                 android:layout_height="50dp"
                 android:gravity="center_vertical">
 
-                <code.name.monkey.retromusic.views.IconImageView
+                <androidx.appcompat.widget.AppCompatImageView
                     android:id="@+id/back"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:padding="14dp"
-                    app:srcCompat="@drawable/ic_keyboard_backspace_black_24dp" />
+                    app:srcCompat="@drawable/ic_keyboard_backspace_black_24dp"
+                    app:tint="?colorOnSurface" />
 
 
                 <com.google.android.material.textfield.TextInputEditText
@@ -55,44 +58,50 @@
                     <requestFocus />
                 </com.google.android.material.textfield.TextInputEditText>
 
-                <code.name.monkey.retromusic.views.IconImageView
+                <androidx.appcompat.widget.AppCompatImageView
                     android:id="@+id/voiceSearch"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_weight="0"
                     android:background="?roundSelector"
                     android:padding="14dp"
-                    app:srcCompat="@drawable/ic_mic_white_24dp" />
+                    app:srcCompat="@drawable/ic_mic_white_24dp"
+                    app:tint="?colorOnSurface"
+                    tools:visibility="visible" />
             </LinearLayout>
         </com.google.android.material.card.MaterialCardView>
     </com.google.android.material.appbar.AppBarLayout>
 
-    <FrameLayout
+    <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior">
 
-        <com.google.android.material.textview.MaterialTextView
-            android:id="@android:id/empty"
+        <FrameLayout
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:paddingTop="48dp"
-            android:paddingBottom="48dp"
-            android:text="@string/no_results"
-            android:textAppearance="@style/TextViewHeadline6"
-            android:visibility="gone"
-            tools:visibility="visible" />
+            android:layout_height="wrap_content">
 
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/recyclerView"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:clipToPadding="false"
-            android:scrollbarStyle="outsideOverlay"
-            android:scrollbars="vertical"
-            app:layout_behavior="@string/appbar_scrolling_view_behavior" />
-    </FrameLayout>
+            <com.google.android.material.textview.MaterialTextView
+                android:id="@android:id/empty"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:paddingTop="48dp"
+                android:paddingBottom="48dp"
+                android:text="@string/no_results"
+                android:textAppearance="@style/TextViewHeadline6"
+                android:visibility="gone"
+                tools:visibility="visible" />
+
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/recyclerView"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:clipToPadding="false"
+                android:scrollbarStyle="outsideOverlay"
+                android:scrollbars="vertical" />
+        </FrameLayout>
+    </androidx.core.widget.NestedScrollView>
 
     <com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
         android:id="@+id/keyboardPopup"
diff --git a/app/src/main/res/layout/fragment_banner_home.xml b/app/src/main/res/layout/fragment_banner_home.xml
index 4253cf501..aaad8303e 100644
--- a/app/src/main/res/layout/fragment_banner_home.xml
+++ b/app/src/main/res/layout/fragment_banner_home.xml
@@ -77,6 +77,7 @@
                     app:cardCornerRadius="8dp"
                     app:cardElevation="0dp"
                     app:cardUseCompatPadding="true"
+                    app:layout_collapseMode="pin"
                     app:layout_scrollFlags="scroll|enterAlways"
                     app:strokeColor="?dividerColor">
 
diff --git a/app/src/main/res/layout/fragment_classic_player.xml b/app/src/main/res/layout/fragment_classic_player.xml
index 9fa141969..452b5b689 100644
--- a/app/src/main/res/layout/fragment_classic_player.xml
+++ b/app/src/main/res/layout/fragment_classic_player.xml
@@ -14,10 +14,10 @@
         android:clickable="false"
         android:focusable="true"
         android:gravity="bottom"
+        sothree:umanoDragView="@id/playerPanel"
         sothree:umanoFadeColor="#00000000"
         sothree:umanoOverlay="true"
         sothree:umanoPanelHeight="0dp"
-        sothree:umanoDragView="@id/playerPanel"
         sothree:umanoScrollableView="@+id/playerRecyclerView"
         sothree:umanoShadowHeight="0dp">
 
@@ -76,7 +76,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="@dimen/status_bar_padding" />
 
-                    <code.name.monkey.appthemehelper.common.views.ATEToolbar
+                    <com.google.android.material.appbar.MaterialToolbar
                         android:id="@+id/playerToolbar"
                         style="@style/Toolbar"
                         android:background="@android:color/transparent"
@@ -127,7 +127,7 @@
                             android:id="@+id/currentSong"
                             layout="@layout/item_list" />
 
-                        <TextView
+                        <com.google.android.material.textview.MaterialTextView
                             android:id="@+id/playerQueueSubHeader"
                             android:layout_width="match_parent"
                             android:layout_height="48dp"
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index 0ae14deb9..e8c23ecc2 100755
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -34,8 +34,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:background="@android:color/transparent"
-            android:elevation="0dp"
-            app:elevation="0dp">
+            app:liftOnScroll="true">
 
             <com.google.android.material.card.MaterialCardView
                 android:id="@+id/toolbarContainer"
@@ -48,6 +47,7 @@
                 app:cardCornerRadius="8dp"
                 app:cardElevation="0dp"
                 app:cardUseCompatPadding="true"
+                app:layout_collapseMode="pin"
                 app:layout_scrollFlags="scroll|enterAlways"
                 app:strokeColor="?dividerColor"
                 app:strokeWidth="1dp">
diff --git a/app/src/main/res/layout/section_recycler_view.xml b/app/src/main/res/layout/section_recycler_view.xml
index 0cd93c177..c4f05bc07 100644
--- a/app/src/main/res/layout/section_recycler_view.xml
+++ b/app/src/main/res/layout/section_recycler_view.xml
@@ -12,10 +12,10 @@
         style="@style/Widget.MaterialComponents.Chip.Action"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="12dp"
-        android:layout_marginBottom="12dp"
         android:layout_marginStart="@dimen/horizontal_padding_home"
+        android:layout_marginTop="12dp"
         android:layout_marginEnd="@dimen/horizontal_padding_home"
+        android:layout_marginBottom="12dp"
         android:textAppearance="@style/ChipFont"
         android:textColor="?android:textColorSecondary"
         app:chipIconTint="?iconColor"
diff --git a/app/src/main/res/values-land/dimens.xml b/app/src/main/res/values-land/dimens.xml
index a54c60a11..6c3a3c449 100644
--- a/app/src/main/res/values-land/dimens.xml
+++ b/app/src/main/res/values-land/dimens.xml
@@ -1,4 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <dimen name="horizontal_margin">52dp</dimen>
+    <dimen name="toolbar_margin_horizontal">52dp</dimen>
+    <dimen name="horizontal_padding_home">52dp</dimen>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index a5cae4cc4..8694491d1 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -68,5 +68,5 @@ http://developer.android.com/guide/topics/appwidgets/index.html#CreatingLayout
     <dimen name="item_song_height">52dp</dimen>
     <dimen name="button_padding_vertical">10dp</dimen>
     <dimen name="button_margin_horizontal">4dp</dimen>
-    <dimen name="horizontal_padding_home">0dp</dimen>
+    <dimen name="horizontal_padding_home">8dp</dimen>
 </resources>