diff --git a/app/components/BackgroundHeaderFlatList.tsx b/app/components/BackgroundHeaderFlatList.tsx
new file mode 100644
index 0000000..87c07f8
--- /dev/null
+++ b/app/components/BackgroundHeaderFlatList.tsx
@@ -0,0 +1,54 @@
+import React from 'react'
+import { FlatList, FlatListProps, useWindowDimensions, View, StyleSheet } from 'react-native'
+import colors from '@app/styles/colors'
+import GradientBackground, { GradientBackgroundProps } from '@app/components/GradientBackground'
+import { useLayout } from '@react-native-community/hooks'
+import NothingHere from './NothingHere'
+import ImageGradientBackground, { ImageGradientBackgroundProps } from './ImageGradientBackground'
+
+export type BackgroundHeaderFlatListPropsBase<ItemT> = FlatListProps<ItemT> & {
+  contentMarginTop?: number
+}
+
+export type BackgroundHeaderFlatListProp<ItemT> = BackgroundHeaderFlatListPropsBase<ItemT> & {
+  BackgroundComponent: typeof ImageGradientBackground | typeof GradientBackground
+  backgroundProps?: ImageGradientBackgroundProps | GradientBackgroundProps
+}
+
+function BackgroundHeaderFlatList<ItemT>(props: BackgroundHeaderFlatListProp<ItemT>) {
+  const window = useWindowDimensions()
+  const headerLayout = useLayout()
+
+  let marginBottom = -window.height + (props.contentMarginTop || 0)
+  if (props.ListHeaderComponent) {
+    marginBottom += headerLayout.height || window.height
+  }
+
+  const headerStyle = { marginBottom }
+
+  return (
+    <FlatList
+      {...props}
+      contentContainerStyle={[props.contentContainerStyle, { minHeight: window.height }]}
+      style={[props.style, styles.list]}
+      ListHeaderComponent={
+        <props.BackgroundComponent position="relative" {...props.backgroundProps}>
+          <View onLayout={headerLayout.onLayout}>{props.ListHeaderComponent}</View>
+        </props.BackgroundComponent>
+      }
+      ListHeaderComponentStyle={[headerStyle]}
+      ListEmptyComponent={<NothingHere style={styles.nothing} />}
+    />
+  )
+}
+
+const styles = StyleSheet.create({
+  list: {
+    backgroundColor: colors.gradient.low,
+  },
+  nothing: {
+    width: '100%',
+  },
+})
+
+export default BackgroundHeaderFlatList
diff --git a/app/components/GradientBackground.tsx b/app/components/GradientBackground.tsx
index 4491a74..a16e1d2 100644
--- a/app/components/GradientBackground.tsx
+++ b/app/components/GradientBackground.tsx
@@ -3,14 +3,27 @@ import { useWindowDimensions, ViewStyle } from 'react-native'
 import LinearGradient from 'react-native-linear-gradient'
 import colorStyles from '@app/styles/colors'
 
-const GradientBackground: React.FC<{
+export type GradientBackgroundPropsBase = {
   height?: number | string
   width?: number | string
   position?: 'relative' | 'absolute'
   style?: ViewStyle
+}
+
+export type GradientBackgroundProps = GradientBackgroundPropsBase & {
   colors?: string[]
   locations?: number[]
-}> = ({ height, width, position, style, colors, locations, children }) => {
+}
+
+const GradientBackground: React.FC<GradientBackgroundProps> = ({
+  height,
+  width,
+  position,
+  style,
+  colors,
+  locations,
+  children,
+}) => {
   const layout = useWindowDimensions()
 
   return (
diff --git a/app/components/GradientFlatList.tsx b/app/components/GradientFlatList.tsx
index f6d85b8..953c8cd 100644
--- a/app/components/GradientFlatList.tsx
+++ b/app/components/GradientFlatList.tsx
@@ -1,28 +1,13 @@
+import GradientBackground, { GradientBackgroundProps } from '@app/components/GradientBackground'
 import React from 'react'
-import { FlatList, FlatListProps, StyleSheet, useWindowDimensions } from 'react-native'
-import colors from '@app/styles/colors'
-import GradientBackground from '@app/components/GradientBackground'
+import BackgroundHeaderFlatList, { BackgroundHeaderFlatListPropsBase } from './BackgroundHeaderFlatList'
 
-function GradientFlatList<ItemT>(props: FlatListProps<ItemT>) {
-  const layout = useWindowDimensions()
+export type GradientFlatListProps<ItemT> = BackgroundHeaderFlatListPropsBase<ItemT> & {
+  backgroundProps?: GradientBackgroundProps
+}
 
-  const contentContainerStyle = StyleSheet.flatten(props.contentContainerStyle)
-
-  return (
-    <FlatList
-      {...props}
-      style={{
-        ...(props.style as any),
-        backgroundColor: colors.gradient.low,
-      }}
-      ListHeaderComponent={() => <GradientBackground position="relative" />}
-      ListHeaderComponentStyle={{
-        marginBottom: -layout.height,
-        marginHorizontal: -(contentContainerStyle.paddingHorizontal || 0),
-        top: -(contentContainerStyle.paddingTop || 0),
-      }}
-    />
-  )
+function GradientFlatList<ItemT>(props: GradientFlatListProps<ItemT>) {
+  return <BackgroundHeaderFlatList BackgroundComponent={GradientBackground} {...props} />
 }
 
 export default GradientFlatList
diff --git a/app/components/ImageGradientBackground.tsx b/app/components/ImageGradientBackground.tsx
index 15bf056..07d41c5 100644
--- a/app/components/ImageGradientBackground.tsx
+++ b/app/components/ImageGradientBackground.tsx
@@ -1,16 +1,11 @@
 import { useNavigation } from '@react-navigation/native'
 import React, { useEffect, useState } from 'react'
-import { ViewStyle } from 'react-native'
 import ImageColors from 'react-native-image-colors'
 import { AndroidImageColors } from 'react-native-image-colors/lib/typescript/types'
 import colors from '@app/styles/colors'
-import GradientBackground from '@app/components/GradientBackground'
+import GradientBackground, { GradientBackgroundPropsBase } from '@app/components/GradientBackground'
 
-export type ImageGradientBackgroundProps = {
-  height?: number | string
-  width?: number | string
-  position?: 'relative' | 'absolute'
-  style?: ViewStyle
+export type ImageGradientBackgroundProps = GradientBackgroundPropsBase & {
   imagePath?: string
   onGetColor?: (color: string) => void
 }
diff --git a/app/components/ImageGradientFlatList.tsx b/app/components/ImageGradientFlatList.tsx
new file mode 100644
index 0000000..c10f706
--- /dev/null
+++ b/app/components/ImageGradientFlatList.tsx
@@ -0,0 +1,13 @@
+import React from 'react'
+import BackgroundHeaderFlatList, { BackgroundHeaderFlatListPropsBase } from './BackgroundHeaderFlatList'
+import ImageGradientBackground, { ImageGradientBackgroundProps } from './ImageGradientBackground'
+
+export type ImageGradientFlatListProps<ItemT> = BackgroundHeaderFlatListPropsBase<ItemT> & {
+  backgroundProps?: ImageGradientBackgroundProps
+}
+
+function ImageGradientFlatList<ItemT>(props: ImageGradientFlatListProps<ItemT>) {
+  return <BackgroundHeaderFlatList BackgroundComponent={ImageGradientBackground} {...props} />
+}
+
+export default ImageGradientFlatList
diff --git a/app/components/ListItem.tsx b/app/components/ListItem.tsx
index b25ed23..0e36e1a 100644
--- a/app/components/ListItem.tsx
+++ b/app/components/ListItem.tsx
@@ -7,7 +7,7 @@ import colors from '@app/styles/colors'
 import font from '@app/styles/font'
 import { useNavigation } from '@react-navigation/native'
 import React, { useCallback } from 'react'
-import { StyleSheet, Text, View } from 'react-native'
+import { StyleProp, StyleSheet, Text, View, ViewStyle } from 'react-native'
 import IconFA5 from 'react-native-vector-icons/FontAwesome5'
 import IconMat from 'react-native-vector-icons/MaterialIcons'
 import { AlbumContextPressable, ArtistContextPressable, SongContextPressable } from './ContextMenu'
@@ -55,7 +55,8 @@ const ListItem: React.FC<{
   showStar?: boolean
   listStyle?: 'big' | 'small'
   subtitle?: string
-}> = ({ item, contextId, queueId, onPress, showArt, showStar, subtitle, listStyle }) => {
+  style?: StyleProp<ViewStyle>
+}> = ({ item, contextId, queueId, onPress, showArt, showStar, subtitle, listStyle, style }) => {
   const navigation = useNavigation()
   const starred = useStarred(item.id, item.itemType)
 
@@ -156,7 +157,7 @@ const ListItem: React.FC<{
   }
 
   return (
-    <View style={[styles.container, sizeStyle.container]}>
+    <View style={[styles.container, sizeStyle.container, style]}>
       <PressableComponent>
         {showArt && coverArt}
         <View style={styles.text}>
diff --git a/app/screens/LibraryAlbums.tsx b/app/screens/LibraryAlbums.tsx
index 2d5ffc0..351a40d 100644
--- a/app/screens/LibraryAlbums.tsx
+++ b/app/screens/LibraryAlbums.tsx
@@ -72,7 +72,6 @@ const AlbumsList = () => {
   return (
     <View style={styles.container}>
       <GradientFlatList
-        contentContainerStyle={styles.listContent}
         data={list.map(album => ({ album, size, height }))}
         renderItem={AlbumListRenderItem}
         keyExtractor={item => item.album.id}
@@ -100,9 +99,6 @@ const AlbumsList = () => {
 }
 
 const styles = StyleSheet.create({
-  listContent: {
-    minHeight: '100%',
-  },
   container: {
     flex: 1,
   },
diff --git a/app/screens/LibraryArtists.tsx b/app/screens/LibraryArtists.tsx
index cdd290f..9f4f1bb 100644
--- a/app/screens/LibraryArtists.tsx
+++ b/app/screens/LibraryArtists.tsx
@@ -11,7 +11,7 @@ import React, { useEffect, useState } from 'react'
 import { StyleSheet, View } from 'react-native'
 
 const ArtistRenderItem: React.FC<{ item: Artist }> = ({ item }) => (
-  <ListItem item={item} showArt={true} showStar={false} listStyle="big" />
+  <ListItem item={item} showArt={true} showStar={false} listStyle="big" style={styles.listItem} />
 )
 
 const filterOptions: OptionData[] = [
@@ -44,7 +44,6 @@ const ArtistsList = () => {
   return (
     <View style={styles.container}>
       <GradientFlatList
-        contentContainerStyle={styles.listContent}
         data={sortedList}
         renderItem={ArtistRenderItem}
         keyExtractor={item => item.id}
@@ -52,6 +51,7 @@ const ArtistsList = () => {
         refreshing={refreshing}
         overScrollMode="never"
         windowSize={3}
+        contentMarginTop={6}
       />
       <FilterButton
         data={filterOptions}
@@ -71,10 +71,8 @@ const styles = StyleSheet.create({
   container: {
     flex: 1,
   },
-  listContent: {
-    minHeight: '100%',
+  listItem: {
     paddingHorizontal: 10,
-    paddingTop: 6,
   },
 })
 
diff --git a/app/screens/LibraryPlaylists.tsx b/app/screens/LibraryPlaylists.tsx
index ccb9b2a..9c3fb00 100644
--- a/app/screens/LibraryPlaylists.tsx
+++ b/app/screens/LibraryPlaylists.tsx
@@ -8,7 +8,7 @@ import React from 'react'
 import { StyleSheet } from 'react-native'
 
 const PlaylistRenderItem: React.FC<{ item: PlaylistListItem }> = ({ item }) => (
-  <ListItem item={item} showArt={true} showStar={false} listStyle="big" />
+  <ListItem item={item} showArt={true} showStar={false} listStyle="big" style={styles.listItem} />
 )
 
 const PlaylistsList = () => {
@@ -17,7 +17,6 @@ const PlaylistsList = () => {
 
   return (
     <GradientFlatList
-      contentContainerStyle={styles.listContent}
       data={list}
       renderItem={PlaylistRenderItem}
       keyExtractor={item => item.id}
@@ -25,15 +24,14 @@ const PlaylistsList = () => {
       refreshing={refreshing}
       overScrollMode="never"
       windowSize={5}
+      contentMarginTop={6}
     />
   )
 }
 
 const styles = StyleSheet.create({
-  listContent: {
-    minHeight: '100%',
+  listItem: {
     paddingHorizontal: 10,
-    paddingTop: 6,
   },
 })
 
diff --git a/app/screens/NowPlayingQueue.tsx b/app/screens/NowPlayingQueue.tsx
index ebcf30f..247f0a7 100644
--- a/app/screens/NowPlayingQueue.tsx
+++ b/app/screens/NowPlayingQueue.tsx
@@ -1,49 +1,56 @@
-import GradientScrollView from '@app/components/GradientScrollView'
+import GradientFlatList from '@app/components/GradientFlatList'
 import ListItem from '@app/components/ListItem'
 import NowPlayingBar from '@app/components/NowPlayingBar'
 import { useSkipTo } from '@app/hooks/trackplayer'
+import { Song } from '@app/models/music'
 import { useStore } from '@app/state/store'
 import { selectTrackPlayer } from '@app/state/trackplayer'
 import { selectTrackPlayerMap } from '@app/state/trackplayermap'
 import React from 'react'
 import { StyleSheet, View } from 'react-native'
 
+const SongRenderItem: React.FC<{
+  item: {
+    song: Song
+    i: number
+    onPress: () => void
+  }
+}> = ({ item }) => (
+  <ListItem
+    item={item.song}
+    queueId={item.i}
+    onPress={item.onPress}
+    showArt={true}
+    style={styles.listItem}
+    subtitle={`${item.song.artist} • ${item.song.album}`}
+  />
+)
+
 const NowPlayingQueue = React.memo<{}>(() => {
   const queue = useStore(selectTrackPlayer.queue)
   const mapTrackExtToSong = useStore(selectTrackPlayerMap.mapTrackExtToSong)
   const skipTo = useSkipTo()
 
   return (
-    <View style={styles.outerContainer}>
-      <GradientScrollView style={styles.container}>
-        <View style={styles.content}>
-          {queue.map(mapTrackExtToSong).map((song, i) => (
-            <ListItem
-              key={i}
-              item={song}
-              queueId={i}
-              onPress={() => skipTo(i)}
-              showArt={true}
-              subtitle={`${song.artist} • ${song.album}`}
-            />
-          ))}
-        </View>
-      </GradientScrollView>
+    <View style={styles.container}>
+      <GradientFlatList
+        data={queue.map(mapTrackExtToSong).map((song, i) => ({ song, i, onPress: () => skipTo(i) }))}
+        renderItem={SongRenderItem}
+        keyExtractor={(item, i) => i.toString()}
+        overScrollMode="never"
+        windowSize={7}
+        contentMarginTop={10}
+      />
       <NowPlayingBar />
     </View>
   )
 })
 
 const styles = StyleSheet.create({
-  outerContainer: {
-    flex: 1,
-  },
   container: {
     flex: 1,
   },
-  content: {
-    alignItems: 'center',
-    paddingTop: 10,
+  listItem: {
     paddingHorizontal: 20,
   },
 })
diff --git a/app/screens/SearchResultsView.tsx b/app/screens/SearchResultsView.tsx
index bfa8b45..da53ff4 100644
--- a/app/screens/SearchResultsView.tsx
+++ b/app/screens/SearchResultsView.tsx
@@ -28,6 +28,7 @@ const ResultsListItem: React.FC<{ item: SearchListItemType }> = ({ item }) => {
       showStar={false}
       listStyle="small"
       onPress={onPress}
+      style={styles.listItem}
     />
   )
 }
@@ -69,25 +70,24 @@ const SearchResultsView: React.FC<{
 
   return (
     <GradientFlatList
-      contentContainerStyle={styles.listContent}
       data={list}
       renderItem={SearchResultsRenderItem}
-      keyExtractor={item => item.id}
+      keyExtractor={(item, i) => i.toString()}
       onRefresh={refresh}
       refreshing={refreshing}
       overScrollMode="never"
       onEndReached={fetchNextPage}
       removeClippedSubviews={true}
       onEndReachedThreshold={2}
+      contentMarginTop={6}
+      windowSize={5}
     />
   )
 }
 
 const styles = StyleSheet.create({
-  listContent: {
-    minHeight: '100%',
+  listItem: {
     paddingHorizontal: 10,
-    paddingTop: 6,
   },
 })
 
diff --git a/app/screens/SongListView.tsx b/app/screens/SongListView.tsx
index 8a34b8b..dd51547 100644
--- a/app/screens/SongListView.tsx
+++ b/app/screens/SongListView.tsx
@@ -1,10 +1,9 @@
 import CoverArt from '@app/components/CoverArt'
 import GradientBackground from '@app/components/GradientBackground'
 import HeaderBar from '@app/components/HeaderBar'
-import ImageGradientScrollView from '@app/components/ImageGradientScrollView'
+import ImageGradientFlatList from '@app/components/ImageGradientFlatList'
 import ListItem from '@app/components/ListItem'
 import ListPlayerControls from '@app/components/ListPlayerControls'
-import NothingHere from '@app/components/NothingHere'
 import { useCoverArtFile } from '@app/hooks/cache'
 import { useAlbumWithSongs, usePlaylistWithSongs } from '@app/hooks/music'
 import { AlbumWithSongs, PlaylistWithSongs, Song } from '@app/models/music'
@@ -23,15 +22,42 @@ const SongListDetailsFallback = React.memo(() => (
   </GradientBackground>
 ))
 
-const Songs = React.memo<{
-  songs: Song[]
-  name: string
+const SongRenderItem: React.FC<{
+  item: {
+    song: Song
+    contextId?: string
+    queueId?: number
+    subtitle?: string
+    onPress?: () => void
+    showArt?: boolean
+  }
+}> = ({ item }) => (
+  <ListItem
+    item={item.song}
+    contextId={item.contextId}
+    queueId={item.queueId}
+    subtitle={item.subtitle}
+    onPress={item.onPress}
+    showArt={item.showArt}
+    style={styles.listItem}
+  />
+)
+
+const SongListDetails = React.memo<{
+  title: string
   type: SongListType
-  itemId: string
-}>(({ songs, name, type, itemId }) => {
+  songList?: AlbumWithSongs | PlaylistWithSongs
+  subtitle?: string
+}>(({ title, songList, subtitle, type }) => {
+  const coverArtFile = useCoverArtFile(songList?.coverArt, 'thumbnail')
+  const [headerColor, setHeaderColor] = useState<string | undefined>(undefined)
   const setQueue = useStore(selectTrackPlayer.setQueue)
 
-  const _songs = [...songs]
+  if (!songList) {
+    return <SongListDetailsFallback />
+  }
+
+  const _songs = [...songList.songs]
   let typeName = ''
 
   if (type === 'album') {
@@ -49,46 +75,6 @@ const Songs = React.memo<{
     typeName = 'Playlist'
   }
 
-  return (
-    <>
-      <ListPlayerControls
-        style={styles.controls}
-        songs={_songs}
-        typeName={typeName}
-        queueName={name}
-        queueContextId={itemId}
-        queueContextType={type}
-      />
-      <View style={styles.songs}>
-        {_songs.map((s, i) => (
-          <ListItem
-            key={i}
-            item={s}
-            contextId={itemId}
-            queueId={i}
-            subtitle={s.artist}
-            onPress={() => setQueue(_songs, name, type, itemId, i)}
-            showArt={false}
-          />
-        ))}
-      </View>
-    </>
-  )
-})
-
-const SongListDetails = React.memo<{
-  title: string
-  type: SongListType
-  songList?: AlbumWithSongs | PlaylistWithSongs
-  subtitle?: string
-}>(({ title, songList, subtitle, type }) => {
-  const coverArtFile = useCoverArtFile(songList?.coverArt, 'thumbnail')
-  const [headerColor, setHeaderColor] = useState<string | undefined>(undefined)
-
-  if (!songList) {
-    return <SongListDetailsFallback />
-  }
-
   return (
     <View style={styles.container}>
       <HeaderBar
@@ -96,21 +82,43 @@ const SongListDetails = React.memo<{
         title={title}
         contextItem={songList.itemType === 'album' ? songList : undefined}
       />
-      <ImageGradientScrollView
-        imagePath={coverArtFile?.file?.path}
-        style={styles.container}
-        onGetColor={setHeaderColor}>
-        <View style={styles.content}>
-          <CoverArt type="cover" size="original" coverArt={songList.coverArt} style={styles.cover} />
-          <Text style={styles.title}>{songList.name}</Text>
-          {subtitle ? <Text style={styles.subtitle}>{subtitle}</Text> : <></>}
-          {songList.songs.length > 0 ? (
-            <Songs songs={songList.songs} name={songList.name} type={type} itemId={songList.id} />
-          ) : (
-            <NothingHere height={300} width={250} />
-          )}
-        </View>
-      </ImageGradientScrollView>
+      <ImageGradientFlatList
+        data={_songs.map((s, i) => ({
+          song: s,
+          contextId: songList.id,
+          queueId: i,
+          subtitle: s.artist,
+          onPress: () => setQueue(_songs, songList.name, type, songList.id, i),
+          showArt: songList.itemType === 'playlist',
+        }))}
+        renderItem={SongRenderItem}
+        keyExtractor={(item, i) => i.toString()}
+        backgroundProps={{
+          imagePath: coverArtFile?.file?.path,
+          style: styles.container,
+          onGetColor: setHeaderColor,
+        }}
+        overScrollMode="never"
+        windowSize={7}
+        contentMarginTop={26}
+        ListHeaderComponent={
+          <View style={styles.content}>
+            <CoverArt type="cover" size="original" coverArt={songList.coverArt} style={styles.cover} />
+            <Text style={styles.title}>{songList.name}</Text>
+            {subtitle ? <Text style={styles.subtitle}>{subtitle}</Text> : <></>}
+            {songList.songs.length > 0 && (
+              <ListPlayerControls
+                style={styles.controls}
+                songs={_songs}
+                typeName={typeName}
+                queueName={songList.name}
+                queueContextId={songList.id}
+                queueContextType={type}
+              />
+            )}
+          </View>
+        }
+      />
     </View>
   )
 })
@@ -185,6 +193,9 @@ const styles = StyleSheet.create({
     alignItems: 'center',
     paddingTop: 100,
   },
+  listItem: {
+    paddingHorizontal: 20,
+  },
 })
 
 export default SongListView
diff --git a/app/state/musicmap.ts b/app/state/musicmap.ts
index db6d3a1..a8b4601 100644
--- a/app/state/musicmap.ts
+++ b/app/state/musicmap.ts
@@ -135,8 +135,7 @@ export const createMusicMapSlice = (set: SetState<Store>, get: GetState<Store>):
   mapPlaylistWithSongs: async playlist => {
     return {
       ...get().mapPlaylistListItem(playlist),
-      // passing cover art here is a temp fix to improve large playlist performance
-      songs: await get().mapChildrenToSongs(playlist.songs, playlist.coverArt),
+      songs: await get().mapChildrenToSongs(playlist.songs),
       coverArt: playlist.coverArt,
     }
   },