diff --git a/app/src/main/java/com/cappielloantonio/play/ui/activity/base/BaseActivity.java b/app/src/main/java/com/cappielloantonio/play/ui/activity/base/BaseActivity.java
index e66a7197..184dd182 100644
--- a/app/src/main/java/com/cappielloantonio/play/ui/activity/base/BaseActivity.java
+++ b/app/src/main/java/com/cappielloantonio/play/ui/activity/base/BaseActivity.java
@@ -39,7 +39,7 @@ public class BaseActivity extends AppCompatActivity {
     @Override
     protected void onStart() {
         super.onStart();
-        initializeBarColors();
+        setNavigationBarColor();
         initializeBrowser();
     }
 
@@ -111,8 +111,7 @@ public class BaseActivity extends AppCompatActivity {
         CastContext.getSharedInstance(this);
     }
 
-    private void initializeBarColors() {
-        getWindow().setStatusBarColor(SurfaceColors.getColorForElevation(this, 10));
+    private void setNavigationBarColor() {
         getWindow().setNavigationBarColor(SurfaceColors.getColorForElevation(this, 10));
     }
 }
diff --git a/app/src/main/res/layout/fragment_album_catalogue.xml b/app/src/main/res/layout/fragment_album_catalogue.xml
index 28e47d4d..4bd8cbe2 100644
--- a/app/src/main/res/layout/fragment_album_catalogue.xml
+++ b/app/src/main/res/layout/fragment_album_catalogue.xml
@@ -26,6 +26,7 @@
                 android:id="@+id/album_info_sector"
                 android:layout_width="match_parent"
                 android:layout_height="172dp"
+                android:background="?attr/colorSurface"
                 app:layout_scrollFlags="scroll|exitUntilCollapsed|snap">
 
                 <TextView
diff --git a/app/src/main/res/layout/fragment_album_list_page.xml b/app/src/main/res/layout/fragment_album_list_page.xml
index f3dbf02c..cd735806 100644
--- a/app/src/main/res/layout/fragment_album_list_page.xml
+++ b/app/src/main/res/layout/fragment_album_list_page.xml
@@ -26,6 +26,7 @@
                 android:id="@+id/album_info_sector"
                 android:layout_width="match_parent"
                 android:layout_height="172dp"
+                android:background="?attr/colorSurface"
                 android:clipChildren="false"
                 app:layout_scrollFlags="scroll|exitUntilCollapsed|snap">
 
diff --git a/app/src/main/res/layout/fragment_album_page.xml b/app/src/main/res/layout/fragment_album_page.xml
index 8d0a8ba3..8417668e 100644
--- a/app/src/main/res/layout/fragment_album_page.xml
+++ b/app/src/main/res/layout/fragment_album_page.xml
@@ -9,6 +9,7 @@
         android:id="@+id/anim_toolbar"
         android:layout_width="match_parent"
         android:layout_height="?attr/actionBarSize"
+        android:background="?attr/colorSurface"
         app:layout_collapseMode="pin"
         app:navigationIcon="@drawable/ic_arrow_back" />
 
@@ -136,7 +137,7 @@
                         android:textAllCaps="false"
                         app:icon="@drawable/ic_shuffle"
                         app:iconGravity="textStart"
-                        app:iconPadding="18dp"/>
+                        app:iconPadding="18dp" />
                 </LinearLayout>
 
                 <TextView
diff --git a/app/src/main/res/layout/fragment_artist_catalogue.xml b/app/src/main/res/layout/fragment_artist_catalogue.xml
index 6721e6ce..5b300902 100644
--- a/app/src/main/res/layout/fragment_artist_catalogue.xml
+++ b/app/src/main/res/layout/fragment_artist_catalogue.xml
@@ -26,6 +26,7 @@
                 android:id="@+id/artist_info_sector"
                 android:layout_width="match_parent"
                 android:layout_height="172dp"
+                android:background="?attr/colorSurface"
                 app:layout_scrollFlags="scroll|exitUntilCollapsed|snap">
 
                 <TextView
diff --git a/app/src/main/res/layout/fragment_artist_list_page.xml b/app/src/main/res/layout/fragment_artist_list_page.xml
index 070fca60..64c775a8 100644
--- a/app/src/main/res/layout/fragment_artist_list_page.xml
+++ b/app/src/main/res/layout/fragment_artist_list_page.xml
@@ -26,6 +26,7 @@
                 android:id="@+id/artist_info_sector"
                 android:layout_width="match_parent"
                 android:layout_height="172dp"
+                android:background="?attr/colorSurface"
                 android:clipChildren="false"
                 app:layout_scrollFlags="scroll|exitUntilCollapsed|snap">
 
diff --git a/app/src/main/res/layout/fragment_download.xml b/app/src/main/res/layout/fragment_download.xml
index 7f46ef6f..28a60fc2 100644
--- a/app/src/main/res/layout/fragment_download.xml
+++ b/app/src/main/res/layout/fragment_download.xml
@@ -13,6 +13,7 @@
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:background="?attr/colorSurface"
             app:layout_scrollFlags="scroll|enterAlways|snap">
 
             <LinearLayout
diff --git a/app/src/main/res/layout/fragment_filter.xml b/app/src/main/res/layout/fragment_filter.xml
index 3b84a3e0..83daab6a 100644
--- a/app/src/main/res/layout/fragment_filter.xml
+++ b/app/src/main/res/layout/fragment_filter.xml
@@ -26,6 +26,7 @@
                 android:id="@+id/genre_filter_info_sector"
                 android:layout_width="match_parent"
                 android:layout_height="172dp"
+                android:background="?attr/colorSurface"
                 android:clipChildren="false"
                 app:layout_scrollFlags="scroll|exitUntilCollapsed|snap">
 
diff --git a/app/src/main/res/layout/fragment_genre_catalogue.xml b/app/src/main/res/layout/fragment_genre_catalogue.xml
index 88a16bf2..f3ece665 100644
--- a/app/src/main/res/layout/fragment_genre_catalogue.xml
+++ b/app/src/main/res/layout/fragment_genre_catalogue.xml
@@ -26,6 +26,7 @@
                 android:id="@+id/genre_info_sector"
                 android:layout_width="match_parent"
                 android:layout_height="172dp"
+                android:background="?attr/colorSurface"
                 android:clipChildren="false"
                 app:layout_scrollFlags="scroll|exitUntilCollapsed|snap">
 
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index 7fbe76a5..b4e76fae 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -13,6 +13,7 @@
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:background="?attr/colorSurface"
             app:layout_scrollFlags="scroll|enterAlways|snap">
 
             <LinearLayout
diff --git a/app/src/main/res/layout/fragment_library.xml b/app/src/main/res/layout/fragment_library.xml
index 37835f47..41b604fd 100644
--- a/app/src/main/res/layout/fragment_library.xml
+++ b/app/src/main/res/layout/fragment_library.xml
@@ -13,6 +13,7 @@
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:background="?attr/colorSurface"
             app:layout_scrollFlags="scroll|enterAlways|snap">
 
             <LinearLayout
diff --git a/app/src/main/res/layout/fragment_login.xml b/app/src/main/res/layout/fragment_login.xml
index b118c136..66267bf2 100644
--- a/app/src/main/res/layout/fragment_login.xml
+++ b/app/src/main/res/layout/fragment_login.xml
@@ -25,6 +25,7 @@
                 android:id="@+id/server_info_sector"
                 android:layout_width="match_parent"
                 android:layout_height="172dp"
+                android:background="?attr/colorSurface"
                 app:layout_scrollFlags="scroll|exitUntilCollapsed|snap">
 
                 <TextView
diff --git a/app/src/main/res/layout/fragment_playlist_catalogue.xml b/app/src/main/res/layout/fragment_playlist_catalogue.xml
index b056b8cc..186071dd 100644
--- a/app/src/main/res/layout/fragment_playlist_catalogue.xml
+++ b/app/src/main/res/layout/fragment_playlist_catalogue.xml
@@ -26,6 +26,7 @@
                 android:id="@+id/album_info_sector"
                 android:layout_width="match_parent"
                 android:layout_height="172dp"
+                android:background="?attr/colorSurface"
                 app:layout_scrollFlags="scroll|exitUntilCollapsed|snap">
 
                 <TextView
diff --git a/app/src/main/res/layout/fragment_playlist_page.xml b/app/src/main/res/layout/fragment_playlist_page.xml
index 2903e935..e64bc88f 100644
--- a/app/src/main/res/layout/fragment_playlist_page.xml
+++ b/app/src/main/res/layout/fragment_playlist_page.xml
@@ -152,7 +152,7 @@
                         android:textAllCaps="false"
                         app:icon="@drawable/ic_play"
                         app:iconGravity="textStart"
-                        app:iconPadding="18dp"/>
+                        app:iconPadding="18dp" />
 
                     <Button
                         android:id="@+id/playlist_page_shuffle_button"
@@ -202,7 +202,7 @@
                 android:clipToPadding="false"
                 android:nestedScrollingEnabled="false"
                 android:paddingTop="8dp"
-                android:paddingBottom="@dimen/global_padding_bottom"/>
+                android:paddingBottom="@dimen/global_padding_bottom" />
 
         </LinearLayout>
     </androidx.core.widget.NestedScrollView>
diff --git a/app/src/main/res/layout/fragment_song_list_page.xml b/app/src/main/res/layout/fragment_song_list_page.xml
index d7b06394..d685076f 100644
--- a/app/src/main/res/layout/fragment_song_list_page.xml
+++ b/app/src/main/res/layout/fragment_song_list_page.xml
@@ -27,6 +27,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="172dp"
                 android:clipChildren="false"
+                android:background="?attr/colorSurface"
                 app:layout_scrollFlags="scroll|exitUntilCollapsed|snap">
 
                 <TextView
diff --git a/app/src/main/res/layout/inner_fragment_player_controller_layout.xml b/app/src/main/res/layout/inner_fragment_player_controller_layout.xml
index 42b0022a..06ebd2b8 100644
--- a/app/src/main/res/layout/inner_fragment_player_controller_layout.xml
+++ b/app/src/main/res/layout/inner_fragment_player_controller_layout.xml
@@ -123,13 +123,13 @@
         android:layout_marginTop="18dp"
         android:layout_marginEnd="16dp"
         app:bar_height="2dp"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/player_artist_name_label"
         app:buffered_color="?attr/colorOnSecondaryContainer"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/player_artist_name_label"
         app:played_color="?attr/colorOnPrimaryContainer"
         app:scrubber_color="?attr/colorOnPrimaryContainer"
-        app:unplayed_color="?attr/colorPrimaryContainer"/>
+        app:unplayed_color="?attr/colorPrimaryContainer" />
 
     <TextView
         android:id="@+id/exo_duration"