diff --git a/app/src/main/res/drawable/ic_add_24.xml b/app/src/main/res/drawable/ic_add_24.xml
index c056f550e..91ccc34d8 100644
--- a/app/src/main/res/drawable/ic_add_24.xml
+++ b/app/src/main/res/drawable/ic_add_24.xml
@@ -2,10 +2,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="M11,19V13H5V11H11V5H13V11H19V13H13V19Z"/>
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M11,19V13H5V11H11V5H13V11H19V13H13V19Z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_copy_24.xml b/app/src/main/res/drawable/ic_copy_24.xml
index 65bb96df5..35480bed7 100644
--- a/app/src/main/res/drawable/ic_copy_24.xml
+++ b/app/src/main/res/drawable/ic_copy_24.xml
@@ -2,10 +2,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
+    android:tint="?attr/colorControlNormal"
     android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M200,880Q167,880 143.5,856.5Q120,833 120,800L120,240L200,240L200,800Q200,800 200,800Q200,800 200,800L640,800L640,880L200,880ZM360,720Q327,720 303.5,696.5Q280,673 280,640L280,160Q280,127 303.5,103.5Q327,80 360,80L720,80Q753,80 776.5,103.5Q800,127 800,160L800,640Q800,673 776.5,696.5Q753,720 720,720L360,720ZM360,640L720,640Q720,640 720,640Q720,640 720,640L720,160Q720,160 720,160Q720,160 720,160L360,160Q360,160 360,160Q360,160 360,160L360,640Q360,640 360,640Q360,640 360,640ZM360,640Q360,640 360,640Q360,640 360,640L360,160Q360,160 360,160Q360,160 360,160L360,160Q360,160 360,160Q360,160 360,160L360,640Q360,640 360,640Q360,640 360,640L360,640Z"/>
+    android:viewportHeight="960">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M200,880Q167,880 143.5,856.5Q120,833 120,800L120,240L200,240L200,800Q200,800 200,800Q200,800 200,800L640,800L640,880L200,880ZM360,720Q327,720 303.5,696.5Q280,673 280,640L280,160Q280,127 303.5,103.5Q327,80 360,80L720,80Q753,80 776.5,103.5Q800,127 800,160L800,640Q800,673 776.5,696.5Q753,720 720,720L360,720ZM360,640L720,640Q720,640 720,640Q720,640 720,640L720,160Q720,160 720,160Q720,160 720,160L360,160Q360,160 360,160Q360,160 360,160L360,640Q360,640 360,640Q360,640 360,640ZM360,640Q360,640 360,640Q360,640 360,640L360,160Q360,160 360,160Q360,160 360,160L360,160Q360,160 360,160Q360,160 360,160L360,640Q360,640 360,640Q360,640 360,640L360,640Z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_details_24.xml b/app/src/main/res/drawable/ic_details_24.xml
index 525ec5618..ea9ffe732 100644
--- a/app/src/main/res/drawable/ic_details_24.xml
+++ b/app/src/main/res/drawable/ic_details_24.xml
@@ -2,10 +2,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
+    android:tint="?attr/colorControlNormal"
     android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M360,720L800,720Q800,720 800,720Q800,720 800,720L800,613L360,613L360,720ZM160,347L280,347L280,240L160,240Q160,240 160,240Q160,240 160,240L160,347ZM160,534L280,534L280,427L160,427L160,534ZM160,720L280,720L280,613L160,613L160,720Q160,720 160,720Q160,720 160,720ZM360,534L800,534L800,427L360,427L360,534ZM360,347L800,347L800,240Q800,240 800,240Q800,240 800,240L360,240L360,347ZM160,800Q127,800 103.5,776.5Q80,753 80,720L80,240Q80,207 103.5,183.5Q127,160 160,160L800,160Q833,160 856.5,183.5Q880,207 880,240L880,720Q880,753 856.5,776.5Q833,800 800,800L160,800Z"/>
+    android:viewportHeight="960">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M360,720L800,720Q800,720 800,720Q800,720 800,720L800,613L360,613L360,720ZM160,347L280,347L280,240L160,240Q160,240 160,240Q160,240 160,240L160,347ZM160,534L280,534L280,427L160,427L160,534ZM160,720L280,720L280,613L160,613L160,720Q160,720 160,720Q160,720 160,720ZM360,534L800,534L800,427L360,427L360,534ZM360,347L800,347L800,240Q800,240 800,240Q800,240 800,240L360,240L360,347ZM160,800Q127,800 103.5,776.5Q80,753 80,720L80,240Q80,207 103.5,183.5Q127,160 160,160L800,160Q833,160 856.5,183.5Q880,207 880,240L880,720Q880,753 856.5,776.5Q833,800 800,800L160,800Z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_edit_24.xml b/app/src/main/res/drawable/ic_edit_24.xml
index 9ce54759b..06285a565 100644
--- a/app/src/main/res/drawable/ic_edit_24.xml
+++ b/app/src/main/res/drawable/ic_edit_24.xml
@@ -2,10 +2,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
+    android:tint="?attr/colorControlNormal"
     android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M200,760L256,760L601,415L545,359L200,704L200,760ZM772,357L602,189L715,76L884,245L772,357ZM120,840L120,670L544,246L714,416L290,840L120,840ZM573,387L545,359L545,359L601,415L601,415L573,387Z"/>
+    android:viewportHeight="960">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M200,760L256,760L601,415L545,359L200,704L200,760ZM772,357L602,189L715,76L884,245L772,357ZM120,840L120,670L544,246L714,416L290,840L120,840ZM573,387L545,359L545,359L601,415L601,415L573,387Z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_import_24.xml b/app/src/main/res/drawable/ic_import_24.xml
index 427745f84..9cfbef4c0 100644
--- a/app/src/main/res/drawable/ic_import_24.xml
+++ b/app/src/main/res/drawable/ic_import_24.xml
@@ -2,10 +2,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
+    android:tint="?attr/colorControlNormal"
     android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M440,760L520,760L520,593L584,657L640,600L480,440L320,600L377,656L440,593L440,760ZM240,880Q207,880 183.5,856.5Q160,833 160,800L160,160Q160,127 183.5,103.5Q207,80 240,80L560,80L800,320L800,800Q800,833 776.5,856.5Q753,880 720,880L240,880ZM520,360L520,160L240,160Q240,160 240,160Q240,160 240,160L240,800Q240,800 240,800Q240,800 240,800L720,800Q720,800 720,800Q720,800 720,800L720,360L520,360ZM240,160L240,160L240,360L240,360L240,160L240,360L240,360L240,800Q240,800 240,800Q240,800 240,800L240,800Q240,800 240,800Q240,800 240,800L240,160Q240,160 240,160Q240,160 240,160Z"/>
+    android:viewportHeight="960">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M440,760L520,760L520,593L584,657L640,600L480,440L320,600L377,656L440,593L440,760ZM240,880Q207,880 183.5,856.5Q160,833 160,800L160,160Q160,127 183.5,103.5Q207,80 240,80L560,80L800,320L800,800Q800,833 776.5,856.5Q753,880 720,880L240,880ZM520,360L520,160L240,160Q240,160 240,160Q240,160 240,160L240,800Q240,800 240,800Q240,800 240,800L720,800Q720,800 720,800Q720,800 720,800L720,360L520,360ZM240,160L240,160L240,360L240,360L240,160L240,360L240,360L240,800Q240,800 240,800Q240,800 240,800L240,800Q240,800 240,800Q240,800 240,800L240,160Q240,160 240,160Q240,160 240,160Z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_play_next_24.xml b/app/src/main/res/drawable/ic_play_next_24.xml
index df1a8dd79..b507eea91 100644
--- a/app/src/main/res/drawable/ic_play_next_24.xml
+++ b/app/src/main/res/drawable/ic_play_next_24.xml
@@ -2,10 +2,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
+    android:tint="?attr/colorControlNormal"
     android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M780,900L720,840L840,720L720,600L780,540L960,720L780,900ZM320,840L320,760L160,760Q127,760 103.5,736.5Q80,713 80,680L80,200Q80,167 103.5,143.5Q127,120 160,120L800,120Q833,120 856.5,143.5Q880,167 880,200L880,480L800,480L800,200Q800,200 800,200Q800,200 800,200L160,200Q160,200 160,200Q160,200 160,200L160,680Q160,680 160,680Q160,680 160,680L680,680L680,760L600,760L600,840L320,840ZM440,600L520,600L520,480L640,480L640,400L520,400L520,280L440,280L440,400L320,400L320,480L440,480L440,600ZM160,680L160,680Q160,680 160,680Q160,680 160,680L160,200Q160,200 160,200Q160,200 160,200L160,200Q160,200 160,200Q160,200 160,200L160,680L160,680L160,680Z"/>
+    android:viewportHeight="960">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M780,900L720,840L840,720L720,600L780,540L960,720L780,900ZM320,840L320,760L160,760Q127,760 103.5,736.5Q80,713 80,680L80,200Q80,167 103.5,143.5Q127,120 160,120L800,120Q833,120 856.5,143.5Q880,167 880,200L880,480L800,480L800,200Q800,200 800,200Q800,200 800,200L160,200Q160,200 160,200Q160,200 160,200L160,680Q160,680 160,680Q160,680 160,680L680,680L680,760L600,760L600,840L320,840ZM440,600L520,600L520,480L640,480L640,400L520,400L520,280L440,280L440,400L320,400L320,480L440,480L440,600ZM160,680L160,680Q160,680 160,680Q160,680 160,680L160,200Q160,200 160,200Q160,200 160,200L160,200Q160,200 160,200Q160,200 160,200L160,680L160,680L160,680Z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_playlist_24.xml b/app/src/main/res/drawable/ic_playlist_24.xml
index d92e150b1..e24a5e217 100644
--- a/app/src/main/res/drawable/ic_playlist_24.xml
+++ b/app/src/main/res/drawable/ic_playlist_24.xml
@@ -2,10 +2,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="M2.5,16V14H10.5V16ZM2.5,12V10H14.5V12ZM2.5,8V6H14.5V8ZM15.5,21V13L21.5,17Z"/>
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M2.5,16V14H10.5V16ZM2.5,12V10H14.5V12ZM2.5,8V6H14.5V8ZM15.5,21V13L21.5,17Z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_playlist_add_24.xml b/app/src/main/res/drawable/ic_playlist_add_24.xml
index 6d0cfca3f..fba53c9fd 100644
--- a/app/src/main/res/drawable/ic_playlist_add_24.xml
+++ b/app/src/main/res/drawable/ic_playlist_add_24.xml
@@ -2,11 +2,11 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
+    android:tint="?attr/colorControlNormal"
     android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M120,640L120,560L400,560L400,640L120,640ZM120,480L120,400L560,400L560,480L120,480ZM120,320L120,240L560,240L560,320L120,320ZM640,800L640,640L480,640L480,560L640,560L640,400L720,400L720,560L880,560L880,640L720,640L720,800L640,800Z"/>
+    android:viewportHeight="960">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M120,640L120,560L400,560L400,640L120,640ZM120,480L120,400L560,400L560,480L120,480ZM120,320L120,240L560,240L560,320L120,320ZM640,800L640,640L480,640L480,560L640,560L640,400L720,400L720,560L880,560L880,640L720,640L720,800L640,800Z" />
 </vector>
 
diff --git a/app/src/main/res/drawable/ic_queue_add_24.xml b/app/src/main/res/drawable/ic_queue_add_24.xml
index a9e7e0ac3..d0ea17445 100644
--- a/app/src/main/res/drawable/ic_queue_add_24.xml
+++ b/app/src/main/res/drawable/ic_queue_add_24.xml
@@ -2,10 +2,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
+    android:tint="?attr/colorControlNormal"
     android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M440,600L520,600L520,480L640,480L640,400L520,400L520,280L440,280L440,400L320,400L320,480L440,480L440,600ZM320,840L320,760L160,760Q127,760 103.5,736.5Q80,713 80,680L80,200Q80,167 103.5,143.5Q127,120 160,120L800,120Q833,120 856.5,143.5Q880,167 880,200L880,680Q880,713 856.5,736.5Q833,760 800,760L640,760L640,840L320,840ZM160,680L800,680Q800,680 800,680Q800,680 800,680L800,200Q800,200 800,200Q800,200 800,200L160,200Q160,200 160,200Q160,200 160,200L160,680Q160,680 160,680Q160,680 160,680ZM160,680Q160,680 160,680Q160,680 160,680L160,200Q160,200 160,200Q160,200 160,200L160,200Q160,200 160,200Q160,200 160,200L160,680Q160,680 160,680Q160,680 160,680L160,680Z"/>
+    android:viewportHeight="960">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M440,600L520,600L520,480L640,480L640,400L520,400L520,280L440,280L440,400L320,400L320,480L440,480L440,600ZM320,840L320,760L160,760Q127,760 103.5,736.5Q80,713 80,680L80,200Q80,167 103.5,143.5Q127,120 160,120L800,120Q833,120 856.5,143.5Q880,167 880,200L880,680Q880,713 856.5,736.5Q833,760 800,760L640,760L640,840L320,840ZM160,680L800,680Q800,680 800,680Q800,680 800,680L800,200Q800,200 800,200Q800,200 800,200L160,200Q160,200 160,200Q160,200 160,200L160,680Q160,680 160,680Q160,680 160,680ZM160,680Q160,680 160,680Q160,680 160,680L160,200Q160,200 160,200Q160,200 160,200L160,200Q160,200 160,200Q160,200 160,200L160,680Q160,680 160,680Q160,680 160,680L160,680Z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_save_24.xml b/app/src/main/res/drawable/ic_save_24.xml
index 4fc73a9f3..2fa6cd2e4 100644
--- a/app/src/main/res/drawable/ic_save_24.xml
+++ b/app/src/main/res/drawable/ic_save_24.xml
@@ -2,11 +2,11 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
+    android:tint="@color/sel_activatable_icon"
     android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:tint="@color/sel_activatable_icon">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M840,280L840,840L120,840L120,120L680,120L840,280ZM760,314L646,200L200,200L200,760L760,760L760,314ZM480,720Q530,720 565,685Q600,650 600,600Q600,550 565,515Q530,480 480,480Q430,480 395,515Q360,550 360,600Q360,650 395,685Q430,720 480,720ZM240,400L600,400L600,240L240,240L240,400ZM200,314L200,760L200,760L200,200L200,200L200,314Z"/>
+    android:viewportHeight="960">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M840,280L840,840L120,840L120,120L680,120L840,280ZM760,314L646,200L200,200L200,760L760,760L760,314ZM480,720Q530,720 565,685Q600,650 600,600Q600,550 565,515Q530,480 480,480Q430,480 395,515Q360,550 360,600Q360,650 395,685Q430,720 480,720ZM240,400L600,400L600,240L240,240L240,400ZM200,314L200,760L200,760L200,200L200,200L200,314Z" />
 </vector>
 
diff --git a/app/src/main/res/drawable/ic_share_24.xml b/app/src/main/res/drawable/ic_share_24.xml
index 17485830b..816d28711 100644
--- a/app/src/main/res/drawable/ic_share_24.xml
+++ b/app/src/main/res/drawable/ic_share_24.xml
@@ -2,10 +2,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
+    android:tint="?attr/colorControlNormal"
     android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M720,880Q670,880 635,845Q600,810 600,760Q600,753 601,745.5Q602,738 604,732L322,568Q305,583 284,591.5Q263,600 240,600Q190,600 155,565Q120,530 120,480Q120,430 155,395Q190,360 240,360Q263,360 284,368.5Q305,377 322,392L604,228Q602,222 601,214.5Q600,207 600,200Q600,150 635,115Q670,80 720,80Q770,80 805,115Q840,150 840,200Q840,250 805,285Q770,320 720,320Q697,320 676,311.5Q655,303 638,288L356,452Q358,458 359,465.5Q360,473 360,480Q360,487 359,494.5Q358,502 356,508L638,672Q655,657 676,648.5Q697,640 720,640Q770,640 805,675Q840,710 840,760Q840,810 805,845Q770,880 720,880ZM720,240Q737,240 748.5,228.5Q760,217 760,200Q760,183 748.5,171.5Q737,160 720,160Q703,160 691.5,171.5Q680,183 680,200Q680,217 691.5,228.5Q703,240 720,240ZM240,520Q257,520 268.5,508.5Q280,497 280,480Q280,463 268.5,451.5Q257,440 240,440Q223,440 211.5,451.5Q200,463 200,480Q200,497 211.5,508.5Q223,520 240,520ZM720,800Q737,800 748.5,788.5Q760,777 760,760Q760,743 748.5,731.5Q737,720 720,720Q703,720 691.5,731.5Q680,743 680,760Q680,777 691.5,788.5Q703,800 720,800ZM720,200Q720,200 720,200Q720,200 720,200Q720,200 720,200Q720,200 720,200Q720,200 720,200Q720,200 720,200Q720,200 720,200Q720,200 720,200ZM240,480Q240,480 240,480Q240,480 240,480Q240,480 240,480Q240,480 240,480Q240,480 240,480Q240,480 240,480Q240,480 240,480Q240,480 240,480ZM720,760Q720,760 720,760Q720,760 720,760Q720,760 720,760Q720,760 720,760Q720,760 720,760Q720,760 720,760Q720,760 720,760Q720,760 720,760Z"/>
+    android:viewportHeight="960">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M720,880Q670,880 635,845Q600,810 600,760Q600,753 601,745.5Q602,738 604,732L322,568Q305,583 284,591.5Q263,600 240,600Q190,600 155,565Q120,530 120,480Q120,430 155,395Q190,360 240,360Q263,360 284,368.5Q305,377 322,392L604,228Q602,222 601,214.5Q600,207 600,200Q600,150 635,115Q670,80 720,80Q770,80 805,115Q840,150 840,200Q840,250 805,285Q770,320 720,320Q697,320 676,311.5Q655,303 638,288L356,452Q358,458 359,465.5Q360,473 360,480Q360,487 359,494.5Q358,502 356,508L638,672Q655,657 676,648.5Q697,640 720,640Q770,640 805,675Q840,710 840,760Q840,810 805,845Q770,880 720,880ZM720,240Q737,240 748.5,228.5Q760,217 760,200Q760,183 748.5,171.5Q737,160 720,160Q703,160 691.5,171.5Q680,183 680,200Q680,217 691.5,228.5Q703,240 720,240ZM240,520Q257,520 268.5,508.5Q280,497 280,480Q280,463 268.5,451.5Q257,440 240,440Q223,440 211.5,451.5Q200,463 200,480Q200,497 211.5,508.5Q223,520 240,520ZM720,800Q737,800 748.5,788.5Q760,777 760,760Q760,743 748.5,731.5Q737,720 720,720Q703,720 691.5,731.5Q680,743 680,760Q680,777 691.5,788.5Q703,800 720,800ZM720,200Q720,200 720,200Q720,200 720,200Q720,200 720,200Q720,200 720,200Q720,200 720,200Q720,200 720,200Q720,200 720,200Q720,200 720,200ZM240,480Q240,480 240,480Q240,480 240,480Q240,480 240,480Q240,480 240,480Q240,480 240,480Q240,480 240,480Q240,480 240,480Q240,480 240,480ZM720,760Q720,760 720,760Q720,760 720,760Q720,760 720,760Q720,760 720,760Q720,760 720,760Q720,760 720,760Q720,760 720,760Q720,760 720,760Z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_shuffle_off_24.xml b/app/src/main/res/drawable/ic_shuffle_off_24.xml
index d73a3c489..28a688e1d 100644
--- a/app/src/main/res/drawable/ic_shuffle_off_24.xml
+++ b/app/src/main/res/drawable/ic_shuffle_off_24.xml
@@ -2,10 +2,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
+    android:tint="?attr/colorControlNormal"
     android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M560,800L560,720L664,720L537,593L594,536L720,662L720,560L800,560L800,800L560,800ZM216,800L160,744L664,240L560,240L560,160L800,160L800,400L720,400L720,296L216,800ZM367,423L160,216L216,160L423,367L367,423Z"/>
+    android:viewportHeight="960">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M560,800L560,720L664,720L537,593L594,536L720,662L720,560L800,560L800,800L560,800ZM216,800L160,744L664,240L560,240L560,160L800,160L800,400L720,400L720,296L216,800ZM367,423L160,216L216,160L423,367L367,423Z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_shuffle_on_24.xml b/app/src/main/res/drawable/ic_shuffle_on_24.xml
index 1e4330f55..52d82252f 100644
--- a/app/src/main/res/drawable/ic_shuffle_on_24.xml
+++ b/app/src/main/res/drawable/ic_shuffle_on_24.xml
@@ -2,10 +2,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
+    android:tint="?attr/colorPrimary"
     android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:tint="?attr/colorPrimary">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M546,817L546,703L627,703L528,603L607,524L706,623L706,543L820,543L820,817L546,817ZM219,823L140,744L627,257L546,257L546,143L820,143L820,417L706,417L706,336L219,823ZM359,435L140,216L219,137L438,356L359,435Z"/>
+    android:viewportHeight="960">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M546,817L546,703L627,703L528,603L607,524L706,623L706,543L820,543L820,817L546,817ZM219,823L140,744L627,257L546,257L546,143L820,143L820,417L706,417L706,336L219,823ZM359,435L140,216L219,137L438,356L359,435Z" />
 </vector>
diff --git a/app/src/main/res/drawable/ui_selection_badge_bg.xml b/app/src/main/res/drawable/ui_selection_badge_bg.xml
index d6ae300cc..88a78c3bb 100644
--- a/app/src/main/res/drawable/ui_selection_badge_bg.xml
+++ b/app/src/main/res/drawable/ui_selection_badge_bg.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="oval">
-    <solid
-        android:color="?attr/colorPrimary" />
+    <solid android:color="?attr/colorPrimary" />
     <size
         android:width="20dp"
         android:height="20dp" />
diff --git a/app/src/main/res/layout-h600dp/item_detail_header.xml b/app/src/main/res/layout-h600dp/item_detail_header.xml
index e94d8538f..cdaf0e484 100644
--- a/app/src/main/res/layout-h600dp/item_detail_header.xml
+++ b/app/src/main/res/layout-h600dp/item_detail_header.xml
@@ -4,18 +4,19 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:paddingTop="@dimen/spacing_medium"
     android:paddingStart="@dimen/spacing_medium"
+    android:paddingTop="@dimen/spacing_medium"
     android:paddingEnd="@dimen/spacing_medium"
     android:paddingBottom="@dimen/spacing_mid_medium">
+
     <org.oxycblt.auxio.image.CoverView
         android:id="@+id/detail_cover"
         style="@style/Widget.Auxio.Image.Huge"
+        app:enablePlaybackIndicator="false"
+        app:enableSelectionBadge="false"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:enablePlaybackIndicator="false"
-        app:enableSelectionBadge="false"
         tools:ignore="ContentDescription" />
 
     <TextView
diff --git a/app/src/main/res/layout-land/item_detail_header.xml b/app/src/main/res/layout-land/item_detail_header.xml
index ae5271849..432f6dc3e 100644
--- a/app/src/main/res/layout-land/item_detail_header.xml
+++ b/app/src/main/res/layout-land/item_detail_header.xml
@@ -4,18 +4,18 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:paddingTop="@dimen/spacing_medium"
     android:paddingStart="@dimen/spacing_medium"
+    android:paddingTop="@dimen/spacing_medium"
     android:paddingEnd="@dimen/spacing_medium"
     android:paddingBottom="@dimen/spacing_mid_medium">
 
     <org.oxycblt.auxio.image.CoverView
         android:id="@+id/detail_cover"
         style="@style/Widget.Auxio.Image.Large"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
         app:enablePlaybackIndicator="false"
         app:enableSelectionBadge="false"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
         tools:ignore="ContentDescription" />
 
     <TextView
diff --git a/app/src/main/res/layout-sw600dp/item_detail_header.xml b/app/src/main/res/layout-sw600dp/item_detail_header.xml
index 84632e573..4b354bc58 100644
--- a/app/src/main/res/layout-sw600dp/item_detail_header.xml
+++ b/app/src/main/res/layout-sw600dp/item_detail_header.xml
@@ -10,9 +10,9 @@
     <org.oxycblt.auxio.image.CoverView
         android:id="@+id/detail_cover"
         style="@style/Widget.Auxio.Image.MidHuge"
-        app:layout_constraintDimensionRatio="1"
         app:enablePlaybackIndicator="false"
         app:enableSelectionBadge="false"
+        app:layout_constraintDimensionRatio="1"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         tools:ignore="ContentDescription" />
diff --git a/app/src/main/res/layout-sw840dp/item_detail_header.xml b/app/src/main/res/layout-sw840dp/item_detail_header.xml
index 87dcf941e..d66af44bb 100644
--- a/app/src/main/res/layout-sw840dp/item_detail_header.xml
+++ b/app/src/main/res/layout-sw840dp/item_detail_header.xml
@@ -9,10 +9,10 @@
     <org.oxycblt.auxio.image.CoverView
         android:id="@+id/detail_cover"
         style="@style/Widget.Auxio.Image.Huge"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
         app:enablePlaybackIndicator="false"
         app:enableSelectionBadge="false"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
         tools:ignore="ContentDescription" />
 
     <TextView
diff --git a/app/src/main/res/layout-w600dp-land/fragment_main.xml b/app/src/main/res/layout-w600dp-land/fragment_main.xml
index e381eae0f..f7b562988 100644
--- a/app/src/main/res/layout-w600dp-land/fragment_main.xml
+++ b/app/src/main/res/layout-w600dp-land/fragment_main.xml
@@ -12,9 +12,9 @@
         android:name="androidx.navigation.fragment.NavHostFragment"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        app:defaultNavHost="true"
         app:layout_behavior="org.oxycblt.auxio.ui.BottomSheetContentBehavior"
         app:navGraph="@navigation/inner"
-        app:defaultNavHost="true"
         tools:layout="@layout/fragment_home" />
 
     <androidx.coordinatorlayout.widget.CoordinatorLayout
diff --git a/app/src/main/res/layout/design_bottom_sheet_dialog.xml b/app/src/main/res/layout/design_bottom_sheet_dialog.xml
index bb70eccbb..3a72a5d9d 100644
--- a/app/src/main/res/layout/design_bottom_sheet_dialog.xml
+++ b/app/src/main/res/layout/design_bottom_sheet_dialog.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright (C) 2015 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,8 +13,7 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
 -->
-<FrameLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<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"
@@ -23,29 +21,29 @@
     android:layout_height="match_parent"
     android:fitsSystemWindows="true">
 
-  <androidx.coordinatorlayout.widget.CoordinatorLayout
-      android:id="@+id/coordinator"
-      android:layout_width="match_parent"
-      android:layout_height="match_parent"
-      android:fitsSystemWindows="true">
-
-    <View
-        android:id="@+id/touch_outside"
+    <androidx.coordinatorlayout.widget.CoordinatorLayout
+        android:id="@+id/coordinator"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:focusable="false"
-        android:importantForAccessibility="no"
-        android:soundEffectsEnabled="false"
-        tools:ignore="UnusedAttribute"/>
+        android:fitsSystemWindows="true">
 
-    <FrameLayout
-        android:id="@+id/design_bottom_sheet"
-        style="?attr/bottomSheetStyle"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_horizontal|top"
-        app:layout_behavior="com.google.android.material.bottomsheet.BackportBottomSheetBehavior"/>
+        <View
+            android:id="@+id/touch_outside"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:focusable="false"
+            android:importantForAccessibility="no"
+            android:soundEffectsEnabled="false"
+            tools:ignore="UnusedAttribute" />
 
-  </androidx.coordinatorlayout.widget.CoordinatorLayout>
+        <FrameLayout
+            android:id="@+id/design_bottom_sheet"
+            style="?attr/bottomSheetStyle"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal|top"
+            app:layout_behavior="com.google.android.material.bottomsheet.BackportBottomSheetBehavior" />
+
+    </androidx.coordinatorlayout.widget.CoordinatorLayout>
 
 </FrameLayout>
diff --git a/app/src/main/res/layout/dialog_delete_playlist.xml b/app/src/main/res/layout/dialog_delete_playlist.xml
index 4987c3290..1fba917ff 100644
--- a/app/src/main/res/layout/dialog_delete_playlist.xml
+++ b/app/src/main/res/layout/dialog_delete_playlist.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/deletion_info"
     android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:paddingStart="@dimen/spacing_large"
     android:paddingTop="@dimen/spacing_medium"
     android:paddingEnd="@dimen/spacing_large"
-    android:paddingStart="@dimen/spacing_large"
-    android:layout_height="match_parent"
     android:textAppearance="@style/TextAppearance.Auxio.BodyLarge"
-    xmlns:tools="http://schemas.android.com/tools"
-    tools:text="Delete Playlist 16? This cannot be undone."/>
\ No newline at end of file
+    tools:text="Delete Playlist 16? This cannot be undone." />
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_error_details.xml b/app/src/main/res/layout/dialog_error_details.xml
index 729c17d0b..e19d930ab 100644
--- a/app/src/main/res/layout/dialog_error_details.xml
+++ b/app/src/main/res/layout/dialog_error_details.xml
@@ -1,24 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout 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"
+    android:paddingStart="@dimen/spacing_large"
     android:paddingTop="@dimen/spacing_medium"
     android:paddingEnd="@dimen/spacing_large"
-    android:paddingStart="@dimen/spacing_large"
     tools:context=".MainActivity">
 
     <com.google.android.material.card.MaterialCardView
         android:id="@+id/error_container"
+        style="@style/Widget.Material3.CardView.Filled"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        style="@style/Widget.Material3.CardView.Filled"
-        app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent">
+        app:layout_constraintTop_toTopOf="parent">
 
         <FrameLayout
             android:layout_width="match_parent"
@@ -37,12 +36,12 @@
                         android:id="@+id/error_stack_trace"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:paddingTop="@dimen/spacing_medium"
-                        android:paddingStart="@dimen/spacing_medium"
-                        android:paddingBottom="@dimen/spacing_medium"
-                        android:paddingEnd="@dimen/size_copy_button"
                         android:breakStrategy="simple"
                         android:hyphenationFrequency="none"
+                        android:paddingStart="@dimen/spacing_medium"
+                        android:paddingTop="@dimen/spacing_medium"
+                        android:paddingEnd="@dimen/size_copy_button"
+                        android:paddingBottom="@dimen/spacing_medium"
                         android:typeface="monospace"
                         tools:text="Stack trace here" />
 
@@ -56,10 +55,10 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="bottom|end"
-                app:icon="@drawable/ic_copy_24"
                 android:layout_margin="@dimen/spacing_small"
+                android:src="@drawable/ic_code_24"
                 app:backgroundTint="?attr/colorPrimaryContainer"
-                android:src="@drawable/ic_code_24" />
+                app:icon="@drawable/ic_copy_24" />
 
         </FrameLayout>
     </com.google.android.material.card.MaterialCardView>
diff --git a/app/src/main/res/layout/dialog_music_dirs.xml b/app/src/main/res/layout/dialog_music_dirs.xml
index fa48b8a9c..0885dbc22 100644
--- a/app/src/main/res/layout/dialog_music_dirs.xml
+++ b/app/src/main/res/layout/dialog_music_dirs.xml
@@ -30,8 +30,8 @@
             android:layout_marginTop="@dimen/spacing_tiny"
             android:layout_marginEnd="@dimen/spacing_large"
             android:gravity="center"
-            app:layout_constraintTop_toBottomOf="@+id/dirs_mode_header"
             app:checkedButton="@+id/dirs_mode_exclude"
+            app:layout_constraintTop_toBottomOf="@+id/dirs_mode_header"
             app:selectionRequired="true"
             app:singleSelection="true">
 
@@ -41,8 +41,8 @@
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
-                tools:icon="@drawable/ic_check_24"
-                android:text="@string/set_dirs_mode_exclude" />
+                android:text="@string/set_dirs_mode_exclude"
+                tools:icon="@drawable/ic_check_24" />
 
             <org.oxycblt.auxio.ui.RippleFixMaterialButton
                 android:id="@+id/dirs_mode_include"
@@ -70,7 +70,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/spacing_medium"
-            app:layout_constraintTop_toBottomOf="@+id/dirs_mode_desc"/>
+            app:layout_constraintTop_toBottomOf="@+id/dirs_mode_desc" />
 
         <TextView
             android:id="@+id/dirs_list_header"
@@ -83,15 +83,15 @@
             app:layout_constraintTop_toBottomOf="@+id/dirs_list_header_divider" />
 
         <org.oxycblt.auxio.ui.RippleFixMaterialButton
-            style="@style/Widget.Auxio.Button.Icon.Small"
             android:id="@+id/dirs_add"
+            style="@style/Widget.Auxio.Button.Icon.Small"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            app:icon="@drawable/ic_add_24"
-            android:contentDescription="@string/lbl_add"
             android:layout_marginEnd="@dimen/spacing_mid_large"
-            app:layout_constraintTop_toBottomOf="@+id/dirs_list_header_divider"
-            app:layout_constraintEnd_toEndOf="@+id/dirs_list_header" />
+            android:contentDescription="@string/lbl_add"
+            app:icon="@drawable/ic_add_24"
+            app:layout_constraintEnd_toEndOf="@+id/dirs_list_header"
+            app:layout_constraintTop_toBottomOf="@+id/dirs_list_header_divider" />
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/dirs_recycler"
@@ -117,7 +117,7 @@
             android:textAlignment="center"
             android:textAppearance="@style/TextAppearance.Auxio.LabelLarge"
             android:textColor="?android:attr/textColorSecondary"
-            app:layout_constraintTop_toTopOf="@+id/dirs_recycler"/>
+            app:layout_constraintTop_toTopOf="@+id/dirs_recycler" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
diff --git a/app/src/main/res/layout/dialog_playlist_export.xml b/app/src/main/res/layout/dialog_playlist_export.xml
index 15f12f8bb..6809ad38d 100644
--- a/app/src/main/res/layout/dialog_playlist_export.xml
+++ b/app/src/main/res/layout/dialog_playlist_export.xml
@@ -45,7 +45,7 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:text="@string/lbl_path_style_absolute"/>
+            android:text="@string/lbl_path_style_absolute" />
 
 
     </com.google.android.material.button.MaterialButtonToggleGroup>
@@ -69,10 +69,10 @@
             android:clickable="false"
             android:focusable="false"
             android:paddingStart="@dimen/spacing_medium"
+            android:text="@string/lbl_windows_paths"
             android:textAlignment="viewStart"
             android:textAppearance="@style/TextAppearance.Auxio.BodyLarge"
-            tools:ignore="RtlSymmetry,contentDescription"
-            android:text="@string/lbl_windows_paths" />
+            tools:ignore="RtlSymmetry,contentDescription" />
     </FrameLayout>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_playlist_name.xml b/app/src/main/res/layout/dialog_playlist_name.xml
index 5d237fd74..f181cd72e 100644
--- a/app/src/main/res/layout/dialog_playlist_name.xml
+++ b/app/src/main/res/layout/dialog_playlist_name.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <com.google.android.material.textfield.TextInputLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/playlist_container"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:paddingStart="@dimen/spacing_mid_large"
     android:paddingTop="@dimen/spacing_medium"
     android:paddingEnd="@dimen/spacing_mid_large"
-    android:paddingStart="@dimen/spacing_mid_large"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     app:hintEnabled="false">
 
     <com.google.android.material.textfield.TextInputEditText
diff --git a/app/src/main/res/layout/dialog_sort.xml b/app/src/main/res/layout/dialog_sort.xml
index bf6ba7511..118bbc0f2 100644
--- a/app/src/main/res/layout/dialog_sort.xml
+++ b/app/src/main/res/layout/dialog_sort.xml
@@ -32,10 +32,10 @@
 
     <org.oxycblt.auxio.list.recycler.DialogRecyclerView
         android:id="@+id/sort_mode_recycler"
+        style="@style/Widget.Auxio.RecyclerView.Linear"
         android:layout_width="match_parent"
         android:layout_height="0dp"
         android:layout_weight="1"
-        style="@style/Widget.Auxio.RecyclerView.Linear"
         tools:listitem="@layout/item_sort_mode" />
 
     <androidx.constraintlayout.widget.ConstraintLayout
@@ -54,9 +54,9 @@
             android:id="@+id/sort_direction_group"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:layout_marginHorizontal="@dimen/spacing_medium"
             android:layout_marginTop="@dimen/spacing_tiny"
             android:gravity="center"
-            android:layout_marginHorizontal="@dimen/spacing_medium"
             app:layout_constraintTop_toBottomOf="@+id/sort_header"
             app:selectionRequired="false"
             app:singleSelection="true"
@@ -97,9 +97,9 @@
             style="@style/Widget.Material3.Button.TextButton.Dialog"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/spacing_mid_medium"
             android:layout_marginEnd="@dimen/spacing_medium"
             android:layout_marginBottom="@dimen/spacing_mid_medium"
-            android:layout_marginTop="@dimen/spacing_mid_medium"
             android:text="@string/lbl_ok"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/fragment_about.xml b/app/src/main/res/layout/fragment_about.xml
index ca50a6edc..ae6eb64ba 100644
--- a/app/src/main/res/layout/fragment_about.xml
+++ b/app/src/main/res/layout/fragment_about.xml
@@ -42,8 +42,8 @@
 
                 <androidx.constraintlayout.widget.ConstraintLayout
                     android:layout_width="match_parent"
-                    android:paddingBottom="@dimen/spacing_tiny"
-                    android:layout_height="match_parent">
+                    android:layout_height="match_parent"
+                    android:paddingBottom="@dimen/spacing_tiny">
 
                     <ImageView
                         android:id="@+id/about_auxio_icon"
@@ -175,8 +175,8 @@
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
-                android:paddingBottom="@dimen/spacing_tiny"
-                    android:orientation="vertical">
+                    android:orientation="vertical"
+                    android:paddingBottom="@dimen/spacing_tiny">
 
                     <TextView
                         android:id="@+id/about_library_counts"
diff --git a/app/src/main/res/layout/fragment_detail.xml b/app/src/main/res/layout/fragment_detail.xml
index d3a9409da..8d46398f8 100644
--- a/app/src/main/res/layout/fragment_detail.xml
+++ b/app/src/main/res/layout/fragment_detail.xml
@@ -33,8 +33,8 @@
                 android:layout_height="wrap_content"
                 android:clickable="true"
                 android:focusable="true"
-                app:navigationIcon="@drawable/ic_close_24"
-                app:menu="@menu/toolbar_selection" />
+                app:menu="@menu/toolbar_selection"
+                app:navigationIcon="@drawable/ic_close_24" />
 
             <com.google.android.material.appbar.MaterialToolbar
                 android:id="@+id/detail_edit_toolbar"
@@ -42,8 +42,8 @@
                 android:layout_height="wrap_content"
                 android:clickable="true"
                 android:focusable="true"
-                app:navigationIcon="@drawable/ic_close_24"
-                app:menu="@menu/toolbar_edit" />
+                app:menu="@menu/toolbar_edit"
+                app:navigationIcon="@drawable/ic_close_24" />
 
         </org.oxycblt.auxio.ui.MultiToolbar>
 
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index d24c1a2d3..78100da62 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -32,8 +32,8 @@
                 android:layout_height="wrap_content"
                 android:clickable="true"
                 android:focusable="true"
-                app:navigationIcon="@drawable/ic_close_24"
-                app:menu="@menu/toolbar_selection" />
+                app:menu="@menu/toolbar_selection"
+                app:navigationIcon="@drawable/ic_close_24" />
 
         </org.oxycblt.auxio.ui.MultiToolbar>
 
@@ -71,8 +71,8 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center"
             android:layout_margin="@dimen/spacing_medium"
-            android:visibility="invisible"
-            android:fitsSystemWindows="true">
+            android:fitsSystemWindows="true"
+            android:visibility="invisible">
 
             <com.google.android.material.card.MaterialCardView
                 android:layout_width="match_parent"
@@ -111,10 +111,10 @@
                         android:id="@+id/home_indexing_actions"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:orientation="horizontal"
                         android:layout_marginStart="@dimen/spacing_medium"
                         android:layout_marginEnd="@dimen/spacing_medium"
                         android:layout_marginBottom="@dimen/spacing_medium"
+                        android:orientation="horizontal"
                         android:visibility="invisible"
                         app:layout_constraintBottom_toBottomOf="parent"
                         tools:layout_editor_absoluteX="16dp">
@@ -149,42 +149,40 @@
 
     <org.oxycblt.auxio.home.EdgeFrameLayout
         android:layout_width="match_parent"
-        app:layout_anchor="@id/home_content"
+        android:layout_height="match_parent"
         android:layout_gravity="bottom|end"
-        android:layout_height="match_parent">
+        android:clipChildren="false"
+        android:clipToPadding="false"
+        app:layout_anchor="@id/home_content">
 
 
-    <com.leinardi.android.speeddial.SpeedDialOverlayLayout
-        android:id="@+id/home_speed_dial_overlay"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" />
+        <com.leinardi.android.speeddial.SpeedDialOverlayLayout
+            android:id="@+id/home_speed_dial_overlay"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" />
 
         <org.oxycblt.auxio.home.ThemedSpeedDialView
             android:id="@+id/home_new_playlist_fab"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            app:sdMainFabAnimationRotateAngle="135"
+            android:layout_gravity="bottom|end"
             android:clickable="true"
             android:focusable="true"
             android:gravity="bottom|end"
-            app:sdMainFabClosedSrc="@drawable/ic_add_24"
-            android:layout_gravity="bottom|end"
+            app:sdMainFabAnimationRotateAngle="135"
             app:sdMainFabClosedIconColor="@android:color/white"
+            app:sdMainFabClosedSrc="@drawable/ic_add_24"
             app:sdOverlayLayout="@+id/home_speed_dial_overlay" />
 
         <com.google.android.material.floatingactionbutton.FloatingActionButton
             android:id="@+id/home_shuffle_fab"
-            android:layout_margin="@dimen/spacing_medium"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_gravity="bottom|end"
+            android:layout_margin="@dimen/spacing_medium"
             android:src="@drawable/ic_shuffle_off_24" />
 
     </org.oxycblt.auxio.home.EdgeFrameLayout>
 
 
-
-
-
-
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/fragment_main.xml b/app/src/main/res/layout/fragment_main.xml
index 98328654d..986aab759 100644
--- a/app/src/main/res/layout/fragment_main.xml
+++ b/app/src/main/res/layout/fragment_main.xml
@@ -13,9 +13,9 @@
         android:name="androidx.navigation.fragment.NavHostFragment"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        app:defaultNavHost="true"
         app:layout_behavior="org.oxycblt.auxio.ui.BottomSheetContentBehavior"
         app:navGraph="@navigation/inner"
-        app:defaultNavHost="true"
         tools:layout="@layout/fragment_home" />
 
     <androidx.coordinatorlayout.widget.CoordinatorLayout
@@ -48,9 +48,9 @@
 
             <androidx.constraintlayout.widget.ConstraintLayout
                 android:id="@+id/queue_handle_wrapper"
-                android:contentDescription="@string/desc_queue_bar"
                 android:layout_width="match_parent"
-                android:layout_height="@dimen/size_bottom_sheet_bar">
+                android:layout_height="@dimen/size_bottom_sheet_bar"
+                android:contentDescription="@string/desc_queue_bar">
 
                 <com.google.android.material.bottomsheet.BottomSheetDragHandleView
                     android:id="@+id/queue_handle"
diff --git a/app/src/main/res/layout/fragment_search.xml b/app/src/main/res/layout/fragment_search.xml
index d8eba32d7..dcaf57b1b 100644
--- a/app/src/main/res/layout/fragment_search.xml
+++ b/app/src/main/res/layout/fragment_search.xml
@@ -55,8 +55,8 @@
                 android:layout_height="wrap_content"
                 android:clickable="true"
                 android:focusable="true"
-                app:navigationIcon="@drawable/ic_close_24"
-                app:menu="@menu/toolbar_selection" />
+                app:menu="@menu/toolbar_selection"
+                app:navigationIcon="@drawable/ic_close_24" />
 
         </org.oxycblt.auxio.ui.MultiToolbar>
 
diff --git a/app/src/main/res/layout/item_album_song.xml b/app/src/main/res/layout/item_album_song.xml
index 3d495dd40..0e1fc4254 100644
--- a/app/src/main/res/layout/item_album_song.xml
+++ b/app/src/main/res/layout/item_album_song.xml
@@ -26,9 +26,9 @@
             android:id="@+id/song_track_placeholder"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:src="@drawable/ic_song_24"
-            android:scaleType="center"
             android:contentDescription="@string/def_track"
+            android:scaleType="center"
+            android:src="@drawable/ic_song_24"
             android:visibility="invisible"
             app:tint="@color/sel_on_cover_bg"
             tools:ignore="ContentDescription" />
diff --git a/app/src/main/res/layout/item_detail_header.xml b/app/src/main/res/layout/item_detail_header.xml
index 56c756f38..0ea6a4111 100644
--- a/app/src/main/res/layout/item_detail_header.xml
+++ b/app/src/main/res/layout/item_detail_header.xml
@@ -5,16 +5,16 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:paddingTop="@dimen/spacing_medium"
     android:paddingStart="@dimen/spacing_medium"
+    android:paddingTop="@dimen/spacing_medium"
     android:paddingEnd="@dimen/spacing_medium"
     android:paddingBottom="@dimen/spacing_mid_medium">
 
     <org.oxycblt.auxio.image.CoverView
         android:id="@+id/detail_cover"
+        style="@style/Widget.Auxio.Image.MidHuge"
         app:enablePlaybackIndicator="false"
         app:enableSelectionBadge="false"
-        style="@style/Widget.Auxio.Image.MidHuge"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
diff --git a/app/src/main/res/layout/item_disc_header.xml b/app/src/main/res/layout/item_disc_header.xml
index 6ddc08409..dbcc0e4f6 100644
--- a/app/src/main/res/layout/item_disc_header.xml
+++ b/app/src/main/res/layout/item_disc_header.xml
@@ -25,8 +25,8 @@
             android:id="@+id/disc_icon"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:src="@drawable/ic_album_24"
             android:scaleType="center"
+            android:src="@drawable/ic_album_24"
             app:tint="@color/sel_on_cover_bg"
             tools:ignore="ContentDescription" />
 
@@ -54,9 +54,9 @@
         android:layout_marginEnd="@dimen/spacing_mid_medium"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        tools:visibility="gone"
         app:layout_constraintStart_toEndOf="@+id/disc_cover"
         app:layout_constraintTop_toBottomOf="@+id/disc_number"
-        tools:text="Part 1" />
+        tools:text="Part 1"
+        tools:visibility="gone" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/item_edit_header.xml b/app/src/main/res/layout/item_edit_header.xml
index e3bbb9009..8894c79b0 100644
--- a/app/src/main/res/layout/item_edit_header.xml
+++ b/app/src/main/res/layout/item_edit_header.xml
@@ -3,17 +3,17 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
+    android:layout_height="wrap_content"
     android:background="?attr/colorSurface"
-    android:orientation="horizontal"
-    android:layout_height="wrap_content">
+    android:orientation="horizontal">
 
     <TextView
         android:id="@+id/header_title"
         style="@style/Widget.Auxio.TextView.Header"
         android:layout_width="0dp"
-        android:layout_weight="1"
         android:layout_height="wrap_content"
         android:layout_marginEnd="@dimen/spacing_mid_medium"
+        android:layout_weight="1"
         app:layout_constraintEnd_toStartOf="@+id/header_button"
         app:layout_constraintStart_toStartOf="parent"
         tools:text="Songs" />
diff --git a/app/src/main/res/layout/item_header.xml b/app/src/main/res/layout/item_header.xml
index 4adf76f0c..66d4b8e45 100644
--- a/app/src/main/res/layout/item_header.xml
+++ b/app/src/main/res/layout/item_header.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-        android:id="@android:id/title"
-        style="@style/Widget.Auxio.TextView.Header"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+    android:id="@android:id/title"
+    style="@style/Widget.Auxio.TextView.Header"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
     android:background="?attr/colorSurface"
-        tools:text="Songs" />
\ No newline at end of file
+    tools:text="Songs" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_menu_option.xml b/app/src/main/res/layout/item_menu_option.xml
index 894882598..ad603d078 100644
--- a/app/src/main/res/layout/item_menu_option.xml
+++ b/app/src/main/res/layout/item_menu_option.xml
@@ -3,13 +3,13 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@android:id/title"
+    style="@style/Widget.Auxio.TextView.Icon.Clickable"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:clickable="true"
     android:focusable="true"
     android:padding="@dimen/spacing_medium"
     android:textColor="@color/sel_selectable_text_primary"
-    style="@style/Widget.Auxio.TextView.Icon.Clickable"
     app:drawableStartCompat="@drawable/ic_edit_24"
     app:drawableTint="@color/sel_activatable_icon"
     tools:text="Songs" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_music_dir.xml b/app/src/main/res/layout/item_music_dir.xml
index 48dbddfd8..ae1082de6 100644
--- a/app/src/main/res/layout/item_music_dir.xml
+++ b/app/src/main/res/layout/item_music_dir.xml
@@ -4,10 +4,10 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:paddingTop="@dimen/spacing_small"
-    android:paddingBottom="@dimen/spacing_small"
     android:gravity="center"
-    android:orientation="horizontal">
+    android:orientation="horizontal"
+    android:paddingTop="@dimen/spacing_small"
+    android:paddingBottom="@dimen/spacing_small">
 
     <TextView
         android:id="@+id/dir_path"
diff --git a/app/src/main/res/layout/item_new_playlist_choice.xml b/app/src/main/res/layout/item_new_playlist_choice.xml
index 5445f4146..5292298a8 100644
--- a/app/src/main/res/layout/item_new_playlist_choice.xml
+++ b/app/src/main/res/layout/item_new_playlist_choice.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout 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="wrap_content"
-    xmlns:tools="http://schemas.android.com/tools"
     android:background="?attr/selectableItemBackground"
     android:paddingStart="@dimen/spacing_large"
     android:paddingTop="@dimen/spacing_mid_medium"
@@ -14,18 +14,18 @@
         android:id="@+id/picker_image"
         style="@style/Widget.Auxio.Image.Small"
         android:contentDescription="@string/lbl_new_playlist"
+        app:enablePlaybackIndicator="false"
+        app:enableSelectionBadge="false"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:enablePlaybackIndicator="false"
-        app:enableSelectionBadge="false">
+        app:layout_constraintTop_toTopOf="parent">
 
         <ImageView
             android:id="@+id/picker_icon"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:src="@drawable/ic_add_24"
             android:scaleType="center"
+            android:src="@drawable/ic_add_24"
             app:tint="@color/sel_on_cover_bg"
             tools:ignore="ContentDescription" />
 
@@ -37,12 +37,12 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginEnd="@dimen/spacing_mid_medium"
+        android:text="@string/lbl_new_playlist"
         android:textColor="@color/sel_selectable_text_primary"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@+id/picker_image"
         app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_chainStyle="packed"
-        android:text="@string/lbl_new_playlist" />
+        app:layout_constraintVertical_chainStyle="packed" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/item_song_property.xml b/app/src/main/res/layout/item_song_property.xml
index bc24a3a3e..893eab015 100644
--- a/app/src/main/res/layout/item_song_property.xml
+++ b/app/src/main/res/layout/item_song_property.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <com.google.android.material.textfield.TextInputLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/property_name"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
     android:paddingStart="@dimen/spacing_medium"
-    android:paddingEnd="@dimen/spacing_medium"
     android:paddingTop="@dimen/spacing_small"
+    android:paddingEnd="@dimen/spacing_medium"
     android:paddingBottom="@dimen/spacing_small"
-    tools:hint="@string/lbl_path"
-    app:expandedHintEnabled="false">
+    app:expandedHintEnabled="false"
+    tools:hint="@string/lbl_path">
 
     <org.oxycblt.auxio.detail.ReadOnlyTextInput
         android:id="@+id/property_value"
diff --git a/app/src/main/res/layout/item_sort_header.xml b/app/src/main/res/layout/item_sort_header.xml
index ef24e6d6b..ab933d6b0 100644
--- a/app/src/main/res/layout/item_sort_header.xml
+++ b/app/src/main/res/layout/item_sort_header.xml
@@ -3,17 +3,17 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
+    android:layout_height="wrap_content"
     android:background="?attr/colorSurface"
-    android:orientation="horizontal"
-    android:layout_height="wrap_content">
+    android:orientation="horizontal">
 
     <TextView
         android:id="@+id/header_title"
         style="@style/Widget.Auxio.TextView.Header"
         android:layout_width="0dp"
-        android:layout_weight="1"
         android:layout_height="wrap_content"
         android:layout_marginEnd="@dimen/spacing_mid_medium"
+        android:layout_weight="1"
         app:layout_constraintEnd_toStartOf="@+id/header_button"
         app:layout_constraintStart_toStartOf="parent"
         tools:text="Songs" />
diff --git a/app/src/main/res/layout/item_sort_mode.xml b/app/src/main/res/layout/item_sort_mode.xml
index 7d8129737..79c9d483f 100644
--- a/app/src/main/res/layout/item_sort_mode.xml
+++ b/app/src/main/res/layout/item_sort_mode.xml
@@ -17,8 +17,8 @@
         android:layout_marginStart="@dimen/spacing_mid_medium"
         android:layout_marginEnd="@dimen/spacing_mid_medium"
         android:clickable="false"
-        android:focusable="false"
         android:drawableTint="?attr/colorControlNormal"
+        android:focusable="false"
         android:paddingStart="@dimen/spacing_medium"
         android:textAlignment="viewStart"
         android:textAppearance="@style/TextAppearance.Auxio.BodyLarge"
diff --git a/app/src/main/res/layout/view_preference_switch.xml b/app/src/main/res/layout/view_preference_switch.xml
index 51b1df5ad..ba3fd967a 100644
--- a/app/src/main/res/layout/view_preference_switch.xml
+++ b/app/src/main/res/layout/view_preference_switch.xml
@@ -2,4 +2,4 @@
 <com.google.android.material.materialswitch.MaterialSwitch xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/switchWidget"
     android:layout_width="wrap_content"
-    android:layout_height="wrap_content"  />
\ No newline at end of file
+    android:layout_height="wrap_content" />
\ No newline at end of file
diff --git a/app/src/main/res/menu/album.xml b/app/src/main/res/menu/album.xml
index f560baefc..cc3f9e24c 100644
--- a/app/src/main/res/menu/album.xml
+++ b/app/src/main/res/menu/album.xml
@@ -2,34 +2,34 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
     <item
         android:id="@+id/action_play"
-        android:title="@string/lbl_play"
-        android:icon="@drawable/ic_play_24" />
+        android:icon="@drawable/ic_play_24"
+        android:title="@string/lbl_play" />
     <item
         android:id="@+id/action_shuffle"
-        android:title="@string/lbl_shuffle"
-        android:icon="@drawable/ic_shuffle_off_24"/>
+        android:icon="@drawable/ic_shuffle_off_24"
+        android:title="@string/lbl_shuffle" />
     <item
         android:id="@+id/action_detail"
-        android:title="@string/lbl_parent_detail"
-        android:icon="@drawable/ic_details_24" />
+        android:icon="@drawable/ic_details_24"
+        android:title="@string/lbl_parent_detail" />
     <item
         android:id="@+id/action_play_next"
-        android:title="@string/lbl_play_next"
-        android:icon="@drawable/ic_play_next_24"/>
+        android:icon="@drawable/ic_play_next_24"
+        android:title="@string/lbl_play_next" />
     <item
         android:id="@+id/action_queue_add"
-        android:title="@string/lbl_queue_add"
-        android:icon="@drawable/ic_queue_add_24"/>
+        android:icon="@drawable/ic_queue_add_24"
+        android:title="@string/lbl_queue_add" />
     <item
         android:id="@+id/action_playlist_add"
-        android:title="@string/lbl_playlist_add"
-        android:icon="@drawable/ic_playlist_add_24"/>
+        android:icon="@drawable/ic_playlist_add_24"
+        android:title="@string/lbl_playlist_add" />
     <item
         android:id="@+id/action_artist_details"
-        android:title="@string/lbl_artist_details"
-        android:icon="@drawable/ic_artist_24" />
+        android:icon="@drawable/ic_artist_24"
+        android:title="@string/lbl_artist_details" />
     <item
         android:id="@+id/action_share"
-        android:title="@string/lbl_share"
-        android:icon="@drawable/ic_share_24"/>
+        android:icon="@drawable/ic_share_24"
+        android:title="@string/lbl_share" />
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/album_song.xml b/app/src/main/res/menu/album_song.xml
index fdbc3fc5f..3b68c0766 100644
--- a/app/src/main/res/menu/album_song.xml
+++ b/app/src/main/res/menu/album_song.xml
@@ -2,34 +2,34 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
     <item
         android:id="@+id/action_play"
-        android:title="@string/lbl_play"
-        android:icon="@drawable/ic_play_24" />
+        android:icon="@drawable/ic_play_24"
+        android:title="@string/lbl_play" />
     <item
         android:id="@+id/action_shuffle"
-        android:title="@string/lbl_shuffle"
-        android:icon="@drawable/ic_shuffle_off_24"/>
+        android:icon="@drawable/ic_shuffle_off_24"
+        android:title="@string/lbl_shuffle" />
     <item
         android:id="@+id/action_play_next"
-        android:title="@string/lbl_play_next"
-        android:icon="@drawable/ic_play_next_24"/>
+        android:icon="@drawable/ic_play_next_24"
+        android:title="@string/lbl_play_next" />
     <item
         android:id="@+id/action_queue_add"
-        android:title="@string/lbl_queue_add"
-        android:icon="@drawable/ic_queue_add_24"/>
+        android:icon="@drawable/ic_queue_add_24"
+        android:title="@string/lbl_queue_add" />
     <item
         android:id="@+id/action_playlist_add"
-        android:title="@string/lbl_playlist_add"
-        android:icon="@drawable/ic_playlist_add_24"/>
+        android:icon="@drawable/ic_playlist_add_24"
+        android:title="@string/lbl_playlist_add" />
     <item
         android:id="@+id/action_artist_details"
-        android:title="@string/lbl_artist_details"
-        android:icon="@drawable/ic_artist_24" />
+        android:icon="@drawable/ic_artist_24"
+        android:title="@string/lbl_artist_details" />
     <item
         android:id="@+id/action_detail"
-        android:title="@string/lbl_song_detail"
-        android:icon="@drawable/ic_details_24" />
+        android:icon="@drawable/ic_details_24"
+        android:title="@string/lbl_song_detail" />
     <item
         android:id="@+id/action_share"
-        android:title="@string/lbl_share"
-        android:icon="@drawable/ic_share_24"/>
+        android:icon="@drawable/ic_share_24"
+        android:title="@string/lbl_share" />
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/artist_album.xml b/app/src/main/res/menu/artist_album.xml
index 8c159d9c6..3ec1b90eb 100644
--- a/app/src/main/res/menu/artist_album.xml
+++ b/app/src/main/res/menu/artist_album.xml
@@ -2,30 +2,30 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
     <item
         android:id="@+id/action_play"
-        android:title="@string/lbl_play"
-        android:icon="@drawable/ic_play_24" />
+        android:icon="@drawable/ic_play_24"
+        android:title="@string/lbl_play" />
     <item
         android:id="@+id/action_shuffle"
-        android:title="@string/lbl_shuffle"
-        android:icon="@drawable/ic_shuffle_off_24"/>
+        android:icon="@drawable/ic_shuffle_off_24"
+        android:title="@string/lbl_shuffle" />
     <item
         android:id="@+id/action_detail"
-        android:title="@string/lbl_parent_detail"
-        android:icon="@drawable/ic_details_24" />
+        android:icon="@drawable/ic_details_24"
+        android:title="@string/lbl_parent_detail" />
     <item
         android:id="@+id/action_play_next"
-        android:title="@string/lbl_play_next"
-        android:icon="@drawable/ic_play_next_24"/>
+        android:icon="@drawable/ic_play_next_24"
+        android:title="@string/lbl_play_next" />
     <item
         android:id="@+id/action_queue_add"
-        android:title="@string/lbl_queue_add"
-        android:icon="@drawable/ic_queue_add_24"/>
+        android:icon="@drawable/ic_queue_add_24"
+        android:title="@string/lbl_queue_add" />
     <item
         android:id="@+id/action_playlist_add"
-        android:title="@string/lbl_playlist_add"
-        android:icon="@drawable/ic_playlist_add_24"/>
+        android:icon="@drawable/ic_playlist_add_24"
+        android:title="@string/lbl_playlist_add" />
     <item
         android:id="@+id/action_share"
-        android:title="@string/lbl_share"
-        android:icon="@drawable/ic_share_24"/>
+        android:icon="@drawable/ic_share_24"
+        android:title="@string/lbl_share" />
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/artist_song.xml b/app/src/main/res/menu/artist_song.xml
index 803a12785..8a6b33c0b 100644
--- a/app/src/main/res/menu/artist_song.xml
+++ b/app/src/main/res/menu/artist_song.xml
@@ -2,34 +2,34 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
     <item
         android:id="@+id/action_play"
-        android:title="@string/lbl_play"
-        android:icon="@drawable/ic_play_24" />
+        android:icon="@drawable/ic_play_24"
+        android:title="@string/lbl_play" />
     <item
         android:id="@+id/action_shuffle"
-        android:title="@string/lbl_shuffle"
-        android:icon="@drawable/ic_shuffle_off_24"/>
+        android:icon="@drawable/ic_shuffle_off_24"
+        android:title="@string/lbl_shuffle" />
     <item
         android:id="@+id/action_play_next"
-        android:title="@string/lbl_play_next"
-        android:icon="@drawable/ic_play_next_24"/>
+        android:icon="@drawable/ic_play_next_24"
+        android:title="@string/lbl_play_next" />
     <item
         android:id="@+id/action_queue_add"
-        android:title="@string/lbl_queue_add"
-        android:icon="@drawable/ic_queue_add_24"/>
+        android:icon="@drawable/ic_queue_add_24"
+        android:title="@string/lbl_queue_add" />
     <item
         android:id="@+id/action_playlist_add"
-        android:title="@string/lbl_playlist_add"
-        android:icon="@drawable/ic_playlist_add_24"/>
+        android:icon="@drawable/ic_playlist_add_24"
+        android:title="@string/lbl_playlist_add" />
     <item
         android:id="@+id/action_album_details"
-        android:title="@string/lbl_album_details"
-        android:icon="@drawable/ic_album_24" />
+        android:icon="@drawable/ic_album_24"
+        android:title="@string/lbl_album_details" />
     <item
         android:id="@+id/action_detail"
-        android:title="@string/lbl_song_detail"
-        android:icon="@drawable/ic_details_24" />
+        android:icon="@drawable/ic_details_24"
+        android:title="@string/lbl_song_detail" />
     <item
         android:id="@+id/action_share"
-        android:title="@string/lbl_share"
-        android:icon="@drawable/ic_share_24"/>
+        android:icon="@drawable/ic_share_24"
+        android:title="@string/lbl_share" />
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/detail_album.xml b/app/src/main/res/menu/detail_album.xml
index 742abdb11..4dd418008 100644
--- a/app/src/main/res/menu/detail_album.xml
+++ b/app/src/main/res/menu/detail_album.xml
@@ -2,30 +2,30 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
     <item
         android:id="@+id/action_play"
-        android:title="@string/lbl_play"
-        android:icon="@drawable/ic_play_24" />
+        android:icon="@drawable/ic_play_24"
+        android:title="@string/lbl_play" />
     <item
         android:id="@+id/action_shuffle"
-        android:title="@string/lbl_shuffle"
-        android:icon="@drawable/ic_shuffle_off_24"/>
+        android:icon="@drawable/ic_shuffle_off_24"
+        android:title="@string/lbl_shuffle" />
     <item
         android:id="@+id/action_play_next"
-        android:title="@string/lbl_play_next"
-        android:icon="@drawable/ic_play_next_24"/>
+        android:icon="@drawable/ic_play_next_24"
+        android:title="@string/lbl_play_next" />
     <item
         android:id="@+id/action_queue_add"
-        android:title="@string/lbl_queue_add"
-        android:icon="@drawable/ic_queue_add_24"/>
+        android:icon="@drawable/ic_queue_add_24"
+        android:title="@string/lbl_queue_add" />
     <item
         android:id="@+id/action_playlist_add"
-        android:title="@string/lbl_playlist_add"
-        android:icon="@drawable/ic_playlist_add_24"/>
+        android:icon="@drawable/ic_playlist_add_24"
+        android:title="@string/lbl_playlist_add" />
     <item
         android:id="@+id/action_artist_details"
-        android:title="@string/lbl_artist_details"
-        android:icon="@drawable/ic_artist_24" />
+        android:icon="@drawable/ic_artist_24"
+        android:title="@string/lbl_artist_details" />
     <item
         android:id="@+id/action_share"
-        android:title="@string/lbl_share"
-        android:icon="@drawable/ic_share_24"/>
+        android:icon="@drawable/ic_share_24"
+        android:title="@string/lbl_share" />
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/detail_parent.xml b/app/src/main/res/menu/detail_parent.xml
index a6a1b6d09..99f35f8ba 100644
--- a/app/src/main/res/menu/detail_parent.xml
+++ b/app/src/main/res/menu/detail_parent.xml
@@ -2,26 +2,26 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
     <item
         android:id="@+id/action_play"
-        android:title="@string/lbl_play"
-        android:icon="@drawable/ic_play_24" />
+        android:icon="@drawable/ic_play_24"
+        android:title="@string/lbl_play" />
     <item
         android:id="@+id/action_shuffle"
-        android:title="@string/lbl_shuffle"
-        android:icon="@drawable/ic_shuffle_off_24"/>
+        android:icon="@drawable/ic_shuffle_off_24"
+        android:title="@string/lbl_shuffle" />
     <item
         android:id="@+id/action_play_next"
-        android:title="@string/lbl_play_next"
-        android:icon="@drawable/ic_play_next_24"/>
+        android:icon="@drawable/ic_play_next_24"
+        android:title="@string/lbl_play_next" />
     <item
         android:id="@+id/action_queue_add"
-        android:title="@string/lbl_queue_add"
-        android:icon="@drawable/ic_queue_add_24"/>
+        android:icon="@drawable/ic_queue_add_24"
+        android:title="@string/lbl_queue_add" />
     <item
         android:id="@+id/action_playlist_add"
-        android:title="@string/lbl_playlist_add"
-        android:icon="@drawable/ic_playlist_add_24" />
+        android:icon="@drawable/ic_playlist_add_24"
+        android:title="@string/lbl_playlist_add" />
     <item
         android:id="@+id/action_share"
-        android:title="@string/lbl_share"
-        android:icon="@drawable/ic_share_24"/>
+        android:icon="@drawable/ic_share_24"
+        android:title="@string/lbl_share" />
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/detail_playlist.xml b/app/src/main/res/menu/detail_playlist.xml
index 178588c3b..cea8e98bd 100644
--- a/app/src/main/res/menu/detail_playlist.xml
+++ b/app/src/main/res/menu/detail_playlist.xml
@@ -2,30 +2,30 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
     <item
         android:id="@+id/action_play"
-        android:title="@string/lbl_play"
-        android:icon="@drawable/ic_play_24" />
+        android:icon="@drawable/ic_play_24"
+        android:title="@string/lbl_play" />
     <item
         android:id="@+id/action_shuffle"
-        android:title="@string/lbl_shuffle"
-        android:icon="@drawable/ic_shuffle_off_24"/>
+        android:icon="@drawable/ic_shuffle_off_24"
+        android:title="@string/lbl_shuffle" />
     <item
         android:id="@+id/action_play_next"
-        android:title="@string/lbl_play_next"
-        android:icon="@drawable/ic_play_next_24"/>
+        android:icon="@drawable/ic_play_next_24"
+        android:title="@string/lbl_play_next" />
     <item
         android:id="@+id/action_queue_add"
-        android:title="@string/lbl_queue_add"
-        android:icon="@drawable/ic_queue_add_24"/>
+        android:icon="@drawable/ic_queue_add_24"
+        android:title="@string/lbl_queue_add" />
     <item
         android:id="@+id/action_rename"
-        android:title="@string/lbl_rename"
-        android:icon="@drawable/ic_edit_24"/>
+        android:icon="@drawable/ic_edit_24"
+        android:title="@string/lbl_rename" />
     <item
         android:id="@+id/action_delete"
-        android:title="@string/lbl_delete"
-        android:icon="@drawable/ic_delete_24"/>
+        android:icon="@drawable/ic_delete_24"
+        android:title="@string/lbl_delete" />
     <item
         android:id="@+id/action_share"
-        android:title="@string/lbl_share"
-        android:icon="@drawable/ic_share_24"/>
+        android:icon="@drawable/ic_share_24"
+        android:title="@string/lbl_share" />
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/parent.xml b/app/src/main/res/menu/parent.xml
index cae1e0c53..b431eb7b5 100644
--- a/app/src/main/res/menu/parent.xml
+++ b/app/src/main/res/menu/parent.xml
@@ -2,31 +2,31 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
     <item
         android:id="@+id/action_play"
-        android:title="@string/lbl_play"
-        android:icon="@drawable/ic_play_24" />
+        android:icon="@drawable/ic_play_24"
+        android:title="@string/lbl_play" />
     <item
         android:id="@+id/action_shuffle"
-        android:title="@string/lbl_shuffle"
-        android:icon="@drawable/ic_shuffle_off_24"/>
+        android:icon="@drawable/ic_shuffle_off_24"
+        android:title="@string/lbl_shuffle" />
     <item
         android:id="@+id/action_detail"
-        android:title="@string/lbl_parent_detail"
-        android:icon="@drawable/ic_details_24" />
+        android:icon="@drawable/ic_details_24"
+        android:title="@string/lbl_parent_detail" />
     <item
         android:id="@+id/action_play_next"
-        android:title="@string/lbl_play_next"
-        android:icon="@drawable/ic_play_next_24"/>
+        android:icon="@drawable/ic_play_next_24"
+        android:title="@string/lbl_play_next" />
     <item
         android:id="@+id/action_queue_add"
-        android:title="@string/lbl_queue_add"
-        android:icon="@drawable/ic_queue_add_24"/>
+        android:icon="@drawable/ic_queue_add_24"
+        android:title="@string/lbl_queue_add" />
 
     <item
         android:id="@+id/action_playlist_add"
-        android:title="@string/lbl_playlist_add"
-        android:icon="@drawable/ic_playlist_add_24" />
+        android:icon="@drawable/ic_playlist_add_24"
+        android:title="@string/lbl_playlist_add" />
     <item
         android:id="@+id/action_share"
-        android:title="@string/lbl_share"
-        android:icon="@drawable/ic_share_24"/>
+        android:icon="@drawable/ic_share_24"
+        android:title="@string/lbl_share" />
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/playback_song.xml b/app/src/main/res/menu/playback_song.xml
index 2cfc524b2..87061766b 100644
--- a/app/src/main/res/menu/playback_song.xml
+++ b/app/src/main/res/menu/playback_song.xml
@@ -7,20 +7,20 @@
         android:title="@string/lbl_playlist_add" />
     <item
         android:id="@+id/action_artist_details"
-        android:title="@string/lbl_artist_details"
-        android:icon="@drawable/ic_artist_24" />
+        android:icon="@drawable/ic_artist_24"
+        android:title="@string/lbl_artist_details" />
     <item
         android:id="@+id/action_album_details"
-        android:title="@string/lbl_album_details"
         android:icon="@drawable/ic_album_24"
+        android:title="@string/lbl_album_details"
         app:showAsAction="never" />
     <item
         android:id="@+id/action_detail"
-        android:title="@string/lbl_song_detail"
         android:icon="@drawable/ic_details_24"
+        android:title="@string/lbl_song_detail"
         app:showAsAction="never" />
     <item
         android:id="@+id/action_share"
-        android:title="@string/lbl_share"
-        android:icon="@drawable/ic_share_24" />
+        android:icon="@drawable/ic_share_24"
+        android:title="@string/lbl_share" />
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/playlist.xml b/app/src/main/res/menu/playlist.xml
index a5cdca330..afa071eab 100644
--- a/app/src/main/res/menu/playlist.xml
+++ b/app/src/main/res/menu/playlist.xml
@@ -2,38 +2,38 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
     <item
         android:id="@+id/action_play"
-        android:title="@string/lbl_play"
-        android:icon="@drawable/ic_play_24" />
+        android:icon="@drawable/ic_play_24"
+        android:title="@string/lbl_play" />
     <item
         android:id="@+id/action_shuffle"
-        android:title="@string/lbl_shuffle"
-        android:icon="@drawable/ic_shuffle_off_24"/>
+        android:icon="@drawable/ic_shuffle_off_24"
+        android:title="@string/lbl_shuffle" />
     <item
         android:id="@+id/action_detail"
-        android:title="@string/lbl_parent_detail"
-        android:icon="@drawable/ic_details_24" />
+        android:icon="@drawable/ic_details_24"
+        android:title="@string/lbl_parent_detail" />
     <item
         android:id="@+id/action_play_next"
-        android:title="@string/lbl_play_next"
-        android:icon="@drawable/ic_play_next_24"/>
+        android:icon="@drawable/ic_play_next_24"
+        android:title="@string/lbl_play_next" />
     <item
         android:id="@+id/action_queue_add"
-        android:title="@string/lbl_queue_add"
-        android:icon="@drawable/ic_queue_add_24"/>
+        android:icon="@drawable/ic_queue_add_24"
+        android:title="@string/lbl_queue_add" />
     <item
         android:id="@+id/action_rename"
-        android:title="@string/lbl_rename"
-        android:icon="@drawable/ic_edit_24"/>
+        android:icon="@drawable/ic_edit_24"
+        android:title="@string/lbl_rename" />
     <item
-        android:id="@+id/action_playlist_export"
-        android:title="@string/lbl_export"
-        android:icon="@drawable/ic_save_24"/>
+        android:id="@+id/action_export"
+        android:icon="@drawable/ic_save_24"
+        android:title="@string/lbl_export" />
     <item
         android:id="@+id/action_delete"
-        android:title="@string/lbl_delete"
-        android:icon="@drawable/ic_delete_24"/>
+        android:icon="@drawable/ic_delete_24"
+        android:title="@string/lbl_delete" />
     <item
         android:id="@+id/action_share"
-        android:title="@string/lbl_share"
-        android:icon="@drawable/ic_share_24"/>
+        android:icon="@drawable/ic_share_24"
+        android:title="@string/lbl_share" />
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/playlist_song.xml b/app/src/main/res/menu/playlist_song.xml
index 934d8b514..c60b57f89 100644
--- a/app/src/main/res/menu/playlist_song.xml
+++ b/app/src/main/res/menu/playlist_song.xml
@@ -2,34 +2,34 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
     <item
         android:id="@+id/action_play"
-        android:title="@string/lbl_play"
-        android:icon="@drawable/ic_play_24" />
+        android:icon="@drawable/ic_play_24"
+        android:title="@string/lbl_play" />
     <item
         android:id="@+id/action_shuffle"
-        android:title="@string/lbl_shuffle"
-        android:icon="@drawable/ic_shuffle_off_24"/>
+        android:icon="@drawable/ic_shuffle_off_24"
+        android:title="@string/lbl_shuffle" />
     <item
         android:id="@+id/action_play_next"
-        android:title="@string/lbl_play_next"
-        android:icon="@drawable/ic_details_24" />
+        android:icon="@drawable/ic_details_24"
+        android:title="@string/lbl_play_next" />
     <item
         android:id="@+id/action_queue_add"
-        android:title="@string/lbl_queue_add"
-        android:icon="@drawable/ic_queue_add_24" />
+        android:icon="@drawable/ic_queue_add_24"
+        android:title="@string/lbl_queue_add" />
     <item
         android:id="@+id/action_artist_details"
-        android:title="@string/lbl_artist_details"
-        android:icon="@drawable/ic_artist_24" />
+        android:icon="@drawable/ic_artist_24"
+        android:title="@string/lbl_artist_details" />
     <item
         android:id="@+id/action_album_details"
-        android:title="@string/lbl_album_details"
-        android:icon="@drawable/ic_album_24" />
+        android:icon="@drawable/ic_album_24"
+        android:title="@string/lbl_album_details" />
     <item
         android:id="@+id/action_detail"
-        android:title="@string/lbl_song_detail"
-        android:icon="@drawable/ic_details_24" />
+        android:icon="@drawable/ic_details_24"
+        android:title="@string/lbl_song_detail" />
     <item
         android:id="@+id/action_share"
-        android:title="@string/lbl_share"
-        android:icon="@drawable/ic_share_24"/>
+        android:icon="@drawable/ic_share_24"
+        android:title="@string/lbl_share" />
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/selection.xml b/app/src/main/res/menu/selection.xml
index 1d4f3d94d..61749966e 100644
--- a/app/src/main/res/menu/selection.xml
+++ b/app/src/main/res/menu/selection.xml
@@ -3,28 +3,28 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
         android:id="@+id/action_play"
-        android:title="@string/lbl_play"
         android:icon="@drawable/ic_play_24"
-        app:showAsAction="never"/>
+        android:title="@string/lbl_play"
+        app:showAsAction="never" />
     <item
         android:id="@+id/action_shuffle"
-        android:title="@string/lbl_shuffle"
         android:icon="@drawable/ic_shuffle_off_24"
-        app:showAsAction="never"/>
+        android:title="@string/lbl_shuffle"
+        app:showAsAction="never" />
     <item
         android:id="@+id/action_play_next"
-        android:title="@string/lbl_play_next"
-        android:icon="@drawable/ic_play_next_24" />
+        android:icon="@drawable/ic_play_next_24"
+        android:title="@string/lbl_play_next" />
     <item
         android:id="@+id/action_queue_add"
-        android:title="@string/lbl_queue_add"
-        android:icon="@drawable/ic_queue_add_24" />
+        android:icon="@drawable/ic_queue_add_24"
+        android:title="@string/lbl_queue_add" />
     <item
         android:id="@+id/action_playlist_add"
-        android:title="@string/lbl_playlist_add"
-        android:icon="@drawable/ic_playlist_add_24" />
+        android:icon="@drawable/ic_playlist_add_24"
+        android:title="@string/lbl_playlist_add" />
     <item
         android:id="@+id/action_share"
-        android:title="@string/lbl_share"
-        android:icon="@drawable/ic_share_24" />
+        android:icon="@drawable/ic_share_24"
+        android:title="@string/lbl_share" />
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/song.xml b/app/src/main/res/menu/song.xml
index d82272d49..fa9f28538 100644
--- a/app/src/main/res/menu/song.xml
+++ b/app/src/main/res/menu/song.xml
@@ -2,38 +2,38 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
     <item
         android:id="@+id/action_play"
-        android:title="@string/lbl_play"
-        android:icon="@drawable/ic_play_24" />
+        android:icon="@drawable/ic_play_24"
+        android:title="@string/lbl_play" />
     <item
         android:id="@+id/action_shuffle"
-        android:title="@string/lbl_shuffle"
-        android:icon="@drawable/ic_shuffle_off_24"/>
+        android:icon="@drawable/ic_shuffle_off_24"
+        android:title="@string/lbl_shuffle" />
     <item
         android:id="@+id/action_play_next"
-        android:title="@string/lbl_play_next"
-        android:icon="@drawable/ic_play_next_24" />
+        android:icon="@drawable/ic_play_next_24"
+        android:title="@string/lbl_play_next" />
     <item
         android:id="@+id/action_queue_add"
-        android:title="@string/lbl_queue_add"
-        android:icon="@drawable/ic_queue_add_24" />
+        android:icon="@drawable/ic_queue_add_24"
+        android:title="@string/lbl_queue_add" />
     <item
         android:id="@+id/action_playlist_add"
-        android:title="@string/lbl_playlist_add"
-        android:icon="@drawable/ic_playlist_add_24" />
+        android:icon="@drawable/ic_playlist_add_24"
+        android:title="@string/lbl_playlist_add" />
     <item
         android:id="@+id/action_artist_details"
-        android:title="@string/lbl_artist_details"
-        android:icon="@drawable/ic_artist_24" />
+        android:icon="@drawable/ic_artist_24"
+        android:title="@string/lbl_artist_details" />
     <item
         android:id="@+id/action_album_details"
-        android:title="@string/lbl_album_details"
-        android:icon="@drawable/ic_album_24" />
+        android:icon="@drawable/ic_album_24"
+        android:title="@string/lbl_album_details" />
     <item
         android:id="@+id/action_detail"
-        android:title="@string/lbl_song_detail"
-        android:icon="@drawable/ic_details_24" />
+        android:icon="@drawable/ic_details_24"
+        android:title="@string/lbl_song_detail" />
     <item
         android:id="@+id/action_share"
-        android:title="@string/lbl_share"
-        android:icon="@drawable/ic_share_24" />
+        android:icon="@drawable/ic_share_24"
+        android:title="@string/lbl_share" />
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/toolbar_edit.xml b/app/src/main/res/menu/toolbar_edit.xml
index 10ac3d9ef..c3436fee7 100644
--- a/app/src/main/res/menu/toolbar_edit.xml
+++ b/app/src/main/res/menu/toolbar_edit.xml
@@ -3,7 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
         android:id="@+id/action_save"
+        android:icon="@drawable/ic_save_24"
         android:title="@string/lbl_save"
-        app:showAsAction="always"
-        android:icon="@drawable/ic_save_24" />
+        app:showAsAction="always" />
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/toolbar_selection.xml b/app/src/main/res/menu/toolbar_selection.xml
index e1cf43ef0..dadf1e709 100644
--- a/app/src/main/res/menu/toolbar_selection.xml
+++ b/app/src/main/res/menu/toolbar_selection.xml
@@ -3,14 +3,14 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
         android:id="@+id/action_selection_play_next"
-        android:title="@string/lbl_play_next"
         android:icon="@drawable/ic_play_next_24"
-        app:showAsAction="ifRoom"/>
+        android:title="@string/lbl_play_next"
+        app:showAsAction="ifRoom" />
     <item
         android:id="@+id/action_selection_playlist_add"
-        android:title="@string/lbl_playlist_add"
         android:icon="@drawable/ic_playlist_add_24"
-        app:showAsAction="ifRoom"/>
+        android:title="@string/lbl_playlist_add"
+        app:showAsAction="ifRoom" />
     <item
         android:id="@+id/placeholder"
         android:title=""
diff --git a/app/src/main/res/xml/backup_descriptor.xml b/app/src/main/res/xml/backup_descriptor.xml
index 587567dab..b977c9b69 100644
--- a/app/src/main/res/xml/backup_descriptor.xml
+++ b/app/src/main/res/xml/backup_descriptor.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <full-backup-content>
     <!-- Cache databases are useless between devices, drop them -->
-    <exclude domain="database" path="music_cache.db" />
+    <exclude
+        domain="database"
+        path="music_cache.db" />
 </full-backup-content>
diff --git a/app/src/main/res/xml/data_extraction_rules.xml b/app/src/main/res/xml/data_extraction_rules.xml
index a95e572f9..32c6c4b64 100644
--- a/app/src/main/res/xml/data_extraction_rules.xml
+++ b/app/src/main/res/xml/data_extraction_rules.xml
@@ -2,9 +2,13 @@
 <data-extraction-rules>
     <!-- Cache databases are useless between devices, drop them -->
     <cloud-backup>
-        <exclude domain="database" path="music_cache.db" />
+        <exclude
+            domain="database"
+            path="music_cache.db" />
     </cloud-backup>
     <device-transfer>
-        <exclude domain="database" path="music_cache.db" />
+        <exclude
+            domain="database"
+            path="music_cache.db" />
     </device-transfer>
 </data-extraction-rules>
\ No newline at end of file