diff --git a/app/src/main/java/com/cappielloantonio/play/ui/fragment/AlbumCatalogueFragment.java b/app/src/main/java/com/cappielloantonio/play/ui/fragment/AlbumCatalogueFragment.java
index cf0baaf1..cce071f5 100644
--- a/app/src/main/java/com/cappielloantonio/play/ui/fragment/AlbumCatalogueFragment.java
+++ b/app/src/main/java/com/cappielloantonio/play/ui/fragment/AlbumCatalogueFragment.java
@@ -113,7 +113,7 @@ public class AlbumCatalogueFragment extends Fragment {
 
     @Override
     public void onCreateOptionsMenu(@NonNull Menu menu, @NonNull MenuInflater inflater) {
-        inflater.inflate(R.menu.album_catalogue_menu, menu);
+        inflater.inflate(R.menu.toolbar_menu, menu);
 
         MenuItem searchItem = menu.findItem(R.id.action_search);
 
diff --git a/app/src/main/java/com/cappielloantonio/play/ui/fragment/ArtistCatalogueFragment.java b/app/src/main/java/com/cappielloantonio/play/ui/fragment/ArtistCatalogueFragment.java
index 7788ba70..ff9810b9 100644
--- a/app/src/main/java/com/cappielloantonio/play/ui/fragment/ArtistCatalogueFragment.java
+++ b/app/src/main/java/com/cappielloantonio/play/ui/fragment/ArtistCatalogueFragment.java
@@ -113,7 +113,7 @@ public class ArtistCatalogueFragment extends Fragment {
 
     @Override
     public void onCreateOptionsMenu(@NonNull Menu menu, @NonNull MenuInflater inflater) {
-        inflater.inflate(R.menu.album_catalogue_menu, menu);
+        inflater.inflate(R.menu.toolbar_menu, menu);
 
         MenuItem searchItem = menu.findItem(R.id.action_search);
 
diff --git a/app/src/main/java/com/cappielloantonio/play/ui/fragment/GenreCatalogueFragment.java b/app/src/main/java/com/cappielloantonio/play/ui/fragment/GenreCatalogueFragment.java
index 8e4c473a..34556b78 100644
--- a/app/src/main/java/com/cappielloantonio/play/ui/fragment/GenreCatalogueFragment.java
+++ b/app/src/main/java/com/cappielloantonio/play/ui/fragment/GenreCatalogueFragment.java
@@ -126,7 +126,7 @@ public class GenreCatalogueFragment extends Fragment {
 
     @Override
     public void onCreateOptionsMenu(@NonNull Menu menu, @NonNull MenuInflater inflater) {
-        inflater.inflate(R.menu.album_catalogue_menu, menu);
+        inflater.inflate(R.menu.toolbar_menu, menu);
 
         MenuItem searchItem = menu.findItem(R.id.action_search);
 
diff --git a/app/src/main/java/com/cappielloantonio/play/ui/fragment/PlaylistCatalogueFragment.java b/app/src/main/java/com/cappielloantonio/play/ui/fragment/PlaylistCatalogueFragment.java
index 05b35fa0..3340146e 100644
--- a/app/src/main/java/com/cappielloantonio/play/ui/fragment/PlaylistCatalogueFragment.java
+++ b/app/src/main/java/com/cappielloantonio/play/ui/fragment/PlaylistCatalogueFragment.java
@@ -109,7 +109,7 @@ public class PlaylistCatalogueFragment extends Fragment {
 
     @Override
     public void onCreateOptionsMenu(@NonNull Menu menu, @NonNull MenuInflater inflater) {
-        inflater.inflate(R.menu.album_catalogue_menu, menu);
+        inflater.inflate(R.menu.toolbar_menu, menu);
 
         MenuItem searchItem = menu.findItem(R.id.action_search);
 
diff --git a/app/src/main/res/drawable/button_favorite_selector.xml b/app/src/main/res/drawable/button_favorite_selector.xml
index 540ec2ee..d34ba9b1 100644
--- a/app/src/main/res/drawable/button_favorite_selector.xml
+++ b/app/src/main/res/drawable/button_favorite_selector.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/ic_favorite" android:state_checked="true" android:color="@color/titleTextColor"/>
-    <item android:drawable="@drawable/ic_favorites_outlined" android:state_checked="false" android:color="@color/titleTextColor" />
+    <item android:color="@color/titleTextColor" android:drawable="@drawable/ic_favorite" android:state_checked="true" />
+    <item android:color="@color/titleTextColor" android:drawable="@drawable/ic_favorites_outlined" android:state_checked="false" />
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_play_pause_selector.xml b/app/src/main/res/drawable/button_play_pause_selector.xml
index 79b2b707..0c3018c3 100644
--- a/app/src/main/res/drawable/button_play_pause_selector.xml
+++ b/app/src/main/res/drawable/button_play_pause_selector.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/ic_play" android:state_checked="true" android:color="@color/titleTextColor"/>
-    <item android:drawable="@drawable/ic_pause" android:state_checked="false" android:color="@color/titleTextColor" />
+    <item android:color="@color/titleTextColor" android:drawable="@drawable/ic_play" android:state_checked="true" />
+    <item android:color="@color/titleTextColor" android:drawable="@drawable/ic_pause" android:state_checked="false" />
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/gradient_backdrop_background_image.xml b/app/src/main/res/drawable/gradient_backdrop_background_image.xml
index ef1747d5..7a7d77c3 100644
--- a/app/src/main/res/drawable/gradient_backdrop_background_image.xml
+++ b/app/src/main/res/drawable/gradient_backdrop_background_image.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <gradient
-        android:startColor="#00000000"
-        android:endColor="#FF121212"
         android:angle="270"
-        android:dither="true" />
+        android:dither="true"
+        android:endColor="#FF121212"
+        android:startColor="#00000000" />
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/gradient_discover_background_image.xml b/app/src/main/res/drawable/gradient_discover_background_image.xml
index f034255a..09e19cb8 100644
--- a/app/src/main/res/drawable/gradient_discover_background_image.xml
+++ b/app/src/main/res/drawable/gradient_discover_background_image.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <gradient
-        android:startColor="#00000000"
-        android:endColor="#FF000000"
         android:angle="180"
-        android:dither="true" />
+        android:dither="true"
+        android:endColor="#FF000000"
+        android:startColor="#00000000" />
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_arrow_back.xml b/app/src/main/res/drawable/ic_arrow_back.xml
index b941b121..77bb91d6 100644
--- a/app/src/main/res/drawable/ic_arrow_back.xml
+++ b/app/src/main/res/drawable/ic_arrow_back.xml
@@ -3,7 +3,7 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-  <path
-      android:fillColor="@color/titleTextColor"
-      android:pathData="M20,11H7.83l5.59,-5.59L12,4l-8,8 8,8 1.41,-1.41L7.83,13H20v-2z"/>
+    <path
+        android:fillColor="@color/titleTextColor"
+        android:pathData="M20,11H7.83l5.59,-5.59L12,4l-8,8 8,8 1.41,-1.41L7.83,13H20v-2z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_check_circle.xml b/app/src/main/res/drawable/ic_check_circle.xml
index 53a6ad40..7435e424 100644
--- a/app/src/main/res/drawable/ic_check_circle.xml
+++ b/app/src/main/res/drawable/ic_check_circle.xml
@@ -3,7 +3,7 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-  <path
-      android:fillColor="@color/titleTextColor"
-      android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8zM16.59,7.58L10,14.17l-2.59,-2.58L6,13l4,4 8,-8z"/>
+    <path
+        android:fillColor="@color/titleTextColor"
+        android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8zM16.59,7.58L10,14.17l-2.59,-2.58L6,13l4,4 8,-8z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_close.xml b/app/src/main/res/drawable/ic_close.xml
index 16d6d37d..d5d2297a 100644
--- a/app/src/main/res/drawable/ic_close.xml
+++ b/app/src/main/res/drawable/ic_close.xml
@@ -1,10 +1,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
+    android:tint="?attr/colorControlNormal"
     android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z"/>
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_done.xml b/app/src/main/res/drawable/ic_done.xml
index 122a7ac6..fee2fd7d 100644
--- a/app/src/main/res/drawable/ic_done.xml
+++ b/app/src/main/res/drawable/ic_done.xml
@@ -3,7 +3,7 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-  <path
-      android:fillColor="@color/titleTextColor"
-      android:pathData="M9,16.2L4.8,12l-1.4,1.4L9,19 21,7l-1.4,-1.4L9,16.2z"/>
+    <path
+        android:fillColor="@color/titleTextColor"
+        android:pathData="M9,16.2L4.8,12l-1.4,1.4L9,19 21,7l-1.4,-1.4L9,16.2z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_downloading.xml b/app/src/main/res/drawable/ic_downloading.xml
index dc70bf7d..057c6b99 100644
--- a/app/src/main/res/drawable/ic_downloading.xml
+++ b/app/src/main/res/drawable/ic_downloading.xml
@@ -3,7 +3,7 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-  <path
-      android:fillColor="@color/titleTextColor"
-      android:pathData="M18.32,4.26C16.84,3.05 15.01,2.25 13,2.05v2.02c1.46,0.18 2.79,0.76 3.9,1.62L18.32,4.26zM19.93,11h2.02c-0.2,-2.01 -1,-3.84 -2.21,-5.32L18.31,7.1C19.17,8.21 19.75,9.54 19.93,11zM18.31,16.9l1.43,1.43c1.21,-1.48 2.01,-3.32 2.21,-5.32h-2.02C19.75,14.46 19.17,15.79 18.31,16.9zM13,19.93v2.02c2.01,-0.2 3.84,-1 5.32,-2.21l-1.43,-1.43C15.79,19.17 14.46,19.75 13,19.93zM15.59,10.59L13,13.17V7h-2v6.17l-2.59,-2.59L7,12l5,5l5,-5L15.59,10.59zM11,19.93v2.02c-5.05,-0.5 -9,-4.76 -9,-9.95s3.95,-9.45 9,-9.95v2.02C7.05,4.56 4,7.92 4,12S7.05,19.44 11,19.93z"/>
+    <path
+        android:fillColor="@color/titleTextColor"
+        android:pathData="M18.32,4.26C16.84,3.05 15.01,2.25 13,2.05v2.02c1.46,0.18 2.79,0.76 3.9,1.62L18.32,4.26zM19.93,11h2.02c-0.2,-2.01 -1,-3.84 -2.21,-5.32L18.31,7.1C19.17,8.21 19.75,9.54 19.93,11zM18.31,16.9l1.43,1.43c1.21,-1.48 2.01,-3.32 2.21,-5.32h-2.02C19.75,14.46 19.17,15.79 18.31,16.9zM13,19.93v2.02c2.01,-0.2 3.84,-1 5.32,-2.21l-1.43,-1.43C15.79,19.17 14.46,19.75 13,19.93zM15.59,10.59L13,13.17V7h-2v6.17l-2.59,-2.59L7,12l5,5l5,-5L15.59,10.59zM11,19.93v2.02c-5.05,-0.5 -9,-4.76 -9,-9.95s3.95,-9.45 9,-9.95v2.02C7.05,4.56 4,7.92 4,12S7.05,19.44 11,19.93z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_drag_handle.xml b/app/src/main/res/drawable/ic_drag_handle.xml
index 68166d4e..3c6cdf66 100644
--- a/app/src/main/res/drawable/ic_drag_handle.xml
+++ b/app/src/main/res/drawable/ic_drag_handle.xml
@@ -3,7 +3,7 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-  <path
-      android:fillColor="@color/titleTextColor"
-      android:pathData="M19,9H5c-0.55,0 -1,0.45 -1,1s0.45,1 1,1h14c0.55,0 1,-0.45 1,-1s-0.45,-1 -1,-1zM5,15h14c0.55,0 1,-0.45 1,-1s-0.45,-1 -1,-1H5c-0.55,0 -1,0.45 -1,1s0.45,1 1,1z"/>
+    <path
+        android:fillColor="@color/titleTextColor"
+        android:pathData="M19,9H5c-0.55,0 -1,0.45 -1,1s0.45,1 1,1h14c0.55,0 1,-0.45 1,-1s-0.45,-1 -1,-1zM5,15h14c0.55,0 1,-0.45 1,-1s-0.45,-1 -1,-1H5c-0.55,0 -1,0.45 -1,1s0.45,1 1,1z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_error.xml b/app/src/main/res/drawable/ic_error.xml
index e5a5f372..8cffcf17 100644
--- a/app/src/main/res/drawable/ic_error.xml
+++ b/app/src/main/res/drawable/ic_error.xml
@@ -3,7 +3,7 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-  <path
-      android:fillColor="@color/titleTextColor"
-      android:pathData="M11,15h2v2h-2v-2zM11,7h2v6h-2L11,7zM11.99,2C6.47,2 2,6.48 2,12s4.47,10 9.99,10C17.52,22 22,17.52 22,12S17.52,2 11.99,2zM12,20c-4.42,0 -8,-3.58 -8,-8s3.58,-8 8,-8 8,3.58 8,8 -3.58,8 -8,8z"/>
+    <path
+        android:fillColor="@color/titleTextColor"
+        android:pathData="M11,15h2v2h-2v-2zM11,7h2v6h-2L11,7zM11.99,2C6.47,2 2,6.48 2,12s4.47,10 9.99,10C17.52,22 22,17.52 22,12S17.52,2 11.99,2zM12,20c-4.42,0 -8,-3.58 -8,-8s3.58,-8 8,-8 8,3.58 8,8 -3.58,8 -8,8z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_favorite.xml b/app/src/main/res/drawable/ic_favorite.xml
index af39c7c9..753a4220 100644
--- a/app/src/main/res/drawable/ic_favorite.xml
+++ b/app/src/main/res/drawable/ic_favorite.xml
@@ -3,7 +3,7 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-  <path
-      android:fillColor="@color/titleTextColor"
-      android:pathData="M12,21.35l-1.45,-1.32C5.4,15.36 2,12.28 2,8.5 2,5.42 4.42,3 7.5,3c1.74,0 3.41,0.81 4.5,2.09C13.09,3.81 14.76,3 16.5,3 19.58,3 22,5.42 22,8.5c0,3.78 -3.4,6.86 -8.55,11.54L12,21.35z"/>
+    <path
+        android:fillColor="@color/titleTextColor"
+        android:pathData="M12,21.35l-1.45,-1.32C5.4,15.36 2,12.28 2,8.5 2,5.42 4.42,3 7.5,3c1.74,0 3.41,0.81 4.5,2.09C13.09,3.81 14.76,3 16.5,3 19.58,3 22,5.42 22,8.5c0,3.78 -3.4,6.86 -8.55,11.54L12,21.35z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_favorites_outlined.xml b/app/src/main/res/drawable/ic_favorites_outlined.xml
index 5ce8a48a..03706ffe 100644
--- a/app/src/main/res/drawable/ic_favorites_outlined.xml
+++ b/app/src/main/res/drawable/ic_favorites_outlined.xml
@@ -3,7 +3,7 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-  <path
-      android:fillColor="@color/titleTextColor"
-      android:pathData="M16.5,3c-1.74,0 -3.41,0.81 -4.5,2.09C10.91,3.81 9.24,3 7.5,3 4.42,3 2,5.42 2,8.5c0,3.78 3.4,6.86 8.55,11.54L12,21.35l1.45,-1.32C18.6,15.36 22,12.28 22,8.5 22,5.42 19.58,3 16.5,3zM12.1,18.55l-0.1,0.1 -0.1,-0.1C7.14,14.24 4,11.39 4,8.5 4,6.5 5.5,5 7.5,5c1.54,0 3.04,0.99 3.57,2.36h1.87C13.46,5.99 14.96,5 16.5,5c2,0 3.5,1.5 3.5,3.5 0,2.89 -3.14,5.74 -7.9,10.05z"/>
+    <path
+        android:fillColor="@color/titleTextColor"
+        android:pathData="M16.5,3c-1.74,0 -3.41,0.81 -4.5,2.09C10.91,3.81 9.24,3 7.5,3 4.42,3 2,5.42 2,8.5c0,3.78 3.4,6.86 8.55,11.54L12,21.35l1.45,-1.32C18.6,15.36 22,12.28 22,8.5 22,5.42 19.58,3 16.5,3zM12.1,18.55l-0.1,0.1 -0.1,-0.1C7.14,14.24 4,11.39 4,8.5 4,6.5 5.5,5 7.5,5c1.54,0 3.04,0.99 3.57,2.36h1.87C13.46,5.99 14.96,5 16.5,5c2,0 3.5,1.5 3.5,3.5 0,2.89 -3.14,5.74 -7.9,10.05z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_filter_list.xml b/app/src/main/res/drawable/ic_filter_list.xml
index 6ff78015..9c116d2e 100644
--- a/app/src/main/res/drawable/ic_filter_list.xml
+++ b/app/src/main/res/drawable/ic_filter_list.xml
@@ -3,7 +3,7 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-  <path
-      android:fillColor="@color/titleTextColor"
-      android:pathData="M10,18h4v-2h-4v2zM3,6v2h18L21,6L3,6zM6,13h12v-2L6,11v2z"/>
+    <path
+        android:fillColor="@color/titleTextColor"
+        android:pathData="M10,18h4v-2h-4v2zM3,6v2h18L21,6L3,6zM6,13h12v-2L6,11v2z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_graphic_eq.xml b/app/src/main/res/drawable/ic_graphic_eq.xml
index 3932127d..c9f4b0f4 100644
--- a/app/src/main/res/drawable/ic_graphic_eq.xml
+++ b/app/src/main/res/drawable/ic_graphic_eq.xml
@@ -3,7 +3,7 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="M8,18c0.55,0 1,-0.45 1,-1L9,7c0,-0.55 -0.45,-1 -1,-1s-1,0.45 -1,1v10c0,0.55 0.45,1 1,1zM12,22c0.55,0 1,-0.45 1,-1L13,3c0,-0.55 -0.45,-1 -1,-1s-1,0.45 -1,1v18c0,0.55 0.45,1 1,1zM4,14c0.55,0 1,-0.45 1,-1v-2c0,-0.55 -0.45,-1 -1,-1s-1,0.45 -1,1v2c0,0.55 0.45,1 1,1zM16,18c0.55,0 1,-0.45 1,-1L17,7c0,-0.55 -0.45,-1 -1,-1s-1,0.45 -1,1v10c0,0.55 0.45,1 1,1zM19,11v2c0,0.55 0.45,1 1,1s1,-0.45 1,-1v-2c0,-0.55 -0.45,-1 -1,-1s-1,0.45 -1,1z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M8,18c0.55,0 1,-0.45 1,-1L9,7c0,-0.55 -0.45,-1 -1,-1s-1,0.45 -1,1v10c0,0.55 0.45,1 1,1zM12,22c0.55,0 1,-0.45 1,-1L13,3c0,-0.55 -0.45,-1 -1,-1s-1,0.45 -1,1v18c0,0.55 0.45,1 1,1zM4,14c0.55,0 1,-0.45 1,-1v-2c0,-0.55 -0.45,-1 -1,-1s-1,0.45 -1,1v2c0,0.55 0.45,1 1,1zM16,18c0.55,0 1,-0.45 1,-1L17,7c0,-0.55 -0.45,-1 -1,-1s-1,0.45 -1,1v10c0,0.55 0.45,1 1,1zM19,11v2c0,0.55 0.45,1 1,1s1,-0.45 1,-1v-2c0,-0.55 -0.45,-1 -1,-1s-1,0.45 -1,1z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_home.xml b/app/src/main/res/drawable/ic_home.xml
index ad6065c4..083e7c71 100644
--- a/app/src/main/res/drawable/ic_home.xml
+++ b/app/src/main/res/drawable/ic_home.xml
@@ -3,7 +3,7 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="M12,5.69l5,4.5V18h-2v-6H9v6H7v-7.81l5,-4.5M12,3L2,12h3v8h6v-6h2v6h6v-8h3L12,3z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M12,5.69l5,4.5V18h-2v-6H9v6H7v-7.81l5,-4.5M12,3L2,12h3v8h6v-6h2v6h6v-8h3L12,3z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_more_vert.xml b/app/src/main/res/drawable/ic_more_vert.xml
index 23f95efa..69fb9ecb 100644
--- a/app/src/main/res/drawable/ic_more_vert.xml
+++ b/app/src/main/res/drawable/ic_more_vert.xml
@@ -3,7 +3,7 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-  <path
-      android:fillColor="@color/titleTextColor"
-      android:pathData="M12,8c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM12,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM12,16c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2z"/>
+    <path
+        android:fillColor="@color/titleTextColor"
+        android:pathData="M12,8c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM12,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM12,16c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_pause.xml b/app/src/main/res/drawable/ic_pause.xml
index 68eb36c7..d9b8d165 100644
--- a/app/src/main/res/drawable/ic_pause.xml
+++ b/app/src/main/res/drawable/ic_pause.xml
@@ -3,7 +3,7 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-  <path
-      android:fillColor="@color/titleTextColor"
-      android:pathData="M6,19h4L10,5L6,5v14zM14,5v14h4L18,5h-4z"/>
+    <path
+        android:fillColor="@color/titleTextColor"
+        android:pathData="M6,19h4L10,5L6,5v14zM14,5v14h4L18,5h-4z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_pause_white_24dp.xml b/app/src/main/res/drawable/ic_pause_white_24dp.xml
index 660fbd6b..193030b1 100644
--- a/app/src/main/res/drawable/ic_pause_white_24dp.xml
+++ b/app/src/main/res/drawable/ic_pause_white_24dp.xml
@@ -1,8 +1,8 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:viewportHeight="24.0"
-    android:viewportWidth="24.0">
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
     <path
         android:fillColor="#FFFFFFFF"
         android:pathData="M6,19h4L10,5L6,5v14zM14,5v14h4L18,5h-4z" />
diff --git a/app/src/main/res/drawable/ic_play.xml b/app/src/main/res/drawable/ic_play.xml
index 0497fc57..f8f81bd5 100644
--- a/app/src/main/res/drawable/ic_play.xml
+++ b/app/src/main/res/drawable/ic_play.xml
@@ -3,7 +3,7 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-  <path
-      android:fillColor="@color/titleTextColor"
-      android:pathData="M8,5v14l11,-7z"/>
+    <path
+        android:fillColor="@color/titleTextColor"
+        android:pathData="M8,5v14l11,-7z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_play_arrow_white_24dp.xml b/app/src/main/res/drawable/ic_play_arrow_white_24dp.xml
index 69301a3c..4250d72c 100644
--- a/app/src/main/res/drawable/ic_play_arrow_white_24dp.xml
+++ b/app/src/main/res/drawable/ic_play_arrow_white_24dp.xml
@@ -1,8 +1,8 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:viewportHeight="24.0"
-    android:viewportWidth="24.0">
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
     <path
         android:fillColor="#FFFFFFFF"
         android:pathData="M8,5v14l11,-7z" />
diff --git a/app/src/main/res/drawable/ic_search.xml b/app/src/main/res/drawable/ic_search.xml
index da931c27..a46bda2f 100644
--- a/app/src/main/res/drawable/ic_search.xml
+++ b/app/src/main/res/drawable/ic_search.xml
@@ -3,7 +3,7 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="M15.5,14h-0.79l-0.28,-0.27C15.41,12.59 16,11.11 16,9.5 16,5.91 13.09,3 9.5,3S3,5.91 3,9.5 5.91,16 9.5,16c1.61,0 3.09,-0.59 4.23,-1.57l0.27,0.28v0.79l5,4.99L20.49,19l-4.99,-5zM9.5,14C7.01,14 5,11.99 5,9.5S7.01,5 9.5,5 14,7.01 14,9.5 11.99,14 9.5,14z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M15.5,14h-0.79l-0.28,-0.27C15.41,12.59 16,11.11 16,9.5 16,5.91 13.09,3 9.5,3S3,5.91 3,9.5 5.91,16 9.5,16c1.61,0 3.09,-0.59 4.23,-1.57l0.27,0.28v0.79l5,4.99L20.49,19l-4.99,-5zM9.5,14C7.01,14 5,11.99 5,9.5S7.01,5 9.5,5 14,7.01 14,9.5 11.99,14 9.5,14z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_settings.xml b/app/src/main/res/drawable/ic_settings.xml
index 282c986f..e50f6fe3 100644
--- a/app/src/main/res/drawable/ic_settings.xml
+++ b/app/src/main/res/drawable/ic_settings.xml
@@ -3,7 +3,7 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="M19.14,12.94c0.04,-0.3 0.06,-0.61 0.06,-0.94c0,-0.32 -0.02,-0.64 -0.07,-0.94l2.03,-1.58c0.18,-0.14 0.23,-0.41 0.12,-0.61l-1.92,-3.32c-0.12,-0.22 -0.37,-0.29 -0.59,-0.22l-2.39,0.96c-0.5,-0.38 -1.03,-0.7 -1.62,-0.94L14.4,2.81c-0.04,-0.24 -0.24,-0.41 -0.48,-0.41h-3.84c-0.24,0 -0.43,0.17 -0.47,0.41L9.25,5.35C8.66,5.59 8.12,5.92 7.63,6.29L5.24,5.33c-0.22,-0.08 -0.47,0 -0.59,0.22L2.74,8.87C2.62,9.08 2.66,9.34 2.86,9.48l2.03,1.58C4.84,11.36 4.8,11.69 4.8,12s0.02,0.64 0.07,0.94l-2.03,1.58c-0.18,0.14 -0.23,0.41 -0.12,0.61l1.92,3.32c0.12,0.22 0.37,0.29 0.59,0.22l2.39,-0.96c0.5,0.38 1.03,0.7 1.62,0.94l0.36,2.54c0.05,0.24 0.24,0.41 0.48,0.41h3.84c0.24,0 0.44,-0.17 0.47,-0.41l0.36,-2.54c0.59,-0.24 1.13,-0.56 1.62,-0.94l2.39,0.96c0.22,0.08 0.47,0 0.59,-0.22l1.92,-3.32c0.12,-0.22 0.07,-0.47 -0.12,-0.61L19.14,12.94zM12,15.6c-1.98,0 -3.6,-1.62 -3.6,-3.6s1.62,-3.6 3.6,-3.6s3.6,1.62 3.6,3.6S13.98,15.6 12,15.6z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M19.14,12.94c0.04,-0.3 0.06,-0.61 0.06,-0.94c0,-0.32 -0.02,-0.64 -0.07,-0.94l2.03,-1.58c0.18,-0.14 0.23,-0.41 0.12,-0.61l-1.92,-3.32c-0.12,-0.22 -0.37,-0.29 -0.59,-0.22l-2.39,0.96c-0.5,-0.38 -1.03,-0.7 -1.62,-0.94L14.4,2.81c-0.04,-0.24 -0.24,-0.41 -0.48,-0.41h-3.84c-0.24,0 -0.43,0.17 -0.47,0.41L9.25,5.35C8.66,5.59 8.12,5.92 7.63,6.29L5.24,5.33c-0.22,-0.08 -0.47,0 -0.59,0.22L2.74,8.87C2.62,9.08 2.66,9.34 2.86,9.48l2.03,1.58C4.84,11.36 4.8,11.69 4.8,12s0.02,0.64 0.07,0.94l-2.03,1.58c-0.18,0.14 -0.23,0.41 -0.12,0.61l1.92,3.32c0.12,0.22 0.37,0.29 0.59,0.22l2.39,-0.96c0.5,0.38 1.03,0.7 1.62,0.94l0.36,2.54c0.05,0.24 0.24,0.41 0.48,0.41h3.84c0.24,0 0.44,-0.17 0.47,-0.41l0.36,-2.54c0.59,-0.24 1.13,-0.56 1.62,-0.94l2.39,0.96c0.22,0.08 0.47,0 0.59,-0.22l1.92,-3.32c0.12,-0.22 0.07,-0.47 -0.12,-0.61L19.14,12.94zM12,15.6c-1.98,0 -3.6,-1.62 -3.6,-3.6s1.62,-3.6 3.6,-3.6s3.6,1.62 3.6,3.6S13.98,15.6 12,15.6z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_shuffle.xml b/app/src/main/res/drawable/ic_shuffle.xml
index 9210568d..1843fc75 100644
--- a/app/src/main/res/drawable/ic_shuffle.xml
+++ b/app/src/main/res/drawable/ic_shuffle.xml
@@ -3,7 +3,7 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-  <path
-      android:fillColor="@color/titleTextColor"
-      android:pathData="M10.59,9.17L5.41,4 4,5.41l5.17,5.17 1.42,-1.41zM14.5,4l2.04,2.04L4,18.59 5.41,20 17.96,7.46 20,9.5L20,4h-5.5zM14.83,13.41l-1.41,1.41 3.13,3.13L14.5,20L20,20v-5.5l-2.04,2.04 -3.13,-3.13z"/>
+    <path
+        android:fillColor="@color/titleTextColor"
+        android:pathData="M10.59,9.17L5.41,4 4,5.41l5.17,5.17 1.42,-1.41zM14.5,4l2.04,2.04L4,18.59 5.41,20 17.96,7.46 20,9.5L20,4h-5.5zM14.83,13.41l-1.41,1.41 3.13,3.13L14.5,20L20,20v-5.5l-2.04,2.04 -3.13,-3.13z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_skip_next.xml b/app/src/main/res/drawable/ic_skip_next.xml
index f237aa3b..15298023 100644
--- a/app/src/main/res/drawable/ic_skip_next.xml
+++ b/app/src/main/res/drawable/ic_skip_next.xml
@@ -3,7 +3,7 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-  <path
-      android:fillColor="@color/titleTextColor"
-      android:pathData="M6,18l8.5,-6L6,6v12zM16,6v12h2V6h-2z"/>
+    <path
+        android:fillColor="@color/titleTextColor"
+        android:pathData="M6,18l8.5,-6L6,6v12zM16,6v12h2V6h-2z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_skip_next_white_24dp.xml b/app/src/main/res/drawable/ic_skip_next_white_24dp.xml
index 473f8513..b5e31f5d 100644
--- a/app/src/main/res/drawable/ic_skip_next_white_24dp.xml
+++ b/app/src/main/res/drawable/ic_skip_next_white_24dp.xml
@@ -1,8 +1,8 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:viewportHeight="24.0"
-    android:viewportWidth="24.0">
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
     <path
         android:fillColor="#FFFFFFFF"
         android:pathData="M6,18l8.5,-6L6,6v12zM16,6v12h2V6h-2z" />
diff --git a/app/src/main/res/drawable/ic_skip_previous_white_24dp.xml b/app/src/main/res/drawable/ic_skip_previous_white_24dp.xml
index 487947c7..dd6c1cb2 100644
--- a/app/src/main/res/drawable/ic_skip_previous_white_24dp.xml
+++ b/app/src/main/res/drawable/ic_skip_previous_white_24dp.xml
@@ -1,8 +1,8 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:viewportHeight="24.0"
-    android:viewportWidth="24.0">
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
     <path
         android:fillColor="#FFFFFFFF"
         android:pathData="M6,6h2v12L6,18zM9.5,12l8.5,6L18,6z" />
diff --git a/app/src/main/res/font/open_sans_font_family.xml b/app/src/main/res/font/open_sans_font_family.xml
deleted file mode 100644
index 05d03a24..00000000
--- a/app/src/main/res/font/open_sans_font_family.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<font-family
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-    <font app:font="@font/regular" app:fontStyle="normal" app:fontWeight="400" />
-    <font app:font="@font/bold" app:fontStyle="normal" app:fontWeight="700" />
-    <font app:font="@font/extra_bold" app:fontStyle="normal" app:fontWeight="900" />
-</font-family>
\ No newline at end of file
diff --git a/app/src/main/res/font/opensans.xml b/app/src/main/res/font/opensans.xml
new file mode 100644
index 00000000..98830240
--- /dev/null
+++ b/app/src/main/res/font/opensans.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<font-family
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+    <font app:font="@font/opensans_regular" app:fontStyle="normal" app:fontWeight="400" />
+    <font app:font="@font/opensans_bold" app:fontStyle="normal" app:fontWeight="700" />
+    <font app:font="@font/opensans_extra_bold" app:fontStyle="normal" app:fontWeight="900" />
+</font-family>
\ No newline at end of file
diff --git a/app/src/main/res/font/bold.ttf b/app/src/main/res/font/opensans_bold.ttf
similarity index 100%
rename from app/src/main/res/font/bold.ttf
rename to app/src/main/res/font/opensans_bold.ttf
diff --git a/app/src/main/res/font/extra_bold.ttf b/app/src/main/res/font/opensans_extra_bold.ttf
similarity index 100%
rename from app/src/main/res/font/extra_bold.ttf
rename to app/src/main/res/font/opensans_extra_bold.ttf
diff --git a/app/src/main/res/font/regular.ttf b/app/src/main/res/font/opensans_regular.ttf
similarity index 100%
rename from app/src/main/res/font/regular.ttf
rename to app/src/main/res/font/opensans_regular.ttf
diff --git a/app/src/main/res/layout/bottom_sheet_album_dialog.xml b/app/src/main/res/layout/bottom_sheet_album_dialog.xml
index e14c56bf..afa45758 100644
--- a/app/src/main/res/layout/bottom_sheet_album_dialog.xml
+++ b/app/src/main/res/layout/bottom_sheet_album_dialog.xml
@@ -30,7 +30,7 @@
             android:ellipsize="marquee"
             android:focusable="true"
             android:focusableInTouchMode="true"
-            android:fontFamily="@font/open_sans_font_family"
+            android:fontFamily="@font/opensans"
             android:marqueeRepeatLimit="marquee_forever"
             android:paddingStart="12dp"
             android:paddingTop="8dp"
@@ -49,7 +49,7 @@
             android:id="@+id/album_artist_text_view"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:fontFamily="@font/open_sans_font_family"
+            android:fontFamily="@font/opensans"
             android:paddingStart="12dp"
             android:paddingEnd="12dp"
             android:text="@string/label_placeholder"
@@ -77,7 +77,7 @@
             android:layout_height="wrap_content"
             android:background="?attr/selectableItemBackground"
             android:clickable="true"
-            android:fontFamily="@font/open_sans_font_family"
+            android:fontFamily="@font/opensans"
             android:paddingStart="20dp"
             android:paddingTop="12dp"
             android:paddingEnd="20dp"
@@ -93,7 +93,7 @@
             android:layout_height="wrap_content"
             android:background="?attr/selectableItemBackground"
             android:clickable="true"
-            android:fontFamily="@font/open_sans_font_family"
+            android:fontFamily="@font/opensans"
             android:paddingStart="20dp"
             android:paddingTop="12dp"
             android:paddingEnd="20dp"
@@ -109,7 +109,7 @@
             android:layout_height="wrap_content"
             android:background="?attr/selectableItemBackground"
             android:clickable="true"
-            android:fontFamily="@font/open_sans_font_family"
+            android:fontFamily="@font/opensans"
             android:paddingStart="20dp"
             android:paddingTop="12dp"
             android:paddingEnd="20dp"
@@ -125,7 +125,7 @@
             android:layout_height="wrap_content"
             android:background="?attr/selectableItemBackground"
             android:clickable="true"
-            android:fontFamily="@font/open_sans_font_family"
+            android:fontFamily="@font/opensans"
             android:paddingStart="20dp"
             android:paddingTop="12dp"
             android:paddingEnd="20dp"
@@ -141,7 +141,7 @@
             android:layout_height="wrap_content"
             android:background="?attr/selectableItemBackground"
             android:clickable="true"
-            android:fontFamily="@font/open_sans_font_family"
+            android:fontFamily="@font/opensans"
             android:paddingStart="20dp"
             android:paddingTop="12dp"
             android:paddingEnd="20dp"
@@ -157,7 +157,7 @@
             android:layout_height="wrap_content"
             android:background="?attr/selectableItemBackground"
             android:clickable="true"
-            android:fontFamily="@font/open_sans_font_family"
+            android:fontFamily="@font/opensans"
             android:paddingStart="20dp"
             android:paddingTop="12dp"
             android:paddingEnd="20dp"
@@ -173,7 +173,7 @@
             android:layout_height="wrap_content"
             android:background="?attr/selectableItemBackground"
             android:clickable="true"
-            android:fontFamily="@font/open_sans_font_family"
+            android:fontFamily="@font/opensans"
             android:paddingStart="20dp"
             android:paddingTop="12dp"
             android:paddingEnd="20dp"
diff --git a/app/src/main/res/layout/bottom_sheet_artist_dialog.xml b/app/src/main/res/layout/bottom_sheet_artist_dialog.xml
index 861abcda..81022e3a 100644
--- a/app/src/main/res/layout/bottom_sheet_artist_dialog.xml
+++ b/app/src/main/res/layout/bottom_sheet_artist_dialog.xml
@@ -30,7 +30,7 @@
             android:ellipsize="marquee"
             android:focusable="true"
             android:focusableInTouchMode="true"
-            android:fontFamily="@font/open_sans_font_family"
+            android:fontFamily="@font/opensans"
             android:marqueeRepeatLimit="marquee_forever"
             android:paddingStart="12dp"
             android:paddingEnd="12dp"
@@ -63,7 +63,7 @@
             android:layout_height="wrap_content"
             android:background="?attr/selectableItemBackground"
             android:clickable="true"
-            android:fontFamily="@font/open_sans_font_family"
+            android:fontFamily="@font/opensans"
             android:paddingStart="20dp"
             android:paddingTop="12dp"
             android:paddingEnd="20dp"
@@ -79,7 +79,7 @@
             android:layout_height="wrap_content"
             android:background="?attr/selectableItemBackground"
             android:clickable="true"
-            android:fontFamily="@font/open_sans_font_family"
+            android:fontFamily="@font/opensans"
             android:paddingStart="20dp"
             android:paddingTop="12dp"
             android:paddingEnd="20dp"
diff --git a/app/src/main/res/layout/bottom_sheet_song_dialog.xml b/app/src/main/res/layout/bottom_sheet_song_dialog.xml
index 84429f4c..5b5522ba 100644
--- a/app/src/main/res/layout/bottom_sheet_song_dialog.xml
+++ b/app/src/main/res/layout/bottom_sheet_song_dialog.xml
@@ -48,7 +48,7 @@
             android:ellipsize="marquee"
             android:focusable="true"
             android:focusableInTouchMode="true"
-            android:fontFamily="@font/open_sans_font_family"
+            android:fontFamily="@font/opensans"
             android:marqueeRepeatLimit="marquee_forever"
             android:paddingStart="12dp"
             android:paddingEnd="12dp"
@@ -66,7 +66,7 @@
             android:id="@+id/song_artist_text_view"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:fontFamily="@font/open_sans_font_family"
+            android:fontFamily="@font/opensans"
             android:paddingStart="12dp"
             android:paddingEnd="12dp"
             android:text="@string/label_placeholder"
@@ -106,7 +106,7 @@
             android:layout_height="wrap_content"
             android:background="?attr/selectableItemBackground"
             android:clickable="true"
-            android:fontFamily="@font/open_sans_font_family"
+            android:fontFamily="@font/opensans"
             android:paddingStart="20dp"
             android:paddingTop="12dp"
             android:paddingEnd="20dp"
@@ -122,7 +122,7 @@
             android:layout_height="wrap_content"
             android:background="?attr/selectableItemBackground"
             android:clickable="true"
-            android:fontFamily="@font/open_sans_font_family"
+            android:fontFamily="@font/opensans"
             android:paddingStart="20dp"
             android:paddingTop="12dp"
             android:paddingEnd="20dp"
@@ -138,7 +138,7 @@
             android:layout_height="wrap_content"
             android:background="?attr/selectableItemBackground"
             android:clickable="true"
-            android:fontFamily="@font/open_sans_font_family"
+            android:fontFamily="@font/opensans"
             android:paddingStart="20dp"
             android:paddingTop="12dp"
             android:paddingEnd="20dp"
@@ -154,7 +154,7 @@
             android:layout_height="wrap_content"
             android:background="?attr/selectableItemBackground"
             android:clickable="true"
-            android:fontFamily="@font/open_sans_font_family"
+            android:fontFamily="@font/opensans"
             android:paddingStart="20dp"
             android:paddingTop="12dp"
             android:paddingEnd="20dp"
@@ -170,7 +170,7 @@
             android:layout_height="wrap_content"
             android:background="?attr/selectableItemBackground"
             android:clickable="true"
-            android:fontFamily="@font/open_sans_font_family"
+            android:fontFamily="@font/opensans"
             android:paddingStart="20dp"
             android:paddingTop="12dp"
             android:paddingEnd="20dp"
@@ -186,7 +186,7 @@
             android:layout_height="wrap_content"
             android:background="?attr/selectableItemBackground"
             android:clickable="true"
-            android:fontFamily="@font/open_sans_font_family"
+            android:fontFamily="@font/opensans"
             android:paddingStart="20dp"
             android:paddingTop="12dp"
             android:paddingEnd="20dp"
@@ -202,7 +202,7 @@
             android:layout_height="wrap_content"
             android:background="?attr/selectableItemBackground"
             android:clickable="true"
-            android:fontFamily="@font/open_sans_font_family"
+            android:fontFamily="@font/opensans"
             android:paddingStart="20dp"
             android:paddingTop="12dp"
             android:paddingEnd="20dp"
diff --git a/app/src/main/res/layout/chip_search_filter_genre.xml b/app/src/main/res/layout/chip_search_filter_genre.xml
index 2cbdf161..54d01126 100644
--- a/app/src/main/res/layout/chip_search_filter_genre.xml
+++ b/app/src/main/res/layout/chip_search_filter_genre.xml
@@ -5,7 +5,7 @@
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:checkable="true"
-    android:fontFamily="@font/open_sans_font_family"
+    android:fontFamily="@font/opensans"
     android:gravity="center"
     android:paddingLeft="8dp"
     android:paddingRight="8dp"
diff --git a/app/src/main/res/layout/player_header_bottom_sheet.xml b/app/src/main/res/layout/player_header_bottom_sheet.xml
index 2f155035..3243ad4b 100644
--- a/app/src/main/res/layout/player_header_bottom_sheet.xml
+++ b/app/src/main/res/layout/player_header_bottom_sheet.xml
@@ -36,7 +36,7 @@
         style="@style/ItemSubtitleTextView"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:fontFamily="@font/open_sans_font_family"
+        android:fontFamily="@font/opensans"
         android:paddingStart="8dp"
         android:paddingEnd="8dp"
         app:layout_constraintEnd_toStartOf="@+id/player_header_button"
diff --git a/app/src/main/res/menu/album_catalogue_menu.xml b/app/src/main/res/menu/toolbar_menu.xml
similarity index 63%
rename from app/src/main/res/menu/album_catalogue_menu.xml
rename to app/src/main/res/menu/toolbar_menu.xml
index 8e16b210..43920171 100644
--- a/app/src/main/res/menu/album_catalogue_menu.xml
+++ b/app/src/main/res/menu/toolbar_menu.xml
@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<menu
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <item
         android:id="@+id/action_search"
         android:icon="@drawable/ic_search"
-        android:title="Search"
-        app:showAsAction="ifRoom"
         android:iconTint="@color/titleTextColor"
-        app:actionViewClass="android.widget.SearchView"/>
+        android:title="Search"
+        app:actionViewClass="android.widget.SearchView"
+        app:showAsAction="ifRoom" />
 
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/navigation/nav_graph.xml b/app/src/main/res/navigation/nav_graph.xml
index a37dfbcf..dc67eb14 100644
--- a/app/src/main/res/navigation/nav_graph.xml
+++ b/app/src/main/res/navigation/nav_graph.xml
@@ -9,7 +9,7 @@
         android:id="@+id/landingFragment"
         android:name="com.cappielloantonio.play.ui.fragment.LandingFragment"
         android:label="fragment_landing"
-        tools:layout="@layout/fragment_landing" >
+        tools:layout="@layout/fragment_landing">
         <action
             android:id="@+id/action_landingFragment_to_loginFragment"
             app:destination="@id/loginFragment"
@@ -58,7 +58,7 @@
             android:id="@+id/action_syncFragment_to_libraryFragment"
             app:destination="@id/libraryFragment"
             app:popUpTo="@id/syncFragment"
-            app:popUpToInclusive="true"/>
+            app:popUpToInclusive="true" />
     </fragment>
 
     <fragment
@@ -94,7 +94,7 @@
             app:destination="@id/playlistCatalogueFragment" />
         <action
             android:id="@+id/action_libraryFragment_to_artistPageFragment"
-            app:destination="@id/artistPageFragment"/>
+            app:destination="@id/artistPageFragment" />
         <action
             android:id="@+id/action_libraryFragment_to_albumPageFragment"
             app:destination="@id/albumPageFragment" />
@@ -128,7 +128,7 @@
         tools:layout="@layout/fragment_search">
         <action
             android:id="@+id/action_searchFragment_to_artistPageFragment"
-            app:destination="@id/artistPageFragment"/>
+            app:destination="@id/artistPageFragment" />
         <action
             android:id="@+id/action_searchFragment_to_albumPageFragment"
             app:destination="@id/albumPageFragment" />
@@ -140,7 +140,7 @@
         android:id="@+id/filterFragment"
         android:name="com.cappielloantonio.play.ui.fragment.FilterFragment"
         android:label="FilterFragment"
-        tools:layout="@layout/fragment_filter" >
+        tools:layout="@layout/fragment_filter">
         <action
             android:id="@+id/action_filterFragment_to_songListPageFragment"
             app:destination="@id/songListPageFragment" />
@@ -152,7 +152,7 @@
         tools:layout="@layout/fragment_artist_catalogue">
         <action
             android:id="@+id/action_artistCatalogueFragment_to_artistPageFragment"
-            app:destination="@id/artistPageFragment"/>
+            app:destination="@id/artistPageFragment" />
     </fragment>
     <fragment
         android:id="@+id/albumCatalogueFragment"
@@ -201,33 +201,30 @@
         android:id="@+id/albumPageFragment"
         android:name="com.cappielloantonio.play.ui.fragment.AlbumPageFragment"
         android:label="AlbumPageFragment"
-        tools:layout="@layout/fragment_album_page"/>
+        tools:layout="@layout/fragment_album_page" />
     <fragment
         android:id="@+id/songListPageFragment"
         android:name="com.cappielloantonio.play.ui.fragment.SongListPageFragment"
         android:label="SongListPageFragment"
-        tools:layout="@layout/fragment_song_list_page"/>
+        tools:layout="@layout/fragment_song_list_page" />
     <fragment
         android:id="@+id/playlistPageFragment"
         android:name="com.cappielloantonio.play.ui.fragment.PlaylistPageFragment"
         android:label="PlaylistPageFragment"
-        tools:layout="@layout/fragment_playlist_page"/>
+        tools:layout="@layout/fragment_playlist_page" />
     <dialog
         android:id="@+id/songBottomSheetDialog"
         android:name="com.cappielloantonio.play.ui.fragment.bottomsheetdialog.SongBottomSheetDialog"
         android:label="SongBottomSheetDialog"
-        tools:layout="@layout/bottom_sheet_song_dialog">
-    </dialog>
+        tools:layout="@layout/bottom_sheet_song_dialog" />
     <dialog
         android:id="@+id/artistBottomSheetDialog"
         android:name="com.cappielloantonio.play.ui.fragment.bottomsheetdialog.ArtistBottomSheetDialog"
         android:label="ArtistBottomSheetDialog"
-        tools:layout="@layout/bottom_sheet_artist_dialog">
-    </dialog>
+        tools:layout="@layout/bottom_sheet_artist_dialog" />
     <dialog
         android:id="@+id/albumBottomSheetDialog"
         android:name="com.cappielloantonio.play.ui.fragment.bottomsheetdialog.AlbumBottomSheetDialog"
         android:label="AlbumBottomSheetDialog"
-        tools:layout="@layout/bottom_sheet_album_dialog">
-    </dialog>
+        tools:layout="@layout/bottom_sheet_album_dialog" />
 </navigation>
\ No newline at end of file
diff --git a/app/src/main/res/values-night/styles.xml b/app/src/main/res/values-night/styles.xml
index e9dbe52c..0ad8a9c4 100644
--- a/app/src/main/res/values-night/styles.xml
+++ b/app/src/main/res/values-night/styles.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+
     <style name="AppTheme" parent="Theme.MaterialComponents.DayNight.NoActionBar">
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
diff --git a/app/src/main/res/xml/global_preferences.xml b/app/src/main/res/xml/global_preferences.xml
index 9cb7ebac..fea1b86a 100644
--- a/app/src/main/res/xml/global_preferences.xml
+++ b/app/src/main/res/xml/global_preferences.xml
@@ -1,5 +1,5 @@
-<PreferenceScreen xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:android="http://schemas.android.com/apk/res/android">
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
     <PreferenceCategory app:title="@string/general_header">
         <ListPreference
             app:defaultValue="400000000"
@@ -49,19 +49,19 @@
 
     <PreferenceCategory app:title="@string/sync_header">
         <Preference
-            android:title="@string/music_sync"
             android:key="@string/music_sync"
-            android:summary="@string/music_sync_caption" />
+            android:summary="@string/music_sync_caption"
+            android:title="@string/music_sync" />
 
         <Preference
-            android:title="@string/genres_music_cross_sync"
             android:key="@string/genres_music_cross_sync"
-            android:summary="@string/genres_music_cross_sync_caption" />
+            android:summary="@string/genres_music_cross_sync_caption"
+            android:title="@string/genres_music_cross_sync" />
 
         <Preference
-            android:title="@string/playlist_song_cross_sync"
             android:key="@string/playlist_song_cross_sync"
-            android:summary="@string/playlist_song_cross_sync_caption" />
+            android:summary="@string/playlist_song_cross_sync_caption"
+            android:title="@string/playlist_song_cross_sync" />
 
     </PreferenceCategory>
 
@@ -71,13 +71,13 @@
             app:summary="@string/summary_about" />
 
         <Preference
-            app:title="@string/title_version"
-            app:summary="@string/app_version" />
+            app:summary="@string/app_version"
+            app:title="@string/title_version" />
 
         <!-- preference opens url in browser -->
         <Preference
-            app:title="@string/github_page"
-            app:summary="@string/development">
+            app:summary="@string/development"
+            app:title="@string/github_page">
             <intent
                 android:action="android.intent.action.VIEW"
                 android:data="@string/github_url" />