diff --git a/app/src/main/java/emu/skyline/views/DragIndicatorView.kt b/app/src/main/java/emu/skyline/views/DragHandleView.kt
similarity index 89%
rename from app/src/main/java/emu/skyline/views/DragIndicatorView.kt
rename to app/src/main/java/emu/skyline/views/DragHandleView.kt
index 7bd23027..ccb969dd 100644
--- a/app/src/main/java/emu/skyline/views/DragIndicatorView.kt
+++ b/app/src/main/java/emu/skyline/views/DragHandleView.kt
@@ -11,14 +11,16 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.transition.TransitionManager
 import com.google.android.material.bottomsheet.BottomSheetBehavior
-import emu.skyline.R
+import com.google.android.material.bottomsheet.BottomSheetDragHandleView
 
-class DragIndicatorView : androidx.appcompat.widget.AppCompatImageView {
+/**
+ * A [BottomSheetDragHandleView] that hides itself when the bottom sheet is expanded full-screen
+ */
+class DragHandleView : BottomSheetDragHandleView {
     private val visibilityCallback = DragIndicatorCallback()
     private var callbackAttached = false
 
     init {
-        setImageResource(R.drawable.drag_indicator)
         isFocusable = false
         isClickable = false
     }
diff --git a/app/src/main/res/drawable/drag_indicator.xml b/app/src/main/res/drawable/drag_indicator.xml
deleted file mode 100644
index e7117665..00000000
--- a/app/src/main/res/drawable/drag_indicator.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <size
-        android:width="42dp"
-        android:height="4dp" />
-    <solid android:color="@color/onBackgroundLight" />
-    <corners android:radius="4dp" />
-</shape>
diff --git a/app/src/main/res/layout/app_dialog.xml b/app/src/main/res/layout/app_dialog.xml
index 4d34d677..8f1b0f6e 100644
--- a/app/src/main/res/layout/app_dialog.xml
+++ b/app/src/main/res/layout/app_dialog.xml
@@ -6,11 +6,12 @@
     android:layout_height="wrap_content"
     android:orientation="vertical">
 
-    <emu.skyline.views.DragIndicatorView
+    <emu.skyline.views.DragHandleView
         android:id="@+id/drag_indicator"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:padding="8dp" />
+        android:minHeight="40dp"
+        android:paddingBottom="12dp" />
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/license_dialog.xml b/app/src/main/res/layout/license_dialog.xml
index b3442071..f8d14aa8 100644
--- a/app/src/main/res/layout/license_dialog.xml
+++ b/app/src/main/res/layout/license_dialog.xml
@@ -10,10 +10,11 @@
         android:orientation="vertical"
         android:paddingHorizontal="2.5dp">
 
-        <emu.skyline.views.DragIndicatorView
+        <emu.skyline.views.DragHandleView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:paddingVertical="8dp" />
+            android:minHeight="40dp"
+            android:paddingBottom="12dp" />
 
         <TextView
             android:id="@+id/library_title"
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
deleted file mode 100644
index 5e7b22fc..00000000
--- a/app/src/main/res/values-night/colors.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="onBackgroundLight">#1AFFFFFF</color>
-</resources>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index eb9cd5a8..538fb395 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <color name="logoBackground">#121212</color>
-    <color name="onBackgroundLight">#1E000000</color>
 
     <color name="colorPerfStatsPrimary">#9FFFFF00</color>
     <color name="colorPerfStatsSecondary">#9F00FFFF</color>