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 cbb502c2d..eb30bb35c 100644
--- a/app/src/main/res/layout-land/fragment_banner_home.xml
+++ b/app/src/main/res/layout-land/fragment_banner_home.xml
@@ -45,14 +45,15 @@
                     android:layout_height="182dp"
                     app:layout_collapseMode="pin">
 
-                    <ImageView
+                    <androidx.appcompat.widget.AppCompatImageView
                         android:id="@+id/bannerImage"
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
                         android:scaleType="centerCrop"
                         app:layout_collapseMode="parallax"
                         tools:background="@color/md_red_400"
-                        tools:ignore="ContentDescription" />
+                        tools:ignore="ContentDescription"
+                        tools:srcCompat="@tools:sample/backgrounds/scenic[9]" />
                 </FrameLayout>
 
                 <LinearLayout
diff --git a/app/src/main/res/layout-land/fragment_blur.xml b/app/src/main/res/layout-land/fragment_blur.xml
index 1d3d6d1b7..90b075efc 100644
--- a/app/src/main/res/layout-land/fragment_blur.xml
+++ b/app/src/main/res/layout-land/fragment_blur.xml
@@ -54,7 +54,7 @@
                     android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    tools:layout="@layout/fragment_player_album_cover" />
+                    tools:layout="@layout/fragment_album_cover" />
             </code.name.monkey.retromusic.views.HeightFitSquareLayout>
 
             <LinearLayout
@@ -72,8 +72,7 @@
                 <FrameLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_weight="0"
-                    tools:background="@color/md_red_A700">
+                    android:layout_weight="0" >
 
                     <code.name.monkey.appthemehelper.common.views.ATEToolbar
                         android:id="@+id/playerToolbar"
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 bc2ddc208..b81c3d46a 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
@@ -65,7 +65,8 @@
                 android:id="@+id/playerAlbumCoverFragment"
                 android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content" />
+                android:layout_height="wrap_content"
+                tools:layout="@layout/fragment_album_card_cover" />
         </FrameLayout>
 
     </LinearLayout>
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 535bc6d74..944bc852e 100644
--- a/app/src/main/res/layout-land/fragment_card_player.xml
+++ b/app/src/main/res/layout-land/fragment_card_player.xml
@@ -13,7 +13,7 @@
         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" />
+        tools:layout="@layout/fragment_album_full_cover" />
 
 
     <LinearLayout
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 25e37f4c0..b13ff0da3 100644
--- a/app/src/main/res/layout-land/fragment_classic_player.xml
+++ b/app/src/main/res/layout-land/fragment_classic_player.xml
@@ -35,7 +35,8 @@
                     android:id="@+id/playerAlbumCoverFragment"
                     class="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
                     android:layout_width="match_parent"
-                    android:layout_height="match_parent" />
+                    android:layout_height="match_parent"
+                    tools:layout="@layout/fragment_album_full_cover" />
             </code.name.monkey.retromusic.views.HeightFitSquareLayout>
 
             <com.sothree.slidinguppanel.SlidingUpPanelLayout xmlns:sothree="http://schemas.android.com/apk/res-auto"
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 f4b6bec10..3ac63b7b5 100644
--- a/app/src/main/res/layout-land/fragment_color_player.xml
+++ b/app/src/main/res/layout-land/fragment_color_player.xml
@@ -49,7 +49,8 @@
                         android:id="@+id/playerImage"
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
-                        android:scaleType="centerCrop" />
+                        android:scaleType="centerCrop"
+                        tools:srcCompat="@tools:sample/backgrounds/scenic[10]" />
 
                     <ScrollView
                         android:id="@+id/lyricsContainer"
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 febac4849..6f790172e 100644
--- a/app/src/main/res/layout-land/fragment_flat_player.xml
+++ b/app/src/main/res/layout-land/fragment_flat_player.xml
@@ -42,7 +42,7 @@
                     android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    tools:layout="@layout/fragment_player_album_cover" />
+                    tools:layout="@layout/fragment_album_flat_cover" />
             </code.name.monkey.retromusic.views.HeightFitSquareLayout>
 
 
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 cf4fa7664..0c00264ff 100644
--- a/app/src/main/res/layout-land/fragment_plain_player.xml
+++ b/app/src/main/res/layout-land/fragment_plain_player.xml
@@ -36,7 +36,7 @@
                     android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
-                    tools:layout="@layout/fragment_player_album_cover" />
+                    tools:layout="@layout/fragment_album_cover" />
             </code.name.monkey.retromusic.views.HeightFitSquareLayout>
 
             <LinearLayout
diff --git a/app/src/main/res/layout-land/fragment_player.xml b/app/src/main/res/layout-land/fragment_player.xml
index f8d47f709..6d951b08a 100755
--- a/app/src/main/res/layout-land/fragment_player.xml
+++ b/app/src/main/res/layout-land/fragment_player.xml
@@ -41,7 +41,7 @@
                     android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
-                    tools:layout="@layout/fragment_player_album_cover" />
+                    tools:layout="@layout/fragment_album_cover" />
             </code.name.monkey.retromusic.views.HeightFitSquareLayout>
 
             <LinearLayout
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 b6b45a29d..3474f70d2 100644
--- a/app/src/main/res/layout-land/fragment_simple_player.xml
+++ b/app/src/main/res/layout-land/fragment_simple_player.xml
@@ -42,7 +42,7 @@
                     android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    tools:layout="@layout/fragment_player_album_cover" />
+                    tools:layout="@layout/fragment_album_cover" />
             </code.name.monkey.retromusic.views.HeightFitSquareLayout>
 
 
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 9ae0815a0..f1e742ef5 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
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright (c) 2019 Hemanth Savarala.
   ~
   ~ Licensed under the GNU General Public License v3
@@ -47,14 +46,15 @@
                     android:layout_height="258dp"
                     app:layout_collapseMode="parallax">
 
-                    <ImageView
+                    <androidx.appcompat.widget.AppCompatImageView
                         android:id="@+id/bannerImage"
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
                         android:scaleType="centerCrop"
                         app:layout_collapseMode="parallax"
                         tools:background="@color/md_red_400"
-                        tools:ignore="ContentDescription" />
+                        tools:ignore="ContentDescription"
+                        tools:srcCompat="@tools:sample/backgrounds/scenic[9]" />
                 </FrameLayout>
 
                 <LinearLayout
@@ -75,10 +75,10 @@
                         android:id="@+id/toolbarContainer"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        app:cardCornerRadius="8dp"
-                        app:cardElevation="6dp"
                         android:layout_marginStart="128dp"
                         android:layout_marginEnd="128dp"
+                        app:cardCornerRadius="8dp"
+                        app:cardElevation="6dp"
                         app:cardUseCompatPadding="true"
                         app:layout_scrollFlags="scroll|enterAlways">
 
diff --git a/app/src/main/res/layout-xlarge-land/fragment_blur.xml b/app/src/main/res/layout-xlarge-land/fragment_blur.xml
index f40379135..1adf19940 100644
--- a/app/src/main/res/layout-xlarge-land/fragment_blur.xml
+++ b/app/src/main/res/layout-xlarge-land/fragment_blur.xml
@@ -51,7 +51,8 @@
                 android:id="@+id/playerAlbumCoverFragment"
                 android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent" />
+                android:layout_height="match_parent"
+                tools:layout="@layout/fragment_album_cover" />
         </code.name.monkey.retromusic.views.WidthFitSquareLayout>
 
         <FrameLayout
diff --git a/app/src/main/res/layout-xlarge-land/fragment_player.xml b/app/src/main/res/layout-xlarge-land/fragment_player.xml
index cfed47084..dd2897622 100644
--- a/app/src/main/res/layout-xlarge-land/fragment_player.xml
+++ b/app/src/main/res/layout-xlarge-land/fragment_player.xml
@@ -37,7 +37,7 @@
                     android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
-                    tools:layout="@layout/fragment_player_album_cover" />
+                    tools:layout="@layout/fragment_album_cover" />
             </code.name.monkey.retromusic.views.WidthFitSquareLayout>
 
             <fragment
diff --git a/app/src/main/res/layout-xlarge/fragment_album_card_cover.xml b/app/src/main/res/layout-xlarge/fragment_album_card_cover.xml
index 773e82a4e..a75d2aed7 100644
--- a/app/src/main/res/layout-xlarge/fragment_album_card_cover.xml
+++ b/app/src/main/res/layout-xlarge/fragment_album_card_cover.xml
@@ -5,8 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:tools="http://schemas.android.com/tools"
+    <androidx.cardview.widget.CardView
         android:id="@+id/player_album_art_frame"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
@@ -21,7 +20,8 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:scaleType="centerCrop"
-            tools:ignore="ContentDescription,UnusedAttribute" />
+            tools:ignore="ContentDescription,UnusedAttribute"
+            tools:srcCompat="@tools:sample/backgrounds/scenic[2]" />
 
         <View
             android:layout_width="match_parent"
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 a5810b287..82a517f7e 100644
--- a/app/src/main/res/layout-xlarge/fragment_banner_home.xml
+++ b/app/src/main/res/layout-xlarge/fragment_banner_home.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright (c) 2019 Hemanth Savarala.
   ~
   ~ Licensed under the GNU General Public License v3
@@ -47,14 +46,15 @@
                     android:layout_height="228dp"
                     app:layout_collapseMode="parallax">
 
-                    <ImageView
+                    <androidx.appcompat.widget.AppCompatImageView
                         android:id="@+id/bannerImage"
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
                         android:scaleType="centerCrop"
                         app:layout_collapseMode="parallax"
                         tools:background="@color/md_red_400"
-                        tools:ignore="ContentDescription" />
+                        tools:ignore="ContentDescription"
+                        tools:srcCompat="@tools:sample/backgrounds/scenic[9]" />
                 </FrameLayout>
 
                 <LinearLayout
diff --git a/app/src/main/res/layout-xlarge/fragment_blur.xml b/app/src/main/res/layout-xlarge/fragment_blur.xml
index afead1489..790d8fbbf 100644
--- a/app/src/main/res/layout-xlarge/fragment_blur.xml
+++ b/app/src/main/res/layout-xlarge/fragment_blur.xml
@@ -49,7 +49,8 @@
                 android:id="@+id/playerAlbumCoverFragment"
                 android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content" />
+                android:layout_height="wrap_content"
+                tools:layout="@layout/fragment_album_cover" />
         </code.name.monkey.retromusic.views.WidthFitSquareLayout>
 
         <FrameLayout
@@ -69,8 +70,7 @@
         <FrameLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_weight="0"
-            tools:background="@color/md_red_A700">
+            android:layout_weight="0">
 
             <code.name.monkey.appthemehelper.common.views.ATEToolbar
                 android:id="@+id/playerToolbar"
diff --git a/app/src/main/res/layout-xlarge/fragment_player.xml b/app/src/main/res/layout-xlarge/fragment_player.xml
index 070456943..c45c98d7f 100644
--- a/app/src/main/res/layout-xlarge/fragment_player.xml
+++ b/app/src/main/res/layout-xlarge/fragment_player.xml
@@ -39,7 +39,7 @@
                 android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                tools:layout="@layout/fragment_player_album_cover" />
+                tools:layout="@layout/fragment_album_cover" />
         </code.name.monkey.retromusic.views.WidthFitSquareLayout>
 
         <FrameLayout
diff --git a/app/src/main/res/layout/fragment_adaptive_player.xml b/app/src/main/res/layout/fragment_adaptive_player.xml
index e5bb5cf67..325245078 100644
--- a/app/src/main/res/layout/fragment_adaptive_player.xml
+++ b/app/src/main/res/layout/fragment_adaptive_player.xml
@@ -52,7 +52,8 @@
                 android:id="@+id/playerAlbumCoverFragment"
                 android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent" />
+                android:layout_height="match_parent"
+                tools:layout="@layout/fragment_album_full_card_cover" />
 
             <FrameLayout
                 android:id="@+id/player_lyrics"
diff --git a/app/src/main/res/layout/fragment_album_card_cover.xml b/app/src/main/res/layout/fragment_album_card_cover.xml
index 41fbee7d3..f3e714191 100644
--- a/app/src/main/res/layout/fragment_album_card_cover.xml
+++ b/app/src/main/res/layout/fragment_album_card_cover.xml
@@ -5,8 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <com.google.android.material.card.MaterialCardView xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:tools="http://schemas.android.com/tools"
+    <com.google.android.material.card.MaterialCardView
         android:id="@+id/player_album_art_frame"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
@@ -22,7 +21,8 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:scaleType="centerCrop"
-            tools:ignore="ContentDescription,UnusedAttribute" />
+            tools:ignore="ContentDescription,UnusedAttribute"
+            tools:srcCompat="@tools:sample/backgrounds/scenic[2]" />
 
         <View
             android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/fragment_album_carousel_cover.xml b/app/src/main/res/layout/fragment_album_carousel_cover.xml
index 5986a5ca3..fe9b40c78 100644
--- a/app/src/main/res/layout/fragment_album_carousel_cover.xml
+++ b/app/src/main/res/layout/fragment_album_carousel_cover.xml
@@ -33,7 +33,8 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:scaleType="centerCrop"
-            tools:ignore="ContentDescription,UnusedAttribute" />
+            tools:ignore="ContentDescription,UnusedAttribute"
+            tools:srcCompat="@tools:sample/backgrounds/scenic[3]" />
 
     </com.google.android.material.card.MaterialCardView>
 </code.name.monkey.retromusic.views.WidthFitSquareLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_album_circle_cover.xml b/app/src/main/res/layout/fragment_album_circle_cover.xml
index b89ec22dd..1c33abfdb 100644
--- a/app/src/main/res/layout/fragment_album_circle_cover.xml
+++ b/app/src/main/res/layout/fragment_album_circle_cover.xml
@@ -17,7 +17,8 @@
             android:scaleType="centerCrop"
             app:civ_border="false"
             app:civ_shadow="false"
-            tools:ignore="ContentDescription,UnusedAttribute" />
+            tools:ignore="ContentDescription,UnusedAttribute"
+            tools:srcCompat="@tools:sample/backgrounds/scenic[4]" />
 
     </code.name.monkey.retromusic.views.WidthFitSquareLayout>
 </FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_album_cover.xml b/app/src/main/res/layout/fragment_album_cover.xml
index 509682deb..41fd91038 100644
--- a/app/src/main/res/layout/fragment_album_cover.xml
+++ b/app/src/main/res/layout/fragment_album_cover.xml
@@ -16,15 +16,16 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:layout_margin="16dp"
-            app:cardElevation="6dp"
-            app:cardCornerRadius="8dp">
+            app:cardCornerRadius="8dp"
+            app:cardElevation="6dp">
 
             <androidx.appcompat.widget.AppCompatImageView
                 android:id="@+id/player_image"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:scaleType="centerCrop"
-                tools:ignore="ContentDescription,UnusedAttribute" />
+                tools:ignore="ContentDescription,UnusedAttribute"
+                tools:srcCompat="@tools:sample/backgrounds/scenic[5]" />
 
         </com.google.android.material.card.MaterialCardView>
     </code.name.monkey.retromusic.views.WidthFitSquareLayout>
diff --git a/app/src/main/res/layout/fragment_album_flat_cover.xml b/app/src/main/res/layout/fragment_album_flat_cover.xml
index 569ed482a..1e9be1b21 100644
--- a/app/src/main/res/layout/fragment_album_flat_cover.xml
+++ b/app/src/main/res/layout/fragment_album_flat_cover.xml
@@ -14,7 +14,7 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:scaleType="centerCrop"
-            tools:ignore="ContentDescription,UnusedAttribute" />
+            tools:ignore="ContentDescription,UnusedAttribute"
+            tools:srcCompat="@tools:sample/backgrounds/scenic[6]" />
     </code.name.monkey.retromusic.views.WidthFitSquareLayout>
-
 </FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_album_full_card_cover.xml b/app/src/main/res/layout/fragment_album_full_card_cover.xml
index dbbf9ec0a..f3deeb40f 100644
--- a/app/src/main/res/layout/fragment_album_full_card_cover.xml
+++ b/app/src/main/res/layout/fragment_album_full_card_cover.xml
@@ -16,6 +16,7 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:scaleType="centerCrop"
-            tools:ignore="ContentDescription,UnusedAttribute" />
+            tools:ignore="ContentDescription,UnusedAttribute"
+            tools:srcCompat="@tools:sample/backgrounds/scenic" />
     </com.google.android.material.card.MaterialCardView>
 </FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_album_full_cover.xml b/app/src/main/res/layout/fragment_album_full_cover.xml
index 1aa012625..b2a3bf57b 100644
--- a/app/src/main/res/layout/fragment_album_full_cover.xml
+++ b/app/src/main/res/layout/fragment_album_full_cover.xml
@@ -4,11 +4,12 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <ImageView
+    <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/player_image"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:scaleType="centerCrop"
-        tools:ignore="ContentDescription,UnusedAttribute"/>
+        tools:ignore="ContentDescription,UnusedAttribute"
+        tools:srcCompat="@tools:sample/backgrounds/scenic[7]" />
 
 </FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_album_material_cover.xml b/app/src/main/res/layout/fragment_album_material_cover.xml
index 46f2d5cae..83d8946db 100644
--- a/app/src/main/res/layout/fragment_album_material_cover.xml
+++ b/app/src/main/res/layout/fragment_album_material_cover.xml
@@ -23,7 +23,8 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:scaleType="centerCrop"
-                tools:ignore="ContentDescription,UnusedAttribute" />
+                tools:ignore="ContentDescription,UnusedAttribute"
+                tools:srcCompat="@tools:sample/backgrounds/scenic[8]" />
         </code.name.monkey.retromusic.views.WidthFitSquareLayout>
     </com.google.android.material.card.MaterialCardView>
 </FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_banner_home.xml b/app/src/main/res/layout/fragment_banner_home.xml
index 3d2433512..526310b32 100644
--- a/app/src/main/res/layout/fragment_banner_home.xml
+++ b/app/src/main/res/layout/fragment_banner_home.xml
@@ -40,14 +40,15 @@
                 android:layout_height="228dp"
                 app:layout_collapseMode="parallax">
 
-                <ImageView
+                <androidx.appcompat.widget.AppCompatImageView
                     android:id="@+id/bannerImage"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:scaleType="centerCrop"
                     app:layout_collapseMode="parallax"
                     tools:background="@color/md_red_400"
-                    tools:ignore="ContentDescription" />
+                    tools:ignore="ContentDescription"
+                    tools:srcCompat="@tools:sample/backgrounds/scenic[9]" />
             </FrameLayout>
 
             <LinearLayout
diff --git a/app/src/main/res/layout/fragment_blur.xml b/app/src/main/res/layout/fragment_blur.xml
index e06fa1f69..ff19ebea8 100644
--- a/app/src/main/res/layout/fragment_blur.xml
+++ b/app/src/main/res/layout/fragment_blur.xml
@@ -45,7 +45,8 @@
                 android:id="@+id/playerAlbumCoverFragment"
                 android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content" />
+                android:layout_height="wrap_content"
+                tools:layout="@layout/fragment_album_cover" />
         </code.name.monkey.retromusic.views.WidthFitSquareLayout>
 
         <FrameLayout
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 465676f65..c63eb8fef 100644
--- a/app/src/main/res/layout/fragment_card_blur_player.xml
+++ b/app/src/main/res/layout/fragment_card_blur_player.xml
@@ -67,7 +67,8 @@
                     android:id="@+id/playerAlbumCoverFragment"
                     android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content" />
+                    android:layout_height="wrap_content"
+                    tools:layout="@layout/fragment_album_card_cover" />
             </FrameLayout>
 
         </LinearLayout>
diff --git a/app/src/main/res/layout/fragment_card_player.xml b/app/src/main/res/layout/fragment_card_player.xml
index f6a5e308e..9f79c43aa 100644
--- a/app/src/main/res/layout/fragment_card_player.xml
+++ b/app/src/main/res/layout/fragment_card_player.xml
@@ -33,7 +33,6 @@
             android:layout_height="wrap_content"
             android:layout_weight="0">
 
-
             <code.name.monkey.appthemehelper.common.views.ATEToolbar
                 android:id="@+id/playerToolbar"
                 style="@style/Toolbar"
diff --git a/app/src/main/res/layout/fragment_classic_player.xml b/app/src/main/res/layout/fragment_classic_player.xml
index a4388008a..728538406 100644
--- a/app/src/main/res/layout/fragment_classic_player.xml
+++ b/app/src/main/res/layout/fragment_classic_player.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout 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">
 
@@ -44,7 +45,8 @@
                         android:id="@+id/playerAlbumCoverFragment"
                         class="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
                         android:layout_width="match_parent"
-                        android:layout_height="wrap_content" />
+                        android:layout_height="wrap_content"
+                        tools:layout="@layout/fragment_album_full_cover" />
 
                 </code.name.monkey.retromusic.views.WidthFitSquareLayout>
 
@@ -103,7 +105,7 @@
 
                 <RelativeLayout
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content" >
+                    android:layout_height="wrap_content">
 
                     <!--This is necessary for the drag sorting to work at the top-->
                     <View
diff --git a/app/src/main/res/layout/fragment_color_player.xml b/app/src/main/res/layout/fragment_color_player.xml
index 28a6cca9f..94fd71152 100644
--- a/app/src/main/res/layout/fragment_color_player.xml
+++ b/app/src/main/res/layout/fragment_color_player.xml
@@ -48,7 +48,8 @@
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:scaleType="centerCrop"
-                    tools:ignore="ContentDescription,UnusedAttribute" />
+                    tools:ignore="ContentDescription,UnusedAttribute"
+                    tools:srcCompat="@tools:sample/backgrounds/scenic[10]" />
 
                 <ScrollView
                     android:id="@+id/lyricsContainer"
diff --git a/app/src/main/res/layout/fragment_flat_player.xml b/app/src/main/res/layout/fragment_flat_player.xml
index cacc58738..7665c2e4a 100644
--- a/app/src/main/res/layout/fragment_flat_player.xml
+++ b/app/src/main/res/layout/fragment_flat_player.xml
@@ -49,7 +49,7 @@
                 android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                tools:layout="@layout/fragment_player_album_cover" />
+                tools:layout="@layout/fragment_album_flat_cover" />
         </code.name.monkey.retromusic.views.WidthFitSquareLayout>
 
         <FrameLayout
diff --git a/app/src/main/res/layout/fragment_full.xml b/app/src/main/res/layout/fragment_full.xml
index 7ebb3a179..847aec392 100644
--- a/app/src/main/res/layout/fragment_full.xml
+++ b/app/src/main/res/layout/fragment_full.xml
@@ -11,7 +11,7 @@
         android:id="@+id/playerAlbumCoverFragment"
         android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="match_parent"
         tools:layout="@layout/fragment_album_full_cover" />
 
     <View
diff --git a/app/src/main/res/layout/fragment_plain_player.xml b/app/src/main/res/layout/fragment_plain_player.xml
index bc236a16c..5e7383de6 100644
--- a/app/src/main/res/layout/fragment_plain_player.xml
+++ b/app/src/main/res/layout/fragment_plain_player.xml
@@ -63,7 +63,7 @@
                 android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                tools:layout="@layout/fragment_player_album_cover" />
+                tools:layout="@layout/fragment_album_cover" />
         </code.name.monkey.retromusic.views.WidthFitSquareLayout>
 
         <FrameLayout
diff --git a/app/src/main/res/layout/fragment_simple_player.xml b/app/src/main/res/layout/fragment_simple_player.xml
index eb84c9332..50b534719 100644
--- a/app/src/main/res/layout/fragment_simple_player.xml
+++ b/app/src/main/res/layout/fragment_simple_player.xml
@@ -31,7 +31,7 @@
                 android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                tools:layout="@layout/fragment_player_album_cover" />
+                tools:layout="@layout/fragment_album_cover" />
         </code.name.monkey.retromusic.views.WidthFitSquareLayout>
 
         <FrameLayout