diff --git a/ultrasonic/src/main/java/org/moire/ultrasonic/util/LoadingTask.java b/ultrasonic/src/main/java/org/moire/ultrasonic/util/LoadingTask.java
index 16936c09..a2c25fa2 100644
--- a/ultrasonic/src/main/java/org/moire/ultrasonic/util/LoadingTask.java
+++ b/ultrasonic/src/main/java/org/moire/ultrasonic/util/LoadingTask.java
@@ -38,14 +38,9 @@ public abstract class LoadingTask<T> extends BackgroundTask<T>
 						return;
 					}
 
-					getHandler().post(new Runnable()
-					{
-						@Override
-						public void run()
-						{
-							swipe.setRefreshing(false);
-							done(result);
-						}
+					getHandler().post(() -> {
+						swipe.setRefreshing(false);
+						done(result);
 					});
 				}
 				catch (final Throwable t)
@@ -55,14 +50,9 @@ public abstract class LoadingTask<T> extends BackgroundTask<T>
 						return;
 					}
 
-					getHandler().post(new Runnable()
-					{
-						@Override
-						public void run()
-						{
-							swipe.setRefreshing(false);
-							error(t);
-						}
+					getHandler().post(() -> {
+						swipe.setRefreshing(false);
+						error(t);
 					});
 				}
 			}
diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/PlayerFragment.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/PlayerFragment.kt
index a8f4f19c..9e3b4d7a 100644
--- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/PlayerFragment.kt
+++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/PlayerFragment.kt
@@ -610,10 +610,6 @@ class PlayerFragment :
                 Navigation.findNavController(requireView()).navigate(action)
                 return true
             }
-            R.id.menu_remove -> {
-                onPlaylistChanged()
-                return true
-            }
             R.id.menu_item_screen_on_off -> {
                 val window = requireActivity().window
                 if (mediaPlayerController.keepScreenOn) {
diff --git a/ultrasonic/src/main/res/menu/nowplaying_context.xml b/ultrasonic/src/main/res/menu/nowplaying_context.xml
index 51cea1ea..51d41305 100644
--- a/ultrasonic/src/main/res/menu/nowplaying_context.xml
+++ b/ultrasonic/src/main/res/menu/nowplaying_context.xml
@@ -10,9 +10,6 @@
     <item
         a:id="@+id/menu_lyrics"
         a:title="@string/download.menu_lyrics"/>
-    <item
-        a:id="@+id/menu_remove"
-        a:title="@string/download.menu_remove"/>
     <item
         a:id="@+id/menu_shuffle"
         a:title="@string/download.menu_shuffle"/>
diff --git a/ultrasonic/src/main/res/values-cs/strings.xml b/ultrasonic/src/main/res/values-cs/strings.xml
index 10634765..0d215da8 100644
--- a/ultrasonic/src/main/res/values-cs/strings.xml
+++ b/ultrasonic/src/main/res/values-cs/strings.xml
@@ -53,7 +53,6 @@
     <string name="download.menu_jukebox_off">Jukebox vypnut</string>
     <string name="download.menu_jukebox_on">Jukebox zapnut</string>
     <string name="download.menu_lyrics">Texty písní</string>
-    <string name="download.menu_remove">Odstranit skladbu</string>
     <string name="download.menu_save">Uložit playlist</string>
     <string name="download.menu_screen_off">Obrazovka vypnuta</string>
     <string name="download.menu_screen_on">Obrazovka zapnuta</string>
diff --git a/ultrasonic/src/main/res/values-de/strings.xml b/ultrasonic/src/main/res/values-de/strings.xml
index 07d2f06a..b6d0f161 100644
--- a/ultrasonic/src/main/res/values-de/strings.xml
+++ b/ultrasonic/src/main/res/values-de/strings.xml
@@ -67,7 +67,6 @@
     <string name="download.menu_jukebox_off">Jukebox Aus</string>
     <string name="download.menu_jukebox_on">Jukebox An</string>
     <string name="download.menu_lyrics">Liedtext</string>
-    <string name="download.menu_remove">Titel entfernen</string>
     <string name="download.menu_save">Wiedergabeliste speichern</string>
     <string name="download.menu_screen_off">Bildschirm aus</string>
     <string name="download.menu_screen_on">Bildschirm an</string>
diff --git a/ultrasonic/src/main/res/values-es/strings.xml b/ultrasonic/src/main/res/values-es/strings.xml
index cb8c09d0..1736524b 100644
--- a/ultrasonic/src/main/res/values-es/strings.xml
+++ b/ultrasonic/src/main/res/values-es/strings.xml
@@ -68,7 +68,6 @@
     <string name="download.menu_jukebox_off">Apagar Jukebox</string>
     <string name="download.menu_jukebox_on">Encender Jukebox</string>
     <string name="download.menu_lyrics">Letras</string>
-    <string name="download.menu_remove">Quitar canción</string>
     <string name="download.menu_save">Guardar lista de reproducción</string>
     <string name="download.menu_screen_off">Pantalla apagada</string>
     <string name="download.menu_screen_on">Pantalla encendida</string>
diff --git a/ultrasonic/src/main/res/values-fr/strings.xml b/ultrasonic/src/main/res/values-fr/strings.xml
index 437e10db..7ae48c42 100644
--- a/ultrasonic/src/main/res/values-fr/strings.xml
+++ b/ultrasonic/src/main/res/values-fr/strings.xml
@@ -67,7 +67,6 @@
     <string name="download.menu_jukebox_off">Désactiver le mode jukebox</string>
     <string name="download.menu_jukebox_on">Activer le mode jukebox</string>
     <string name="download.menu_lyrics">Paroles</string>
-    <string name="download.menu_remove">Retirer le morceau</string>
     <string name="download.menu_save">Enregistrer la playlist</string>
     <string name="download.menu_screen_off">Désactiver l\'écran</string>
     <string name="download.menu_screen_on">Sur l\'écran</string>
diff --git a/ultrasonic/src/main/res/values-hu/strings.xml b/ultrasonic/src/main/res/values-hu/strings.xml
index 402514bf..ed40d385 100644
--- a/ultrasonic/src/main/res/values-hu/strings.xml
+++ b/ultrasonic/src/main/res/values-hu/strings.xml
@@ -59,7 +59,6 @@
     <string name="download.menu_jukebox_off">Jukebox ki</string>
     <string name="download.menu_jukebox_on">Jukebox be</string>
     <string name="download.menu_lyrics">Dalszöveg</string>
-    <string name="download.menu_remove">Dal eltávolítása</string>
     <string name="download.menu_save">Mentés lejátszási listába</string>
     <string name="download.menu_screen_off">Kijelző ki</string>
     <string name="download.menu_screen_on">Kijelző be</string>
diff --git a/ultrasonic/src/main/res/values-it/strings.xml b/ultrasonic/src/main/res/values-it/strings.xml
index 02686cde..ab45e3ab 100644
--- a/ultrasonic/src/main/res/values-it/strings.xml
+++ b/ultrasonic/src/main/res/values-it/strings.xml
@@ -51,7 +51,6 @@
     <string name="download.menu_jukebox_off">Jukebox spento</string>
     <string name="download.menu_jukebox_on">Jukebox acceso</string>
     <string name="download.menu_lyrics">Testi</string>
-    <string name="download.menu_remove">Elimina canzone</string>
     <string name="download.menu_save">Salva Playlist</string>
     <string name="download.menu_screen_off">Schermo spento</string>
     <string name="download.menu_screen_on">Schermo acceso</string>
diff --git a/ultrasonic/src/main/res/values-nl/strings.xml b/ultrasonic/src/main/res/values-nl/strings.xml
index 86744704..b92aab0f 100644
--- a/ultrasonic/src/main/res/values-nl/strings.xml
+++ b/ultrasonic/src/main/res/values-nl/strings.xml
@@ -68,7 +68,6 @@
     <string name="download.menu_jukebox_off">Jukebox uitgeschakeld</string>
     <string name="download.menu_jukebox_on">Jukebox ingeschakeld</string>
     <string name="download.menu_lyrics">Songtekst</string>
-    <string name="download.menu_remove">Nummer verwijderen</string>
     <string name="download.menu_save">Afspeellijst opslaan</string>
     <string name="download.menu_screen_off">Scherm uit</string>
     <string name="download.menu_screen_on">Scherm aan</string>
diff --git a/ultrasonic/src/main/res/values-pl/strings.xml b/ultrasonic/src/main/res/values-pl/strings.xml
index efff621c..1b84f3e0 100644
--- a/ultrasonic/src/main/res/values-pl/strings.xml
+++ b/ultrasonic/src/main/res/values-pl/strings.xml
@@ -53,7 +53,6 @@
     <string name="download.menu_jukebox_off">Jukebox wyłączony</string>
     <string name="download.menu_jukebox_on">Jukebox włączony</string>
     <string name="download.menu_lyrics">Tekst utworu</string>
-    <string name="download.menu_remove">Usuń utwór</string>
     <string name="download.menu_save">Zapisz playlistę</string>
     <string name="download.menu_screen_off">Ekran wyłączony</string>
     <string name="download.menu_screen_on">Ekran włączony</string>
diff --git a/ultrasonic/src/main/res/values-pt-rBR/strings.xml b/ultrasonic/src/main/res/values-pt-rBR/strings.xml
index a4f2dc9a..a6bf5731 100644
--- a/ultrasonic/src/main/res/values-pt-rBR/strings.xml
+++ b/ultrasonic/src/main/res/values-pt-rBR/strings.xml
@@ -67,7 +67,6 @@
     <string name="download.menu_jukebox_off">Jukebox Desligado</string>
     <string name="download.menu_jukebox_on">Jukebox Ligado</string>
     <string name="download.menu_lyrics">Letras</string>
-    <string name="download.menu_remove">Excluir Música</string>
     <string name="download.menu_save">Salvar Playlist</string>
     <string name="download.menu_screen_off">Tela Desligada</string>
     <string name="download.menu_screen_on">Tela Ligada</string>
diff --git a/ultrasonic/src/main/res/values-pt/strings.xml b/ultrasonic/src/main/res/values-pt/strings.xml
index e188bfc7..420872cb 100644
--- a/ultrasonic/src/main/res/values-pt/strings.xml
+++ b/ultrasonic/src/main/res/values-pt/strings.xml
@@ -53,7 +53,6 @@
     <string name="download.menu_jukebox_off">Jukebox Desligado</string>
     <string name="download.menu_jukebox_on">Jukebox Ligado</string>
     <string name="download.menu_lyrics">Letras</string>
-    <string name="download.menu_remove">Apagar Música</string>
     <string name="download.menu_save">Salvar Playlist</string>
     <string name="download.menu_screen_off">Ecrã Desligado</string>
     <string name="download.menu_screen_on">Ecrã Ligado</string>
diff --git a/ultrasonic/src/main/res/values-ru/strings.xml b/ultrasonic/src/main/res/values-ru/strings.xml
index 699fa66d..05cb3e20 100644
--- a/ultrasonic/src/main/res/values-ru/strings.xml
+++ b/ultrasonic/src/main/res/values-ru/strings.xml
@@ -64,7 +64,6 @@
     <string name="download.menu_jukebox_off">Jukebox выключен</string>
     <string name="download.menu_jukebox_on">Jukebox включен</string>
     <string name="download.menu_lyrics">Тексты</string>
-    <string name="download.menu_remove">Удалить песню</string>
     <string name="download.menu_save">Сохранить плейлист</string>
     <string name="download.menu_screen_off">Отключение дисплея</string>
     <string name="download.menu_screen_on">Включение дисплея</string>
diff --git a/ultrasonic/src/main/res/values-zh-rCN/strings.xml b/ultrasonic/src/main/res/values-zh-rCN/strings.xml
index 2419a85b..e73d79a4 100644
--- a/ultrasonic/src/main/res/values-zh-rCN/strings.xml
+++ b/ultrasonic/src/main/res/values-zh-rCN/strings.xml
@@ -66,7 +66,6 @@
     <string name="download.menu_jukebox_off">关闭 Jukebox</string>
     <string name="download.menu_jukebox_on">开启 Jukebox</string>
     <string name="download.menu_lyrics">歌词</string>
-    <string name="download.menu_remove">删除歌曲</string>
     <string name="download.menu_save">保存播放列表</string>
     <string name="download.menu_screen_off">关闭屏幕常亮</string>
     <string name="download.menu_screen_on">开启屏幕常亮</string>
diff --git a/ultrasonic/src/main/res/values/arrays.xml b/ultrasonic/src/main/res/values/arrays.xml
index 9b78df01..4762fc89 100644
--- a/ultrasonic/src/main/res/values/arrays.xml
+++ b/ultrasonic/src/main/res/values/arrays.xml
@@ -31,6 +31,10 @@
         <item>@string/settings.preload_3</item>
         <item>@string/settings.preload_5</item>
         <item>@string/settings.preload_10</item>
+        <item>@string/settings.preload_50</item>
+        <item>@string/settings.preload_100</item>
+        <item>@string/settings.preload_500</item>
+        <item>@string/settings.preload_1000</item>
         <item>@string/settings.preload_unlimited</item>
     </string-array>
     <string-array name="cacheSizeValues" translatable="false">
diff --git a/ultrasonic/src/main/res/values/strings.xml b/ultrasonic/src/main/res/values/strings.xml
index b5ebfaa7..b233813e 100644
--- a/ultrasonic/src/main/res/values/strings.xml
+++ b/ultrasonic/src/main/res/values/strings.xml
@@ -68,7 +68,6 @@
     <string name="download.menu_jukebox_off">Jukebox Off</string>
     <string name="download.menu_jukebox_on">Jukebox On</string>
     <string name="download.menu_lyrics">Lyrics</string>
-    <string name="download.menu_remove">Remove Song</string>
     <string name="download.menu_save">Save Playlist</string>
     <string name="download.menu_screen_off">Screen Off</string>
     <string name="download.menu_screen_on">Screen On</string>
@@ -267,6 +266,10 @@
     <string name="settings.preload_2">2 songs</string>
     <string name="settings.preload_3">3 songs</string>
     <string name="settings.preload_5">5 songs</string>
+    <string name="settings.preload_50">50 songs</string>
+    <string name="settings.preload_100">100 songs</string>
+    <string name="settings.preload_500">500 songs</string>
+    <string name="settings.preload_1000">1000 songs</string>
     <string name="settings.preload_unlimited">Unlimited</string>
     <string name="settings.scrobble_summary">Remember to set up your user and password in the Scrobble service(s) on the server</string>
     <string name="settings.scrobble_title">Scrobble my plays</string>