diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/AlbumCoverStyle.kt b/app/src/main/java/code/name/monkey/retromusic/ui/fragments/AlbumCoverStyle.kt
index f901e7f7..af797328 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/AlbumCoverStyle.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/ui/fragments/AlbumCoverStyle.kt
@@ -10,9 +10,9 @@ enum class AlbumCoverStyle(@param:StringRes @field:StringRes
                            @param:DrawableRes @field:DrawableRes
                            val drawableResId: Int, val id: Int) {
     NORMAL(R.string.normal, R.drawable.album_cover_normal, 0),
-    FLAT(R.string.flat, R.drawable.album_cover_square, 1),
+    FLAT(R.string.flat, R.drawable.album_cover_flat, 1),
     CIRCLE(R.string.circular, R.drawable.album_cover_circle, 2),
-    MATERIAL(R.string.material, R.drawable.album_cover_normal, 3),
+    MATERIAL(R.string.material, R.drawable.album_cover_material, 3),
     CARD(R.string.card, R.drawable.album_cover_card, 4),
     FULL(R.string.full, R.drawable.album_cover_full, 5),
     FULL_CARD(R.string.full_card, R.drawable.album_cover_full_card, 6)
diff --git a/app/src/main/java/code/name/monkey/retromusic/views/StatusBarMarginFrameLayout.java b/app/src/main/java/code/name/monkey/retromusic/views/StatusBarMarginFrameLayout.java
index 00508ebe..e1097407 100644
--- a/app/src/main/java/code/name/monkey/retromusic/views/StatusBarMarginFrameLayout.java
+++ b/app/src/main/java/code/name/monkey/retromusic/views/StatusBarMarginFrameLayout.java
@@ -29,6 +29,7 @@ public class StatusBarMarginFrameLayout extends FrameLayout {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
             MarginLayoutParams lp = (MarginLayoutParams) getLayoutParams();
             lp.topMargin = insets.getSystemWindowInsetTop();
+            lp.bottomMargin = insets.getSystemWindowInsetBottom();
             setLayoutParams(lp);
         }
         return super.onApplyWindowInsets(insets);
diff --git a/app/src/main/res/drawable-xxxhdpi/album_cover_card.webp b/app/src/main/res/drawable-xxxhdpi/album_cover_card.webp
index 3ea37804..23b888a0 100644
Binary files a/app/src/main/res/drawable-xxxhdpi/album_cover_card.webp and b/app/src/main/res/drawable-xxxhdpi/album_cover_card.webp differ
diff --git a/app/src/main/res/drawable-xxxhdpi/album_cover_carousal.webp b/app/src/main/res/drawable-xxxhdpi/album_cover_carousal.webp
deleted file mode 100644
index e67863f8..00000000
Binary files a/app/src/main/res/drawable-xxxhdpi/album_cover_carousal.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/album_cover_circle.webp b/app/src/main/res/drawable-xxxhdpi/album_cover_circle.webp
index 14850397..7a812475 100644
Binary files a/app/src/main/res/drawable-xxxhdpi/album_cover_circle.webp and b/app/src/main/res/drawable-xxxhdpi/album_cover_circle.webp differ
diff --git a/app/src/main/res/drawable-xxxhdpi/album_cover_flat.webp b/app/src/main/res/drawable-xxxhdpi/album_cover_flat.webp
new file mode 100644
index 00000000..fca8d015
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/album_cover_flat.webp differ
diff --git a/app/src/main/res/drawable-xxxhdpi/album_cover_full.webp b/app/src/main/res/drawable-xxxhdpi/album_cover_full.webp
index f4c765b5..fc1fcca2 100644
Binary files a/app/src/main/res/drawable-xxxhdpi/album_cover_full.webp and b/app/src/main/res/drawable-xxxhdpi/album_cover_full.webp differ
diff --git a/app/src/main/res/drawable-xxxhdpi/album_cover_full_card.webp b/app/src/main/res/drawable-xxxhdpi/album_cover_full_card.webp
index 6d7b0ca4..20f03c4f 100644
Binary files a/app/src/main/res/drawable-xxxhdpi/album_cover_full_card.webp and b/app/src/main/res/drawable-xxxhdpi/album_cover_full_card.webp differ
diff --git a/app/src/main/res/drawable-xxxhdpi/album_cover_material.webp b/app/src/main/res/drawable-xxxhdpi/album_cover_material.webp
new file mode 100644
index 00000000..71ca05f0
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/album_cover_material.webp differ
diff --git a/app/src/main/res/drawable-xxxhdpi/album_cover_normal.webp b/app/src/main/res/drawable-xxxhdpi/album_cover_normal.webp
index a83b9f97..b297b6ce 100644
Binary files a/app/src/main/res/drawable-xxxhdpi/album_cover_normal.webp and b/app/src/main/res/drawable-xxxhdpi/album_cover_normal.webp differ
diff --git a/app/src/main/res/drawable-xxxhdpi/album_cover_square.webp b/app/src/main/res/drawable-xxxhdpi/album_cover_square.webp
deleted file mode 100644
index 73d5a6d9..00000000
Binary files a/app/src/main/res/drawable-xxxhdpi/album_cover_square.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/np_adaptive.png b/app/src/main/res/drawable-xxxhdpi/np_adaptive.png
deleted file mode 100644
index 774bb5ca..00000000
Binary files a/app/src/main/res/drawable-xxxhdpi/np_adaptive.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/np_adaptive.webp b/app/src/main/res/drawable-xxxhdpi/np_adaptive.webp
new file mode 100644
index 00000000..c60809ec
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/np_adaptive.webp differ
diff --git a/app/src/main/res/drawable-xxxhdpi/np_blur.png b/app/src/main/res/drawable-xxxhdpi/np_blur.png
deleted file mode 100644
index 1a1be050..00000000
Binary files a/app/src/main/res/drawable-xxxhdpi/np_blur.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/np_blur.webp b/app/src/main/res/drawable-xxxhdpi/np_blur.webp
new file mode 100644
index 00000000..5a164d1c
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/np_blur.webp differ
diff --git a/app/src/main/res/drawable-xxxhdpi/np_blur_card.png b/app/src/main/res/drawable-xxxhdpi/np_blur_card.png
deleted file mode 100644
index 50977cfa..00000000
Binary files a/app/src/main/res/drawable-xxxhdpi/np_blur_card.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/np_blur_card.webp b/app/src/main/res/drawable-xxxhdpi/np_blur_card.webp
new file mode 100644
index 00000000..cc42ebff
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/np_blur_card.webp differ
diff --git a/app/src/main/res/drawable-xxxhdpi/np_card.png b/app/src/main/res/drawable-xxxhdpi/np_card.png
deleted file mode 100644
index 2ca27062..00000000
Binary files a/app/src/main/res/drawable-xxxhdpi/np_card.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/np_card.webp b/app/src/main/res/drawable-xxxhdpi/np_card.webp
new file mode 100644
index 00000000..cd3279e9
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/np_card.webp differ
diff --git a/app/src/main/res/drawable-xxxhdpi/np_color.png b/app/src/main/res/drawable-xxxhdpi/np_color.png
deleted file mode 100644
index 409ed46b..00000000
Binary files a/app/src/main/res/drawable-xxxhdpi/np_color.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/np_color.webp b/app/src/main/res/drawable-xxxhdpi/np_color.webp
new file mode 100644
index 00000000..b5edff24
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/np_color.webp differ
diff --git a/app/src/main/res/drawable-xxxhdpi/np_fit.png b/app/src/main/res/drawable-xxxhdpi/np_fit.png
deleted file mode 100644
index 2d3470f6..00000000
Binary files a/app/src/main/res/drawable-xxxhdpi/np_fit.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/np_fit.webp b/app/src/main/res/drawable-xxxhdpi/np_fit.webp
new file mode 100644
index 00000000..b93dca49
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/np_fit.webp differ
diff --git a/app/src/main/res/drawable-xxxhdpi/np_flat.png b/app/src/main/res/drawable-xxxhdpi/np_flat.png
deleted file mode 100644
index 7f6a1b47..00000000
Binary files a/app/src/main/res/drawable-xxxhdpi/np_flat.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/np_flat.webp b/app/src/main/res/drawable-xxxhdpi/np_flat.webp
new file mode 100644
index 00000000..f445b596
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/np_flat.webp differ
diff --git a/app/src/main/res/drawable-xxxhdpi/np_full.png b/app/src/main/res/drawable-xxxhdpi/np_full.png
deleted file mode 100644
index 3e517169..00000000
Binary files a/app/src/main/res/drawable-xxxhdpi/np_full.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/np_full.webp b/app/src/main/res/drawable-xxxhdpi/np_full.webp
new file mode 100644
index 00000000..fc1fcca2
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/np_full.webp differ
diff --git a/app/src/main/res/drawable-xxxhdpi/np_material.png b/app/src/main/res/drawable-xxxhdpi/np_material.png
deleted file mode 100644
index 03f50f8c..00000000
Binary files a/app/src/main/res/drawable-xxxhdpi/np_material.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/np_material.webp b/app/src/main/res/drawable-xxxhdpi/np_material.webp
new file mode 100644
index 00000000..692893dd
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/np_material.webp differ
diff --git a/app/src/main/res/drawable-xxxhdpi/np_normal.png b/app/src/main/res/drawable-xxxhdpi/np_normal.png
deleted file mode 100644
index 0b4c0a93..00000000
Binary files a/app/src/main/res/drawable-xxxhdpi/np_normal.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/np_normal.webp b/app/src/main/res/drawable-xxxhdpi/np_normal.webp
new file mode 100644
index 00000000..06965c7a
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/np_normal.webp differ
diff --git a/app/src/main/res/drawable-xxxhdpi/np_plain.png b/app/src/main/res/drawable-xxxhdpi/np_plain.png
deleted file mode 100644
index 04c3d19d..00000000
Binary files a/app/src/main/res/drawable-xxxhdpi/np_plain.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/np_plain.webp b/app/src/main/res/drawable-xxxhdpi/np_plain.webp
new file mode 100644
index 00000000..35c1448e
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/np_plain.webp differ
diff --git a/app/src/main/res/drawable-xxxhdpi/np_simple.png b/app/src/main/res/drawable-xxxhdpi/np_simple.png
deleted file mode 100644
index f9b1fe44..00000000
Binary files a/app/src/main/res/drawable-xxxhdpi/np_simple.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/np_simple.webp b/app/src/main/res/drawable-xxxhdpi/np_simple.webp
new file mode 100644
index 00000000..d44abc08
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/np_simple.webp differ
diff --git a/app/src/main/res/layout-xlarge/abs_playlists.xml b/app/src/main/res/layout-xlarge/abs_playlists.xml
index 76072a6a..3662b750 100644
--- a/app/src/main/res/layout-xlarge/abs_playlists.xml
+++ b/app/src/main/res/layout-xlarge/abs_playlists.xml
@@ -20,9 +20,8 @@
 
         <code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
             android:id="@+id/sectionTitle"
-            android:text="@string/for_you"
             style="@style/SubTitleTextAppearance"
-            android:textStyle="bold" />
+            android:text="@string/for_you" />
 
     </LinearLayout>
 
diff --git a/app/src/main/res/layout/abs_playlists.xml b/app/src/main/res/layout/abs_playlists.xml
index 4ff42f35..2a167bc4 100644
--- a/app/src/main/res/layout/abs_playlists.xml
+++ b/app/src/main/res/layout/abs_playlists.xml
@@ -21,8 +21,7 @@
         <code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
             android:id="@+id/sectionTitle"
             style="@style/SubTitleTextAppearance"
-            android:text="@string/for_you"
-             />
+            android:text="@string/for_you" />
 
     </LinearLayout>
 
diff --git a/app/src/main/res/layout/fragment_player.xml b/app/src/main/res/layout/fragment_player.xml
index 656b9ce0..950cbffc 100644
--- a/app/src/main/res/layout/fragment_player.xml
+++ b/app/src/main/res/layout/fragment_player.xml
@@ -19,7 +19,7 @@
 
     <include layout="@layout/shadow_statusbar_toolbar" />
 
-    <code.name.monkey.retromusic.views.FitSystemWindowsLayout
+    <code.name.monkey.retromusic.views.StatusBarMarginFrameLayout
         android:id="@+id/safeArea"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
@@ -29,13 +29,6 @@
             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>
-
             <FrameLayout
                 android:id="@+id/playerAlbumCoverContainer"
                 android:layout_width="match_parent"
@@ -76,5 +69,5 @@
                     app:navigationIcon="@drawable/ic_close_white_24dp" />
             </FrameLayout>
         </LinearLayout>
-    </code.name.monkey.retromusic.views.FitSystemWindowsLayout>
+    </code.name.monkey.retromusic.views.StatusBarMarginFrameLayout>
 </FrameLayout>
\ No newline at end of file