diff --git a/CHANGELOG.md b/CHANGELOG.md
index f363b1ae7..06e0002f3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,6 +19,9 @@ within it
 - Fixed blurry playing indicator in album/artist/genre/playlist items
 - Fixed incorrect songs being displayed when adding albums to the end of the queue
 
+#### What's Changed
+- Android Lollipop and Marshmallow support have been dropped
+
 ## 3.1.0
 
 #### What's New
diff --git a/README.md b/README.md
index fb8ede52d..8dd46d94c 100644
--- a/README.md
+++ b/README.md
@@ -11,7 +11,7 @@
     <a href="https://www.gnu.org/licenses/gpl-3.0">
         <img src="https://img.shields.io/badge/license-GPL%20v3-2B6DBE.svg?style=flat">
     </a>
-    <img alt="Minimum SDK Version" src="https://img.shields.io/badge/API-21%2B-1450A8?style=flat">
+    <img alt="Minimum SDK Version" src="https://img.shields.io/badge/API-24%2B-1450A8?style=flat">
 </p>
 <h4 align="center"><a href="/CHANGELOG.md">Changelog</a> | <a href="https://github.com/OxygenCobalt/Auxio/wiki">Wiki</a></h4>
 <p align="center">
diff --git a/app/build.gradle b/app/build.gradle
index 16c0c2cca..965b4244b 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -23,7 +23,7 @@ android {
         versionName "3.1.0"
         versionCode 30
 
-        minSdk 21
+        minSdk 24
         targetSdk 33
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
diff --git a/app/src/main/java/org/oxycblt/auxio/util/ContextUtil.kt b/app/src/main/java/org/oxycblt/auxio/util/ContextUtil.kt
index d4c058077..c8bcd6a9c 100644
--- a/app/src/main/java/org/oxycblt/auxio/util/ContextUtil.kt
+++ b/app/src/main/java/org/oxycblt/auxio/util/ContextUtil.kt
@@ -184,7 +184,7 @@ fun Context.newMainPendingIntent(): PendingIntent =
         this,
         IntegerTable.REQUEST_CODE,
         Intent(this, MainActivity::class.java),
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) PendingIntent.FLAG_IMMUTABLE else 0)
+        PendingIntent.FLAG_IMMUTABLE)
 
 /**
  * Create a [PendingIntent] that will broadcast the specified command when launched.
@@ -196,4 +196,4 @@ fun Context.newBroadcastPendingIntent(action: String): PendingIntent =
         this,
         IntegerTable.REQUEST_CODE,
         Intent(action).setFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY),
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) PendingIntent.FLAG_IMMUTABLE else 0)
+        PendingIntent.FLAG_IMMUTABLE)
diff --git a/app/src/main/res/drawable-v23/ui_item_ripple.xml b/app/src/main/res/drawable-v23/ui_item_ripple.xml
deleted file mode 100644
index 8f0d43cfb..000000000
--- a/app/src/main/res/drawable-v23/ui_item_ripple.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/sel_selection_bg" />
-    <item android:drawable="?attr/selectableItemBackground" />
-</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ui_item_bg.xml b/app/src/main/res/drawable/ui_item_bg.xml
index fb0a9dec3..a8a60879f 100644
--- a/app/src/main/res/drawable/ui_item_bg.xml
+++ b/app/src/main/res/drawable/ui_item_bg.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:drawable="?attr/colorSurface" />
+    <item android:drawable="@drawable/sel_selection_bg" />
     <item android:drawable="@drawable/ui_item_ripple" />
 </layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/values-v23/styles_core.xml b/app/src/main/res/values-v23/styles_core.xml
deleted file mode 100644
index c3bd17685..000000000
--- a/app/src/main/res/values-v23/styles_core.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <style name="Theme.Auxio.V23" parent="Theme.Auxio">
-
-        <!-- Fix dumb default android behavior -->
-        <item name="colorControlHighlight">@color/sel_compat_ripple</item>
-
-        <!-- Work around hard-coded text highlight colors in the default Material3 theme -->
-        <item name="android:textColorHighlight">@color/overlay_text_highlight</item>
-        <item name="android:textColorHighlightInverse">@color/overlay_text_highlight_inverse</item>
-    </style>
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles_core.xml b/app/src/main/res/values/styles_core.xml
index bbe18c90c..446c3064f 100644
--- a/app/src/main/res/values/styles_core.xml
+++ b/app/src/main/res/values/styles_core.xml
@@ -50,9 +50,15 @@
         <item name="windowActionBar">false</item>
         <item name="windowNoTitle">true</item>
 
+        <!-- Fix dumb default android behavior -->
+        <item name="colorControlHighlight">@color/sel_compat_ripple</item>
         <item name="colorControlNormal">?attr/colorOnSurfaceVariant</item>
         <item name="colorControlActivated">?attr/colorPrimary</item>
 
+        <!-- Work around hard-coded text highlight colors in the default Material3 theme -->
+        <item name="android:textColorHighlight">@color/overlay_text_highlight</item>
+        <item name="android:textColorHighlightInverse">@color/overlay_text_highlight_inverse</item>
+
         <item name="preferenceTheme">@style/PreferenceTheme.Auxio</item>
         <item name="preferenceStyle">@style/Preference.Auxio</item>
         <item name="preferenceCategoryStyle">@style/Preference.Auxio.PreferenceCategory</item>