diff --git a/app/src/main/java/com/github/libretube/ui/sheets/PlayingQueueSheet.kt b/app/src/main/java/com/github/libretube/ui/sheets/PlayingQueueSheet.kt
index d8038e513..59c0d8bb4 100644
--- a/app/src/main/java/com/github/libretube/ui/sheets/PlayingQueueSheet.kt
+++ b/app/src/main/java/com/github/libretube/ui/sheets/PlayingQueueSheet.kt
@@ -33,13 +33,17 @@ class PlayingQueueSheet : BottomSheetDialogFragment() {
 
         binding.shuffle.setOnClickListener {
             val streams = PlayingQueue.getStreams()
-            streams.subList(PlayingQueue.currentIndex(), PlayingQueue.size()).shuffle()
-            adapter.notifyItemRangeChanged(0, PlayingQueue.size())
+            val size =  PlayingQueue.size()
+            streams.subList(PlayingQueue.currentIndex(), size).shuffle()
+            adapter.notifyItemRangeChanged(0, size)
         }
 
         binding.clear.setOnClickListener {
             val streams = PlayingQueue.getStreams()
-            streams.subList(PlayingQueue.currentIndex(), PlayingQueue.size()).clear()
+            val currentIndex = PlayingQueue.currentIndex()
+            val size = PlayingQueue.size()
+            streams.subList(currentIndex, size).clear()
+            adapter.notifyItemRangeRemoved(currentIndex + 1, size)
         }
 
         binding.bottomControls.setOnClickListener {
diff --git a/app/src/main/res/drawable/ic_shuffle.xml b/app/src/main/res/drawable/ic_shuffle.xml
index 76ff342cd..67d78b7a1 100644
--- a/app/src/main/res/drawable/ic_shuffle.xml
+++ b/app/src/main/res/drawable/ic_shuffle.xml
@@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="#000000"
+    android:tint="?attr/colorControlNormal"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
diff --git a/app/src/main/res/layout/queue_bottom_sheet.xml b/app/src/main/res/layout/queue_bottom_sheet.xml
index 7f6a0a8eb..01b45506d 100644
--- a/app/src/main/res/layout/queue_bottom_sheet.xml
+++ b/app/src/main/res/layout/queue_bottom_sheet.xml
@@ -26,7 +26,8 @@
             <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/options_recycler"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content" />
+                android:layout_height="0dp"
+                android:layout_weight="1" />
 
             <LinearLayout
                 android:id="@+id/bottom_controls"