diff --git a/app/src/main/java/org/oxycblt/auxio/MainActivity.kt b/app/src/main/java/org/oxycblt/auxio/MainActivity.kt
index 58e4b9c98..5d0ec4d90 100644
--- a/app/src/main/java/org/oxycblt/auxio/MainActivity.kt
+++ b/app/src/main/java/org/oxycblt/auxio/MainActivity.kt
@@ -1,10 +1,7 @@
 package org.oxycblt.auxio
 
-import android.content.ComponentName
 import android.content.Context
 import android.content.Intent
-import android.content.ServiceConnection
-import android.os.IBinder
 import android.util.AttributeSet
 import android.view.View
 import androidx.appcompat.app.AppCompatActivity
diff --git a/app/src/main/java/org/oxycblt/auxio/playback/NotificationUtils.kt b/app/src/main/java/org/oxycblt/auxio/playback/NotificationUtils.kt
index 274a04e28..d10c3f949 100644
--- a/app/src/main/java/org/oxycblt/auxio/playback/NotificationUtils.kt
+++ b/app/src/main/java/org/oxycblt/auxio/playback/NotificationUtils.kt
@@ -8,7 +8,6 @@ import android.content.Context
 import android.content.Intent
 import android.os.Build
 import android.support.v4.media.session.MediaSessionCompat
-import android.util.Log
 import androidx.core.app.NotificationCompat
 import androidx.media.app.NotificationCompat.MediaStyle
 import org.oxycblt.auxio.MainActivity
diff --git a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
index 14c8a9d96..602dbf3a2 100644
--- a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
+++ b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
@@ -4,29 +4,18 @@
     android:height="108dp"
     android:viewportWidth="108"
     android:viewportHeight="108">
-  <group android:scaleX="0.95"
-      android:scaleY="0.95"
-      android:translateX="2.7"
-      android:translateY="2.7">
     <path
-        android:pathData="M 54.000004,28.557237 V 58.38181 c -1.667916,-0.96117 -3.590261,-1.554837 -5.65395,-1.554837 -6.247608,0 -11.307896,5.060283 -11.307896,11.307898 0,6.24761 5.060288,11.307892 11.307896,11.307892 6.24761,0 11.307898,-5.06028 11.307898,-11.307891 V 39.865131 H 70.961841 V 28.557237 Z"
+        android:pathData="M54 29.83v28.333c-1.585-0.913-3.41-1.477-5.371-1.477-5.935 0-10.743 4.807-10.743 10.743 0 5.935 4.807 10.742 10.743 10.742 5.935 0 10.743-4.807 10.743-10.742V40.573h10.742V29.831z"
         android:strokeWidth="0.890156"
         android:strokeColor="#ffffff">
-      <aapt:attr name="android:fillColor">
+        <aapt:attr name="android:fillColor">
             <gradient
-                android:startX="60"
-                android:startY="61.5"
-                android:endX="64.75"
-                android:endY="28.5"
-                android:type="linear">
-                <item
-                    android:color="#2196f3"
-                    android:offset="0.0" />
-                <item
-                    android:color="#90caf9"
-                    android:offset="1.0" />
+                android:type="linear"
+                android:startX="60" android:startY="61.5"
+                android:endX="64.75" android:endY="28.5">
+                <item android:color="#2196f3" android:offset="0.0"/>
+                <item android:color="#90caf9" android:offset="1.0"/>
             </gradient>
         </aapt:attr>
     </path>
-  </group>
-</vector>
\ No newline at end of file
+</vector>
diff --git a/app/src/main/res/drawable/ic_back.xml b/app/src/main/res/drawable/ic_back.xml
index 080fc1b88..5377fe60a 100644
--- a/app/src/main/res/drawable/ic_back.xml
+++ b/app/src/main/res/drawable/ic_back.xml
@@ -3,7 +3,7 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24"
-    android:tint="?android:attr/colorControlNormal">
+    android:tint="?attr/colorControlNormal">
     <path
         android:fillColor="@android:color/white"
         android:pathData="M20,11H7.83l5.59,-5.59L12,4l-8,8 8,8 1.41,-1.41L7.83,13H20v-2z" />
diff --git a/app/src/main/res/drawable/ic_down.xml b/app/src/main/res/drawable/ic_down.xml
index c69ccb52a..5fc1d0fe8 100644
--- a/app/src/main/res/drawable/ic_down.xml
+++ b/app/src/main/res/drawable/ic_down.xml
@@ -4,7 +4,7 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24"
-    android:tint="?android:attr/colorControlNormal">
+    android:tint="?attr/colorControlNormal">
     <path
         android:fillColor="@android:color/white"
         android:pathData="M 5.88,7.06 12,13.166667 18.12,7.06 20,8.94 l -8,8 -8,-8 z" />
diff --git a/app/src/main/res/drawable/ic_handle.xml b/app/src/main/res/drawable/ic_handle.xml
index 6f12a4f85..0fb1b9358 100644
--- a/app/src/main/res/drawable/ic_handle.xml
+++ b/app/src/main/res/drawable/ic_handle.xml
@@ -4,7 +4,7 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24"
-    android:tint="?android:attr/colorControlNormal">
+    android:tint="?attr/colorControlNormal">
     <path
         android:fillColor="@android:color/white"
         android:pathData="M20,9H4v2h16V9zM4,15h16v-2H4V15z" />
diff --git a/app/src/main/res/drawable/ic_launcher_foreground.xml b/app/src/main/res/drawable/ic_launcher_foreground.xml
new file mode 100644
index 000000000..602dbf3a2
--- /dev/null
+++ b/app/src/main/res/drawable/ic_launcher_foreground.xml
@@ -0,0 +1,21 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+    <path
+        android:pathData="M54 29.83v28.333c-1.585-0.913-3.41-1.477-5.371-1.477-5.935 0-10.743 4.807-10.743 10.743 0 5.935 4.807 10.742 10.743 10.742 5.935 0 10.743-4.807 10.743-10.742V40.573h10.742V29.831z"
+        android:strokeWidth="0.890156"
+        android:strokeColor="#ffffff">
+        <aapt:attr name="android:fillColor">
+            <gradient
+                android:type="linear"
+                android:startX="60" android:startY="61.5"
+                android:endX="64.75" android:endY="28.5">
+                <item android:color="#2196f3" android:offset="0.0"/>
+                <item android:color="#90caf9" android:offset="1.0"/>
+            </gradient>
+        </aapt:attr>
+    </path>
+</vector>
diff --git a/app/src/main/res/drawable/ic_library.xml b/app/src/main/res/drawable/ic_library.xml
index b17661a54..c734a21dd 100644
--- a/app/src/main/res/drawable/ic_library.xml
+++ b/app/src/main/res/drawable/ic_library.xml
@@ -4,7 +4,7 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24"
-    android:tint="?android:attr/colorPrimary">
+    android:tint="?attr/colorPrimary">
     <path
         android:fillColor="@android:color/white"
         android:pathData="M20,2L8,2c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L22,4c0,-1.1 -0.9,-2 -2,-2zM18,7h-3v5.5c0,1.38 -1.12,2.5 -2.5,2.5S10,13.88 10,12.5s1.12,-2.5 2.5,-2.5c0.57,0 1.08,0.19 1.5,0.51L14,5h4v2zM4,6L2,6v14c0,1.1 0.9,2 2,2h14v-2L4,20L4,6z" />
diff --git a/app/src/main/res/drawable/ic_loop.xml b/app/src/main/res/drawable/ic_loop.xml
index 962a21eed..08649b001 100644
--- a/app/src/main/res/drawable/ic_loop.xml
+++ b/app/src/main/res/drawable/ic_loop.xml
@@ -4,7 +4,7 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24"
-    android:tint="?android:attr/colorControlNormal">
+    android:tint="?attr/colorControlNormal">
   <path
       android:fillColor="@android:color/white"
       android:pathData="M7,7h10v3l4,-4 -4,-4v3L5,5v6h2L7,7zM17,17L7,17v-3l-4,4 4,4v-3h12v-6h-2v4z"/>
diff --git a/app/src/main/res/drawable/ic_loop_large.xml b/app/src/main/res/drawable/ic_loop_large.xml
index 52e22f421..0916f8d99 100644
--- a/app/src/main/res/drawable/ic_loop_large.xml
+++ b/app/src/main/res/drawable/ic_loop_large.xml
@@ -4,7 +4,7 @@
     android:height="32dp"
     android:viewportWidth="24"
     android:viewportHeight="24"
-    android:tint="?android:attr/colorControlNormal">
+    android:tint="?attr/colorControlNormal">
   <path
       android:fillColor="@android:color/white"
       android:pathData="M7,7h10v3l4,-4 -4,-4v3L5,5v6h2L7,7zM17,17L7,17v-3l-4,4 4,4v-3h12v-6h-2v4z"/>
diff --git a/app/src/main/res/drawable/ic_loop_one.xml b/app/src/main/res/drawable/ic_loop_one.xml
index 89b912ce9..2226d7fbe 100644
--- a/app/src/main/res/drawable/ic_loop_one.xml
+++ b/app/src/main/res/drawable/ic_loop_one.xml
@@ -4,7 +4,7 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24"
-    android:tint="?android:attr/colorControlNormal">
+    android:tint="?attr/colorControlNormal">
   <path
       android:fillColor="@android:color/white"
       android:pathData="M7,7h10v3l4,-4 -4,-4v3L5,5v6h2L7,7zM17,17L7,17v-3l-4,4 4,4v-3h12v-6h-2v4zM13,15L13,9h-1l-2,1v1h1.5v4L13,15z"/>
diff --git a/app/src/main/res/drawable/ic_loop_one_large.xml b/app/src/main/res/drawable/ic_loop_one_large.xml
index d9f548be3..30747a1a9 100644
--- a/app/src/main/res/drawable/ic_loop_one_large.xml
+++ b/app/src/main/res/drawable/ic_loop_one_large.xml
@@ -4,7 +4,7 @@
     android:height="32dp"
     android:viewportWidth="24"
     android:viewportHeight="24"
-    android:tint="?android:attr/colorControlNormal">
+    android:tint="?attr/colorControlNormal">
   <path
       android:fillColor="@android:color/white"
       android:pathData="M7,7h10v3l4,-4 -4,-4v3L5,5v6h2L7,7zM17,17L7,17v-3l-4,4 4,4v-3h12v-6h-2v4zM13,15L13,9h-1l-2,1v1h1.5v4L13,15z"/>
diff --git a/app/src/main/res/drawable/ic_pause.xml b/app/src/main/res/drawable/ic_pause.xml
index be458bd95..f8e0203a3 100644
--- a/app/src/main/res/drawable/ic_pause.xml
+++ b/app/src/main/res/drawable/ic_pause.xml
@@ -5,7 +5,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24"
     android:tint="?android:attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M 5.571429,19.5 H 9.857143 V 4.5000003 H 5.571429 Z M 14.142857,4.5000003 V 19.5 h 4.285714 V 4.5000003 Z"/>
-</vector>
\ No newline at end of file
+    <path android:fillColor="@android:color/white"
+        android:pathData="M5.571 19.5h4.286v-15H5.571zm8.572-15v15h4.286v-15z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_play.xml b/app/src/main/res/drawable/ic_play.xml
index c2f1de008..d22f9c07c 100644
--- a/app/src/main/res/drawable/ic_play.xml
+++ b/app/src/main/res/drawable/ic_play.xml
@@ -4,8 +4,7 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24"
-    android:tint="?android:attr/colorControlNormal">
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M 5.0778755,4.0890012 V 12 H 18.922123 v 0 z m 0,15.8219978 V 12 H 18.922123 v 0 z" />
-</vector>
\ No newline at end of file
+    android:tint="?attr/colorControlNormal">
+    <path android:fillColor="@android:color/white"
+        android:pathData="M5.078 4.089V12h13.844zm0 15.822V12h13.844z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_search.xml b/app/src/main/res/drawable/ic_search.xml
index 76894fee3..2b1a6a6b8 100644
--- a/app/src/main/res/drawable/ic_search.xml
+++ b/app/src/main/res/drawable/ic_search.xml
@@ -4,7 +4,7 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24"
-    android:tint="?android:attr/colorControlNormal">
+    android:tint="?attr/colorControlNormal">
     <path
         android:fillColor="@android:color/white"
         android:pathData="M15.5,14h-0.79l-0.28,-0.27C15.41,12.59 16,11.11 16,9.5 16,5.91 13.09,3 9.5,3S3,5.91 3,9.5 5.91,16 9.5,16c1.61,0 3.09,-0.59 4.23,-1.57l0.27,0.28v0.79l5,4.99L20.49,19l-4.99,-5zM9.5,14C7.01,14 5,11.99 5,9.5S7.01,5 9.5,5 14,7.01 14,9.5 11.99,14 9.5,14z" />
diff --git a/app/src/main/res/drawable/ic_shuffle.xml b/app/src/main/res/drawable/ic_shuffle.xml
index 5020b8b43..09aec324f 100644
--- a/app/src/main/res/drawable/ic_shuffle.xml
+++ b/app/src/main/res/drawable/ic_shuffle.xml
@@ -4,7 +4,7 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24"
-    android:tint="?android:attr/colorControlNormal">
+    android:tint="?attr/colorControlNormal">
     <path
         android:fillColor="@android:color/white"
         android:pathData="M10.59,9.17L5.41,4 4,5.41l5.17,5.17 1.42,-1.41zM14.5,4l2.04,2.04L4,18.59 5.41,20 17.96,7.46 20,9.5L20,4h-5.5zM14.83,13.41l-1.41,1.41 3.13,3.13L14.5,20L20,20v-5.5l-2.04,2.04 -3.13,-3.13z" />
diff --git a/app/src/main/res/drawable/ic_shuffle_disabled.xml b/app/src/main/res/drawable/ic_shuffle_disabled.xml
deleted file mode 100644
index 00f5aee33..000000000
--- a/app/src/main/res/drawable/ic_shuffle_disabled.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="#80ffffff"
-        android:pathData="M10.59,9.17L5.41,4 4,5.41l5.17,5.17 1.42,-1.41zM14.5,4l2.04,2.04L4,18.59 5.41,20 17.96,7.46 20,9.5L20,4h-5.5zM14.83,13.41l-1.41,1.41 3.13,3.13L14.5,20L20,20v-5.5l-2.04,2.04 -3.13,-3.13z" />
-</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_shuffle_large.xml b/app/src/main/res/drawable/ic_shuffle_large.xml
index 20617b959..759ee304a 100644
--- a/app/src/main/res/drawable/ic_shuffle_large.xml
+++ b/app/src/main/res/drawable/ic_shuffle_large.xml
@@ -4,7 +4,7 @@
     android:height="32dp"
     android:viewportWidth="24"
     android:viewportHeight="24"
-    android:tint="?android:attr/colorControlNormal">
+    android:tint="?attr/colorControlNormal">
     <path
         android:fillColor="@android:color/white"
         android:pathData="M10.59,9.17L5.41,4 4,5.41l5.17,5.17 1.42,-1.41zM14.5,4l2.04,2.04L4,18.59 5.41,20 17.96,7.46 20,9.5L20,4h-5.5zM14.83,13.41l-1.41,1.41 3.13,3.13L14.5,20L20,20v-5.5l-2.04,2.04 -3.13,-3.13z" />
diff --git a/app/src/main/res/drawable/ic_skip_next.xml b/app/src/main/res/drawable/ic_skip_next.xml
index cb217d9cb..f1f32d8ac 100644
--- a/app/src/main/res/drawable/ic_skip_next.xml
+++ b/app/src/main/res/drawable/ic_skip_next.xml
@@ -5,7 +5,7 @@
     android:viewportWidth="24"
     android:viewportHeight="24"
     android:autoMirrored="true"
-    android:tint="?android:attr/colorControlNormal">
+    android:tint="?attr/colorControlNormal">
     <path
         android:fillColor="@android:color/white"
         android:pathData="M6,18l8.5,-6L6,6v12zM16,6v12h2V6h-2z" />
diff --git a/app/src/main/res/drawable/ic_skip_next_large.xml b/app/src/main/res/drawable/ic_skip_next_large.xml
index 3bded8633..577f21b39 100644
--- a/app/src/main/res/drawable/ic_skip_next_large.xml
+++ b/app/src/main/res/drawable/ic_skip_next_large.xml
@@ -5,7 +5,7 @@
     android:viewportWidth="24"
     android:viewportHeight="24"
     android:autoMirrored="true"
-    android:tint="?android:attr/colorControlNormal">
+    android:tint="?attr/colorControlNormal">
     <path
         android:fillColor="@android:color/white"
         android:pathData="M6,18l8.5,-6L6,6v12zM16,6v12h2V6h-2z" />
diff --git a/app/src/main/res/drawable/ic_skip_prev.xml b/app/src/main/res/drawable/ic_skip_prev.xml
index 38f80a46b..b5fba33ec 100644
--- a/app/src/main/res/drawable/ic_skip_prev.xml
+++ b/app/src/main/res/drawable/ic_skip_prev.xml
@@ -5,7 +5,7 @@
     android:viewportWidth="24"
     android:viewportHeight="24"
     android:autoMirrored="true"
-    android:tint="?android:attr/colorControlNormal">
+    android:tint="?attr/colorControlNormal">
     <path
         android:fillColor="@android:color/white"
         android:pathData="M6,6h2v12L6,18zM9.5,12l8.5,6L18,6z" />
diff --git a/app/src/main/res/drawable/ic_skip_prev_large.xml b/app/src/main/res/drawable/ic_skip_prev_large.xml
index 76f39a516..d5a20d060 100644
--- a/app/src/main/res/drawable/ic_skip_prev_large.xml
+++ b/app/src/main/res/drawable/ic_skip_prev_large.xml
@@ -5,7 +5,7 @@
     android:viewportWidth="24"
     android:viewportHeight="24"
     android:autoMirrored="true"
-    android:tint="?android:attr/colorControlNormal">
+    android:tint="?attr/colorControlNormal">
     <path
         android:fillColor="@android:color/white"
         android:pathData="M6,6h2v12L6,18zM9.5,12l8.5,6L18,6z" />
diff --git a/app/src/main/res/drawable/ic_song.xml b/app/src/main/res/drawable/ic_song.xml
index cda97cac2..2be9f49d7 100644
--- a/app/src/main/res/drawable/ic_song.xml
+++ b/app/src/main/res/drawable/ic_song.xml
@@ -3,7 +3,7 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24"
-    android:tint="?android:attr/colorPrimary">
+    android:tint="?attr/colorPrimary">
     <path
         android:fillColor="@android:color/white"
         android:pathData="M12,3v10.55c-0.59,-0.34 -1.27,-0.55 -2,-0.55 -2.21,0 -4,1.79 -4,4s1.79,4 4,4 4,-1.79 4,-4V7h4V3h-6z" />
diff --git a/app/src/main/res/drawable/ic_sort_alpha_down.xml b/app/src/main/res/drawable/ic_sort_alpha_down.xml
index 335594fc2..9016fcd76 100644
--- a/app/src/main/res/drawable/ic_sort_alpha_down.xml
+++ b/app/src/main/res/drawable/ic_sort_alpha_down.xml
@@ -3,7 +3,7 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24"
-    android:tint="?android:attr/colorPrimary">
+    android:tint="?attr/colorPrimary">
     <path
         android:pathData="M3.694 17.992H0.976l4.142-12h3.27l4.136 12H9.806L6.8 8.734H6.706zm-0.17-4.717h6.422v1.98H3.524zm10.313 4.717v-1.506l5.988-8.402h-6V5.992h9.188v1.505L17.018 15.9h6.006v2.092z"
         android:strokeWidth="0.4125"
diff --git a/app/src/main/res/drawable/ic_sort_alpha_up.xml b/app/src/main/res/drawable/ic_sort_alpha_up.xml
index 1cdbb3266..4de23d961 100644
--- a/app/src/main/res/drawable/ic_sort_alpha_up.xml
+++ b/app/src/main/res/drawable/ic_sort_alpha_up.xml
@@ -3,7 +3,7 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24"
-    android:tint="?android:attr/colorPrimary">
+    android:tint="?attr/colorPrimary">
     <path
         android:pathData="M15.5 3.448h-7L12-0.008l3.5 3.456z"
         android:strokeWidth="0.139935"
diff --git a/app/src/main/res/drawable/ic_sort_none.xml b/app/src/main/res/drawable/ic_sort_none.xml
index 9e4362c1a..856d0c96e 100644
--- a/app/src/main/res/drawable/ic_sort_none.xml
+++ b/app/src/main/res/drawable/ic_sort_none.xml
@@ -4,7 +4,7 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24"
-    android:tint="?android:attr/colorControlNormal">
+    android:tint="?attr/colorControlNormal">
     <path
         android:fillColor="@android:color/white"
         android:pathData="M3,18h6v-2L3,16v2zM3,6v2h18L21,6L3,6zM3,13h12v-2L3,11v2z" />
diff --git a/app/src/main/res/drawable/ic_sort_numeric_up.xml b/app/src/main/res/drawable/ic_sort_numeric_up.xml
index ee6167a32..8c1bfaf51 100644
--- a/app/src/main/res/drawable/ic_sort_numeric_up.xml
+++ b/app/src/main/res/drawable/ic_sort_numeric_up.xml
@@ -4,7 +4,7 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24"
-    android:tint="?android:attr/colorPrimary">
+    android:tint="?attr/colorPrimary">
     <path
         android:pathData="M6.542 18q-1.508-0.006-2.595-0.716-1.082-0.711-1.667-2.06-0.578-1.348-0.573-3.244 0-1.89 0.58-3.221 0.584-1.331 1.665-2.025 1.088-0.7 2.59-0.7 1.503 0 2.584 0.7 1.088 0.7 1.673 2.03 0.584 1.326 0.578 3.216 0 1.902-0.584 3.25-0.579 1.348-1.66 2.06Q8.05 18 6.542 18zm0-2.025q1.03 0 1.643-0.999 0.614-0.998 0.608-2.996 0-1.314-0.28-2.188-0.275-0.875-0.784-1.315-0.503-0.44-1.187-0.44-1.023 0-1.637 0.987-0.614 0.988-0.62 2.957 0 1.33 0.276 2.222 0.28 0.886 0.789 1.332 0.508 0.44 1.193 0.44zM17.51 6q0.924 0 1.777 0.3 0.86 0.293 1.532 0.953 0.679 0.66 1.07 1.749 0.398 1.083 0.404 2.668-0.006 1.472-0.351 2.629-0.34 1.15-0.976 1.958-0.638 0.806-1.538 1.23-0.895 0.417-2.005 0.417-1.199 0-2.117-0.446-0.918-0.45-1.479-1.224-0.555-0.779-0.672-1.749h2.496q0.146 0.632 0.614 0.982 0.468 0.344 1.158 0.344 1.169 0 1.777-0.982 0.608-0.987 0.614-2.702h-0.082Q19.463 12.635 19.007 13q-0.456 0.362-1.046 0.559-0.585 0.197-1.246 0.197-1.058 0-1.894-0.48-0.83-0.479-1.31-1.32-0.479-0.846-0.473-1.929-0.006-1.173 0.555-2.082 0.562-0.914 1.567-1.433Q16.172 5.994 17.51 6zm0.018 1.918q-0.59 0-1.053 0.271Q16.02 8.46 15.75 8.923q-0.263 0.462-0.257 1.038-0.006 0.575 0.252 1.032 0.263 0.457 0.719 0.728 0.456 0.265 1.04 0.265 0.439 0 0.807-0.158 0.374-0.158 0.65-0.434 0.28-0.282 0.438-0.65 0.158-0.372 0.163-0.795-0.005-0.558-0.269-1.02-0.263-0.463-0.725-0.734-0.461-0.277-1.04-0.277z"
         android:strokeWidth="0.404319"
diff --git a/app/src/main/res/drawable/ui_cursor.xml b/app/src/main/res/drawable/ui_cursor.xml
index 5d7eb28cc..18b632b48 100644
--- a/app/src/main/res/drawable/ui_cursor.xml
+++ b/app/src/main/res/drawable/ui_cursor.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-Custom ui_cursor shape that reflects the current accent color.
+Custom cursor shape that reflects the current accent color.
 https://stackoverflow.com/a/28311351/14143986
 -->
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-    <solid android:color="?android:attr/colorPrimary" />
+    <solid android:color="?attr/colorPrimary" />
     <size android:width="2dp" />
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ui_seekbar_indicator.xml b/app/src/main/res/drawable/ui_seekbar_indicator.xml
index 23e5b6501..a6a040324 100644
--- a/app/src/main/res/drawable/ui_seekbar_indicator.xml
+++ b/app/src/main/res/drawable/ui_seekbar_indicator.xml
@@ -2,7 +2,7 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item>
         <shape android:shape="oval">
-            <solid android:color="?android:attr/colorPrimary" />
+            <solid android:color="?attr/colorPrimary" />
         </shape>
     </item>
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_compact_playback.xml b/app/src/main/res/layout/fragment_compact_playback.xml
index 67c7fe6e5..0f7cb94ea 100644
--- a/app/src/main/res/layout/fragment_compact_playback.xml
+++ b/app/src/main/res/layout/fragment_compact_playback.xml
@@ -29,8 +29,8 @@
             android:layout_width="match_parent"
             android:layout_height="@dimen/height_compact_progress"
             android:clickable="false"
-            android:progressBackgroundTint="?android:attr/colorControlNormal"
-            android:progressTint="?android:attr/colorPrimary"
+            android:progressBackgroundTint="?attr/colorControlNormal"
+            android:progressTint="?attr/colorPrimary"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
             tools:progress="70" />
diff --git a/app/src/main/res/layout/fragment_main.xml b/app/src/main/res/layout/fragment_main.xml
index 28d0d3fb8..e8d9a9b1d 100644
--- a/app/src/main/res/layout/fragment_main.xml
+++ b/app/src/main/res/layout/fragment_main.xml
@@ -34,10 +34,10 @@
             android:elevation="@dimen/elevation_normal"
             app:layout_constraintBottom_toBottomOf="parent"
             app:tabGravity="fill"
-            app:tabIconTint="?android:attr/colorPrimary"
+            app:tabIconTint="?attr/colorPrimary"
             app:tabIconTintMode="src_in"
             app:tabIndicator="@drawable/ui_indicator"
-            app:tabIndicatorColor="?android:attr/colorPrimary"
+            app:tabIndicatorColor="?attr/colorPrimary"
             app:tabMode="fixed"
             app:tabRippleColor="@color/selection_color"
             tools:background="@color/control_color" />
diff --git a/app/src/main/res/layout/fragment_playback.xml b/app/src/main/res/layout/fragment_playback.xml
index 1a394b065..19821a80b 100644
--- a/app/src/main/res/layout/fragment_playback.xml
+++ b/app/src/main/res/layout/fragment_playback.xml
@@ -114,9 +114,9 @@
             android:clickable="true"
             android:focusable="true"
             android:progressBackgroundTint="?android:attr/colorControlNormal"
-            android:progressTint="?android:attr/colorPrimary"
+            android:progressTint="?attr/colorPrimary"
             android:splitTrack="false"
-            android:thumbTint="?android:attr/colorPrimary"
+            android:thumbTint="?attr/colorPrimary"
             app:layout_constraintBottom_toTopOf="@+id/playback_duration_current"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
@@ -149,7 +149,7 @@
             android:layout_height="@dimen/size_play_pause"
             android:layout_marginBottom="30dp"
             android:background="@drawable/ui_circular_button"
-            android:backgroundTint="?android:attr/colorPrimary"
+            android:backgroundTint="?attr/colorPrimary"
             android:contentDescription="@{playbackModel.isPlaying ? @string/description_pause : @string/description_play}"
             android:foregroundTint="@color/background"
             android:onClick="@{() -> playbackModel.invertPlayingStatus()}"
diff --git a/app/src/main/res/layout/item_queue_song.xml b/app/src/main/res/layout/item_queue_song.xml
index 4f46ca0e8..6413f3ae3 100644
--- a/app/src/main/res/layout/item_queue_song.xml
+++ b/app/src/main/res/layout/item_queue_song.xml
@@ -67,7 +67,7 @@
             android:id="@+id/song_drag_handle"
             android:layout_width="wrap_content"
             android:layout_height="0dp"
-            android:padding="@dimen/padding_small"
+            android:padding="@dimen/padding_tiny"
             android:clickable="true"
             android:focusable="true"
             android:src="@drawable/ic_handle"
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index ef43909fa..767d077e3 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -6,8 +6,9 @@
         <item name="android:statusBarColor">@android:color/black</item>
         <item name="android:fontFamily">@font/inter</item>
         <item name="android:textCursorDrawable">@drawable/ui_cursor</item>
-        <item name="android:colorControlNormal">@color/control_color</item>
         <item name="android:fitsSystemWindows">true</item>
+
+        <item name="colorControlNormal">@color/control_color</item>
     </style>
 
     <!-- Hack to fix the weird icon/underline with LibraryFragment's SearchView -->
@@ -18,13 +19,13 @@
     <!-- Toolbar Title Theme -->
     <style name="TextAppearance.Toolbar.Header" parent="TextAppearance.Widget.AppCompat.Toolbar.Title">
         <item name="android:fontFamily">@font/inter_black</item>
-        <item name="android:textColor">?android:attr/colorPrimary</item>
+        <item name="android:textColor">?attr/colorPrimary</item>
     </style>
 
     <!-- Title theme for Detail Fragments -->
     <style name="DetailHeader">
         <item name="android:textAppearance">?android:attr/textAppearanceLarge</item>
-        <item name="android:textColor">?android:attr/colorPrimary</item>
+        <item name="android:textColor">?attr/colorPrimary</item>
         <item name="android:fontFamily">@font/inter_black</item>
         <item name="android:textSize">@dimen/text_size_header_max</item>
     </style>