diff --git a/ultrasonic/lint-baseline.xml b/ultrasonic/lint-baseline.xml
index d74e6655..c5d97926 100644
--- a/ultrasonic/lint-baseline.xml
+++ b/ultrasonic/lint-baseline.xml
@@ -286,38 +286,6 @@
             column="5"/>
     </issue>
 
-    <issue
-        id="UnusedResources"
-        message="The resource `R.drawable.btn_bg` appears to be unused"
-        errorLine1="    &lt;item android:drawable=&quot;@color/ics_opaque&quot; android:state_pressed=&quot;true&quot;/>"
-        errorLine2="^">
-        <location
-            file="src/main/res/drawable/btn_bg.xml"
-            line="14"
-            column="1"/>
-    </issue>
-
-    <issue
-        id="UnusedResources"
-        message="The resource `R.color.ics_opaque` appears to be unused"
-        errorLine1="    &lt;color name=&quot;ics_opaque&quot;>#8033b5e5&lt;/color>"
-        errorLine2="           ~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/values/colors.xml"
-            line="7"
-            column="12"/>
-    </issue>
-
-    <issue
-        id="UnusedResources"
-        message="The resource `R.color.md__transparent` appears to be unused"
-        errorLine1="    &lt;color name=&quot;md__transparent&quot;>#00000000&lt;/color>"
-        errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/values/colors.xml"
-            line="8"
-            column="12"/>
-    </issue>
 
     <issue
         id="UnusedResources"
@@ -341,16 +309,6 @@
             column="1"/>
     </issue>
 
-    <issue
-        id="UnusedResources"
-        message="The resource `R.drawable.line_drawable` appears to be unused"
-        errorLine1="&lt;selector xmlns:android=&quot;http://schemas.android.com/apk/res/android&quot;>"
-        errorLine2="^">
-        <location
-            file="src/main/res/drawable/line_drawable.xml"
-            line="2"
-            column="1"/>
-    </issue>
 
     <issue
         id="UnusedResources"
diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/util/Util.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/util/Util.kt
index 26ae9369..d8366c5e 100644
--- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/util/Util.kt
+++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/util/Util.kt
@@ -102,7 +102,7 @@ object Util {
         when (Settings.theme.lowercase()) {
             Constants.PREFERENCES_KEY_THEME_DARK,
             "fullscreen" -> {
-                context!!.setTheme(R.style.UltrasonicTheme)
+                context!!.setTheme(R.style.UltrasonicTheme_Dark)
             }
             Constants.PREFERENCES_KEY_THEME_BLACK -> {
                 context!!.setTheme(R.style.UltrasonicTheme_Black)
diff --git a/ultrasonic/src/main/res/drawable/btn_bg.xml b/ultrasonic/src/main/res/drawable/btn_bg.xml
deleted file mode 100644
index 79d40784..00000000
--- a/ultrasonic/src/main/res/drawable/btn_bg.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2010 The Android Open Source Project Licensed under the 
-	Apache License, Version 2.0 (the "License"); you may not use this file except 
-	in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 
-	Unless required by applicable law or agreed to in writing, software distributed 
-	under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES 
-	OR CONDITIONS OF ANY KIND, either express or implied. See the License for 
-	the specific language governing permissions and limitations under the License.


--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android" android:exitFadeDuration="@android:integer/config_mediumAnimTime">
-
-    <item android:drawable="@color/ics_opaque" android:state_pressed="true"/>
-    <item android:drawable="@color/ics_opaque" android:state_enabled="true" android:state_focused="true"/>
-
-</selector>
\ No newline at end of file
diff --git a/ultrasonic/src/main/res/drawable/line.xml b/ultrasonic/src/main/res/drawable/line.xml
deleted file mode 100644
index e3f2eaac..00000000
--- a/ultrasonic/src/main/res/drawable/line.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@android:color/darker_gray" />
-
-    <padding
-        android:top="10dp"
-        android:left="10dp"
-        android:right="10dp"
-        android:bottom="10dp"/>
-</shape>
\ No newline at end of file
diff --git a/ultrasonic/src/main/res/drawable/line_drawable.xml b/ultrasonic/src/main/res/drawable/line_drawable.xml
deleted file mode 100644
index 4f79f470..00000000
--- a/ultrasonic/src/main/res/drawable/line_drawable.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:state_pressed="true"
-        android:drawable="@drawable/line"/>
-
-    <item
-        android:drawable="@drawable/line"/>
-</selector>
\ No newline at end of file
diff --git a/ultrasonic/src/main/res/layout/now_playing.xml b/ultrasonic/src/main/res/layout/now_playing.xml
index 5cf76272..60012de0 100644
--- a/ultrasonic/src/main/res/layout/now_playing.xml
+++ b/ultrasonic/src/main/res/layout/now_playing.xml
@@ -21,7 +21,8 @@
             android:layout_height="64.0dip"
             android:focusable="true"
             android:gravity="center"
-            android:layout_marginStart="6dp" />
+            android:layout_marginStart="6dp"
+            android:importantForAccessibility="no"/>
 
         <LinearLayout
             android:layout_width="0.0dp"
@@ -62,7 +63,8 @@
             android:layout_weight="0.0"
             android:focusable="false"
             android:scaleType="fitCenter"
-            android:src="?attr/media_pause" />
+            android:src="?attr/media_pause"
+            android:contentDescription="@string/buttons.play"/>
 
     </LinearLayout>
 
diff --git a/ultrasonic/src/main/res/layout/select_album_header.xml b/ultrasonic/src/main/res/layout/select_album_header.xml
index 95e3096e..c33df633 100644
--- a/ultrasonic/src/main/res/layout/select_album_header.xml
+++ b/ultrasonic/src/main/res/layout/select_album_header.xml
@@ -7,7 +7,7 @@
         a:id="@+id/select_album_art"
         a:layout_width="160dip"
         a:layout_height="160dip"
-        a:layout_alignParentLeft="true"
+        a:layout_alignParentStart="true"
         a:layout_alignParentTop="true"
         a:layout_marginEnd="10dip"
         a:contentDescription="@null"
diff --git a/ultrasonic/src/main/res/layout/song_details.xml b/ultrasonic/src/main/res/layout/song_details.xml
index 7cab9d5f..4de05f9d 100644
--- a/ultrasonic/src/main/res/layout/song_details.xml
+++ b/ultrasonic/src/main/res/layout/song_details.xml
@@ -26,10 +26,10 @@
             a:layout_height="wrap_content"
             a:layout_gravity="left|center_vertical"
             a:layout_weight="1"
-            a:drawablePadding="6dip"
+            a:drawablePadding="4dip"
             a:ellipsize="end"
-            a:paddingStart="4dip"
-            a:paddingEnd="2dip"
+            a:paddingStart="6dip"
+            a:paddingEnd="4dip"
             a:singleLine="true"
             a:textAppearance="?android:attr/textAppearanceMedium"/>
 
@@ -55,7 +55,8 @@
             a:layout_gravity="left|center_vertical"
             a:layout_weight="1"
             a:ellipsize="middle"
-            a:paddingStart="4dip"
+            a:paddingStart="1dip"
+            a:paddingEnd="4dip"
             a:singleLine="true"
             a:textAppearance="?android:attr/textAppearanceSmall"/>
 
diff --git a/ultrasonic/src/main/res/menu/main.xml b/ultrasonic/src/main/res/menu/main.xml
deleted file mode 100644
index 78713454..00000000
--- a/ultrasonic/src/main/res/menu/main.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu
-    xmlns:a="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    >
-
-    <item
-        a:id="@+id/main_shuffle"
-        a:icon="?attr/media_shuffle"
-        app:showAsAction="ifRoom|withText"
-        a:title="@string/main.shuffle"/>
-
-</menu>
\ No newline at end of file
diff --git a/ultrasonic/src/main/res/values/colors.xml b/ultrasonic/src/main/res/values/colors.xml
index 9d5bf7c3..189a0d42 100644
--- a/ultrasonic/src/main/res/values/colors.xml
+++ b/ultrasonic/src/main/res/values/colors.xml
@@ -6,8 +6,6 @@
     <color name="cyan">#0099cc</color>
     <color name="navigation_header_light">#6200EE</color>
     <color name="navigation_header_dark">#BB86FC</color>
-    <color name="ics_opaque">#8033b5e5</color>
-    <color name="md__transparent">#00000000</color>
     <color name="translucent">#80000000</color>
     <color name="background_color_dark">#000000</color>
     <color name="background_color_grey">#333333</color>
diff --git a/ultrasonic/src/main/res/values/themes.xml b/ultrasonic/src/main/res/values/themes.xml
index 286b548c..4e23d827 100644
--- a/ultrasonic/src/main/res/values/themes.xml
+++ b/ultrasonic/src/main/res/values/themes.xml
@@ -64,7 +64,7 @@
         <item name="list_selector_holo_selected">@drawable/list_selector_holo_dark_selected</item>
     </style>
 
-    <style name="UltrasonicTheme" parent="Theme.MaterialComponents">
+    <style name="UltrasonicTheme.Dark" parent="Theme.MaterialComponents">
         <item name="windowActionBar">false</item>
         <item name="windowNoTitle">true</item>
         <item name="color_background">@color/background_color_grey</item>
diff --git a/ultrasonic/src/main/res/xml/settings.xml b/ultrasonic/src/main/res/xml/settings.xml
index a97aaff8..d307bd57 100644
--- a/ultrasonic/src/main/res/xml/settings.xml
+++ b/ultrasonic/src/main/res/xml/settings.xml
@@ -19,7 +19,7 @@
             a:title="@string/settings.server_scaling_title"
             app:iconSpaceReserved="false"/>
         <CheckBoxPreference
-            a:defaultValue="true"
+            a:defaultValue="false"
             a:key="displayBitrateWithArtist"
             a:summary="@string/settings.display_bitrate_summary"
             a:title="@string/settings.display_bitrate"