diff --git a/app/src/main/res/layout/fragment_main_activity_recycler_view.xml b/app/src/main/res/layout/fragment_main_activity_recycler_view.xml
deleted file mode 100644
index 54bcdccb5..000000000
--- a/app/src/main/res/layout/fragment_main_activity_recycler_view.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?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:id="@+id/container"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/recyclerView"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:clipToPadding="false"
-        android:overScrollMode="@integer/overScrollMode"
-        android:scrollbars="none"
-        android:transitionGroup="true"
-        app:layout_dodgeInsetEdges="bottom"
-        tools:listitem="@layout/item_list" />
-
-    <LinearLayout
-        android:id="@android:id/empty"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:gravity="center"
-        android:orientation="vertical"
-        android:visibility="gone"
-        tools:visibility="visible">
-
-        <com.google.android.material.textview.MaterialTextView
-            android:id="@+id/emptyEmoji"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="16dp"
-            android:text="@string/empty_text_emoji"
-            android:textAppearance="@style/TextViewHeadline3" />
-
-        <com.google.android.material.textview.MaterialTextView
-            android:id="@+id/emptyText"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:text="@string/empty"
-            android:textAppearance="@style/TextViewHeadline5"
-            android:textColor="?android:attr/textColorSecondary"
-            tools:visibility="visible" />
-    </LinearLayout>
-</FrameLayout>
diff --git a/app/src/main/res/layout/fragment_mini_player.xml b/app/src/main/res/layout/fragment_mini_player.xml
index a52709afd..9962b68e0 100644
--- a/app/src/main/res/layout/fragment_mini_player.xml
+++ b/app/src/main/res/layout/fragment_mini_player.xml
@@ -1,105 +1,98 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout 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="56dp"
     android:clickable="true"
     android:focusable="true"
-    tools:ignore="UnusedAttribute">
+    android:orientation="horizontal"
+    android:paddingStart="8dp"
+    android:paddingEnd="0dp">
 
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="horizontal"
-        android:paddingStart="8dp"
-        android:paddingEnd="0dp">
-
-        <com.google.android.material.card.MaterialCardView
-            android:id="@+id/imageTextContainer"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical"
-            app:cardCornerRadius="6dp"
-            android:layout_marginStart="8dp"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toEndOf="@id/drag_view"
-            app:layout_constraintTop_toTopOf="parent">
-
-            <androidx.appcompat.widget.AppCompatImageView
-                android:id="@+id/image"
-                android:layout_width="40dp"
-                android:layout_height="40dp"
-                android:layout_gravity="center_vertical"
-                android:gravity="center_vertical"
-                android:scaleType="centerCrop"
-                tools:srcCompat="@tools:sample/backgrounds/scenic"
-                tools:visibility="visible" />
-        </com.google.android.material.card.MaterialCardView>
-
-        <com.google.android.material.textview.MaterialTextView
-            android:id="@+id/miniPlayerTitle"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical"
-            android:layout_marginStart="16dp"
-            android:layout_weight="1"
-            android:ellipsize="marquee"
-            android:focusable="true"
-            android:focusableInTouchMode="true"
-            android:freezesText="true"
-            android:gravity="left"
-            android:marqueeRepeatLimit="marquee_forever"
-            android:scrollHorizontally="true"
-            android:singleLine="true"
-            android:textAppearance="@style/TextViewNormal"
-            android:textColor="?android:attr/textColorPrimary"
-            tools:text="@tools:sample/lorem/random" />
+    <com.google.android.material.card.MaterialCardView
+        android:id="@+id/imageTextContainer"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_vertical"
+        android:layout_marginStart="8dp"
+        app:cardCornerRadius="6dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toEndOf="@id/drag_view"
+        app:layout_constraintTop_toTopOf="parent">
 
         <androidx.appcompat.widget.AppCompatImageView
-            android:id="@+id/actionPrevious"
+            android:id="@+id/image"
             android:layout_width="40dp"
             android:layout_height="40dp"
             android:layout_gravity="center_vertical"
-            android:background="?roundSelector"
-            android:padding="6dp"
-            app:srcCompat="@drawable/ic_skip_previous"
-            app:tint="?attr/colorControlNormal" />
+            android:gravity="center_vertical"
+            android:scaleType="centerCrop"
+            tools:srcCompat="@tools:sample/backgrounds/scenic"
+            tools:visibility="visible" />
+    </com.google.android.material.card.MaterialCardView>
 
-        <FrameLayout
+    <com.google.android.material.textview.MaterialTextView
+        android:id="@+id/miniPlayerTitle"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_vertical"
+        android:layout_marginStart="16dp"
+        android:layout_weight="1"
+        android:ellipsize="marquee"
+        android:focusable="true"
+        android:focusableInTouchMode="true"
+        android:freezesText="true"
+        android:gravity="start"
+        android:marqueeRepeatLimit="marquee_forever"
+        android:scrollHorizontally="true"
+        android:singleLine="true"
+        android:textAppearance="@style/TextViewNormal"
+        android:textColor="?android:attr/textColorPrimary"
+        tools:text="@tools:sample/lorem/random" />
+
+    <androidx.appcompat.widget.AppCompatImageView
+        android:id="@+id/actionPrevious"
+        android:layout_width="40dp"
+        android:layout_height="40dp"
+        android:layout_gravity="center_vertical"
+        android:background="?roundSelector"
+        android:padding="6dp"
+        app:srcCompat="@drawable/ic_skip_previous"
+        app:tint="?attr/colorControlNormal" />
+
+    <FrameLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_vertical">
+
+        <com.google.android.material.progressindicator.CircularProgressIndicator
+            android:id="@+id/progressBar"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical">
-
-            <com.google.android.material.progressindicator.CircularProgressIndicator
-                android:id="@+id/progressBar"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                app:trackCornerRadius="16dp"
-                tools:progress="10" />
-
-            <androidx.appcompat.widget.AppCompatImageView
-                android:id="@+id/miniPlayerPlayPauseButton"
-                android:layout_width="40dp"
-                android:layout_height="40dp"
-                android:layout_gravity="center"
-                android:background="?roundSelector"
-                android:scaleType="center"
-                app:srcCompat="@drawable/ic_pause"
-                app:tint="?attr/colorControlNormal"
-                tools:ignore="ContentDescription" />
-        </FrameLayout>
+            android:layout_gravity="center"
+            app:trackCornerRadius="16dp"
+            tools:progress="10" />
 
         <androidx.appcompat.widget.AppCompatImageView
-            android:id="@+id/actionNext"
+            android:id="@+id/miniPlayerPlayPauseButton"
             android:layout_width="40dp"
             android:layout_height="40dp"
-            android:layout_gravity="center_vertical"
+            android:layout_gravity="center"
             android:background="?roundSelector"
-            android:padding="6dp"
-            app:srcCompat="@drawable/ic_skip_next"
-            app:tint="?attr/colorControlNormal" />
-    </LinearLayout>
+            android:scaleType="center"
+            app:srcCompat="@drawable/ic_pause"
+            app:tint="?attr/colorControlNormal"
+            tools:ignore="ContentDescription" />
+    </FrameLayout>
 
-</FrameLayout>
\ No newline at end of file
+    <androidx.appcompat.widget.AppCompatImageView
+        android:id="@+id/actionNext"
+        android:layout_width="40dp"
+        android:layout_height="40dp"
+        android:layout_gravity="center_vertical"
+        android:background="?roundSelector"
+        android:padding="6dp"
+        app:srcCompat="@drawable/ic_skip_next"
+        app:tint="?attr/colorControlNormal" />
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/navigation/library_graph.xml b/app/src/main/res/navigation/library_graph.xml
index b592676a5..f58195129 100644
--- a/app/src/main/res/navigation/library_graph.xml
+++ b/app/src/main/res/navigation/library_graph.xml
@@ -7,27 +7,27 @@
     <fragment
         android:id="@+id/action_album"
         android:name="code.name.monkey.retromusic.fragments.albums.AlbumsFragment"
-        tools:layout="@layout/fragment_main_activity_recycler_view" />
+        tools:layout="@layout/fragment_main_recycler" />
 
     <fragment
         android:id="@+id/action_artist"
         android:name="code.name.monkey.retromusic.fragments.artists.ArtistsFragment"
-        tools:layout="@layout/fragment_main_activity_recycler_view" />
+        tools:layout="@layout/fragment_main_recycler" />
 
     <fragment
         android:id="@+id/action_song"
         android:name="code.name.monkey.retromusic.fragments.songs.SongsFragment"
-        tools:layout="@layout/fragment_main_activity_recycler_view" />
+        tools:layout="@layout/fragment_main_recycler" />
 
     <fragment
         android:id="@+id/action_genre"
         android:name="code.name.monkey.retromusic.fragments.genres.GenresFragment"
-        tools:layout="@layout/fragment_main_activity_recycler_view" />
+        tools:layout="@layout/fragment_main_recycler" />
 
     <fragment
         android:id="@+id/action_playlist"
         android:name="code.name.monkey.retromusic.fragments.playlists.PlaylistsFragment"
-        tools:layout="@layout/fragment_main_activity_recycler_view" />
+        tools:layout="@layout/fragment_main_recycler" />
 
     <fragment
         android:id="@+id/action_folder"
diff --git a/app/src/main/res/navigation/main_graph.xml b/app/src/main/res/navigation/main_graph.xml
index d1f4f9ab7..721cab2ba 100644
--- a/app/src/main/res/navigation/main_graph.xml
+++ b/app/src/main/res/navigation/main_graph.xml
@@ -82,27 +82,27 @@
     <fragment
         android:id="@+id/action_album"
         android:name="code.name.monkey.retromusic.fragments.albums.AlbumsFragment"
-        tools:layout="@layout/fragment_main_activity_recycler_view" />
+        tools:layout="@layout/fragment_main_recycler" />
 
     <fragment
         android:id="@+id/action_artist"
         android:name="code.name.monkey.retromusic.fragments.artists.ArtistsFragment"
-        tools:layout="@layout/fragment_main_activity_recycler_view" />
+        tools:layout="@layout/fragment_main_recycler" />
 
     <fragment
         android:id="@+id/action_song"
         android:name="code.name.monkey.retromusic.fragments.songs.SongsFragment"
-        tools:layout="@layout/fragment_main_activity_recycler_view" />
+        tools:layout="@layout/fragment_main_recycler" />
 
     <fragment
         android:id="@+id/action_genre"
         android:name="code.name.monkey.retromusic.fragments.genres.GenresFragment"
-        tools:layout="@layout/fragment_main_activity_recycler_view" />
+        tools:layout="@layout/fragment_main_recycler" />
 
     <fragment
         android:id="@+id/action_playlist"
         android:name="code.name.monkey.retromusic.fragments.playlists.PlaylistsFragment"
-        tools:layout="@layout/fragment_main_activity_recycler_view" />
+        tools:layout="@layout/fragment_main_recycler" />
 
     <fragment
         android:id="@+id/action_folder"