diff --git a/app/src/main/kotlin/com/subtracks/ui/components/HeroDetailScaffold.kt b/app/src/main/kotlin/com/subtracks/ui/components/HeroDetailScaffold.kt
index 2e961041..c5a9a1ed 100644
--- a/app/src/main/kotlin/com/subtracks/ui/components/HeroDetailScaffold.kt
+++ b/app/src/main/kotlin/com/subtracks/ui/components/HeroDetailScaffold.kt
@@ -225,7 +225,7 @@ fun HeroHeader(
         modifier =
             modifier
                 .fillMaxWidth()
-                .padding(start = 24.dp, end = 24.dp, top = topInset + 24.dp, bottom = 16.dp),
+                .padding(start = 24.dp, end = 24.dp, top = topInset + 24.dp, bottom = 24.dp),
         horizontalAlignment = Alignment.CenterHorizontally,
     ) {
         CoverArt(
diff --git a/app/src/main/kotlin/com/subtracks/ui/library/SongsContent.kt b/app/src/main/kotlin/com/subtracks/ui/library/SongsContent.kt
index 07acb4a6..83a6e30a 100644
--- a/app/src/main/kotlin/com/subtracks/ui/library/SongsContent.kt
+++ b/app/src/main/kotlin/com/subtracks/ui/library/SongsContent.kt
@@ -5,6 +5,7 @@ import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.offset
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.shape.RoundedCornerShape
@@ -133,16 +134,37 @@ private fun CoverArtCell(
                     .matchParentSize()
                     .border(1.5.dp, MaterialTheme.colorScheme.primary, shape),
             )
-            Icon(
-                imageVector = Icons.Rounded.PlayArrow,
-                contentDescription = "Playing",
-                tint = MaterialTheme.colorScheme.primary,
+            PlayIndicator(
+                shadow = true,
                 modifier = Modifier.align(Alignment.Center).size(PLAY_ICON_SIZE),
             )
         }
     }
 }
 
+@Composable
+private fun PlayIndicator(
+    shadow: Boolean,
+    modifier: Modifier = Modifier,
+) {
+    Box(modifier) {
+        if (shadow) {
+            Icon(
+                imageVector = Icons.Rounded.PlayArrow,
+                contentDescription = null,
+                tint = Color.Black.copy(alpha = 0.6f),
+                modifier = Modifier.matchParentSize().offset(x = 1.dp, y = 1.dp),
+            )
+        }
+        Icon(
+            imageVector = Icons.Rounded.PlayArrow,
+            contentDescription = "Playing",
+            tint = MaterialTheme.colorScheme.primary,
+            modifier = Modifier.matchParentSize(),
+        )
+    }
+}
+
 @Composable
 private fun TrackCell(
     track: Long?,
@@ -153,12 +175,7 @@ private fun TrackCell(
         contentAlignment = Alignment.Center,
     ) {
         if (isPlaying) {
-            Icon(
-                imageVector = Icons.Rounded.PlayArrow,
-                contentDescription = "Playing",
-                tint = MaterialTheme.colorScheme.primary,
-                modifier = Modifier.size(PLAY_ICON_SIZE),
-            )
+            PlayIndicator(shadow = false, modifier = Modifier.size(PLAY_ICON_SIZE))
         } else if (track != null) {
             SmallNumber(track.toString())
         }
diff --git a/app/src/main/kotlin/com/subtracks/ui/playback/NowPlayingScreen.kt b/app/src/main/kotlin/com/subtracks/ui/playback/NowPlayingScreen.kt
index 70c69bde..ebe1b804 100644
--- a/app/src/main/kotlin/com/subtracks/ui/playback/NowPlayingScreen.kt
+++ b/app/src/main/kotlin/com/subtracks/ui/playback/NowPlayingScreen.kt
@@ -356,6 +356,7 @@ fun NowPlayingScreen(
                                         } else {
                                             MaterialTheme.colorScheme.onSurfaceVariant
                                         },
+                                    modifier = Modifier.size(32.dp),
                                 )
                             }
                         }
diff --git a/app/src/main/kotlin/com/subtracks/ui/playback/QueueScreen.kt b/app/src/main/kotlin/com/subtracks/ui/playback/QueueScreen.kt
index da95f72c..fedb3ef3 100644
--- a/app/src/main/kotlin/com/subtracks/ui/playback/QueueScreen.kt
+++ b/app/src/main/kotlin/com/subtracks/ui/playback/QueueScreen.kt
@@ -47,9 +47,7 @@ import androidx.lifecycle.ViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.lifecycle.viewModelScope
 import com.subtracks.data.model.CoverArtRef
-import com.subtracks.data.model.SongDownload
 import com.subtracks.data.model.SongItem
-import com.subtracks.data.repo.DownloadRepository
 import com.subtracks.data.repo.QUEUE_CHUNK
 import com.subtracks.data.repo.QueueRepository
 import com.subtracks.data.repo.QueueWindowItem
@@ -276,10 +274,8 @@ fun QueueRoute(
     viewModel: QueueViewModel = koinViewModel(),
     controller: PlaybackController = koinInject(),
     sourceRepository: SourceRepository = koinInject(),
-    downloadRepository: DownloadRepository = koinInject(),
 ) {
     val playback by controller.state.collectAsStateWithLifecycle()
-    val downloads by downloadRepository.states().collectAsStateWithLifecycle()
     val queueContext = playback.context
     // The item's album keeps the header stable while the async name lookup runs, so it does not
     // flash the fallback when tapping between context and manually queued tracks.
@@ -299,7 +295,6 @@ fun QueueRoute(
         currentSongId = playback.item?.id,
         shuffle = playback.shuffle,
         contextTitle = sourceTitle.value,
-        downloads = downloads,
         onClearUpNext = controller::clearUpNext,
         coverArt = sourceRepository::coverArt,
         onBack = onBack,
@@ -335,7 +330,6 @@ fun QueueScreen(
     generation: Int = 0,
     shuffle: Boolean = false,
     contextTitle: String? = null,
-    downloads: Map<String, SongDownload> = emptyMap(),
     onClearUpNext: () -> Unit = {},
 ) {
     val listState = rememberLazyListState()
@@ -452,7 +446,6 @@ fun QueueScreen(
                                     isPlaying = row.isPlaying(currentPosition, currentSongId),
                                     floating = isDragging,
                                     coverArt = coverArt,
-                                    download = downloads[row.song.song.id],
                                     dragHandle =
                                         if (!enabled) {
                                             null
@@ -553,7 +546,6 @@ private fun QueueRowItem(
     isPlaying: Boolean,
     floating: Boolean,
     coverArt: (String?, Boolean) -> CoverArtRef?,
-    download: SongDownload?,
     dragHandle: Modifier?,
     onClick: () -> Unit,
     onRemove: () -> Unit,
@@ -562,7 +554,6 @@ private fun QueueRowItem(
         song = row.song.song,
         coverArtId = row.song.coverArt,
         coverArt = coverArt,
-        download = download,
         isPlaying = isPlaying,
         trailingContent = {
             Row(verticalAlignment = Alignment.CenterVertically) {