diff --git a/app/src/main/java/org/oxycblt/auxio/music/MusicLoader.kt b/app/src/main/java/org/oxycblt/auxio/music/MusicLoader.kt
index 2b925824c..e4da22cb3 100644
--- a/app/src/main/java/org/oxycblt/auxio/music/MusicLoader.kt
+++ b/app/src/main/java/org/oxycblt/auxio/music/MusicLoader.kt
@@ -51,6 +51,7 @@ class MusicLoader(private val context: Context) {
 
     @Suppress("DEPRECATION")
     private fun buildSelector() {
+        // TODO: Upgrade this to be compatible with Android Q.
         val blacklistDatabase = BlacklistDatabase.getInstance(context)
 
         val paths = blacklistDatabase.readPaths()
diff --git a/app/src/main/java/org/oxycblt/auxio/playback/queue/QueueFragment.kt b/app/src/main/java/org/oxycblt/auxio/playback/queue/QueueFragment.kt
index 981ca021f..f8bd096d4 100644
--- a/app/src/main/java/org/oxycblt/auxio/playback/queue/QueueFragment.kt
+++ b/app/src/main/java/org/oxycblt/auxio/playback/queue/QueueFragment.kt
@@ -11,6 +11,7 @@ import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
 import androidx.navigation.fragment.findNavController
 import androidx.recyclerview.widget.ItemTouchHelper
+import androidx.recyclerview.widget.RecyclerView
 import org.oxycblt.auxio.R
 import org.oxycblt.auxio.databinding.FragmentQueueBinding
 import org.oxycblt.auxio.music.BaseModel
@@ -111,9 +112,10 @@ class QueueFragment : Fragment() {
 
                 // Apply bottom padding to make sure that the last queue item isnt incorrectly lost,
                 // but also make sure that the added padding wont clip the child views entirely.
-                (v as ViewGroup).apply {
+                (v as RecyclerView).apply {
                     clipToPadding = false
                     updatePadding(bottom = bottom)
+                    overScrollMode = RecyclerView.OVER_SCROLL_IF_CONTENT_SCROLLS
                 }
 
                 insets
diff --git a/app/src/main/java/org/oxycblt/auxio/settings/blacklist/BlacklistDialog.kt b/app/src/main/java/org/oxycblt/auxio/settings/blacklist/BlacklistDialog.kt
index 516411892..f9452068b 100644
--- a/app/src/main/java/org/oxycblt/auxio/settings/blacklist/BlacklistDialog.kt
+++ b/app/src/main/java/org/oxycblt/auxio/settings/blacklist/BlacklistDialog.kt
@@ -138,8 +138,9 @@ class BlacklistDialog : LifecycleDialog() {
         // Instead of having to do a ton of cleanup and horrible code changes
         // to restart this application non-destructively, I just restart the UI task [There is only
         // one, after all] and then kill the application using exitProcess. Works well enough.
-        val intent = Intent(requireContext().applicationContext, MainActivity::class.java)
-        intent.flags = Intent.FLAG_ACTIVITY_CLEAR_TASK
+        val intent = Intent(requireContext().applicationContext, MainActivity::class.java).setFlags(
+            Intent.FLAG_ACTIVITY_CLEAR_TASK
+        )
 
         startActivity(intent)
 
diff --git a/app/src/main/res/layout-land/fragment_playback.xml b/app/src/main/res/layout-land/fragment_playback.xml
index c569f9c84..5d63416da 100644
--- a/app/src/main/res/layout-land/fragment_playback.xml
+++ b/app/src/main/res/layout-land/fragment_playback.xml
@@ -188,7 +188,6 @@
         <org.oxycblt.auxio.playback.PlayPauseButton
             android:id="@+id/playback_play_pause"
             style="@style/PlayPause"
-            android:contentDescription="@string/description_play_pause"
             android:onClick="@{() -> playbackModel.invertPlayingStatus()}"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="@+id/playback_song_duration"
diff --git a/app/src/main/res/layout-xlarge-land/fragment_playback.xml b/app/src/main/res/layout-xlarge-land/fragment_playback.xml
index 772141a01..e59a3f896 100644
--- a/app/src/main/res/layout-xlarge-land/fragment_playback.xml
+++ b/app/src/main/res/layout-xlarge-land/fragment_playback.xml
@@ -189,7 +189,6 @@
         <org.oxycblt.auxio.playback.PlayPauseButton
             android:id="@+id/playback_play_pause"
             style="@style/PlayPause"
-            android:contentDescription="@string/description_play_pause"
             android:onClick="@{() -> playbackModel.invertPlayingStatus()}"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="@+id/playback_song_container_duration"
diff --git a/app/src/main/res/layout-xlarge/fragment_playback.xml b/app/src/main/res/layout-xlarge/fragment_playback.xml
index 34f065c34..0adb434f3 100644
--- a/app/src/main/res/layout-xlarge/fragment_playback.xml
+++ b/app/src/main/res/layout-xlarge/fragment_playback.xml
@@ -178,7 +178,6 @@
             android:id="@+id/playback_play_pause"
             style="@style/PlayPause"
             android:layout_marginBottom="@dimen/spacing_large"
-            android:contentDescription="@string/description_play_pause"
             android:onClick="@{() -> playbackModel.invertPlayingStatus()}"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="@+id/playback_song_duration"
diff --git a/app/src/main/res/layout/fragment_playback.xml b/app/src/main/res/layout/fragment_playback.xml
index 8c3023fae..1c4bab60f 100644
--- a/app/src/main/res/layout/fragment_playback.xml
+++ b/app/src/main/res/layout/fragment_playback.xml
@@ -176,7 +176,6 @@
             android:id="@+id/playback_play_pause"
             style="@style/PlayPause"
             android:layout_marginBottom="@dimen/spacing_medium"
-            android:contentDescription="@string/description_play_pause"
             android:onClick="@{() -> playbackModel.invertPlayingStatus()}"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="@+id/playback_song_duration"
diff --git a/app/src/main/res/layout/fragment_queue.xml b/app/src/main/res/layout/fragment_queue.xml
index 4abd0ff13..f95f058ad 100644
--- a/app/src/main/res/layout/fragment_queue.xml
+++ b/app/src/main/res/layout/fragment_queue.xml
@@ -23,6 +23,7 @@
             android:id="@+id/queue_recycler"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
+            android:overScrollMode="ifContentScrolls"
             app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
             tools:listitem="@layout/item_queue_song" />
 
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 02746251a..bd4845afe 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -258,6 +258,8 @@
         <item name="android:layout_width">@dimen/size_play_pause</item>
         <item name="android:background">@drawable/ui_circle_ripple</item>
         <item name="android:backgroundTint">?attr/colorPrimary</item>
+        <item name="android:elevation">@dimen/elevation_normal</item>
+        <item name="android:contentDescription">@string/description_play_pause</item>
         <item name="android:tint">?android:attr/windowBackground</item>
         <item name="android:layout_marginStart">@dimen/spacing_large</item>
         <item name="android:layout_marginTop">@dimen/spacing_medium</item>