diff --git a/android/app/src/main/kotlin/com/novasonic/app/ui/component/PlaylistPickerSheet.kt b/android/app/src/main/kotlin/com/novasonic/app/ui/component/PlaylistPickerSheet.kt
index 27acfd2..12e4881 100644
--- a/android/app/src/main/kotlin/com/novasonic/app/ui/component/PlaylistPickerSheet.kt
+++ b/android/app/src/main/kotlin/com/novasonic/app/ui/component/PlaylistPickerSheet.kt
@@ -7,6 +7,7 @@ import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.filled.PlaylistAdd
 import androidx.compose.material.icons.automirrored.filled.QueueMusic
 import androidx.compose.material.icons.filled.Add
 import androidx.compose.material3.*
@@ -71,15 +72,19 @@ fun PlaylistPickerSheet(
             OutlinedTextField(
                 value = newName,
                 onValueChange = { newName = it },
-                placeholder = { Text("Neue Playlist…", fontSize = 14.sp) },
+                placeholder = { Text("Neue Playlist…", color = NsOnSurface2, fontSize = 14.sp) },
+                leadingIcon = { Icon(Icons.AutoMirrored.Filled.PlaylistAdd, null, tint = NsOnSurface2) },
                 singleLine = true,
+                shape = RoundedCornerShape(12.dp),
                 modifier = Modifier.weight(1f),
                 colors = OutlinedTextFieldDefaults.colors(
-                    focusedBorderColor   = NsAccent,
-                    unfocusedBorderColor = NsBorder,
-                    cursorColor          = NsAccent,
-                    focusedTextColor     = NsOnSurface,
-                    unfocusedTextColor   = NsOnSurface,
+                    focusedBorderColor      = NsAccent,
+                    unfocusedBorderColor    = NsOnSurface3,
+                    cursorColor             = NsAccent,
+                    focusedTextColor        = NsOnSurface,
+                    unfocusedTextColor      = NsOnSurface,
+                    focusedContainerColor   = NsSurface2,
+                    unfocusedContainerColor = NsSurface2,
                 ),
                 textStyle = androidx.compose.ui.text.TextStyle(
                     fontFamily = Outfit, fontSize = 14.sp,
diff --git a/android/app/src/main/kotlin/com/novasonic/app/ui/component/SongContextSheet.kt b/android/app/src/main/kotlin/com/novasonic/app/ui/component/SongContextSheet.kt
index 070876e..ddf643a 100644
--- a/android/app/src/main/kotlin/com/novasonic/app/ui/component/SongContextSheet.kt
+++ b/android/app/src/main/kotlin/com/novasonic/app/ui/component/SongContextSheet.kt
@@ -36,6 +36,9 @@ fun SongContextSheet(
 ) {
     ModalBottomSheet(
         onDismissRequest = onDismiss,
+        // Open fully expanded so all options (incl. "Herunterladen" at the bottom) are reachable
+        // right away — no extra drag-up needed.
+        sheetState = rememberModalBottomSheetState(skipPartiallyExpanded = true),
         containerColor = NsSurface,
         dragHandle = { BottomSheetDefaults.DragHandle(color = NsOnSurface2) },
     ) {