diff --git a/lib/app/view/master_detail_page.dart b/lib/app/view/master_detail_page.dart
index 66dcb8947..aa40d8293 100644
--- a/lib/app/view/master_detail_page.dart
+++ b/lib/app/view/master_detail_page.dart
@@ -6,6 +6,7 @@ import 'package:watch_it/watch_it.dart';
 import 'package:yaru/yaru.dart';
 
 import '../../app_config.dart';
+import '../../common/page_ids.dart';
 import '../../common/view/back_gesture.dart';
 import '../../common/view/global_keys.dart';
 import '../../common/view/header_bar.dart';
@@ -64,7 +65,7 @@ class MasterDetailPage extends StatelessWidget with WatchItMixin {
           if (context.showMasterPanel) const VerticalDivider(),
           Expanded(
             child: Navigator(
-              initialRoute: libraryModel.selectedPageId ?? kSearchPageId,
+              initialRoute: libraryModel.selectedPageId ?? PageIDs.searchPage,
               onDidRemovePage: (page) {},
               key: libraryModel.masterNavigatorKey,
               observers: [libraryModel],
@@ -122,7 +123,7 @@ class MasterPanel extends StatelessWidget {
                 return MasterTile(
                   key: ValueKey(item.pageId),
                   onTap: () {
-                    if (item.pageId == kNewPlaylistPageId) {
+                    if (item.pageId == PageIDs.newPlaylist) {
                       showDialog(
                         context: context,
                         builder: (context) {
diff --git a/lib/app/view/master_items.dart b/lib/app/view/master_items.dart
index 86822b8f8..6e7d9e5a9 100644
--- a/lib/app/view/master_items.dart
+++ b/lib/app/view/master_items.dart
@@ -3,10 +3,10 @@ import 'package:flutter/material.dart';
 
 import '../../app_config.dart';
 import '../../common/data/audio_type.dart';
+import '../../common/page_ids.dart';
 import '../../common/view/icons.dart';
 import '../../common/view/side_bar_fall_back_image.dart';
 import '../../common/view/theme.dart';
-import '../../constants.dart';
 import '../../home/home_page.dart';
 import '../../l10n/l10n.dart';
 import '../../library/library_model.dart';
@@ -47,7 +47,7 @@ List<MasterItem> createMasterItems({required LibraryModel libraryModel}) {
       titleBuilder: (context) => Text(context.l10n.search),
       pageBuilder: (_) => const SearchPage(),
       iconBuilder: (_) => Icon(Iconz.search),
-      pageId: kSearchPageId,
+      pageId: PageIDs.searchPage,
     ),
     MasterItem(
       titleBuilder: (context) => Text(context.l10n.local),
@@ -56,7 +56,7 @@ List<MasterItem> createMasterItems({required LibraryModel libraryModel}) {
         audioType: AudioType.local,
         selected: selected,
       ),
-      pageId: kLocalAudioPageId,
+      pageId: PageIDs.localAudio,
     ),
     MasterItem(
       titleBuilder: (context) => Text(context.l10n.radio),
@@ -65,7 +65,7 @@ List<MasterItem> createMasterItems({required LibraryModel libraryModel}) {
         audioType: AudioType.radio,
         selected: selected,
       ),
-      pageId: kRadioPageId,
+      pageId: PageIDs.radio,
     ),
     MasterItem(
       titleBuilder: (context) => Text(context.l10n.podcasts),
@@ -74,7 +74,7 @@ List<MasterItem> createMasterItems({required LibraryModel libraryModel}) {
         audioType: AudioType.podcast,
         selected: selected,
       ),
-      pageId: kPodcastsPageId,
+      pageId: PageIDs.podcasts,
     ),
     if (isMobilePlatform)
       MasterItem(
@@ -82,7 +82,7 @@ List<MasterItem> createMasterItems({required LibraryModel libraryModel}) {
         iconBuilder: (selected) =>
             Icon(selected ? Iconz.settingsFilled : Iconz.settings),
         pageBuilder: (context) => const SettingsPage(),
-        pageId: kSettingsPageId,
+        pageId: PageIDs.settings,
       ),
     if (isMobilePlatform)
       MasterItem(
@@ -90,17 +90,17 @@ List<MasterItem> createMasterItems({required LibraryModel libraryModel}) {
         iconBuilder: (selected) =>
             Icon(selected ? Iconz.homeFilled : Iconz.home),
         pageBuilder: (context) => const HomePage(),
-        pageId: kHomePageId,
+        pageId: PageIDs.homePage,
       ),
     MasterItem(
       iconBuilder: (selected) => Icon(Iconz.plus),
       titleBuilder: (context) => Text(context.l10n.add),
       pageBuilder: (_) => const SizedBox.shrink(),
-      pageId: kNewPlaylistPageId,
+      pageId: PageIDs.newPlaylist,
     ),
     MasterItem(
       titleBuilder: (context) => Text(context.l10n.likedSongs),
-      pageId: kLikedAudiosPageId,
+      pageId: PageIDs.likedAudios,
       pageBuilder: (_) => const LikedAudioPage(),
       subtitleBuilder: (context) => Text(context.l10n.playlist),
       iconBuilder: (selected) => LikedAudioPageIcon(selected: selected),
diff --git a/lib/app/view/master_tile.dart b/lib/app/view/master_tile.dart
index 7fde1a1f5..73faf2688 100644
--- a/lib/app/view/master_tile.dart
+++ b/lib/app/view/master_tile.dart
@@ -3,13 +3,13 @@ import 'package:watch_it/watch_it.dart';
 import 'package:yaru/yaru.dart';
 
 import '../../common/data/audio_type.dart';
+import '../../common/page_ids.dart';
+import '../../common/view/icons.dart';
+import '../../common/view/spaced_divider.dart';
 import '../../common/view/ui_constants.dart';
-import '../../constants.dart';
 import '../../extensions/build_context_x.dart';
 import '../../library/library_model.dart';
 import '../../player/player_model.dart';
-import '../../common/view/icons.dart';
-import '../../common/view/spaced_divider.dart';
 import '../../radio/radio_model.dart';
 
 class MasterTile extends StatelessWidget {
@@ -46,7 +46,7 @@ class MasterTile extends StatelessWidget {
     );
 
     final Widget tile;
-    if (pageId == kNewPlaylistPageId) {
+    if (pageId == PageIDs.newPlaylist) {
       tile = _FramedMasterTile(tile: yaruMasterTile);
     } else {
       tile = yaruMasterTile;
diff --git a/lib/app/view/mobile_musicpod_app.dart b/lib/app/view/mobile_musicpod_app.dart
index 4b5b818ec..de22fd045 100644
--- a/lib/app/view/mobile_musicpod_app.dart
+++ b/lib/app/view/mobile_musicpod_app.dart
@@ -6,6 +6,7 @@ import 'package:phoenix_theme/phoenix_theme.dart';
 import 'package:watch_it/watch_it.dart';
 
 import '../../app_config.dart';
+import '../../common/page_ids.dart';
 import '../../common/view/theme.dart';
 import '../../constants.dart';
 import '../../external_path/external_path_service.dart';
@@ -57,7 +58,7 @@ class _MobileMusicPodAppState extends State<MobileMusicPodApp> {
       navigatorKey: libraryModel.masterNavigatorKey,
       navigatorObservers: [libraryModel],
       initialRoute: isMobilePlatform
-          ? (libraryModel.selectedPageId ?? kHomePageId)
+          ? (libraryModel.selectedPageId ?? PageIDs.homePage)
           : null,
       onGenerateRoute: (settings) {
         final page = (masterItems.firstWhereOrNull(
diff --git a/lib/app/view/mobile_navigation_bar.dart b/lib/app/view/mobile_navigation_bar.dart
index 9944e7290..8a9b4cbbb 100644
--- a/lib/app/view/mobile_navigation_bar.dart
+++ b/lib/app/view/mobile_navigation_bar.dart
@@ -1,12 +1,13 @@
+import 'package:flutter/material.dart';
+import 'package:watch_it/watch_it.dart';
+
+import '../../common/page_ids.dart';
 import '../../common/view/icons.dart';
 import '../../common/view/theme.dart';
 import '../../common/view/ui_constants.dart';
-import '../../constants.dart';
 import '../../extensions/build_context_x.dart';
 import '../../l10n/l10n.dart';
 import '../../library/library_model.dart';
-import 'package:flutter/material.dart';
-import 'package:watch_it/watch_it.dart';
 
 class MobileNavigationBar extends StatelessWidget with WatchItMixin {
   const MobileNavigationBar({super.key});
@@ -31,34 +32,35 @@ class MobileNavigationBar extends StatelessWidget with WatchItMixin {
             mainAxisAlignment: MainAxisAlignment.spaceEvenly,
             children: [
               IconButton(
-                isSelected: selectedPageId == kHomePageId,
+                isSelected: selectedPageId == PageIDs.homePage,
                 selectedIcon: Icon(Iconz.homeFilled),
                 icon: Icon(Iconz.home),
                 tooltip: l10n.home,
-                onPressed: () => di<LibraryModel>().push(pageId: kHomePageId),
+                onPressed: () =>
+                    di<LibraryModel>().push(pageId: PageIDs.homePage),
               ),
               IconButton(
-                isSelected: selectedPageId == kLocalAudioPageId,
+                isSelected: selectedPageId == PageIDs.localAudio,
                 selectedIcon: Icon(Iconz.localAudioFilled),
                 icon: Icon(Iconz.localAudio),
                 tooltip: l10n.local,
                 onPressed: () =>
-                    di<LibraryModel>().push(pageId: kLocalAudioPageId),
+                    di<LibraryModel>().push(pageId: PageIDs.localAudio),
               ),
               IconButton(
-                isSelected: selectedPageId == kRadioPageId,
+                isSelected: selectedPageId == PageIDs.radio,
                 selectedIcon: Icon(Iconz.radioFilled),
                 icon: Icon(Iconz.radio),
                 tooltip: l10n.radio,
-                onPressed: () => di<LibraryModel>().push(pageId: kRadioPageId),
+                onPressed: () => di<LibraryModel>().push(pageId: PageIDs.radio),
               ),
               IconButton(
-                isSelected: selectedPageId == kPodcastsPageId,
+                isSelected: selectedPageId == PageIDs.podcasts,
                 selectedIcon: Icon(Iconz.podcastFilled),
                 icon: Icon(Iconz.podcast),
                 tooltip: l10n.podcasts,
                 onPressed: () =>
-                    di<LibraryModel>().push(pageId: kPodcastsPageId),
+                    di<LibraryModel>().push(pageId: PageIDs.podcasts),
               ),
             ],
           ),
diff --git a/lib/common/file_names.dart b/lib/common/file_names.dart
new file mode 100644
index 000000000..2d954eafb
--- /dev/null
+++ b/lib/common/file_names.dart
@@ -0,0 +1,29 @@
+class FileNames {
+  static const likedAudios = 'likedAudios.json';
+  static const playlists = 'playlists.json';
+  static const pinnedAlbums = 'finallyFixedPinnedAlbums.json';
+  static const podcasts = 'podcasts.json';
+  static const podcastUpdates = 'podcastsupdates.json';
+  static const starredStations = 'uuidStarredStations.json';
+  static const lastPositions = 'lastPositions.json';
+  static const playerState = 'playerstate.json';
+  static const appState = 'appstate.json';
+  static const downloads = 'downloads.json';
+  static const feedsWithDownloads = 'feedswithdownloads.json';
+  static const coverStore = 'coverStore.json';
+
+  static const all = {
+    likedAudios,
+    playlists,
+    pinnedAlbums,
+    podcasts,
+    podcastUpdates,
+    starredStations,
+    lastPositions,
+    playerState,
+    appState,
+    downloads,
+    feedsWithDownloads,
+    coverStore,
+  };
+}
diff --git a/lib/common/page_ids.dart b/lib/common/page_ids.dart
new file mode 100644
index 000000000..397c19d0d
--- /dev/null
+++ b/lib/common/page_ids.dart
@@ -0,0 +1,21 @@
+class PageIDs {
+  static const settings = 'settings';
+  static const homePage = 'homePage';
+  static const selectedPage = 'selectedPageId';
+  static const localAudio = 'localAudio';
+  static const podcasts = 'podcasts';
+  static const radio = 'radio';
+  static const newPlaylist = 'newPlaylist';
+  static const likedAudios = 'likedAudios';
+  static const searchPage = 'searchPageId';
+
+  static const permanent = {
+    homePage,
+    searchPage,
+    likedAudios,
+    localAudio,
+    podcasts,
+    radio,
+    settings,
+  };
+}
diff --git a/lib/common/view/audio_tile_bottom_sheet.dart b/lib/common/view/audio_tile_bottom_sheet.dart
index cae15bd83..e8ce4f79a 100644
--- a/lib/common/view/audio_tile_bottom_sheet.dart
+++ b/lib/common/view/audio_tile_bottom_sheet.dart
@@ -2,7 +2,6 @@ import 'package:collection/collection.dart';
 import 'package:flutter/material.dart';
 import 'package:watch_it/watch_it.dart';
 
-import '../../constants.dart';
 import '../../extensions/build_context_x.dart';
 import '../../l10n/l10n.dart';
 import '../../library/library_model.dart';
@@ -13,6 +12,7 @@ import '../../player/player_model.dart';
 import '../../playlists/view/add_to_playlist_dialog.dart';
 import '../data/audio.dart';
 import '../data/audio_type.dart';
+import '../page_ids.dart';
 import 'audio_tile_image.dart';
 import 'icons.dart';
 import 'like_all_icon.dart';
@@ -135,7 +135,7 @@ class AudioTileBottomSheet extends StatelessWidget {
                             children: [
                               _Button(
                                 onPressed: () {
-                                  playlistId == kLikedAudiosPageId
+                                  playlistId == PageIDs.likedAudios
                                       ? libraryModel.removeLikedAudios(audios)
                                       : libraryModel.removeAudiosFromPlaylist(
                                           id: playlistId,
@@ -147,7 +147,7 @@ class AudioTileBottomSheet extends StatelessWidget {
                               ),
                               _ButtonLabel(
                                 label:
-                                    '${l10n.removeFrom} ${playlistId == kLikedAudiosPageId ? l10n.likedSongs : playlistId}',
+                                    '${l10n.removeFrom} ${playlistId == PageIDs.likedAudios ? l10n.likedSongs : playlistId}',
                               ),
                             ],
                           ),
diff --git a/lib/common/view/audio_tile_option_button.dart b/lib/common/view/audio_tile_option_button.dart
index 84770d107..bfb471bc2 100644
--- a/lib/common/view/audio_tile_option_button.dart
+++ b/lib/common/view/audio_tile_option_button.dart
@@ -4,7 +4,6 @@ import 'package:watch_it/watch_it.dart';
 import 'package:yaru/yaru.dart';
 
 import '../../app_config.dart';
-import '../../constants.dart';
 import '../../extensions/build_context_x.dart';
 import '../../l10n/l10n.dart';
 import '../../library/library_model.dart';
@@ -12,6 +11,7 @@ import '../../player/player_model.dart';
 import '../../playlists/view/add_to_playlist_dialog.dart';
 import '../data/audio.dart';
 import '../data/audio_type.dart';
+import '../page_ids.dart';
 import 'audio_tile_bottom_sheet.dart';
 import 'icons.dart';
 import 'meta_data_dialog.dart';
@@ -63,26 +63,36 @@ class AudioTileOptionButton extends StatelessWidget {
       tooltip: l10n.moreOptions,
       padding: EdgeInsets.zero,
       itemBuilder: (context) {
+        final currentAudioType = di<PlayerModel>().audio?.audioType;
         return [
           if (audios.none((e) => e.audioType == AudioType.radio))
             PopupMenuItem(
               onTap: () {
-                di<PlayerModel>().insertIntoQueue(audios);
-                showSnackBar(
-                  context: context,
-                  content: Text(
-                    '${l10n.addedTo} ${l10n.queue}: $searchTerm',
-                  ),
-                );
+                if (di<PlayerModel>().audio?.audioType == AudioType.radio) {
+                  di<PlayerModel>()
+                      .startPlaylist(audios: audios, listName: playlistId);
+                } else {
+                  di<PlayerModel>().insertIntoQueue(audios);
+                  showSnackBar(
+                    context: context,
+                    content: Text(
+                      '${l10n.addedTo} ${l10n.queue}: $searchTerm',
+                    ),
+                  );
+                }
               },
               child: YaruTile(
                 leading: Icon(Iconz.insertIntoQueue),
-                title: Text(l10n.playNext),
+                title: Text(
+                  currentAudioType == AudioType.radio
+                      ? l10n.playAll
+                      : l10n.playNext,
+                ),
               ),
             ),
           if (allowRemove)
             PopupMenuItem(
-              onTap: () => playlistId == kLikedAudiosPageId
+              onTap: () => playlistId == PageIDs.likedAudios
                   ? libraryModel.removeLikedAudios(audios)
                   : libraryModel.removeAudiosFromPlaylist(
                       id: playlistId,
@@ -91,7 +101,7 @@ class AudioTileOptionButton extends StatelessWidget {
               child: YaruTile(
                 leading: Icon(Iconz.remove),
                 title: Text(
-                  '${l10n.removeFrom} ${playlistId == kLikedAudiosPageId ? l10n.likedSongs : playlistId}',
+                  '${l10n.removeFrom} ${playlistId == PageIDs.likedAudios ? l10n.likedSongs : playlistId}',
                 ),
               ),
             ),
@@ -109,18 +119,23 @@ class AudioTileOptionButton extends StatelessWidget {
                 ),
               ),
             ),
-          PopupMenuItem(
-            onTap: () => showDialog(
-              context: context,
-              builder: (context) => MetaDataContent.dialog(audio: audios.first),
-            ),
-            child: YaruTile(
-              leading: Icon(Iconz.info),
-              title: Text(
-                '${l10n.showMetaData} ...',
+          if (audios.none(
+                (e) => e.audioType == AudioType.podcast,
+              ) &&
+              audios.length == 1)
+            PopupMenuItem(
+              onTap: () => showDialog(
+                context: context,
+                builder: (context) =>
+                    MetaDataContent.dialog(audio: audios.first),
+              ),
+              child: YaruTile(
+                leading: Icon(Iconz.info),
+                title: Text(
+                  '${l10n.showMetaData} ...',
+                ),
               ),
             ),
-          ),
           if (audios.none((e) => e.audioType == AudioType.radio))
             PopupMenuItem(
               enabled: false,
diff --git a/lib/common/view/icons.dart b/lib/common/view/icons.dart
index 0c03ea6e2..1f20c5674 100644
--- a/lib/common/view/icons.dart
+++ b/lib/common/view/icons.dart
@@ -231,10 +231,10 @@ class Iconz {
           ? CupertinoIcons.refresh
           : Icons.refresh_rounded;
   static IconData get replay => yaruStyled
-      ? YaruIcons.history
+      ? YaruIcons.revert
       : appleStyled
-          ? CupertinoIcons.clock
-          : Icons.history_rounded;
+          ? CupertinoIcons.arrow_counterclockwise_circle
+          : Icons.undo;
   static IconData get speakerLowFilled => yaruStyled
       ? YaruIcons.speaker_low_filled
       : appleStyled
@@ -467,4 +467,9 @@ class Iconz {
       : appleStyled
           ? CupertinoIcons.check_mark_circled_solid
           : Icons.check_circle;
+  static IconData get radioHistory => yaruStyled
+      ? YaruIcons.music_history
+      : appleStyled
+          ? CupertinoIcons.clock
+          : Icons.history_rounded;
 }
diff --git a/lib/common/view/like_icon.dart b/lib/common/view/like_icon.dart
index 53bf2b323..78bb336a1 100644
--- a/lib/common/view/like_icon.dart
+++ b/lib/common/view/like_icon.dart
@@ -1,11 +1,11 @@
 import 'package:flutter/material.dart';
 import 'package:watch_it/watch_it.dart';
 
-import '../../constants.dart';
 import '../../l10n/l10n.dart';
 import '../../library/library_model.dart';
 import '../../playlists/view/add_to_playlist_snack_bar.dart';
 import '../data/audio.dart';
+import '../page_ids.dart';
 import 'animated_like_icon.dart';
 
 class LikeIcon extends StatelessWidget with WatchItMixin {
@@ -39,7 +39,7 @@ class LikeIcon extends StatelessWidget with WatchItMixin {
           showAddedToPlaylistSnackBar(
             context: context,
             libraryModel: libraryModel,
-            id: kLikedAudiosPageId,
+            id: PageIDs.likedAudios,
           );
         }
       };
diff --git a/lib/common/view/search_button.dart b/lib/common/view/search_button.dart
index 549e5387c..c5e348cef 100644
--- a/lib/common/view/search_button.dart
+++ b/lib/common/view/search_button.dart
@@ -3,9 +3,9 @@ import 'package:watch_it/watch_it.dart';
 import 'package:yaru/yaru.dart';
 
 import '../../app_config.dart';
-import '../../constants.dart';
 import '../../extensions/build_context_x.dart';
 import '../../library/library_model.dart';
+import '../page_ids.dart';
 import 'icons.dart';
 import 'theme.dart';
 
@@ -26,7 +26,7 @@ class SearchButton extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     final onTap =
-        onPressed ?? () => di<LibraryModel>().push(pageId: kSearchPageId);
+        onPressed ?? () => di<LibraryModel>().push(pageId: PageIDs.searchPage);
 
     return yaruStyled
         ? YaruSearchButton(
diff --git a/lib/common/view/sliver_audio_page.dart b/lib/common/view/sliver_audio_page.dart
index e17b6f129..9ceaa27e5 100644
--- a/lib/common/view/sliver_audio_page.dart
+++ b/lib/common/view/sliver_audio_page.dart
@@ -2,12 +2,12 @@ import 'package:flutter/material.dart';
 import 'package:watch_it/watch_it.dart';
 
 import '../../app_config.dart';
-import '../../constants.dart';
 import '../../library/library_model.dart';
 import '../../search/search_model.dart';
 import '../../search/search_type.dart';
 import '../data/audio.dart';
 import '../data/audio_type.dart';
+import '../page_ids.dart';
 import 'adaptive_container.dart';
 import 'audio_page_header.dart';
 import 'audio_page_type.dart';
@@ -66,7 +66,7 @@ class SliverAudioPage extends StatelessWidget {
             padding: appBarSingleActionSpacing,
             child: SearchButton(
               onPressed: () {
-                di<LibraryModel>().push(pageId: kSearchPageId);
+                di<LibraryModel>().push(pageId: PageIDs.searchPage);
                 final searchModel = di<SearchModel>();
                 if (searchModel.audioType != AudioType.local) {
                   searchModel
diff --git a/lib/constants.dart b/lib/constants.dart
index d3052b2c0..a20c01ec6 100644
--- a/lib/constants.dart
+++ b/lib/constants.dart
@@ -22,36 +22,10 @@ const kInternetArchiveHeaders = {
   'User-Agent': '$kAppTitle ($kRepoUrl)',
 };
 
-// persistence and library IDs and filenames
-const kLikedAudiosFileName = 'likedAudios.json';
-const kRadioTagFavsFileName = 'tagFavs.json';
-const kCountryFavsFileName = 'countryfavs.json';
-const kFavLanguageCodesFileName = 'languagefavs.json';
-const kLastRadioTag = 'lastFav';
-const kPlaylistsFileName = 'playlists.json';
-const kPinnedAlbumsFileName = 'finallyFixedPinnedAlbums.json';
-const kPodcastsFileName = 'podcasts.json';
-const kPodcastsUpdates = 'podcastsupdates.json';
-const kStarredStationsFileName = 'uuidStarredStations.json';
-const kSettingsFileName = 'settings.json';
-const kLastPositionsFileName = 'lastPositions.json';
-const kPlayerStateFileName = 'playerstate.json';
-const kAppStateFileName = 'appstate.json';
-const kRadioHistoryFileName = 'radiohistory.json';
-const kDownloads = 'downloads.json';
-const kFeedsWithDownloads = 'feedswithdownloads.json';
-const kCoverStore = 'coverStore.json';
 const kDirectoryProperty = 'directory';
 const kDownloadsCustomDir = 'downloadsCustomDir';
-const kRadioUrl = 'de1.api.radio-browser.info';
-const kRadioBrowserBaseUrl = 'all.api.radio-browser.info';
-const kLastAudio = 'lastAudio';
-const kLastPositionAsString = 'lastPositionAsString';
-const kLastDurationAsString = 'lastDurationAsString';
 const kLocalAudioIndex = 'localAudioIndex';
-const kSelectedPageId = 'selectedPageId';
-const kRadioIndex = 'radioIndex';
-const kPodcastIndex = 'podcastIndex';
+
 const kNeverShowImportFails = 'neverShowImportFails';
 const kEnableDiscordRPC = 'enableDiscordRPC';
 const kEnableLastFmScrobbling = 'enableLastFmScrobbling';
@@ -63,18 +37,13 @@ const kEnableListenBrainzScrobbling = 'enableListenBrainzScrobbling';
 const kListenBrainzApiKey = 'listenBrainzApiKey';
 const kLastCountryCode = 'lastCountryCode';
 const kLastLanguageCode = 'lastLanguageCode';
-const kSearchResult = 'searchResult';
-const kLocalAudioPageId = 'localAudio';
-const kPodcastsPageId = 'podcasts';
-const kRadioPageId = 'radio';
-const kNewPlaylistPageId = 'newPlaylist';
-const kLikedAudiosPageId = 'likedAudios';
+
 const kUsePodcastIndex = 'usePodcastIndex';
 const kThemeIndex = 'themeIndex';
 const kPodcastIndexApiKey = 'podcastIndexApiKey';
 const kPodcastIndexApiSecret = 'podcastIndexApiSecret';
 const kUseArtistGridView = 'useArtistGridView';
-const kSearchPageId = 'searchPageId';
+
 const kFavRadioTags = 'favRadioTags';
 const kFavCountryCodes = 'favCountryCodes';
 const kFavLanguageCodes = 'favLanguageCodes';
@@ -83,7 +52,6 @@ const kPatchNotesDisposed = 'kPatchNotesDisposed';
 const kCloseBtnAction = 'closeBtnAction';
 const kUseMoreAnimations = 'useMoreAnimations';
 const kShowPositionDuration = 'showPositionDuration';
-const kSettingsPageId = 'settings';
-const kHomePageId = 'homePage';
+
 const kPlaybackRate = 'playbackRate';
 const kNotifyDataSafeMode = 'notifyDataSafeMode';
diff --git a/lib/home/home_page.dart b/lib/home/home_page.dart
index 7f187e95c..cfcab5843 100644
--- a/lib/home/home_page.dart
+++ b/lib/home/home_page.dart
@@ -2,13 +2,13 @@ import 'package:flutter/material.dart';
 import 'package:watch_it/watch_it.dart';
 
 import '../common/data/audio_type.dart';
+import '../common/page_ids.dart';
 import '../common/view/adaptive_container.dart';
 import '../common/view/header_bar.dart';
 import '../common/view/icons.dart';
 import '../common/view/search_button.dart';
 import '../common/view/theme.dart';
 import '../common/view/ui_constants.dart';
-import '../constants.dart';
 import '../extensions/country_x.dart';
 import '../l10n/l10n.dart';
 import '../library/library_model.dart';
@@ -47,7 +47,7 @@ class HomePage extends StatelessWidget with WatchItMixin {
             selectedIcon: Icon(Iconz.settingsFilled),
             icon: Icon(Iconz.settings),
             tooltip: l10n.settings,
-            onPressed: () => di<LibraryModel>().push(pageId: kSettingsPageId),
+            onPressed: () => di<LibraryModel>().push(pageId: PageIDs.settings),
           ),
           const SizedBox(
             width: kSmallestSpace,
@@ -72,7 +72,7 @@ class HomePage extends StatelessWidget with WatchItMixin {
                     ),
                     trailing: Icon(Iconz.goNext),
                     onTap: () {
-                      di<LibraryModel>().push(pageId: kSearchPageId);
+                      di<LibraryModel>().push(pageId: PageIDs.searchPage);
                       di<SearchModel>()
                         ..setAudioType(AudioType.podcast)
                         ..setSearchType(SearchType.podcastTitle)
@@ -97,7 +97,7 @@ class HomePage extends StatelessWidget with WatchItMixin {
                       '${l10n.radio} ${l10n.charts} ${country ?? ''}',
                     ),
                     onTap: () {
-                      di<LibraryModel>().push(pageId: kSearchPageId);
+                      di<LibraryModel>().push(pageId: PageIDs.searchPage);
                       di<SearchModel>()
                         ..setAudioType(AudioType.radio)
                         ..setSearchType(SearchType.radioCountry)
@@ -121,7 +121,7 @@ class HomePage extends StatelessWidget with WatchItMixin {
                     onTap: () {
                       di<LocalAudioModel>().localAudioindex =
                           LocalAudioView.playlists.index;
-                      di<LibraryModel>().push(pageId: kLocalAudioPageId);
+                      di<LibraryModel>().push(pageId: PageIDs.localAudio);
                     },
                   ),
                 ),
diff --git a/lib/library/library_model.dart b/lib/library/library_model.dart
index 07c71e44f..ead671ef6 100644
--- a/lib/library/library_model.dart
+++ b/lib/library/library_model.dart
@@ -7,8 +7,8 @@ import '../app/view/mobile_page.dart';
 import '../app_config.dart';
 import '../common/data/audio.dart';
 import '../common/logging.dart';
+import '../common/page_ids.dart';
 import '../common/view/back_gesture.dart';
-import '../constants.dart';
 import 'library_service.dart';
 
 class LibraryModel extends SafeChangeNotifier implements NavigatorObserver {
@@ -32,7 +32,7 @@ class LibraryModel extends SafeChangeNotifier implements NavigatorObserver {
   }
 
   List<Audio>? getAudiosById(String pageId) {
-    if (pageId == kLikedAudiosPageId) {
+    if (pageId == PageIDs.likedAudios) {
       return likedAudios;
     } else {
       return playlists[pageId] ??
diff --git a/lib/library/library_service.dart b/lib/library/library_service.dart
index 41ccf04cd..11cc4c1c9 100644
--- a/lib/library/library_service.dart
+++ b/lib/library/library_service.dart
@@ -5,6 +5,8 @@ import 'package:collection/collection.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 
 import '../common/data/audio.dart';
+import '../common/file_names.dart';
+import '../common/page_ids.dart';
 import '../common/view/audio_filter.dart';
 import '../constants.dart';
 import '../persistence_utils.dart';
@@ -28,8 +30,10 @@ class LibraryService {
     if (_likedAudios.contains(audio)) return;
     _likedAudios.add(audio);
     if (notify) {
-      writeAudioMap({kLikedAudiosPageId: _likedAudios}, kLikedAudiosFileName)
-          .then((value) => _propertiesChangedController.add(true));
+      writeAudioMap(
+        map: {PageIDs.likedAudios: _likedAudios},
+        fileName: FileNames.likedAudios,
+      ).then((value) => _propertiesChangedController.add(true));
     }
   }
 
@@ -37,8 +41,10 @@ class LibraryService {
     for (var audio in audios) {
       addLikedAudio(audio, false);
     }
-    writeAudioMap({kLikedAudiosPageId: _likedAudios}, kLikedAudiosFileName)
-        .then((value) => _propertiesChangedController.add(true));
+    writeAudioMap(
+      map: {PageIDs.likedAudios: _likedAudios},
+      fileName: FileNames.likedAudios,
+    ).then((value) => _propertiesChangedController.add(true));
   }
 
   bool liked(Audio audio) {
@@ -48,8 +54,10 @@ class LibraryService {
   void removeLikedAudio(Audio audio, [bool notify = true]) {
     _likedAudios.remove(audio);
     if (notify) {
-      writeAudioMap({kLikedAudiosPageId: _likedAudios}, kLikedAudiosFileName)
-          .then((value) => _propertiesChangedController.add(true));
+      writeAudioMap(
+        map: {PageIDs.likedAudios: _likedAudios},
+        fileName: FileNames.likedAudios,
+      ).then((value) => _propertiesChangedController.add(true));
     }
   }
 
@@ -57,8 +65,10 @@ class LibraryService {
     for (var audio in audios) {
       removeLikedAudio(audio, false);
     }
-    writeAudioMap({kLikedAudiosPageId: _likedAudios}, kLikedAudiosFileName)
-        .then((value) => _propertiesChangedController.add(true));
+    writeAudioMap(
+      map: {PageIDs.likedAudios: _likedAudios},
+      fileName: FileNames.likedAudios,
+    ).then((value) => _propertiesChangedController.add(true));
   }
 
   //
@@ -71,13 +81,13 @@ class LibraryService {
 
   void addStarredStation(String uuid, List<Audio> audios) {
     _starredStations.putIfAbsent(uuid, () => audios);
-    writeAudioMap(_starredStations, kStarredStationsFileName)
+    writeAudioMap(map: _starredStations, fileName: FileNames.starredStations)
         .then((_) => _propertiesChangedController.add(true));
   }
 
   void unStarStation(String uuid) {
     _starredStations.remove(uuid);
-    writeAudioMap(_starredStations, kStarredStationsFileName)
+    writeAudioMap(map: _starredStations, fileName: FileNames.starredStations)
         .then((_) => _propertiesChangedController.add(true));
   }
 
@@ -192,14 +202,15 @@ class LibraryService {
   Future<void> addPlaylist(String id, List<Audio> audios) async {
     if (!_playlists.containsKey(id)) {
       _playlists.putIfAbsent(id, () => audios);
-      await writeAudioMap(_playlists, kPlaylistsFileName)
+      await writeAudioMap(map: _playlists, fileName: FileNames.playlists)
           .then((_) => _propertiesChangedController.add(true));
     }
   }
 
   Future<void> updatePlaylist(String id, List<Audio> audios) async {
     if (_playlists.containsKey(id)) {
-      await writeAudioMap(_playlists, kPlaylistsFileName).then((_) {
+      await writeAudioMap(map: _playlists, fileName: FileNames.playlists)
+          .then((_) {
         _playlists.update(
           id,
           (value) => audios,
@@ -211,7 +222,7 @@ class LibraryService {
 
   void removePlaylist(String id) {
     if (_playlists.containsKey(id)) {
-      writeAudioMap(_playlists, kPlaylistsFileName).then(
+      writeAudioMap(map: _playlists, fileName: FileNames.playlists).then(
         (_) {
           _playlists.remove(id);
           _propertiesChangedController.add(true);
@@ -226,7 +237,7 @@ class LibraryService {
     if (oldList != null) {
       _playlists.remove(oldName);
       _playlists.putIfAbsent(newName, () => oldList);
-      writeAudioMap(_playlists, kPlaylistsFileName)
+      writeAudioMap(map: _playlists, fileName: FileNames.playlists)
           .then((_) => _propertiesChangedController.add(true));
     }
   }
@@ -236,7 +247,7 @@ class LibraryService {
     required int newIndex,
     required String id,
   }) {
-    final audios = id == kLikedAudiosPageId
+    final audios = id == PageIDs.likedAudios
         ? likedAudios.toList()
         : playlists[id]?.toList();
 
@@ -253,15 +264,17 @@ class LibraryService {
     final audio = audios.removeAt(oldIndex);
     audios.insert(newIndex, audio);
 
-    if (id == kLikedAudiosPageId) {
-      writeAudioMap({kLikedAudiosPageId: _likedAudios}, kLikedAudiosFileName)
-          .then((value) {
+    if (id == PageIDs.likedAudios) {
+      writeAudioMap(
+        map: {PageIDs.likedAudios: _likedAudios},
+        fileName: FileNames.likedAudios,
+      ).then((value) {
         likedAudios.clear();
         likedAudios.addAll(audios);
         _propertiesChangedController.add(true);
       });
     } else {
-      writeAudioMap(_playlists, kPlaylistsFileName).then((_) {
+      writeAudioMap(map: _playlists, fileName: FileNames.likedAudios).then((_) {
         _playlists.update(id, (value) => audios);
         _propertiesChangedController.add(true);
       });
@@ -277,7 +290,7 @@ class LibraryService {
         playlist.add(audio);
       }
     }
-    writeAudioMap(_playlists, kPlaylistsFileName)
+    writeAudioMap(map: _playlists, fileName: FileNames.playlists)
         .then((_) => _propertiesChangedController.add(true));
   }
 
@@ -293,7 +306,7 @@ class LibraryService {
         playlist.remove(audio);
       }
     }
-    writeAudioMap(_playlists, kPlaylistsFileName)
+    writeAudioMap(map: _playlists, fileName: FileNames.playlists)
         .then((_) => _propertiesChangedController.add(true));
   }
 
@@ -301,7 +314,7 @@ class LibraryService {
     final playlist = _playlists[id];
     if (playlist != null) {
       playlist.clear();
-      writeAudioMap(_playlists, kPlaylistsFileName)
+      writeAudioMap(map: _playlists, fileName: FileNames.playlists)
           .then((_) => _propertiesChangedController.add(true));
     }
   }
@@ -326,11 +339,11 @@ class LibraryService {
     if (_downloads.containsKey(url)) return;
     _downloads.putIfAbsent(url, () => path);
     _feedsWithDownloads.add(feedUrl);
-    writeStringMap(_downloads, kDownloads)
+    writeStringMap(_downloads, FileNames.downloads)
         .then(
           (_) => writeStringIterable(
             iterable: _feedsWithDownloads,
-            filename: kFeedsWithDownloads,
+            filename: FileNames.feedsWithDownloads,
           ),
         )
         .then((_) => _propertiesChangedController.add(true));
@@ -359,11 +372,11 @@ class LibraryService {
   }
 
   void _updateDownloads() {
-    writeStringMap(_downloads, kDownloads)
+    writeStringMap(_downloads, FileNames.downloads)
         .then(
           (_) => writeStringIterable(
             iterable: _feedsWithDownloads,
-            filename: kFeedsWithDownloads,
+            filename: FileNames.feedsWithDownloads,
           ),
         )
         .then((_) => _propertiesChangedController.add(true));
@@ -383,7 +396,7 @@ class LibraryService {
     _feedsWithDownloads.remove(feedUrl);
     writeStringIterable(
       iterable: _feedsWithDownloads,
-      filename: kFeedsWithDownloads,
+      filename: FileNames.feedsWithDownloads,
     ).then((_) => _propertiesChangedController.add(true));
   }
 
@@ -395,7 +408,7 @@ class LibraryService {
   void addPodcast(String feedUrl, List<Audio> audios) {
     if (isPodcastSubscribed(feedUrl)) return;
     _podcasts.putIfAbsent(feedUrl, () => audios);
-    writeAudioMap(_podcasts, kPodcastsFileName)
+    writeAudioMap(map: _podcasts, fileName: FileNames.podcasts)
         .then((_) => _propertiesChangedController.add(true));
   }
 
@@ -403,15 +416,17 @@ class LibraryService {
     if (feedUrl.isEmpty || audios.isEmpty) return;
     _addPodcastUpdate(feedUrl);
     _podcasts.update(feedUrl, (value) => audios);
-    return writeAudioMap(_podcasts, kPodcastsFileName)
+    return writeAudioMap(map: _podcasts, fileName: FileNames.podcasts)
         .then((_) => _propertiesChangedController.add(true));
   }
 
   void _addPodcastUpdate(String feedUrl) {
     if (_podcastUpdates?.contains(feedUrl) == true) return;
     _podcastUpdates?.add(feedUrl);
-    writeStringIterable(iterable: _podcastUpdates!, filename: kPodcastsUpdates)
-        .then((_) => _propertiesChangedController.add(true));
+    writeStringIterable(
+      iterable: _podcastUpdates!,
+      filename: FileNames.podcastUpdates,
+    ).then((_) => _propertiesChangedController.add(true));
   }
 
   bool showPodcastAscending(String feedUrl) =>
@@ -456,14 +471,16 @@ class LibraryService {
   void removePodcastUpdate(String feedUrl) {
     if (_podcastUpdates?.isNotEmpty == false) return;
     _podcastUpdates?.remove(feedUrl);
-    writeStringIterable(iterable: _podcastUpdates!, filename: kPodcastsUpdates)
-        .then((_) => _propertiesChangedController.add(true));
+    writeStringIterable(
+      iterable: _podcastUpdates!,
+      filename: FileNames.podcastUpdates,
+    ).then((_) => _propertiesChangedController.add(true));
   }
 
   void removePodcast(String feedUrl) {
     if (!isPodcastSubscribed(feedUrl)) return;
     _podcasts.remove(feedUrl);
-    writeAudioMap(_podcasts, kPodcastsFileName)
+    writeAudioMap(map: _podcasts, fileName: FileNames.podcasts)
         .then((_) => _propertiesChangedController.add(true))
         .then((_) => removePodcastUpdate(feedUrl))
         .then((_) => _removeFeedWithDownload(feedUrl));
@@ -484,13 +501,13 @@ class LibraryService {
 
   void addPinnedAlbum(String name, List<Audio> audios) {
     _pinnedAlbums.putIfAbsent(name, () => audios);
-    writeAudioMap(_pinnedAlbums, kPinnedAlbumsFileName)
+    writeAudioMap(map: _pinnedAlbums, fileName: FileNames.pinnedAlbums)
         .then((_) => _propertiesChangedController.add(true));
   }
 
   void removePinnedAlbum(String name) {
     _pinnedAlbums.remove(name);
-    writeAudioMap(_pinnedAlbums, kPinnedAlbumsFileName)
+    writeAudioMap(map: _pinnedAlbums, fileName: FileNames.pinnedAlbums)
         .then((_) => _propertiesChangedController.add(true));
   }
 
@@ -499,30 +516,36 @@ class LibraryService {
     // Ensure [init] is only called once
     if (_libraryInitialized == true) return _libraryInitialized!;
 
-    _playlists = await readAudioMap(kPlaylistsFileName);
-    _pinnedAlbums = await readAudioMap(kPinnedAlbumsFileName);
-    _podcasts = await readAudioMap(kPodcastsFileName);
+    _playlists = await readAudioMap(FileNames.playlists);
+    _pinnedAlbums = await readAudioMap(FileNames.pinnedAlbums);
+    _podcasts = await readAudioMap(FileNames.podcasts);
     _podcastUpdates = Set.from(
-      await readStringIterable(filename: kPodcastsUpdates) ?? <String>{},
+      await readStringIterable(filename: FileNames.podcastUpdates) ??
+          <String>{},
     );
     _podcastUpdates ??= {};
-    _starredStations = await readAudioMap(kStarredStationsFileName);
+    _starredStations = await readAudioMap(FileNames.starredStations);
 
-    _likedAudios =
-        (await readAudioMap(kLikedAudiosFileName)).entries.firstOrNull?.value ??
-            <Audio>[];
+    _likedAudios = (await readAudioMap(FileNames.likedAudios))
+            .entries
+            .firstOrNull
+            ?.value ??
+        <Audio>[];
 
-    _downloads = await readStringMap(kDownloads);
+    _downloads = await readStringMap(FileNames.downloads);
     _feedsWithDownloads = Set.from(
-      await readStringIterable(filename: kFeedsWithDownloads) ?? <String>{},
+      await readStringIterable(filename: FileNames.feedsWithDownloads) ??
+          <String>{},
     );
 
     return true;
   }
 
-  String? get selectedPageId => _sharedPreferences.getString(kSelectedPageId);
+  String? get selectedPageId =>
+      _sharedPreferences.getString(PageIDs.selectedPage);
   Future<void> setSelectedPageId(String value) async {
-    final success = await _sharedPreferences.setString(kSelectedPageId, value);
+    final success =
+        await _sharedPreferences.setString(PageIDs.selectedPage, value);
     if (success) {
       _propertiesChangedController.add(true);
     }
@@ -534,19 +557,9 @@ class LibraryService {
 
   bool isPageInLibrary(String? pageId) =>
       pageId != null &&
-      (_mainPages.contains(pageId) ||
+      (PageIDs.permanent.contains(pageId) ||
           isPinnedAlbum(pageId) ||
           isStarredStation(pageId) ||
           isPlaylistSaved(pageId) ||
           isPodcastSubscribed(pageId));
-
-  final _mainPages = [
-    kHomePageId,
-    kSearchPageId,
-    kLikedAudiosPageId,
-    kLocalAudioPageId,
-    kPodcastsPageId,
-    kRadioPageId,
-    kSettingsPageId,
-  ];
 }
diff --git a/lib/local_audio/view/artist_page.dart b/lib/local_audio/view/artist_page.dart
index 7f637846d..619754a2c 100644
--- a/lib/local_audio/view/artist_page.dart
+++ b/lib/local_audio/view/artist_page.dart
@@ -4,6 +4,7 @@ import 'package:watch_it/watch_it.dart';
 
 import '../../common/data/audio.dart';
 import '../../common/data/audio_type.dart';
+import '../../common/page_ids.dart';
 import '../../common/view/adaptive_container.dart';
 import '../../common/view/audio_page_header.dart';
 import '../../common/view/audio_page_type.dart';
@@ -17,7 +18,6 @@ import '../../common/view/sliver_audio_page_control_panel.dart';
 import '../../common/view/sliver_audio_tile_list.dart';
 import '../../common/view/theme.dart';
 import '../../common/view/ui_constants.dart';
-import '../../constants.dart';
 import '../../l10n/l10n.dart';
 import '../../library/library_model.dart';
 import '../../search/search_model.dart';
@@ -77,7 +77,7 @@ class ArtistPage extends StatelessWidget with WatchItMixin {
             padding: appBarSingleActionSpacing,
             child: SearchButton(
               onPressed: () {
-                di<LibraryModel>().push(pageId: kSearchPageId);
+                di<LibraryModel>().push(pageId: PageIDs.searchPage);
                 final searchmodel = di<SearchModel>();
                 searchmodel
                   ..setAudioType(AudioType.local)
diff --git a/lib/local_audio/view/genre_page.dart b/lib/local_audio/view/genre_page.dart
index 4bbd54db6..52e231c80 100644
--- a/lib/local_audio/view/genre_page.dart
+++ b/lib/local_audio/view/genre_page.dart
@@ -3,11 +3,11 @@ import 'package:radio_browser_api/radio_browser_api.dart' hide State;
 import 'package:watch_it/watch_it.dart';
 
 import '../../common/data/audio_type.dart';
+import '../../common/page_ids.dart';
 import '../../common/view/adaptive_container.dart';
 import '../../common/view/header_bar.dart';
 import '../../common/view/icons.dart';
 import '../../common/view/theme.dart';
-import '../../constants.dart';
 import '../../l10n/l10n.dart';
 import '../../library/library_model.dart';
 import '../../search/search_model.dart';
@@ -55,7 +55,7 @@ class _GenrePageState extends State<GenrePage> {
             IconButton(
               tooltip: context.l10n.searchForRadioStationsWithGenreName,
               onPressed: () {
-                di<LibraryModel>().push(pageId: kSearchPageId);
+                di<LibraryModel>().push(pageId: PageIDs.searchPage);
                 di<SearchModel>()
                   ..setTag(
                     Tag(name: widget.genre.toLowerCase(), stationCount: 1),
diff --git a/lib/local_audio/view/local_audio_page.dart b/lib/local_audio/view/local_audio_page.dart
index e49addc1c..bd023c1e3 100644
--- a/lib/local_audio/view/local_audio_page.dart
+++ b/lib/local_audio/view/local_audio_page.dart
@@ -3,6 +3,7 @@ import 'package:flutter/material.dart';
 import 'package:watch_it/watch_it.dart';
 
 import '../../common/data/audio_type.dart';
+import '../../common/page_ids.dart';
 import '../../common/view/adaptive_container.dart';
 import '../../common/view/header_bar.dart';
 import '../../common/view/no_search_result_page.dart';
@@ -10,7 +11,6 @@ import '../../common/view/search_button.dart';
 import '../../common/view/sliver_filter_app_bar.dart';
 import '../../common/view/theme.dart';
 import '../../common/view/ui_constants.dart';
-import '../../constants.dart';
 import '../../l10n/l10n.dart';
 import '../../library/library_model.dart';
 import '../../search/search_model.dart';
@@ -68,7 +68,7 @@ class _LocalAudioPageState extends State<LocalAudioPage> {
             child: SearchButton(
               active: false,
               onPressed: () {
-                di<LibraryModel>().push(pageId: kSearchPageId);
+                di<LibraryModel>().push(pageId: PageIDs.searchPage);
                 final searchmodel = di<SearchModel>();
                 searchmodel
                   ..setAudioType(AudioType.local)
diff --git a/lib/local_audio/view/playlists_view.dart b/lib/local_audio/view/playlists_view.dart
index feb60df41..6602028b9 100644
--- a/lib/local_audio/view/playlists_view.dart
+++ b/lib/local_audio/view/playlists_view.dart
@@ -2,10 +2,10 @@ import 'package:flutter/material.dart';
 import 'package:watch_it/watch_it.dart';
 import 'package:yaru/yaru.dart';
 
+import '../../common/page_ids.dart';
 import '../../common/view/icons.dart';
 import '../../common/view/round_image_container.dart';
 import '../../common/view/ui_constants.dart';
-import '../../constants.dart';
 import '../../extensions/build_context_x.dart';
 import '../../library/library_model.dart';
 import '../../playlists/view/manual_add_dialog.dart';
@@ -27,8 +27,8 @@ class PlaylistsView extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     final lists = [
-      kNewPlaylistPageId,
-      kLikedAudiosPageId,
+      PageIDs.newPlaylist,
+      PageIDs.likedAudios,
       ...(take != null ? playlists!.take(take!).toList() : playlists ?? []),
     ];
 
@@ -39,7 +39,7 @@ class PlaylistsView extends StatelessWidget {
         final id = lists.elementAt(index);
         return YaruSelectableContainer(
           selected: false,
-          onTap: () => id == kNewPlaylistPageId
+          onTap: () => id == PageIDs.newPlaylist
               ? showDialog(
                   context: context,
                   builder: (context) =>
@@ -58,7 +58,7 @@ class PlaylistsView extends StatelessWidget {
               SizedBox(
                 width: double.infinity,
                 height: double.infinity,
-                child: id == kNewPlaylistPageId
+                child: id == PageIDs.newPlaylist
                     ? Container(
                         decoration: BoxDecoration(
                           color: context.colorScheme.surface.scale(
@@ -68,7 +68,7 @@ class PlaylistsView extends StatelessWidget {
                         ),
                         child: Icon(Iconz.plus),
                       )
-                    : id == kLikedAudiosPageId
+                    : id == PageIDs.likedAudios
                         ? Container(
                             decoration: BoxDecoration(
                               color: context.colorScheme.primary
@@ -82,7 +82,7 @@ class PlaylistsView extends StatelessWidget {
                             fallBackText: id,
                           ),
               ),
-              if (id != kNewPlaylistPageId && id != kLikedAudiosPageId)
+              if (id != PageIDs.newPlaylist && id != PageIDs.likedAudios)
                 ArtistVignette(
                   text: id,
                 ),
diff --git a/lib/local_audio/view/titles_view.dart b/lib/local_audio/view/titles_view.dart
index d19a78e31..32a9a4721 100644
--- a/lib/local_audio/view/titles_view.dart
+++ b/lib/local_audio/view/titles_view.dart
@@ -3,11 +3,11 @@ import 'package:flutter/widgets.dart';
 import 'package:watch_it/watch_it.dart';
 
 import '../../common/data/audio.dart';
+import '../../common/page_ids.dart';
 import '../../common/view/audio_page_type.dart';
 import '../../common/view/no_search_result_page.dart';
 import '../../common/view/sliver_audio_tile_list.dart';
 import '../../common/view/sliver_fill_remaining_progress.dart';
-import '../../constants.dart';
 import '../../library/library_model.dart';
 import '../local_audio_model.dart';
 import 'artist_page.dart';
@@ -41,7 +41,7 @@ class TitlesView extends StatelessWidget {
     return SliverAudioTileList(
       audios: audios!,
       audioPageType: AudioPageType.allTitlesView,
-      pageId: kLocalAudioPageId,
+      pageId: PageIDs.localAudio,
       onSubTitleTab: (text) {
         final artistAudios = model.findTitlesOfArtist(text);
         final artist = artistAudios?.firstOrNull?.artist;
diff --git a/lib/persistence_utils.dart b/lib/persistence_utils.dart
index bffaab040..403bc7fd9 100644
--- a/lib/persistence_utils.dart
+++ b/lib/persistence_utils.dart
@@ -6,9 +6,9 @@ import 'package:path/path.dart' as p;
 import 'package:path_provider/path_provider.dart';
 import 'package:xdg_directories/xdg_directories.dart';
 
+import 'common/data/audio.dart';
 import 'common/logging.dart';
 import 'constants.dart';
-import 'common/data/audio.dart';
 
 String? _workingDir;
 Future<String> getWorkingDir() async {
@@ -64,11 +64,11 @@ Future<String?> getDownloadsDefaultDir() async {
   return null;
 }
 
-Future<void> writeCustomSetting(
-  String? key,
-  dynamic value, [
-  String filename = kSettingsFileName,
-]) async {
+Future<void> writeCustomSetting({
+  required String? key,
+  required dynamic value,
+  required String filename,
+}) async {
   if (key == null || value == null) return;
   final oldSettings = await getCustomSettings(filename);
   if (oldSettings.containsKey(key)) {
@@ -115,10 +115,10 @@ Future<void> writeCustomSettings({
   await file.writeAsString(jsonStr);
 }
 
-Future<void> removeCustomSetting(
-  String key, [
-  String filename = kSettingsFileName,
-]) async {
+Future<void> removeCustomSetting({
+  required String key,
+  required String filename,
+}) async {
   final oldSettings = await getCustomSettings(filename);
   if (oldSettings.containsKey(key)) {
     oldSettings.remove(key);
@@ -135,10 +135,10 @@ Future<void> removeCustomSetting(
   }
 }
 
-Future<void> removeCustomSettings(
-  List<String> keys, [
-  String filename = kSettingsFileName,
-]) async {
+Future<void> removeCustomSettings({
+  required List<String> keys,
+  required String filename,
+}) async {
   final oldSettings = await getCustomSettings(filename);
   for (var key in keys) {
     if (oldSettings.containsKey(key)) {
@@ -156,18 +156,16 @@ Future<void> removeCustomSettings(
   await file.writeAsString(jsonStr);
 }
 
-Future<dynamic> readCustomSetting(
-  dynamic key, [
-  String filename = kSettingsFileName,
-]) async {
+Future<dynamic> readCustomSetting({
+  required dynamic key,
+  required String filename,
+}) async {
   if (key == null) return null;
   final oldSettings = await getCustomSettings(filename);
   return oldSettings[key];
 }
 
-Future<Map<String, String>> getCustomSettings([
-  String filename = kSettingsFileName,
-]) async {
+Future<Map<String, String>> getCustomSettings(String filename) async {
   final workingDir = await getWorkingDir();
 
   final file = File(p.join(workingDir, filename));
@@ -190,18 +188,14 @@ Future<Map<String, String>> getCustomSettings([
   }
 }
 
-Future<void> wipeCustomSettings([
-  String filename = kSettingsFileName,
-]) async {
+Future<void> wipeCustomSettings({required String filename}) async {
   final workingDir = await getWorkingDir();
 
   final file = File(p.join(workingDir, filename));
 
   if (!file.existsSync()) {
-    file.createSync();
+    await file.delete();
   }
-
-  await file.writeAsString('{}');
 }
 
 Future<void> writeStringIterable({
@@ -229,10 +223,10 @@ Future<Iterable<String>?> readStringIterable({
   return content;
 }
 
-Future<void> writeAudioMap(
-  Map<String, List<Audio>> map,
-  String fileName,
-) async {
+Future<void> writeAudioMap({
+  required Map<String, List<Audio>> map,
+  required String fileName,
+}) async {
   final dynamicMap = map.map(
     (key, value) => MapEntry<String, List<dynamic>>(
       key,
diff --git a/lib/player/player_service.dart b/lib/player/player_service.dart
index cd74b71cd..e286fee34 100644
--- a/lib/player/player_service.dart
+++ b/lib/player/player_service.dart
@@ -13,6 +13,7 @@ import '../common/data/audio.dart';
 import '../common/data/audio_type.dart';
 import '../common/data/mpv_meta_data.dart';
 import '../common/data/player_state.dart';
+import '../common/file_names.dart';
 import '../common/logging.dart';
 import '../constants.dart';
 import '../expose/expose_service.dart';
@@ -474,7 +475,7 @@ class PlayerService {
   }
 
   Future<void> _loadLastPositions() async {
-    _lastPositions = (await getCustomSettings(kLastPositionsFileName)).map(
+    _lastPositions = (await getCustomSettings(FileNames.lastPositions)).map(
       (key, value) => MapEntry(key, value.parsedDuration ?? Duration.zero),
     );
   }
@@ -489,9 +490,9 @@ class PlayerService {
   Map<String, Duration> get lastPositions => _lastPositions;
   Future<void> addLastPosition(String key, Duration lastPosition) async {
     await writeCustomSetting(
-      key,
-      lastPosition.toString(),
-      kLastPositionsFileName,
+      key: key,
+      value: lastPosition.toString(),
+      filename: FileNames.lastPositions,
     );
     if (_lastPositions.containsKey(key)) {
       _lastPositions.update(key, (value) => lastPosition);
@@ -512,7 +513,7 @@ class PlayerService {
             ),
           )
           .toList(),
-      filename: kLastPositionsFileName,
+      filename: FileNames.lastPositions,
     );
     await _loadLastPositions();
 
@@ -520,15 +521,15 @@ class PlayerService {
   }
 
   Future<void> removeLastPosition(String key) async {
-    await removeCustomSetting(key, kLastPositionsFileName);
+    await removeCustomSetting(key: key, filename: FileNames.lastPositions);
     _lastPositions.remove(key);
     _propertiesChangedController.add(true);
   }
 
   Future<void> removeLastPositions(List<Audio> audios) async {
     await removeCustomSettings(
-      audios.where((e) => e.url != null).map((e) => e.url!).toList(),
-      kLastPositionsFileName,
+      keys: audios.where((e) => e.url != null).map((e) => e.url!).toList(),
+      filename: FileNames.lastPositions,
     );
 
     await _loadLastPositions();
@@ -861,13 +862,13 @@ class PlayerService {
       rate: _rate.toString(),
     );
 
-    await writeJsonToFile(playerState.toMap(), kPlayerStateFileName);
+    await writeJsonToFile(playerState.toMap(), FileNames.playerState);
   }
 
   Future<PlayerState?> _readPlayerState() async {
     try {
       final workingDir = await getWorkingDir();
-      final file = File(p.join(workingDir, kPlayerStateFileName));
+      final file = File(p.join(workingDir, FileNames.playerState));
 
       if (file.existsSync()) {
         final jsonStr = await file.readAsString();
diff --git a/lib/player/view/full_height_player.dart b/lib/player/view/full_height_player.dart
index 5036d6e5d..97b156010 100644
--- a/lib/player/view/full_height_player.dart
+++ b/lib/player/view/full_height_player.dart
@@ -120,7 +120,7 @@ class FullHeightPlayer extends StatelessWidget with WatchItMixin {
             child: FullHeightPlayerTopControls(
               iconColor: iconColor,
               playerPosition: playerPosition,
-              showQueueButton: !isMobilePlatform && !playerWithSidePanel,
+              showQueueButton: !playerWithSidePanel,
             ),
           ),
           if (isMobilePlatform)
diff --git a/lib/player/view/full_height_player_top_controls.dart b/lib/player/view/full_height_player_top_controls.dart
index 2ce07ff63..db4e0fd43 100644
--- a/lib/player/view/full_height_player_top_controls.dart
+++ b/lib/player/view/full_height_player_top_controls.dart
@@ -5,13 +5,13 @@ import '../../app/app_model.dart';
 import '../../app/connectivity_model.dart';
 import '../../app_config.dart';
 import '../../common/data/audio_type.dart';
+import '../../common/page_ids.dart';
 import '../../common/view/icons.dart';
 import '../../common/view/like_icon.dart';
 import '../../common/view/search_button.dart';
 import '../../common/view/share_button.dart';
 import '../../common/view/theme.dart';
 import '../../common/view/ui_constants.dart';
-import '../../constants.dart';
 import '../../extensions/build_context_x.dart';
 import '../../l10n/l10n.dart';
 import '../../library/library_model.dart';
@@ -73,7 +73,7 @@ class FullHeightPlayerTopControls extends StatelessWidget with WatchItMixin {
                 di<SearchModel>()
                   ..setSearchQuery('')
                   ..setAudioType(audio?.audioType);
-                di<LibraryModel>().push(pageId: kSearchPageId);
+                di<LibraryModel>().push(pageId: PageIDs.searchPage);
               },
             ),
           if (audio?.audioType != AudioType.podcast)
@@ -88,7 +88,11 @@ class FullHeightPlayerTopControls extends StatelessWidget with WatchItMixin {
                 ),
               _ => const SizedBox.shrink(),
             },
-          if (showQueueButton) QueueButton(color: iconColor),
+          if (showQueueButton)
+            QueueButton(
+              color: iconColor,
+              onTap: () => di<AppModel>().setOrToggleQueueOverlay(),
+            ),
           PlayerPauseTimerButton(
             iconColor: iconColor,
           ),
diff --git a/lib/player/view/queue/queue_button.dart b/lib/player/view/queue/queue_button.dart
index 223af756e..c0e9790b6 100644
--- a/lib/player/view/queue/queue_button.dart
+++ b/lib/player/view/queue/queue_button.dart
@@ -2,50 +2,70 @@ import 'package:flutter/material.dart';
 import 'package:watch_it/watch_it.dart';
 
 import '../../../app/app_model.dart';
-import '../../../app_config.dart';
 import '../../../common/data/audio_type.dart';
+import '../../../common/page_ids.dart';
 import '../../../common/view/icons.dart';
 import '../../../common/view/modals.dart';
-import '../../../common/view/ui_constants.dart';
 import '../../../extensions/build_context_x.dart';
 import '../../../l10n/l10n.dart';
-import '../../../radio/view/radio_history_list.dart';
+import '../../../library/library_model.dart';
+import '../../../radio/radio_model.dart';
 import '../../player_model.dart';
 import 'queue_body.dart';
 import 'queue_dialog.dart';
 
 class QueueButton extends StatelessWidget with WatchItMixin {
-  const QueueButton({super.key, this.color, this.isSelected})
-      : _mode = _QueueButtonMode.icon;
+  const QueueButton({
+    super.key,
+    this.color,
+    this.isSelected,
+    this.onTap,
+  }) : _mode = _QueueButtonMode.icon;
 
-  const QueueButton.text({super.key, this.color, this.isSelected})
-      : _mode = _QueueButtonMode.text;
+  const QueueButton.text({
+    super.key,
+    this.color,
+    this.isSelected,
+    this.onTap,
+  }) : _mode = _QueueButtonMode.text;
 
   final Color? color;
   final bool? isSelected;
+  final void Function()? onTap;
 
   final _QueueButtonMode _mode;
 
   @override
   Widget build(BuildContext context) {
     final theme = context.theme;
-    final playerToTheRight = context.mediaQuerySize.width > kSideBarThreshHold;
-    final isFullScreen = watchPropertyValue((AppModel m) => m.fullWindowMode);
     final radio = watchPropertyValue(
       (PlayerModel m) => m.audio?.audioType == AudioType.radio,
     );
 
-    final queueOrHistory = radio
-        ? const SizedBox(
-            width: 400,
-            height: 500,
-            child: RadioHistoryList(
-              simpleList: true,
-            ),
-          )
-        : QueueBody(
+    final content = ModalMode.platformModalMode == ModalMode.bottomSheet
+        ? QueueBody(
             selectedColor: theme.colorScheme.onSurface,
-          );
+          )
+        : const QueueDialog();
+
+    void Function() onPressed = onTap ??
+        () {
+          if (di<PlayerModel>().audio?.audioType == AudioType.radio) {
+            di<RadioModel>()
+                .setRadioCollectionView(RadioCollectionView.history);
+            if (di<LibraryModel>().selectedPageId != PageIDs.radio) {
+              di<LibraryModel>().push(pageId: PageIDs.radio);
+            }
+          } else {
+            showModal(
+              context: context,
+              isScrollControlled: true,
+              showDragHandle: true,
+              content: content,
+              mode: ModalMode.platformModalMode,
+            );
+          }
+        };
 
     return switch (_mode) {
       _QueueButtonMode.icon => IconButton(
@@ -55,23 +75,13 @@ class QueueButton extends StatelessWidget with WatchItMixin {
           padding: EdgeInsets.zero,
           tooltip: radio ? context.l10n.hearingHistory : context.l10n.queue,
           icon: Icon(
-            Iconz.playlist,
+            radio ? Iconz.radioHistory : Iconz.playlist,
             color: color ?? theme.colorScheme.onSurface,
           ),
-          onPressed: () => onPressed(
-            playerToTheRight: playerToTheRight,
-            isFullScreen: isFullScreen,
-            context: context,
-            bottomSheetContent: queueOrHistory,
-          ),
+          onPressed: onPressed,
         ),
       _QueueButtonMode.text => TextButton(
-          onPressed: () => onPressed(
-            playerToTheRight: playerToTheRight,
-            isFullScreen: isFullScreen,
-            context: context,
-            bottomSheetContent: queueOrHistory,
-          ),
+          onPressed: onPressed,
           child: Text(
             radio ? context.l10n.hearingHistory : context.l10n.queue,
             style: context.textTheme.bodyLarge?.copyWith(
@@ -81,27 +91,6 @@ class QueueButton extends StatelessWidget with WatchItMixin {
         )
     };
   }
-
-  void onPressed({
-    required bool playerToTheRight,
-    required bool? isFullScreen,
-    required BuildContext context,
-    required Widget bottomSheetContent,
-  }) {
-    if ((playerToTheRight || isFullScreen == true) && !isMobilePlatform) {
-      di<AppModel>().setOrToggleQueueOverlay();
-    } else {
-      showModal(
-        context: context,
-        isScrollControlled: true,
-        showDragHandle: true,
-        content: ModalMode.platformModalMode == ModalMode.bottomSheet
-            ? bottomSheetContent
-            : const QueueDialog(),
-        mode: ModalMode.platformModalMode,
-      );
-    }
-  }
 }
 
 enum _QueueButtonMode {
diff --git a/lib/player/view/queue/queue_dialog.dart b/lib/player/view/queue/queue_dialog.dart
index b9df2f726..d91b1c2eb 100644
--- a/lib/player/view/queue/queue_dialog.dart
+++ b/lib/player/view/queue/queue_dialog.dart
@@ -1,3 +1,4 @@
+import '../../../common/data/audio_type.dart';
 import '../../../common/view/ui_constants.dart';
 import '../../../l10n/l10n.dart';
 import '../../../library/library_model.dart';
@@ -29,7 +30,7 @@ class QueueDialog extends StatelessWidget with WatchItMixin {
           onPressed: () {
             di<LibraryModel>().addPlaylist(
               '${context.l10n.queue} ${DateTime.now()}',
-              List.from(queue),
+              List.from(queue.where((e) => e.audioType == AudioType.local)),
             );
             Navigator.of(context).pop();
           },
diff --git a/lib/playlists/view/add_to_playlist_navigator.dart b/lib/playlists/view/add_to_playlist_navigator.dart
index 9d755238c..2150e86de 100644
--- a/lib/playlists/view/add_to_playlist_navigator.dart
+++ b/lib/playlists/view/add_to_playlist_navigator.dart
@@ -1,16 +1,17 @@
+import 'package:flutter/material.dart';
+import 'package:watch_it/watch_it.dart';
+
 import '../../common/data/audio.dart';
+import '../../common/page_ids.dart';
 import '../../common/view/common_widgets.dart';
 import '../../common/view/global_keys.dart';
 import '../../common/view/icons.dart';
 import '../../common/view/side_bar_fall_back_image.dart';
 import '../../common/view/theme.dart';
 import '../../common/view/ui_constants.dart';
-import '../../constants.dart';
 import '../../l10n/l10n.dart';
 import '../../library/library_model.dart';
 import 'add_to_playlist_snack_bar.dart';
-import 'package:flutter/material.dart';
-import 'package:watch_it/watch_it.dart';
 
 class AddToPlaylistNavigator extends StatelessWidget {
   const AddToPlaylistNavigator({
@@ -60,7 +61,7 @@ class _PlaylistTilesList extends StatelessWidget with WatchItMixin {
         title: Text(context.l10n.createNewPlaylist),
       ),
       _PlaylistTile(
-        playlistId: kLikedAudiosPageId,
+        playlistId: PageIDs.likedAudios,
         title: context.l10n.likedSongs,
         iconData: Iconz.heartFilled,
         libraryModel: di<LibraryModel>(),
@@ -112,7 +113,7 @@ class _PlaylistTile extends StatelessWidget {
     return ListTile(
       contentPadding: padding,
       onTap: () {
-        if (playlistId == kLikedAudiosPageId) {
+        if (playlistId == PageIDs.likedAudios) {
           libraryModel.addLikedAudios(audios);
         } else {
           libraryModel.addAudiosToPlaylist(
diff --git a/lib/playlists/view/add_to_playlist_snack_bar.dart b/lib/playlists/view/add_to_playlist_snack_bar.dart
index 8f5c4cb58..77a603dc4 100644
--- a/lib/playlists/view/add_to_playlist_snack_bar.dart
+++ b/lib/playlists/view/add_to_playlist_snack_bar.dart
@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:watch_it/watch_it.dart';
 
 import '../../app/app_model.dart';
-import '../../constants.dart';
+import '../../common/page_ids.dart';
 import '../../l10n/l10n.dart';
 import '../../library/library_model.dart';
 
@@ -16,7 +16,7 @@ ScaffoldFeatureController<SnackBar, SnackBarClosedReason>
   return ScaffoldMessenger.of(context).showSnackBar(
     SnackBar(
       content: Text(
-        '${context.l10n.addedTo} ${id == kLikedAudiosPageId ? context.l10n.likedSongs : id}',
+        '${context.l10n.addedTo} ${id == PageIDs.likedAudios ? context.l10n.likedSongs : id}',
         maxLines: 1,
         overflow: TextOverflow.ellipsis,
       ),
diff --git a/lib/playlists/view/liked_audio_page.dart b/lib/playlists/view/liked_audio_page.dart
index bca801a0c..1405ae052 100644
--- a/lib/playlists/view/liked_audio_page.dart
+++ b/lib/playlists/view/liked_audio_page.dart
@@ -2,12 +2,12 @@ import 'package:animated_emoji/animated_emoji.dart';
 import 'package:flutter/material.dart';
 import 'package:watch_it/watch_it.dart';
 
+import '../../common/page_ids.dart';
 import '../../common/view/audio_page_type.dart';
 import '../../common/view/fall_back_header_image.dart';
 import '../../common/view/icons.dart';
 import '../../common/view/side_bar_fall_back_image.dart';
 import '../../common/view/sliver_audio_page.dart';
-import '../../constants.dart';
 import '../../extensions/build_context_x.dart';
 import '../../extensions/theme_data_x.dart';
 import '../../l10n/l10n.dart';
@@ -39,7 +39,7 @@ class LikedAudioPage extends StatelessWidget with WatchItMixin {
       noSearchResultIcons: const AnimatedEmoji(AnimatedEmojis.twoHearts),
       audios: likedAudios,
       audioPageType: AudioPageType.likedAudio,
-      pageId: kLikedAudiosPageId,
+      pageId: PageIDs.likedAudios,
       pageTitle: context.l10n.likedSongs,
       pageLabel: context.l10n.playlist,
       pageSubTitle: '${likedAudios.length} ${context.l10n.titles}',
diff --git a/lib/playlists/view/manual_add_dialog.dart b/lib/playlists/view/manual_add_dialog.dart
index 9d37e2326..beda711d6 100644
--- a/lib/playlists/view/manual_add_dialog.dart
+++ b/lib/playlists/view/manual_add_dialog.dart
@@ -4,11 +4,11 @@ import 'package:yaru/yaru.dart';
 
 import '../../app_config.dart';
 import '../../common/data/audio.dart';
+import '../../common/page_ids.dart';
 import '../../common/view/common_widgets.dart';
 import '../../common/view/global_keys.dart';
 import '../../common/view/icons.dart';
 import '../../common/view/ui_constants.dart';
-import '../../constants.dart';
 import '../../external_path/external_path_service.dart';
 import '../../l10n/l10n.dart';
 import '../../library/library_model.dart';
@@ -173,13 +173,15 @@ class _PlaylistEditDialogContentState extends State<PlaylistEditDialogContent> {
     return Column(
       mainAxisAlignment: MainAxisAlignment.spaceBetween,
       children: [
+        const SizedBox(
+          height: 10,
+        ),
         Padding(
-          padding: const EdgeInsets.only(bottom: 10, top: 10),
+          padding: const EdgeInsets.only(bottom: 10),
           child: TextField(
             autofocus: true,
             decoration: InputDecoration(label: Text(context.l10n.playlist)),
             controller: _controller,
-            onChanged: (v) => setState(() => _controller.text = v),
           ),
         ),
         if (widget.allowCreate)
@@ -223,7 +225,7 @@ class _PlaylistEditDialogContentState extends State<PlaylistEditDialogContent> {
                     di<LocalAudioModel>().localAudioindex =
                         LocalAudioView.playlists.index;
                     await libraryModel.push(
-                      pageId: kLocalAudioPageId,
+                      pageId: PageIDs.likedAudios,
                       replace: true,
                     );
                   },
@@ -237,7 +239,7 @@ class _PlaylistEditDialogContentState extends State<PlaylistEditDialogContent> {
                     di<LocalAudioModel>().localAudioindex =
                         LocalAudioView.playlists.index;
                     libraryModel
-                      ..push(pageId: kLocalAudioPageId)
+                      ..push(pageId: PageIDs.likedAudios)
                       ..updatePlaylistName(
                         widget.playlistName!,
                         _controller.text,
@@ -249,28 +251,36 @@ class _PlaylistEditDialogContentState extends State<PlaylistEditDialogContent> {
                   ),
                 ),
               if (widget.allowCreate)
-                ImportantButton(
-                  onPressed: _controller.text.isEmpty
-                      ? null
-                      : () async {
-                          await libraryModel
-                              .addPlaylist(
-                            _controller.text,
-                            _audios ?? widget.audios ?? [],
-                          )
-                              .then((_) async {
-                            if (context.mounted) {
-                              Navigator.of(context, rootNavigator: true).pop();
-                            }
-                            await Future.delayed(
-                              const Duration(milliseconds: 300),
-                            );
-                            await libraryModel.push(pageId: _controller.text);
-                          });
-                        },
-                  child: Text(
-                    context.l10n.add,
-                  ),
+                ListenableBuilder(
+                  listenable: _controller,
+                  builder: (context, _) {
+                    return ImportantButton(
+                      onPressed: _controller.text.isEmpty
+                          ? null
+                          : () async {
+                              await libraryModel
+                                  .addPlaylist(
+                                _controller.text,
+                                _audios ?? widget.audios ?? [],
+                              )
+                                  .then((_) async {
+                                if (context.mounted) {
+                                  Navigator.of(context, rootNavigator: true)
+                                      .pop();
+                                }
+                                await Future.delayed(
+                                  const Duration(milliseconds: 300),
+                                );
+                                await libraryModel.push(
+                                  pageId: _controller.text,
+                                );
+                              });
+                            },
+                      child: Text(
+                        context.l10n.add,
+                      ),
+                    );
+                  },
                 ),
             ],
           ),
@@ -318,7 +328,6 @@ class _AddStationDialogState extends State<AddStationContent> {
           autofocus: true,
           controller: _urlController,
           decoration: const InputDecoration(label: Text('Url')),
-          onChanged: (v) => setState(() => _urlController.text = v),
         ),
         const SizedBox(
           height: kLargestSpace,
@@ -326,7 +335,6 @@ class _AddStationDialogState extends State<AddStationContent> {
         TextField(
           controller: _nameController,
           decoration: InputDecoration(label: Text(context.l10n.station)),
-          onChanged: (v) => setState(() => _nameController.text = v),
         ),
         const SizedBox(
           height: kLargestSpace,
@@ -343,9 +351,13 @@ class _AddStationDialogState extends State<AddStationContent> {
                   context.l10n.cancel,
                 ),
               ),
-              ImportantButton(
-                onPressed:
-                    _urlController.text.isEmpty || _nameController.text.isEmpty
+              ListenableBuilder(
+                listenable: _nameController,
+                builder: (context, _) => ListenableBuilder(
+                  listenable: _urlController,
+                  builder: (context, _) => ImportantButton(
+                    onPressed: _urlController.text.isEmpty ||
+                            _nameController.text.isEmpty
                         ? null
                         : () {
                             di<LibraryModel>()
@@ -357,8 +369,10 @@ class _AddStationDialogState extends State<AddStationContent> {
                             ]);
                             Navigator.pop(context);
                           },
-                child: Text(
-                  context.l10n.add,
+                    child: Text(
+                      context.l10n.add,
+                    ),
+                  ),
                 ),
               ),
             ],
@@ -404,7 +418,6 @@ class _AddPodcastContentState extends State<AddPodcastContent> {
           autofocus: true,
           controller: _urlController,
           decoration: InputDecoration(label: Text(context.l10n.podcastFeedUrl)),
-          onChanged: (v) => setState(() => _urlController.text = v),
         ),
         const SizedBox(
           height: kLargestSpace,
@@ -421,27 +434,30 @@ class _AddPodcastContentState extends State<AddPodcastContent> {
                   context.l10n.cancel,
                 ),
               ),
-              ImportantButton(
-                onPressed: _urlController.text.isEmpty
-                    ? null
-                    : () {
-                        di<PodcastModel>().loadPodcast(
-                          feedUrl: _urlController.text,
-                          onFind: (podcast) => di<LibraryModel>().push(
-                            builder: (_) => PodcastPage(
-                              imageUrl: podcast.firstOrNull?.imageUrl,
-                              preFetchedEpisodes: podcast,
-                              feedUrl: _urlController.text,
-                              title: podcast.firstOrNull?.album ??
-                                  podcast.firstOrNull?.title ??
-                                  _urlController.text,
+              ListenableBuilder(
+                listenable: _urlController,
+                builder: (context, _) => ImportantButton(
+                  onPressed: _urlController.text.isEmpty
+                      ? null
+                      : () {
+                          di<PodcastModel>().loadPodcast(
+                            feedUrl: _urlController.text,
+                            onFind: (podcast) => di<LibraryModel>().push(
+                              builder: (_) => PodcastPage(
+                                imageUrl: podcast.firstOrNull?.imageUrl,
+                                preFetchedEpisodes: podcast,
+                                feedUrl: _urlController.text,
+                                title: podcast.firstOrNull?.album ??
+                                    podcast.firstOrNull?.title ??
+                                    _urlController.text,
+                              ),
+                              pageId: _urlController.text,
                             ),
-                            pageId: _urlController.text,
-                          ),
-                        );
-                      },
-                child: Text(
-                  context.l10n.search,
+                          );
+                        },
+                  child: Text(
+                    context.l10n.search,
+                  ),
                 ),
               ),
             ],
diff --git a/lib/playlists/view/playlist_page.dart b/lib/playlists/view/playlist_page.dart
index 9c26cc094..4fe2d4dd6 100644
--- a/lib/playlists/view/playlist_page.dart
+++ b/lib/playlists/view/playlist_page.dart
@@ -8,6 +8,7 @@ import 'package:watch_it/watch_it.dart';
 
 import '../../common/data/audio.dart';
 import '../../common/data/audio_type.dart';
+import '../../common/page_ids.dart';
 import '../../common/view/adaptive_container.dart';
 import '../../common/view/audio_page_header.dart';
 import '../../common/view/audio_page_type.dart';
@@ -22,7 +23,6 @@ import '../../common/view/sliver_audio_tile_list.dart';
 import '../../common/view/tapable_text.dart';
 import '../../common/view/theme.dart';
 import '../../common/view/ui_constants.dart';
-import '../../constants.dart';
 import '../../extensions/build_context_x.dart';
 import '../../extensions/media_file_x.dart';
 import '../../extensions/theme_data_x.dart';
@@ -97,7 +97,7 @@ class PlaylistPage extends StatelessWidget with WatchItMixin {
               padding: appBarSingleActionSpacing,
               child: SearchButton(
                 onPressed: () {
-                  di<LibraryModel>().push(pageId: kSearchPageId);
+                  di<LibraryModel>().push(pageId: PageIDs.searchPage);
                   final searchmodel = di<SearchModel>();
                   searchmodel
                     ..setAudioType(AudioType.local)
diff --git a/lib/podcasts/podcast_model.dart b/lib/podcasts/podcast_model.dart
index d0c654fa9..2c9d0d738 100644
--- a/lib/podcasts/podcast_model.dart
+++ b/lib/podcasts/podcast_model.dart
@@ -122,7 +122,11 @@ class PodcastModel extends SafeChangeNotifier {
   }
 }
 
-void podcastStateStreamHandler(context, newValue, cancel) {
+void podcastStateStreamHandler(
+  BuildContext context,
+  AsyncSnapshot<PodcastSearchState?> newValue,
+  void Function() cancel,
+) {
   if (newValue.hasData) {
     if (newValue.data == PodcastSearchState.done) {
       ScaffoldMessenger.of(context).clearSnackBars();
diff --git a/lib/podcasts/view/podcast_mark_done_button.dart b/lib/podcasts/view/podcast_mark_done_button.dart
new file mode 100644
index 000000000..55f30cdeb
--- /dev/null
+++ b/lib/podcasts/view/podcast_mark_done_button.dart
@@ -0,0 +1,32 @@
+import 'package:flutter/material.dart';
+import 'package:watch_it/watch_it.dart';
+
+import '../../common/view/icons.dart';
+import '../../l10n/l10n.dart';
+import '../../library/library_model.dart';
+import '../../player/player_model.dart';
+
+class PodcastMarkDoneButton extends StatelessWidget with WatchItMixin {
+  const PodcastMarkDoneButton({
+    super.key,
+    required this.feedUrl,
+  });
+
+  final String feedUrl;
+
+  @override
+  Widget build(BuildContext context) {
+    final podcast = watchPropertyValue((LibraryModel m) => m.podcasts[feedUrl]);
+
+    return IconButton(
+      tooltip: context.l10n.markAllEpisodesAsDone,
+      onPressed: podcast == null
+          ? null
+          : () {
+              di<PlayerModel>().safeAllLastPositions(podcast);
+              di<LibraryModel>().removePodcastUpdate(feedUrl);
+            },
+      icon: Icon(Iconz.markAllRead),
+    );
+  }
+}
diff --git a/lib/podcasts/view/podcast_page.dart b/lib/podcasts/view/podcast_page.dart
index 4e25f3a77..9aa0a210f 100644
--- a/lib/podcasts/view/podcast_page.dart
+++ b/lib/podcasts/view/podcast_page.dart
@@ -5,6 +5,7 @@ import 'package:watch_it/watch_it.dart';
 import '../../app_config.dart';
 import '../../common/data/audio.dart';
 import '../../common/data/audio_type.dart';
+import '../../common/page_ids.dart';
 import '../../common/view/adaptive_container.dart';
 import '../../common/view/audio_filter.dart';
 import '../../common/view/audio_page_header.dart';
@@ -18,7 +19,6 @@ import '../../common/view/search_button.dart';
 import '../../common/view/sliver_audio_page_control_panel.dart';
 import '../../common/view/theme.dart';
 import '../../common/view/ui_constants.dart';
-import '../../constants.dart';
 import '../../extensions/build_context_x.dart';
 import '../../l10n/l10n.dart';
 import '../../library/library_model.dart';
@@ -27,6 +27,7 @@ import '../../search/search_model.dart';
 import '../../search/search_type.dart';
 import '../../settings/settings_model.dart';
 import '../podcast_model.dart';
+import 'podcast_mark_done_button.dart';
 import 'podcast_refresh_button.dart';
 import 'podcast_reorder_button.dart';
 import 'podcast_replay_button.dart';
@@ -108,7 +109,7 @@ class _PodcastPageState extends State<PodcastPage> {
             padding: appBarSingleActionSpacing,
             child: SearchButton(
               onPressed: () {
-                di<LibraryModel>().push(pageId: kSearchPageId);
+                di<LibraryModel>().push(pageId: PageIDs.searchPage);
                 di<SearchModel>()
                   ..setAudioType(AudioType.podcast)
                   ..setSearchType(SearchType.podcastTitle);
@@ -166,17 +167,8 @@ class _PodcastPageState extends State<PodcastPage> {
                     children: space(
                       children: [
                         if (!isMobilePlatform)
-                          PodcastReplayButton(audios: episodesWithDownloads),
-                        IconButton(
-                          tooltip: l10n.markAllEpisodesAsDone,
-                          onPressed: () {
-                            di<PlayerModel>()
-                                .safeAllLastPositions(episodesWithDownloads);
-                            di<LibraryModel>()
-                                .removePodcastUpdate(widget.feedUrl);
-                          },
-                          icon: Icon(Iconz.markAllRead),
-                        ),
+                          PodcastReplayButton(feedUrl: widget.feedUrl),
+                        PodcastMarkDoneButton(feedUrl: widget.feedUrl),
                         PodcastSubButton(
                           audios: episodesWithDownloads,
                           pageId: widget.feedUrl,
@@ -226,7 +218,7 @@ class _PodcastPageState extends State<PodcastPage> {
     required String text,
   }) async {
     await di<PodcastModel>().init(updateMessage: l10n.updateAvailable);
-    di<LibraryModel>().push(pageId: kSearchPageId);
+    di<LibraryModel>().push(pageId: PageIDs.searchPage);
     di<SearchModel>()
       ..setAudioType(AudioType.podcast)
       ..setSearchQuery(text)
@@ -247,7 +239,7 @@ class _PodcastPageState extends State<PodcastPage> {
           e.id.toLowerCase() == text.toLowerCase() ||
           e.name.toLowerCase() == text.toLowerCase(),
     );
-    di<LibraryModel>().push(pageId: kSearchPageId);
+    di<LibraryModel>().push(pageId: PageIDs.searchPage);
     if (genreOrNull != null) {
       di<SearchModel>()
         ..setAudioType(AudioType.podcast)
diff --git a/lib/podcasts/view/podcast_replay_button.dart b/lib/podcasts/view/podcast_replay_button.dart
index fb73bb348..b595f866c 100644
--- a/lib/podcasts/view/podcast_replay_button.dart
+++ b/lib/podcasts/view/podcast_replay_button.dart
@@ -1,20 +1,24 @@
-import '../../common/data/audio.dart';
+import 'package:flutter/material.dart';
+import 'package:watch_it/watch_it.dart';
+
 import '../../common/view/icons.dart';
 import '../../l10n/l10n.dart';
+import '../../library/library_model.dart';
 import '../../player/player_model.dart';
-import 'package:flutter/material.dart';
-import 'package:watch_it/watch_it.dart';
 
-class PodcastReplayButton extends StatelessWidget {
-  const PodcastReplayButton({super.key, required this.audios});
+class PodcastReplayButton extends StatelessWidget with WatchItMixin {
+  const PodcastReplayButton({super.key, required this.feedUrl});
 
-  final List<Audio> audios;
+  final String feedUrl;
 
   @override
   Widget build(BuildContext context) {
+    final podcast = watchPropertyValue((LibraryModel m) => m.podcasts[feedUrl]);
     return IconButton(
       tooltip: context.l10n.replayAllEpisodes,
-      onPressed: () => di<PlayerModel>().removeLastPositions(audios),
+      onPressed: podcast == null
+          ? null
+          : () => di<PlayerModel>().removeLastPositions(podcast),
       icon: Icon(Iconz.replay),
     );
   }
diff --git a/lib/podcasts/view/podcasts_collection_body.dart b/lib/podcasts/view/podcasts_collection_body.dart
index b38a1dd5b..a84579aff 100644
--- a/lib/podcasts/view/podcasts_collection_body.dart
+++ b/lib/podcasts/view/podcasts_collection_body.dart
@@ -5,6 +5,7 @@ import 'package:watch_it/watch_it.dart';
 import '../../app/connectivity_model.dart';
 import '../../common/data/audio.dart';
 import '../../common/data/audio_type.dart';
+import '../../common/page_ids.dart';
 import '../../common/view/adaptive_container.dart';
 import '../../common/view/audio_card.dart';
 import '../../common/view/audio_card_bottom.dart';
@@ -14,7 +15,6 @@ import '../../common/view/no_search_result_page.dart';
 import '../../common/view/offline_page.dart';
 import '../../common/view/safe_network_image.dart';
 import '../../common/view/theme.dart';
-import '../../constants.dart';
 import '../../extensions/build_context_x.dart';
 import '../../l10n/l10n.dart';
 import '../../library/library_model.dart';
@@ -63,7 +63,7 @@ class PodcastsCollectionBody extends StatelessWidget with WatchItMixin {
             ),
             ImportantButton(
               onPressed: () {
-                di<LibraryModel>().push(pageId: kSearchPageId);
+                di<LibraryModel>().push(pageId: PageIDs.searchPage);
                 di<SearchModel>()
                   ..setAudioType(AudioType.podcast)
                   ..setSearchQuery(null)
diff --git a/lib/podcasts/view/podcasts_page.dart b/lib/podcasts/view/podcasts_page.dart
index 29ded35a0..376668fc4 100644
--- a/lib/podcasts/view/podcasts_page.dart
+++ b/lib/podcasts/view/podcasts_page.dart
@@ -2,10 +2,10 @@ import 'package:flutter/material.dart';
 import 'package:watch_it/watch_it.dart';
 
 import '../../common/data/audio_type.dart';
+import '../../common/page_ids.dart';
 import '../../common/view/header_bar.dart';
 import '../../common/view/search_button.dart';
 import '../../common/view/theme.dart';
-import '../../constants.dart';
 import '../../l10n/l10n.dart';
 import '../../library/library_model.dart';
 import '../../search/search_model.dart';
@@ -43,7 +43,7 @@ class _PodcastsPageState extends State<PodcastsPage> {
             child: SearchButton(
               onPressed: () {
                 final searchModel = di<SearchModel>();
-                di<LibraryModel>().push(pageId: kSearchPageId);
+                di<LibraryModel>().push(pageId: PageIDs.searchPage);
                 if (searchModel.audioType != AudioType.podcast) {
                   searchModel
                     ..setAudioType(AudioType.podcast)
diff --git a/lib/radio/radio_service.dart b/lib/radio/radio_service.dart
index 3ff8e9d2b..d9aec0d89 100644
--- a/lib/radio/radio_service.dart
+++ b/lib/radio/radio_service.dart
@@ -4,9 +4,10 @@ import 'package:basic_utils/basic_utils.dart';
 import 'package:radio_browser_api/radio_browser_api.dart';
 
 import '../common/logging.dart';
-import '../constants.dart';
 
 class RadioService {
+  static const _kRadioBrowserBaseUrl = 'all.api.radio-browser.info';
+
   RadioBrowserApi? _radioBrowserApi;
   final _propertiesChangedController = StreamController<bool>.broadcast();
   Stream<bool> get propertiesChanged => _propertiesChangedController.stream;
@@ -37,7 +38,7 @@ class RadioService {
     final hosts = <String>[];
     try {
       final records = await DnsUtils.lookupRecord(
-        kRadioBrowserBaseUrl,
+        _kRadioBrowserBaseUrl,
         RRecordType.A,
       );
       if (records?.isNotEmpty == false) {
diff --git a/lib/radio/view/next_station_button.dart b/lib/radio/view/next_station_button.dart
index 19acd6974..8f1742521 100644
--- a/lib/radio/view/next_station_button.dart
+++ b/lib/radio/view/next_station_button.dart
@@ -13,12 +13,13 @@ class NextStationButton extends StatelessWidget with WatchItMixin {
 
   @override
   Widget build(BuildContext context) {
-    final loading = watchPropertyValue((SearchModel m) => m.loading);
+    final findingSimilarStation =
+        watchPropertyValue((SearchModel m) => m.findingSimilarStation);
     final audio = watchPropertyValue((PlayerModel m) => m.audio);
 
     return IconButton(
       tooltip: context.l10n.searchSimilarStation,
-      onPressed: loading || audio == null
+      onPressed: findingSimilarStation || audio == null
           ? null
           : () {
               di<SearchModel>().nextSimilarStation(audio).then(
diff --git a/lib/radio/view/open_radio_discover_page_button.dart b/lib/radio/view/open_radio_discover_page_button.dart
index feff2643c..a8ddbfd1b 100644
--- a/lib/radio/view/open_radio_discover_page_button.dart
+++ b/lib/radio/view/open_radio_discover_page_button.dart
@@ -2,8 +2,8 @@ import 'package:flutter/material.dart';
 import 'package:watch_it/watch_it.dart';
 
 import '../../common/data/audio_type.dart';
+import '../../common/page_ids.dart';
 import '../../common/view/common_widgets.dart';
-import '../../constants.dart';
 import '../../l10n/l10n.dart';
 import '../../library/library_model.dart';
 import '../../search/search_model.dart';
@@ -15,7 +15,7 @@ class OpenRadioSearchButton extends StatelessWidget with WatchItMixin {
   Widget build(BuildContext context) {
     return ImportantButton(
       onPressed: () {
-        di<LibraryModel>().push(pageId: kSearchPageId);
+        di<LibraryModel>().push(pageId: PageIDs.searchPage);
         di<SearchModel>()
           ..setAudioType(AudioType.radio)
           ..search();
diff --git a/lib/radio/view/radio_lib_page.dart b/lib/radio/view/radio_lib_page.dart
index 6fd0c778c..f50e522be 100644
--- a/lib/radio/view/radio_lib_page.dart
+++ b/lib/radio/view/radio_lib_page.dart
@@ -8,6 +8,7 @@ import 'package:yaru/yaru.dart';
 
 import '../../app_config.dart';
 import '../../common/data/audio_type.dart';
+import '../../common/page_ids.dart';
 import '../../common/view/adaptive_container.dart';
 import '../../common/view/audio_card.dart';
 import '../../common/view/audio_card_bottom.dart';
@@ -16,7 +17,6 @@ import '../../common/view/no_search_result_page.dart';
 import '../../common/view/side_bar_fall_back_image.dart';
 import '../../common/view/theme.dart';
 import '../../common/view/ui_constants.dart';
-import '../../constants.dart';
 import '../../extensions/build_context_x.dart';
 import '../../l10n/l10n.dart';
 import '../../library/library_model.dart';
@@ -174,7 +174,7 @@ class TagGrid extends StatelessWidget with WatchItMixin {
               ),
               bottom: AudioCardBottom(text: tag),
               onTap: () {
-                di<LibraryModel>().push(pageId: kSearchPageId);
+                di<LibraryModel>().push(pageId: PageIDs.searchPage);
                 di<SearchModel>()
                   ..setTag(Tag(name: tag.toLowerCase(), stationCount: 1))
                   ..setAudioType(AudioType.radio)
diff --git a/lib/radio/view/radio_page.dart b/lib/radio/view/radio_page.dart
index 1f7095551..65c1f57e8 100644
--- a/lib/radio/view/radio_page.dart
+++ b/lib/radio/view/radio_page.dart
@@ -2,13 +2,12 @@ import 'package:flutter/material.dart';
 import 'package:watch_it/watch_it.dart';
 
 import '../../app/connectivity_model.dart';
-
 import '../../common/data/audio_type.dart';
+import '../../common/page_ids.dart';
 import '../../common/view/header_bar.dart';
 import '../../common/view/offline_page.dart';
 import '../../common/view/search_button.dart';
 import '../../common/view/theme.dart';
-import '../../constants.dart';
 import '../../l10n/l10n.dart';
 import '../../library/library_model.dart';
 import '../../search/search_model.dart';
@@ -33,7 +32,7 @@ class RadioPage extends StatelessWidget with WatchItMixin {
               child: SearchButton(
                 active: false,
                 onPressed: () {
-                  di<LibraryModel>().push(pageId: kSearchPageId);
+                  di<LibraryModel>().push(pageId: PageIDs.searchPage);
                   final searchModel = di<SearchModel>();
                   if (searchModel.audioType != AudioType.radio) {
                     searchModel
diff --git a/lib/radio/view/radio_page_tag_bar.dart b/lib/radio/view/radio_page_tag_bar.dart
index b7c1a0383..f20deb8cb 100644
--- a/lib/radio/view/radio_page_tag_bar.dart
+++ b/lib/radio/view/radio_page_tag_bar.dart
@@ -6,8 +6,8 @@ import 'package:yaru/yaru.dart';
 
 import '../../common/data/audio.dart';
 import '../../common/data/audio_type.dart';
+import '../../common/page_ids.dart';
 import '../../common/view/tapable_text.dart';
-import '../../constants.dart';
 import '../../extensions/build_context_x.dart';
 import '../../extensions/theme_data_x.dart';
 import '../../l10n/l10n.dart';
@@ -73,7 +73,7 @@ class RadioPageTagBar extends StatelessWidget {
                 style: style,
                 wrapInFlexible: false,
                 onTap: () {
-                  di<LibraryModel>().push(pageId: kSearchPageId);
+                  di<LibraryModel>().push(pageId: PageIDs.searchPage);
                   di<SearchModel>()
                     ..setTag(Tag(name: e, stationCount: 1))
                     ..setAudioType(AudioType.radio)
diff --git a/lib/radio/view/station_page.dart b/lib/radio/view/station_page.dart
index f56d990da..eee11abf8 100644
--- a/lib/radio/view/station_page.dart
+++ b/lib/radio/view/station_page.dart
@@ -4,6 +4,7 @@ import 'package:watch_it/watch_it.dart';
 import '../../app/connectivity_model.dart';
 import '../../common/data/audio.dart';
 import '../../common/data/audio_type.dart';
+import '../../common/page_ids.dart';
 import '../../common/view/adaptive_container.dart';
 import '../../common/view/audio_fall_back_icon.dart';
 import '../../common/view/audio_page_header.dart';
@@ -15,7 +16,6 @@ import '../../common/view/search_button.dart';
 import '../../common/view/sliver_audio_page_control_panel.dart';
 import '../../common/view/theme.dart';
 import '../../common/view/ui_constants.dart';
-import '../../constants.dart';
 import '../../l10n/l10n.dart';
 import '../../library/library_model.dart';
 import '../../search/search_model.dart';
@@ -46,7 +46,7 @@ class StationPage extends StatelessWidget with WatchItMixin {
             padding: appBarSingleActionSpacing,
             child: SearchButton(
               onPressed: () {
-                di<LibraryModel>().push(pageId: kSearchPageId);
+                di<LibraryModel>().push(pageId: PageIDs.searchPage);
                 final searchModel = di<SearchModel>();
                 if (searchModel.audioType != AudioType.radio) {
                   searchModel
diff --git a/lib/search/search_model.dart b/lib/search/search_model.dart
index 82503660c..26780b5a1 100644
--- a/lib/search/search_model.dart
+++ b/lib/search/search_model.dart
@@ -224,8 +224,15 @@ class SearchModel extends SafeChangeNotifier {
     };
   }
 
+  bool _findingSimilarStation = false;
+  bool get findingSimilarStation => _findingSimilarStation;
+  set _setFindingSimilarStation(bool value) {
+    _findingSimilarStation = value;
+    notifyListeners();
+  }
+
   Future<Audio> nextSimilarStation(Audio station) async {
-    _loading = true;
+    _setFindingSimilarStation = true;
 
     Audio? match;
     Station? maybe = await _findSimilarStation(station);
@@ -235,7 +242,7 @@ class SearchModel extends SafeChangeNotifier {
       match = station;
     }
 
-    _loading = false;
+    _setFindingSimilarStation = false;
 
     return match;
   }
diff --git a/lib/settings/settings_model.dart b/lib/settings/settings_model.dart
index 4cceb428c..39c185b5c 100644
--- a/lib/settings/settings_model.dart
+++ b/lib/settings/settings_model.dart
@@ -116,6 +116,8 @@ class SettingsModel extends SafeChangeNotifier {
   Future<void> setShowPositionDuration(bool value) async =>
       _service.setShowPositionDuration(value);
 
+  Future<void> wipeAllSettings() async => _service.wipeAllSettings();
+
   void init() => _propertiesChangedSub ??=
       _service.propertiesChanged.listen((_) => notifyListeners());
 
diff --git a/lib/settings/settings_service.dart b/lib/settings/settings_service.dart
index 170a05d65..49ba68c04 100644
--- a/lib/settings/settings_service.dart
+++ b/lib/settings/settings_service.dart
@@ -4,7 +4,9 @@ import 'dart:io';
 import 'package:shared_preferences/shared_preferences.dart';
 
 import '../common/data/close_btn_action.dart';
+import '../common/file_names.dart';
 import '../constants.dart';
+import '../persistence_utils.dart';
 
 class SettingsService {
   SettingsService({
@@ -125,5 +127,13 @@ class SettingsService {
     _preferences.setString(kCloseBtnAction, value.toString()).then(notify);
   }
 
+  Future<void> wipeAllSettings() async {
+    await Future.wait([
+      for (final name in FileNames.all) wipeCustomSettings(filename: name),
+      _preferences.clear(),
+    ]);
+    exit(0);
+  }
+
   Future<void> dispose() async => _propertiesChangedController.close();
 }
diff --git a/lib/settings/view/reset_section.dart b/lib/settings/view/reset_section.dart
index af4c434f6..36b7ac544 100644
--- a/lib/settings/view/reset_section.dart
+++ b/lib/settings/view/reset_section.dart
@@ -1,15 +1,13 @@
-import 'dart:io';
-
 import 'package:flutter/material.dart';
+import 'package:watch_it/watch_it.dart';
 import 'package:yaru/yaru.dart';
 
 import '../../common/view/common_widgets.dart';
 import '../../common/view/confirm.dart';
 import '../../common/view/icons.dart';
 import '../../common/view/ui_constants.dart';
-import '../../constants.dart';
 import '../../l10n/l10n.dart';
-import '../../persistence_utils.dart';
+import '../settings_model.dart';
 
 class ResetSection extends StatelessWidget {
   const ResetSection({super.key});
@@ -46,16 +44,11 @@ class ResetSection extends StatelessWidget {
   }
 }
 
-class WipeConfirmDialog extends StatefulWidget {
+class WipeConfirmDialog extends StatelessWidget {
   const WipeConfirmDialog({
     super.key,
   });
 
-  @override
-  State<WipeConfirmDialog> createState() => _WipeConfirmDialogState();
-}
-
-class _WipeConfirmDialogState extends State<WipeConfirmDialog> {
   @override
   Widget build(BuildContext context) {
     final l10n = context.l10n;
@@ -64,22 +57,7 @@ class _WipeConfirmDialogState extends State<WipeConfirmDialog> {
       showCloseIcon: false,
       title: Text(l10n.confirm),
       content: SizedBox(width: 350, child: Text(l10n.resetAllSettingsConfirm)),
-      onConfirm: () => Future.wait([
-        wipeCustomSettings(kLikedAudiosFileName),
-        wipeCustomSettings(kRadioTagFavsFileName),
-        wipeCustomSettings(kCountryFavsFileName),
-        wipeCustomSettings(kFavLanguageCodesFileName),
-        wipeCustomSettings(kPlaylistsFileName),
-        wipeCustomSettings(kPinnedAlbumsFileName),
-        wipeCustomSettings(kPodcastsFileName),
-        wipeCustomSettings(kPodcastsUpdates),
-        wipeCustomSettings(kStarredStationsFileName),
-        wipeCustomSettings(kSettingsFileName),
-        wipeCustomSettings(kLastPositionsFileName),
-        wipeCustomSettings(kPlayerStateFileName),
-        wipeCustomSettings(kAppStateFileName),
-        wipeCustomSettings(kRadioHistoryFileName),
-      ]).then((_) => exit(0)),
+      onConfirm: di<SettingsModel>().wipeAllSettings,
     );
   }
 }
diff --git a/lib/settings/view/settings_action.dart b/lib/settings/view/settings_action.dart
index 1c24be348..3934bc3f6 100644
--- a/lib/settings/view/settings_action.dart
+++ b/lib/settings/view/settings_action.dart
@@ -2,9 +2,9 @@ import 'package:flutter/material.dart';
 import 'package:watch_it/watch_it.dart';
 
 import '../../app_config.dart';
+import '../../common/page_ids.dart';
 import '../../common/view/common_widgets.dart';
 import '../../common/view/icons.dart';
-import '../../constants.dart';
 import '../../l10n/l10n.dart';
 import '../../library/library_model.dart';
 import 'settings_dialog.dart';
@@ -34,7 +34,7 @@ class SettingsButton extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     void onPressed() => isMobilePlatform
-        ? di<LibraryModel>().push(pageId: kSettingsPageId)
+        ? di<LibraryModel>().push(pageId: PageIDs.settings)
         : showDialog(
             context: context,
             builder: (context) => const SettingsDialog(),