diff --git a/lib/app/view/scaffold.dart b/lib/app/view/scaffold.dart
index 3b3ca0ffa..ea798fcf9 100644
--- a/lib/app/view/scaffold.dart
+++ b/lib/app/view/scaffold.dart
@@ -74,19 +74,21 @@ class _MusicPodScaffoldState extends State<MusicPodScaffold> {
                 children: [
                   const Expanded(child: MasterDetailPage()),
                   if (!playerToTheRight || isMobile)
-                    const PlayerView(mode: PlayerPosition.bottom),
+                    const PlayerView(position: PlayerPosition.bottom),
                 ],
               ),
             ),
             if (playerToTheRight)
               const SizedBox(
                 width: kSideBarPlayerWidth,
-                child: PlayerView(mode: PlayerPosition.sideBar),
+                child: PlayerView(position: PlayerPosition.sideBar),
               ),
           ],
         ),
         if (isFullScreen == true)
-          const Scaffold(body: PlayerView(mode: PlayerPosition.fullWindow)),
+          const Scaffold(
+            body: PlayerView(position: PlayerPosition.fullWindow),
+          ),
       ],
     );
   }
diff --git a/lib/common/view/snackbars.dart b/lib/common/view/snackbars.dart
index 425716610..c59f9ca50 100644
--- a/lib/common/view/snackbars.dart
+++ b/lib/common/view/snackbars.dart
@@ -1,15 +1,11 @@
 import 'package:flutter/material.dart';
-import 'package:watch_it/watch_it.dart';
-
-import '../../l10n/l10n.dart';
-import '../../radio/radio_model.dart';
 
 ScaffoldFeatureController<SnackBar, SnackBarClosedReason> showSnackBar({
   required BuildContext context,
   Widget? content,
   SnackBar? snackBar,
   Duration? duration,
-  clear = true,
+  bool clear = true,
 }) {
   if (clear) {
     ScaffoldMessenger.of(context).clearSnackBars();
@@ -22,36 +18,3 @@ ScaffoldFeatureController<SnackBar, SnackBarClosedReason> showSnackBar({
         ),
   );
 }
-
-SnackBar buildConnectSnackBar({
-  required String? connectedHost,
-  required BuildContext context,
-}) {
-  return SnackBar(
-    duration: connectedHost != null
-        ? const Duration(seconds: 1)
-        : const Duration(seconds: 30),
-    content: Text(
-      connectedHost != null
-          ? '${context.l10n.connectedTo}: $connectedHost'
-          : context.l10n.noRadioServerFound,
-    ),
-    action: (connectedHost == null)
-        ? SnackBarAction(
-            onPressed: () async {
-              final connectedHost = await di<RadioModel>().init();
-              if (context.mounted) {
-                showSnackBar(
-                  context: context,
-                  content: buildConnectSnackBar(
-                    connectedHost: connectedHost,
-                    context: context,
-                  ),
-                );
-              }
-            },
-            label: context.l10n.tryReconnect,
-          )
-        : null,
-  );
-}
diff --git a/lib/player/player_mixin.dart b/lib/player/player_mixin.dart
deleted file mode 100644
index 38a439da1..000000000
--- a/lib/player/player_mixin.dart
+++ /dev/null
@@ -1,158 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:url_launcher/url_launcher.dart';
-import 'package:watch_it/watch_it.dart';
-
-import '../app/app_model.dart';
-import '../common/data/audio.dart';
-import '../common/view/copy_clipboard_content.dart';
-import '../common/view/snackbars.dart';
-import '../library/library_model.dart';
-import '../local_audio/local_audio_model.dart';
-import '../local_audio/view/album_page.dart';
-import '../local_audio/view/artist_page.dart';
-import '../podcasts/podcast_utils.dart';
-import '../radio/view/station_page.dart';
-
-mixin PlayerMixin {
-  String getSubTitle(Audio? audio) => (switch (audio?.audioType) {
-            AudioType.podcast => audio?.album,
-            AudioType.radio => audio?.title,
-            _ => audio?.artist
-          } ??
-          '')
-      .trim();
-
-  String getTitle({required Audio? audio, required String? icyTitle}) =>
-      icyTitle?.isNotEmpty == true && audio?.audioType == AudioType.radio
-          ? icyTitle!
-          : (audio?.title?.isNotEmpty == true ? audio!.title! : '').trim();
-
-  void onTitleTap({
-    Audio? audio,
-    String? text,
-    required BuildContext context,
-  }) {
-    if (text?.isNotEmpty == true && audio?.audioType == AudioType.radio ||
-        audio?.audioType == null) {
-      showSnackBar(
-        context: context,
-        content: CopyClipboardContent(text: text!),
-      );
-      return;
-    }
-
-    switch (audio?.audioType) {
-      case AudioType.local:
-        _onLocalAudioTitleTap(
-          audio: audio!,
-        );
-        return;
-      case AudioType.radio:
-      case AudioType.podcast:
-        if (audio?.url == null) return;
-        showSnackBar(
-          context: context,
-          content: CopyClipboardContent(
-            text: audio!.url!,
-            onSearch: () => launchUrl(Uri.parse(audio.url!)),
-          ),
-        );
-        return;
-      default:
-        return;
-    }
-  }
-
-  void _onLocalAudioTitleTap({required Audio audio}) {
-    if (audio.album == null) return;
-    final localAudioModel = di<LocalAudioModel>();
-    localAudioModel.init().then(
-      (value) {
-        final albumAudios = localAudioModel.findAlbum(audio.album!);
-        if (albumAudios?.firstOrNull == null) return;
-        final id = albumAudios!.first.albumId;
-        if (id == null) return;
-
-        di<AppModel>().setFullWindowMode(false);
-
-        final libraryModel = di<LibraryModel>();
-        libraryModel.push(
-          builder: (_) => AlbumPage(
-            id: id,
-            album: albumAudios,
-          ),
-          pageId: id,
-        );
-      },
-    );
-  }
-
-  void onArtistTap({required Audio audio, required BuildContext context}) {
-    switch (audio.audioType) {
-      case AudioType.local:
-        _onLocalAudioArtistTap(
-          audio: audio,
-        );
-        return;
-      case AudioType.radio:
-        _onRadioArtistTap(audio);
-        return;
-      case AudioType.podcast:
-        _onPodcastArtistTap(
-          audio: audio,
-          context: context,
-        );
-        return;
-      default:
-        return;
-    }
-  }
-
-  void _onRadioArtistTap(Audio audio) {
-    final libraryModel = di<LibraryModel>();
-    if (audio.url == null) return;
-    libraryModel.push(
-      builder: (_) => StationPage(station: audio),
-      pageId: audio.url!,
-    );
-  }
-
-  void _onPodcastArtistTap({
-    required Audio audio,
-    required BuildContext context,
-  }) {
-    final libraryModel = di<LibraryModel>();
-    if (audio.website != null &&
-        libraryModel.isPodcastSubscribed(audio.website)) {
-      libraryModel.pushNamed(pageId: audio.website!);
-    } else {
-      searchAndPushPodcastPage(
-        context: context,
-        feedUrl: audio.website,
-        itemImageUrl: audio.albumArtUrl,
-        genre: audio.genre,
-        play: false,
-      );
-    }
-  }
-
-  void _onLocalAudioArtistTap({required Audio audio}) {
-    final localAudioModel = di<LocalAudioModel>();
-
-    final artistName = audio.artist;
-    if (artistName == null) return;
-
-    localAudioModel.init().then(
-      (value) {
-        final artistAudios = localAudioModel.findTitlesOfArtist(artistName);
-        final artist = artistAudios?.firstOrNull?.artist;
-        if (artist == null) return;
-        di<AppModel>().setFullWindowMode(false);
-        di<LibraryModel>().push(
-          builder: (_) => ArtistPage(artistAudios: artistAudios),
-          pageId: artist,
-        );
-      },
-    );
-  }
-}
diff --git a/lib/player/view/bottom_player.dart b/lib/player/view/bottom_player.dart
index 2e9c29d12..3f95dca81 100644
--- a/lib/player/view/bottom_player.dart
+++ b/lib/player/view/bottom_player.dart
@@ -12,18 +12,17 @@ import '../../extensions/build_context_x.dart';
 import '../../l10n/l10n.dart';
 import '../../player/player_model.dart';
 import 'bottom_player_image.dart';
-import 'bottom_player_title_artist.dart';
 import 'play_button.dart';
 import 'playback_rate_button.dart';
 import 'player_main_controls.dart';
+import 'player_title_and_artist.dart';
 import 'player_track.dart';
+import 'player_view.dart';
 import 'queue_button.dart';
 import 'volume_popup.dart';
 
 class BottomPlayer extends StatelessWidget with WatchItMixin {
-  const BottomPlayer({
-    super.key,
-  });
+  const BottomPlayer({super.key});
 
   @override
   Widget build(BuildContext context) {
@@ -74,10 +73,10 @@ class BottomPlayer extends StatelessWidget with WatchItMixin {
                     flex: 4,
                     child: Row(
                       children: [
-                        Flexible(
+                        const Flexible(
                           flex: 5,
-                          child: BottomPlayerTitleArtist(
-                            audio: audio,
+                          child: PlayerTitleAndArtist(
+                            playerPosition: PlayerPosition.bottom,
                           ),
                         ),
                         if (!smallWindow)
diff --git a/lib/player/view/bottom_player_title_artist.dart b/lib/player/view/bottom_player_title_artist.dart
deleted file mode 100644
index b7328cbaa..000000000
--- a/lib/player/view/bottom_player_title_artist.dart
+++ /dev/null
@@ -1,72 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:watch_it/watch_it.dart';
-
-import '../../common/data/audio.dart';
-import '../../common/view/theme.dart';
-import '../player_mixin.dart';
-import '../player_model.dart';
-
-class BottomPlayerTitleArtist extends StatelessWidget
-    with WatchItMixin, PlayerMixin {
-  const BottomPlayerTitleArtist({
-    super.key,
-    required this.audio,
-  });
-  final Audio? audio;
-
-  @override
-  Widget build(BuildContext context) {
-    final icyTitle =
-        watchPropertyValue((PlayerModel m) => m.mpvMetaData?.icyTitle);
-
-    return Column(
-      mainAxisAlignment: MainAxisAlignment.center,
-      crossAxisAlignment: CrossAxisAlignment.start,
-      children: [
-        InkWell(
-          borderRadius: BorderRadius.circular(4),
-          onTap: audio == null
-              ? null
-              : () => onTitleTap(
-                    audio: audio,
-                    text: icyTitle,
-                    context: context,
-                  ),
-          child: Tooltip(
-            message: getTitle(audio: audio, icyTitle: icyTitle),
-            child: Text(
-              getTitle(audio: audio, icyTitle: icyTitle),
-              style: const TextStyle(
-                fontWeight: FontWeight.w400,
-                fontSize: 14,
-              ),
-              maxLines: 1,
-              overflow: TextOverflow.ellipsis,
-            ),
-          ),
-        ),
-        InkWell(
-          borderRadius: BorderRadius.circular(4),
-          onTap: audio == null
-              ? null
-              : () => onArtistTap(
-                    audio: audio!,
-                    context: context,
-                  ),
-          child: Tooltip(
-            message: getSubTitle(audio),
-            child: Text(
-              getSubTitle(audio),
-              style: TextStyle(
-                fontWeight: smallTextFontWeight,
-                fontSize: 12,
-              ),
-              overflow: TextOverflow.ellipsis,
-              maxLines: 1,
-            ),
-          ),
-        ),
-      ],
-    );
-  }
-}
diff --git a/lib/player/view/full_height_player.dart b/lib/player/view/full_height_player.dart
index 111009c7b..4ef611477 100644
--- a/lib/player/view/full_height_player.dart
+++ b/lib/player/view/full_height_player.dart
@@ -12,7 +12,7 @@ import '../../radio/view/radio_history_list.dart';
 import 'blurred_full_height_player_image.dart';
 import 'full_height_player_image.dart';
 import 'full_height_player_top_controls.dart';
-import 'full_height_title_and_artist.dart';
+import 'player_title_and_artist.dart';
 import 'full_height_video_player.dart';
 import 'player_main_controls.dart';
 import 'player_track.dart';
@@ -58,8 +58,8 @@ class FullHeightPlayer extends StatelessWidget with WatchItMixin {
           ),
           Padding(
             padding: const EdgeInsets.symmetric(horizontal: 30),
-            child: FullHeightTitleAndArtist(
-              audio: audio,
+            child: PlayerTitleAndArtist(
+              playerPosition: playerPosition,
             ),
           ),
           const SizedBox(
diff --git a/lib/player/view/full_height_title_and_artist.dart b/lib/player/view/full_height_title_and_artist.dart
deleted file mode 100644
index 7b771b47b..000000000
--- a/lib/player/view/full_height_title_and_artist.dart
+++ /dev/null
@@ -1,79 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:watch_it/watch_it.dart';
-
-import '../../common/view/theme.dart';
-import '../../extensions/build_context_x.dart';
-
-import '../../common/data/audio.dart';
-import '../player_model.dart';
-import '../player_mixin.dart';
-
-class FullHeightTitleAndArtist extends StatelessWidget
-    with WatchItMixin, PlayerMixin {
-  const FullHeightTitleAndArtist({
-    super.key,
-    required this.audio,
-  });
-
-  final Audio? audio;
-
-  @override
-  Widget build(BuildContext context) {
-    final theme = context.theme;
-    final icyTitle =
-        watchPropertyValue((PlayerModel m) => m.mpvMetaData?.icyTitle);
-
-    return Column(
-      mainAxisSize: MainAxisSize.min,
-      children: [
-        InkWell(
-          borderRadius: BorderRadius.circular(10),
-          onTap: audio == null
-              ? null
-              : () => onTitleTap(
-                    audio: audio!,
-                    text: icyTitle,
-                    context: context,
-                  ),
-          child: Tooltip(
-            message: getTitle(audio: audio, icyTitle: icyTitle),
-            child: Text(
-              getTitle(audio: audio, icyTitle: icyTitle),
-              style: TextStyle(
-                fontWeight: largeTextWeight,
-                fontSize: 30,
-                color: theme.colorScheme.onSurface,
-              ),
-              textAlign: TextAlign.center,
-              maxLines: 1,
-              overflow: TextOverflow.ellipsis,
-            ),
-          ),
-        ),
-        InkWell(
-          borderRadius: BorderRadius.circular(8),
-          onTap: audio == null
-              ? null
-              : () => onArtistTap(
-                    audio: audio!,
-                    context: context,
-                  ),
-          child: Tooltip(
-            message: getSubTitle(audio),
-            child: Text(
-              getSubTitle(audio),
-              style: TextStyle(
-                fontWeight: smallTextFontWeight,
-                fontSize: 20,
-                color: theme.colorScheme.onSurface,
-              ),
-              textAlign: TextAlign.center,
-              overflow: TextOverflow.ellipsis,
-              maxLines: 1,
-            ),
-          ),
-        ),
-      ],
-    );
-  }
-}
diff --git a/lib/player/view/player_title_and_artist.dart b/lib/player/view/player_title_and_artist.dart
new file mode 100644
index 000000000..2e2a9c01b
--- /dev/null
+++ b/lib/player/view/player_title_and_artist.dart
@@ -0,0 +1,308 @@
+import 'package:flutter/material.dart';
+import 'package:url_launcher/url_launcher.dart';
+import 'package:watch_it/watch_it.dart';
+
+import '../../app/app_model.dart';
+import '../../common/data/audio.dart';
+import '../../common/view/copy_clipboard_content.dart';
+import '../../common/view/snackbars.dart';
+import '../../common/view/theme.dart';
+import '../../extensions/build_context_x.dart';
+import '../../library/library_model.dart';
+import '../../local_audio/local_audio_model.dart';
+import '../../local_audio/view/album_page.dart';
+import '../../local_audio/view/artist_page.dart';
+import '../../podcasts/podcast_model.dart';
+import '../../radio/view/station_page.dart';
+import '../player_model.dart';
+import 'player_view.dart';
+
+class PlayerTitleAndArtist extends StatelessWidget with WatchItMixin {
+  const PlayerTitleAndArtist({
+    super.key,
+    required this.playerPosition,
+  });
+
+  final PlayerPosition playerPosition;
+
+  @override
+  Widget build(BuildContext context) {
+    final theme = context.theme;
+    final audio = watchPropertyValue((PlayerModel m) => m.audio);
+
+    final icyTitle =
+        watchPropertyValue((PlayerModel m) => m.mpvMetaData?.icyTitle);
+
+    final appModel = di<AppModel>();
+    final libraryModel = di<LibraryModel>();
+    final localAudioModel = di<LocalAudioModel>();
+    final playerModel = di<PlayerModel>();
+    final podcastModel = di<PodcastModel>();
+
+    return Column(
+      mainAxisSize: switch (playerPosition) {
+        PlayerPosition.bottom => MainAxisSize.max,
+        _ => MainAxisSize.min,
+      },
+      mainAxisAlignment: switch (playerPosition) {
+        PlayerPosition.bottom => MainAxisAlignment.center,
+        _ => MainAxisAlignment.start,
+      },
+      crossAxisAlignment: switch (playerPosition) {
+        PlayerPosition.bottom => CrossAxisAlignment.start,
+        _ => CrossAxisAlignment.center,
+      },
+      children: [
+        InkWell(
+          borderRadius: switch (playerPosition) {
+            PlayerPosition.bottom => BorderRadius.circular(4),
+            _ => BorderRadius.circular(10),
+          },
+          onTap: audio == null
+              ? null
+              : () => _onTitleTap(
+                    audio: audio,
+                    text: icyTitle,
+                    context: context,
+                    libraryModel: libraryModel,
+                    playerModel: playerModel,
+                    localAudioModel: localAudioModel,
+                    appModel: appModel,
+                  ),
+          child: Tooltip(
+            message: _title(audio: audio, icyTitle: icyTitle),
+            child: Text(
+              _title(audio: audio, icyTitle: icyTitle),
+              style: switch (playerPosition) {
+                PlayerPosition.bottom => _bottomTitleTextStyle(),
+                _ => _fullHeightTitleTextStyle(theme)
+              },
+              textAlign: _textAlign(),
+              maxLines: 1,
+              overflow: TextOverflow.ellipsis,
+            ),
+          ),
+        ),
+        InkWell(
+          borderRadius: switch (playerPosition) {
+            PlayerPosition.bottom => BorderRadius.circular(4),
+            _ => BorderRadius.circular(8),
+          },
+          onTap: audio == null
+              ? null
+              : () => _onArtistTap(
+                    audio: audio,
+                    context: context,
+                    libraryModel: libraryModel,
+                    playerModel: playerModel,
+                    localAudioModel: localAudioModel,
+                    appModel: appModel,
+                    podcastModel: podcastModel,
+                  ),
+          child: Tooltip(
+            message: _subTitle(audio),
+            child: Text(
+              _subTitle(audio),
+              style: switch (playerPosition) {
+                PlayerPosition.bottom => _bottomArtistTextStyle(),
+                _ => _fullHeightArtistTextStyle(theme)
+              },
+              textAlign: _textAlign(),
+              overflow: TextOverflow.ellipsis,
+              maxLines: 1,
+            ),
+          ),
+        ),
+      ],
+    );
+  }
+
+  TextAlign _textAlign() {
+    return switch (playerPosition) {
+      PlayerPosition.bottom => TextAlign.start,
+      _ => TextAlign.center,
+    };
+  }
+
+  TextStyle _fullHeightTitleTextStyle(ThemeData theme) {
+    return TextStyle(
+      fontWeight: largeTextWeight,
+      fontSize: 30,
+      color: theme.colorScheme.onSurface,
+    );
+  }
+
+  TextStyle _fullHeightArtistTextStyle(ThemeData theme) {
+    return TextStyle(
+      fontWeight: smallTextFontWeight,
+      fontSize: 20,
+      color: theme.colorScheme.onSurface,
+    );
+  }
+
+  TextStyle _bottomTitleTextStyle() => const TextStyle(
+        fontWeight: FontWeight.w400,
+        fontSize: 14,
+      );
+
+  TextStyle _bottomArtistTextStyle() => TextStyle(
+        fontWeight: smallTextFontWeight,
+        fontSize: 12,
+      );
+
+  String _subTitle(Audio? audio) => (switch (audio?.audioType) {
+            AudioType.podcast => audio?.album,
+            AudioType.radio => audio?.title,
+            _ => audio?.artist
+          } ??
+          '')
+      .trim();
+
+  String _title({required Audio? audio, required String? icyTitle}) =>
+      icyTitle?.isNotEmpty == true && audio?.audioType == AudioType.radio
+          ? icyTitle!
+          : (audio?.title?.isNotEmpty == true ? audio!.title! : '').trim();
+
+  void _onTitleTap({
+    Audio? audio,
+    String? text,
+    required BuildContext context,
+    required PlayerModel playerModel,
+    required LibraryModel libraryModel,
+    required LocalAudioModel localAudioModel,
+    required AppModel appModel,
+  }) {
+    if (text?.isNotEmpty == true && audio?.audioType == AudioType.radio ||
+        audio?.audioType == null) {
+      showSnackBar(
+        context: context,
+        content: CopyClipboardContent(text: text!),
+      );
+      return;
+    }
+
+    switch (audio?.audioType) {
+      case AudioType.local:
+        _onLocalAudioTitleTap(
+          audio: audio!,
+          appModel: appModel,
+          libraryModel: libraryModel,
+          localAudioModel: localAudioModel,
+        );
+        return;
+      case AudioType.radio:
+      case AudioType.podcast:
+        if (audio?.url == null) return;
+        showSnackBar(
+          context: context,
+          content: CopyClipboardContent(
+            text: audio!.url!,
+            onSearch: () => launchUrl(Uri.parse(audio.url!)),
+          ),
+        );
+        return;
+      default:
+        return;
+    }
+  }
+
+  void _onLocalAudioTitleTap({
+    required Audio audio,
+    required AppModel appModel,
+    required LibraryModel libraryModel,
+    required LocalAudioModel localAudioModel,
+  }) {
+    if (audio.album == null) return;
+    localAudioModel.init().then(
+      (value) {
+        final albumAudios = localAudioModel.findAlbum(audio.album!);
+        if (albumAudios?.firstOrNull == null) return;
+        final id = albumAudios!.first.albumId;
+        if (id == null) return;
+
+        appModel.setFullWindowMode(false);
+
+        libraryModel.push(
+          builder: (_) => AlbumPage(
+            id: id,
+            album: albumAudios,
+          ),
+          pageId: id,
+        );
+      },
+    );
+  }
+
+  void _onArtistTap({
+    required Audio audio,
+    required BuildContext context,
+    required PodcastModel podcastModel,
+    required PlayerModel playerModel,
+    required LocalAudioModel localAudioModel,
+    required LibraryModel libraryModel,
+    required AppModel appModel,
+  }) {
+    switch (audio.audioType) {
+      case AudioType.local:
+        _onLocalAudioArtistTap(
+          audio: audio,
+          appModel: appModel,
+          libraryModel: libraryModel,
+          localAudioModel: localAudioModel,
+        );
+        return;
+      case AudioType.radio:
+        _onRadioArtistTap(audio: audio, libraryModel: libraryModel);
+        return;
+      case AudioType.podcast:
+        if (audio.website != null) {
+          podcastModel.loadPodcast(
+            context: context,
+            libraryModel: libraryModel,
+            feedUrl: audio.website!,
+            itemImageUrl: audio.albumArtUrl,
+            genre: audio.genre,
+          );
+        }
+        return;
+      default:
+        return;
+    }
+  }
+
+  void _onRadioArtistTap({
+    required Audio audio,
+    required LibraryModel libraryModel,
+  }) {
+    if (audio.url == null ||
+        audio.uuid == null ||
+        libraryModel.selectedPageId == audio.uuid) return;
+    libraryModel.push(
+      builder: (_) => StationPage(station: audio),
+      pageId: audio.uuid!,
+    );
+  }
+
+  void _onLocalAudioArtistTap({
+    required Audio audio,
+    required LocalAudioModel localAudioModel,
+    required AppModel appModel,
+    required LibraryModel libraryModel,
+  }) {
+    final artistName = audio.artist;
+    if (artistName == null) return;
+
+    localAudioModel.init().then(
+      (value) {
+        final artistAudios = localAudioModel.findTitlesOfArtist(artistName);
+        final artist = artistAudios?.firstOrNull?.artist;
+        if (artist == null) return;
+        appModel.setFullWindowMode(false);
+        libraryModel.push(
+          builder: (_) => ArtistPage(artistAudios: artistAudios),
+          pageId: artist,
+        );
+      },
+    );
+  }
+}
diff --git a/lib/player/view/player_view.dart b/lib/player/view/player_view.dart
index eede569a3..21a4ca82e 100644
--- a/lib/player/view/player_view.dart
+++ b/lib/player/view/player_view.dart
@@ -9,9 +9,9 @@ import 'bottom_player.dart';
 import 'full_height_player.dart';
 
 class PlayerView extends StatefulWidget with WatchItStatefulWidgetMixin {
-  const PlayerView({super.key, required this.mode});
+  const PlayerView({super.key, required this.position});
 
-  final PlayerPosition mode;
+  final PlayerPosition position;
 
   @override
   State<PlayerView> createState() => _PlayerViewState();
@@ -25,7 +25,7 @@ class _PlayerViewState extends State<PlayerView> {
     WidgetsBinding.instance.addPostFrameCallback((timeStamp) {
       if (!mounted) return;
       di<AppModel>().setShowWindowControls(
-        widget.mode != PlayerPosition.sideBar,
+        widget.position != PlayerPosition.sideBar,
       );
     });
   }
@@ -37,7 +37,7 @@ class _PlayerViewState extends State<PlayerView> {
     WidgetsBinding.instance.addPostFrameCallback((timeStamp) {
       if (!mounted) return;
       di<AppModel>().setShowWindowControls(
-        widget.mode != PlayerPosition.sideBar,
+        widget.position != PlayerPosition.sideBar,
       );
     });
   }
@@ -49,13 +49,13 @@ class _PlayerViewState extends State<PlayerView> {
     final color = getPlayerBg(c, theme.cardColor);
 
     Widget player;
-    if (widget.mode != PlayerPosition.bottom) {
+    if (widget.position != PlayerPosition.bottom) {
       player = Row(
         children: [
-          if (widget.mode == PlayerPosition.sideBar)
+          if (widget.position == PlayerPosition.sideBar)
             const Material(child: VerticalDivider()),
           Expanded(
-            child: FullHeightPlayer(playerPosition: widget.mode),
+            child: FullHeightPlayer(playerPosition: widget.position),
           ),
         ],
       );
diff --git a/lib/playlists/view/manual_add_dialog.dart b/lib/playlists/view/manual_add_dialog.dart
index be94dd385..46fc058ed 100644
--- a/lib/playlists/view/manual_add_dialog.dart
+++ b/lib/playlists/view/manual_add_dialog.dart
@@ -10,7 +10,7 @@ import '../../common/view/theme.dart';
 import '../../external_path/external_path_service.dart';
 import '../../l10n/l10n.dart';
 import '../../library/library_model.dart';
-import '../../podcasts/podcast_utils.dart';
+import '../../podcasts/podcast_model.dart';
 
 class ManualAddDialog extends StatelessWidget {
   const ManualAddDialog({super.key});
@@ -392,10 +392,10 @@ class _AddPodcastContentState extends State<AddPodcastContent> {
                 onPressed: _urlController.text.isEmpty
                     ? null
                     : () {
-                        searchAndPushPodcastPage(
+                        di<PodcastModel>().loadPodcast(
                           context: context,
                           feedUrl: _urlController.text,
-                          play: false,
+                          libraryModel: di<LibraryModel>(),
                         );
                       },
                 child: Text(
diff --git a/lib/podcasts/podcast_model.dart b/lib/podcasts/podcast_model.dart
index df0a71748..3789b442f 100644
--- a/lib/podcasts/podcast_model.dart
+++ b/lib/podcasts/podcast_model.dart
@@ -1,9 +1,15 @@
 import 'dart:async';
 
+import 'package:flutter/material.dart';
 import 'package:safe_change_notifier/safe_change_notifier.dart';
 
 import '../common/data/audio.dart';
+import '../common/view/snackbars.dart';
+import '../library/library_model.dart';
+import '../player/player_model.dart';
 import 'podcast_service.dart';
+import 'view/podcast_page.dart';
+import 'view/podcast_snackbar_contents.dart';
 
 class PodcastModel extends SafeChangeNotifier {
   PodcastModel({
@@ -71,4 +77,78 @@ class PodcastModel extends SafeChangeNotifier {
     _downloadsOnly = value;
     notifyListeners();
   }
+
+  // This is not optimal since the model uses widgets
+  // but tolerable since snackbars update over the rest of the UI
+  Future<void> loadPodcast({
+    required BuildContext context,
+    required LibraryModel libraryModel,
+    required String feedUrl,
+    String? itemImageUrl,
+    String? genre,
+    PlayerModel? playerModel,
+  }) async {
+    if (libraryModel.isPageInLibrary(feedUrl)) {
+      return libraryModel.pushNamed(pageId: feedUrl);
+    }
+
+    showSnackBar(
+      context: context,
+      duration: const Duration(seconds: 1000),
+      content: const PodcastSearchLoadingSnackBarContent(),
+    );
+
+    setLoadingFeed(true);
+    return _podcastService
+        .findEpisodes(
+      feedUrl: feedUrl,
+      itemImageUrl: itemImageUrl,
+      genre: genre,
+    )
+        .then(
+      (podcast) async {
+        if (podcast.isEmpty) {
+          if (context.mounted) {
+            showSnackBar(
+              context: context,
+              content: const PodcastSearchEmptyFeedSnackBarContent(),
+            );
+          }
+          return;
+        }
+
+        if (playerModel != null) {
+          playerModel.startPlaylist(listName: feedUrl, audios: podcast);
+        } else {
+          libraryModel.push(
+            builder: (_) => PodcastPage(
+              imageUrl: itemImageUrl ?? podcast.firstOrNull?.imageUrl,
+              preFetchedEpisodes: podcast,
+              feedUrl: feedUrl,
+              title: podcast.firstOrNull?.album ??
+                  podcast.firstOrNull?.title ??
+                  feedUrl,
+            ),
+            pageId: feedUrl,
+          );
+        }
+      },
+    ).whenComplete(
+      () {
+        setLoadingFeed(false);
+        if (context.mounted) ScaffoldMessenger.of(context).clearSnackBars();
+      },
+    ).timeout(
+      const Duration(seconds: 15),
+      onTimeout: () {
+        setLoadingFeed(false);
+        if (context.mounted) {
+          showSnackBar(
+            context: context,
+            content: const PodcastSearchTimeoutSnackBarContent(),
+          );
+        }
+      },
+    );
+  }
 }
diff --git a/lib/podcasts/podcast_service.dart b/lib/podcasts/podcast_service.dart
index b783a4919..fbc2dbc88 100644
--- a/lib/podcasts/podcast_service.dart
+++ b/lib/podcasts/podcast_service.dart
@@ -1,5 +1,6 @@
 import 'dart:async';
 
+import 'package:flutter/foundation.dart';
 import 'package:podcast_search/podcast_search.dart';
 
 import '../common/data/audio.dart';
@@ -9,7 +10,6 @@ import '../common/view/languages.dart';
 import '../library/library_service.dart';
 import '../notifications/notifications_service.dart';
 import '../settings/settings_service.dart';
-import 'podcast_utils.dart';
 
 class PodcastService {
   final NotificationsService _notificationsService;
@@ -125,4 +125,42 @@ class PodcastService {
     }
     _updateLock = false;
   }
+
+  Future<List<Audio>> findEpisodes({
+    required String feedUrl,
+    String? itemImageUrl,
+    String? genre,
+  }) async {
+    final Podcast? podcast = await compute(loadPodcast, feedUrl);
+    final episodes = podcast?.episodes
+            .where((e) => e.contentUrl != null)
+            .map(
+              (e) => Audio.fromPodcast(
+                episode: e,
+                podcast: podcast,
+                itemImageUrl: itemImageUrl,
+                genre: genre,
+              ),
+            )
+            .toList() ??
+        <Audio>[];
+
+    sortListByAudioFilter(
+      audioFilter: AudioFilter.year,
+      audios: episodes,
+      descending: true,
+    );
+
+    return episodes;
+  }
+}
+
+Future<Podcast?> loadPodcast(String url) async {
+  try {
+    return await Podcast.loadFeed(
+      url: url,
+    );
+  } catch (e) {
+    return null;
+  }
 }
diff --git a/lib/podcasts/podcast_utils.dart b/lib/podcasts/podcast_utils.dart
deleted file mode 100644
index 6170ae593..000000000
--- a/lib/podcasts/podcast_utils.dart
+++ /dev/null
@@ -1,152 +0,0 @@
-import 'dart:async';
-
-import 'package:flutter/foundation.dart';
-import 'package:flutter/material.dart';
-import 'package:podcast_search/podcast_search.dart';
-import 'package:watch_it/watch_it.dart';
-
-import '../common/data/audio.dart';
-import '../common/view/audio_filter.dart';
-import '../common/view/progress.dart';
-import '../common/view/snackbars.dart';
-import '../common/view/theme.dart';
-import '../l10n/l10n.dart';
-import '../library/library_model.dart';
-import '../player/player_model.dart';
-import 'podcast_model.dart';
-import 'view/podcast_page.dart';
-
-Future<void> searchAndPushPodcastPage({
-  required BuildContext context,
-  required String? feedUrl,
-  String? itemImageUrl,
-  String? genre,
-  required bool play,
-}) async {
-  if (feedUrl == null) {
-    showSnackBar(
-      context: context,
-      content: Text(context.l10n.podcastFeedIsEmpty),
-    );
-    return;
-  }
-
-  final libraryModel = di<LibraryModel>();
-  if (libraryModel.isPageInLibrary(feedUrl)) {
-    return libraryModel.pushNamed(pageId: feedUrl);
-  }
-
-  showSnackBar(
-    context: context,
-    duration: const Duration(seconds: 1000),
-    content: Row(
-      mainAxisAlignment: MainAxisAlignment.spaceBetween,
-      children: [
-        Text(context.l10n.loadingPodcastFeed),
-        SizedBox(
-          height: iconSize,
-          width: iconSize,
-          child: const Progress(),
-        ),
-      ],
-    ),
-  );
-
-  di<PodcastModel>().setLoadingFeed(true);
-  return findEpisodes(
-    feedUrl: feedUrl,
-    itemImageUrl: itemImageUrl,
-    genre: genre,
-  ).then(
-    (podcast) async {
-      if (podcast.isEmpty) {
-        if (context.mounted) {
-          showSnackBar(
-            context: context,
-            content: Text(context.l10n.podcastFeedIsEmpty),
-          );
-        }
-        return;
-      }
-
-      if (play) {
-        di<PlayerModel>().startPlaylist(listName: feedUrl, audios: podcast);
-      } else {
-        di<LibraryModel>().push(
-          builder: (_) => PodcastPage(
-            imageUrl: itemImageUrl ?? podcast.firstOrNull?.imageUrl,
-            preFetchedEpisodes: podcast,
-            feedUrl: feedUrl,
-            title: podcast.firstOrNull?.album ??
-                podcast.firstOrNull?.title ??
-                feedUrl,
-          ),
-          pageId: feedUrl,
-        );
-      }
-    },
-  ).whenComplete(
-    () {
-      di<PodcastModel>().setLoadingFeed(false);
-      if (context.mounted) ScaffoldMessenger.of(context).clearSnackBars();
-    },
-  ).timeout(
-    const Duration(seconds: 15),
-    onTimeout: () {
-      if (context.mounted) {
-        showSnackBar(
-          context: context,
-          content: Row(
-            mainAxisAlignment: MainAxisAlignment.spaceBetween,
-            children: [
-              Expanded(child: Text(context.l10n.podcastFeedLoadingTimeout)),
-              SizedBox(
-                height: iconSize,
-                width: iconSize,
-                child: const Progress(),
-              ),
-            ],
-          ),
-        );
-      }
-    },
-  );
-}
-
-Future<List<Audio>> findEpisodes({
-  required String feedUrl,
-  String? itemImageUrl,
-  String? genre,
-}) async {
-  final Podcast? podcast = await compute(loadPodcast, feedUrl);
-  final episodes = podcast?.episodes
-          .where((e) => e.contentUrl != null)
-          .map(
-            (e) => Audio.fromPodcast(
-              episode: e,
-              podcast: podcast,
-              itemImageUrl: itemImageUrl,
-              genre: genre,
-            ),
-          )
-          .toList() ??
-      <Audio>[];
-
-  sortListByAudioFilter(
-    audioFilter: AudioFilter.year,
-    audios: episodes,
-    descending: true,
-  );
-
-  return episodes;
-}
-
-Future<Podcast?> loadPodcast(String url) async {
-  try {
-    return await Podcast.loadFeed(
-      url: url,
-    );
-  } catch (e) {
-    return null;
-  }
-}
diff --git a/lib/podcasts/view/podcast_page.dart b/lib/podcasts/view/podcast_page.dart
index f4a7461c9..185b8e536 100644
--- a/lib/podcasts/view/podcast_page.dart
+++ b/lib/podcasts/view/podcast_page.dart
@@ -57,6 +57,8 @@ class _PodcastPageState extends State<PodcastPage> {
   void initState() {
     super.initState();
     final libraryModel = di<LibraryModel>();
+    if (!libraryModel.isPageInLibrary(widget.feedUrl)) return;
+
     final episodes =
         widget.preFetchedEpisodes ?? libraryModel.podcasts[widget.feedUrl];
 
diff --git a/lib/podcasts/view/podcast_snackbar_contents.dart b/lib/podcasts/view/podcast_snackbar_contents.dart
new file mode 100644
index 000000000..61b478816
--- /dev/null
+++ b/lib/podcasts/view/podcast_snackbar_contents.dart
@@ -0,0 +1,55 @@
+import '../../common/view/progress.dart';
+import '../../common/view/theme.dart';
+import '../../l10n/l10n.dart';
+import 'package:flutter/material.dart';
+
+class PodcastSearchTimeoutSnackBarContent extends StatelessWidget {
+  const PodcastSearchTimeoutSnackBarContent({
+    super.key,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return Row(
+      mainAxisAlignment: MainAxisAlignment.spaceBetween,
+      children: [
+        Expanded(child: Text(context.l10n.podcastFeedLoadingTimeout)),
+        SizedBox(
+          height: iconSize,
+          width: iconSize,
+          child: const Progress(),
+        ),
+      ],
+    );
+  }
+}
+
+class PodcastSearchLoadingSnackBarContent extends StatelessWidget {
+  const PodcastSearchLoadingSnackBarContent({
+    super.key,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return Row(
+      mainAxisAlignment: MainAxisAlignment.spaceBetween,
+      children: [
+        Text(context.l10n.loadingPodcastFeed),
+        SizedBox(
+          height: iconSize,
+          width: iconSize,
+          child: const Progress(),
+        ),
+      ],
+    );
+  }
+}
+
+class PodcastSearchEmptyFeedSnackBarContent extends StatelessWidget {
+  const PodcastSearchEmptyFeedSnackBarContent({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return Text(context.l10n.podcastFeedIsEmpty);
+  }
+}
diff --git a/lib/radio/radio_model.dart b/lib/radio/radio_model.dart
index 752bae859..6f34e430d 100644
--- a/lib/radio/radio_model.dart
+++ b/lib/radio/radio_model.dart
@@ -29,6 +29,7 @@ class RadioModel extends SafeChangeNotifier {
   // The empty string is used so before the first check the UI does not overreact
   String? _connectedHost = '';
   String? get connectedHost => _connectedHost;
+  // TODO: make init a one time call...
   Future<String?> init() async {
     final oldHost = _connectedHost;
     _connectedHost = await _radioService.init();
diff --git a/lib/radio/view/radio_connect_snackbar.dart b/lib/radio/view/radio_connect_snackbar.dart
new file mode 100644
index 000000000..c6bad433a
--- /dev/null
+++ b/lib/radio/view/radio_connect_snackbar.dart
@@ -0,0 +1,41 @@
+import 'package:flutter/material.dart';
+import 'package:watch_it/watch_it.dart';
+
+import '../../common/view/snackbars.dart';
+import '../../l10n/l10n.dart';
+import '../radio_model.dart';
+
+class RadioConnectSnackbar extends StatelessWidget {
+  const RadioConnectSnackbar({super.key, this.connectedHost});
+
+  final String? connectedHost;
+
+  @override
+  Widget build(BuildContext context) {
+    final l10n = context.l10n;
+    return SnackBar(
+      duration: connectedHost != null
+          ? const Duration(seconds: 1)
+          : const Duration(seconds: 30),
+      content: Text(
+        connectedHost != null
+            ? '${l10n.connectedTo}: $connectedHost'
+            : l10n.noRadioServerFound,
+      ),
+      action: (connectedHost == null)
+          ? SnackBarAction(
+              onPressed: () async {
+                final connectedHost = await di<RadioModel>().init();
+                if (context.mounted) {
+                  showSnackBar(
+                    context: context,
+                    content: RadioConnectSnackbar(connectedHost: connectedHost),
+                  );
+                }
+              },
+              label: l10n.tryReconnect,
+            )
+          : null,
+    );
+  }
+}
diff --git a/lib/radio/view/radio_history_list.dart b/lib/radio/view/radio_history_list.dart
index 0938a7bfd..9f92bab7f 100644
--- a/lib/radio/view/radio_history_list.dart
+++ b/lib/radio/view/radio_history_list.dart
@@ -5,11 +5,10 @@ import 'package:watch_it/watch_it.dart';
 import '../../common/view/adaptive_container.dart';
 import '../../common/view/no_search_result_page.dart';
 import '../../l10n/l10n.dart';
-import '../../player/player_mixin.dart';
 import '../../player/player_model.dart';
 import 'radio_history_tile.dart';
 
-class RadioHistoryList extends StatelessWidget with WatchItMixin, PlayerMixin {
+class RadioHistoryList extends StatelessWidget with WatchItMixin {
   const RadioHistoryList({
     super.key,
     this.filter,
@@ -66,8 +65,7 @@ class RadioHistoryList extends StatelessWidget with WatchItMixin, PlayerMixin {
   }
 }
 
-class SliverRadioHistoryList extends StatelessWidget
-    with WatchItMixin, PlayerMixin {
+class SliverRadioHistoryList extends StatelessWidget with WatchItMixin {
   const SliverRadioHistoryList({
     super.key,
     this.filter,
diff --git a/lib/radio/view/radio_history_tile.dart b/lib/radio/view/radio_history_tile.dart
index 1cdea41fc..54e322b00 100644
--- a/lib/radio/view/radio_history_tile.dart
+++ b/lib/radio/view/radio_history_tile.dart
@@ -4,21 +4,22 @@ import 'package:yaru/constants.dart';
 
 import '../../common/data/audio.dart';
 import '../../common/data/mpv_meta_data.dart';
+import '../../common/view/copy_clipboard_content.dart';
 import '../../common/view/icons.dart';
-import '../radio_model.dart';
-import 'icy_image.dart';
 import '../../common/view/mpv_metadata_dialog.dart';
+import '../../common/view/snackbars.dart';
 import '../../common/view/tapable_text.dart';
 import '../../common/view/theme.dart';
 import '../../extensions/build_context_x.dart';
 import '../../extensions/theme_data_x.dart';
 import '../../l10n/l10n.dart';
 import '../../library/library_model.dart';
-import '../../player/player_mixin.dart';
 import '../../search/search_model.dart';
+import '../radio_model.dart';
+import 'icy_image.dart';
 import 'station_page.dart';
 
-class RadioHistoryTile extends StatelessWidget with PlayerMixin {
+class RadioHistoryTile extends StatelessWidget {
   const RadioHistoryTile({
     super.key,
     required this.entry,
@@ -74,17 +75,18 @@ class RadioHistoryTile extends StatelessWidget with PlayerMixin {
         overflow: TextOverflow.visible,
         maxLines: 10,
         text: entry.value.icyTitle,
-        onTap: () => onTitleTap(
-          text: entry.value.icyTitle,
+        onTap: () => showSnackBar(
           context: context,
+          content: CopyClipboardContent(text: entry.value.icyTitle),
         ),
       ),
       subtitle: TapAbleText(
         text: entry.value.icyName,
-        onTap: () {
+        onTap: () async {
           final libraryModel = di<LibraryModel>();
           if (libraryModel.selectedPageId == entry.value.icyUrl) return;
 
+          await di<RadioModel>().init();
           di<SearchModel>().radioNameSearch(entry.value.icyName).then((v) {
             if (v?.firstOrNull?.stationUUID != null) {
               libraryModel.push(
diff --git a/lib/radio/view/radio_page_tag_bar.dart b/lib/radio/view/radio_page_tag_bar.dart
index 9c64d2915..75b541d0e 100644
--- a/lib/radio/view/radio_page_tag_bar.dart
+++ b/lib/radio/view/radio_page_tag_bar.dart
@@ -15,6 +15,7 @@ import '../../library/library_model.dart';
 import '../../search/search_model.dart';
 import '../../search/search_type.dart';
 import '../radio_model.dart';
+import 'radio_connect_snackbar.dart';
 
 class RadioPageTagBar extends StatelessWidget {
   const RadioPageTagBar({super.key, required this.station});
@@ -87,9 +88,11 @@ class RadioPageTagBar extends StatelessWidget {
                         if (context.mounted) {
                           showSnackBar(
                             context: context,
-                            content: buildConnectSnackBar(
+                            content: RadioConnectSnackbar(
                               connectedHost: connectedHost,
-                              context: context,
+                            ),
+                            duration: Duration(
+                              seconds: connectedHost == null ? 10 : 3,
                             ),
                           );
                         }
diff --git a/lib/radio/view/radio_reconnect_button.dart b/lib/radio/view/radio_reconnect_button.dart
index e25eeff58..5529a03b9 100644
--- a/lib/radio/view/radio_reconnect_button.dart
+++ b/lib/radio/view/radio_reconnect_button.dart
@@ -5,6 +5,7 @@ import '../../common/view/snackbars.dart';
 import '../../l10n/l10n.dart';
 import '../radio_model.dart';
 import 'disconnected_server_icon.dart';
+import 'radio_connect_snackbar.dart';
 
 class RadioReconnectButton extends StatelessWidget {
   const RadioReconnectButton({super.key});
@@ -22,10 +23,8 @@ class RadioReconnectButton extends StatelessWidget {
           if (context.mounted) {
             showSnackBar(
               context: context,
-              snackBar: buildConnectSnackBar(
-                connectedHost: host,
-                context: context,
-              ),
+              content: RadioConnectSnackbar(connectedHost: host),
+              duration: Duration(seconds: host == null ? 10 : 3),
             );
           }
         },
diff --git a/lib/search/view/sliver_podcast_search_results.dart b/lib/search/view/sliver_podcast_search_results.dart
index d4205c8b2..5c9cbf1d4 100644
--- a/lib/search/view/sliver_podcast_search_results.dart
+++ b/lib/search/view/sliver_podcast_search_results.dart
@@ -9,10 +9,13 @@ import '../../common/view/no_search_result_page.dart';
 import '../../common/view/offline_page.dart';
 import '../../common/view/progress.dart';
 import '../../common/view/safe_network_image.dart';
+import '../../common/view/snackbars.dart';
 import '../../common/view/theme.dart';
 import '../../l10n/l10n.dart';
+import '../../library/library_model.dart';
+import '../../player/player_model.dart';
 import '../../podcasts/podcast_model.dart';
-import '../../podcasts/podcast_utils.dart';
+import '../../podcasts/view/podcast_snackbar_contents.dart';
 import '../search_model.dart';
 
 class SliverPodcastSearchResults extends StatefulWidget
@@ -70,6 +73,9 @@ class _SliverPodcastSearchResultsState
     }
 
     final loadingFeed = watchPropertyValue((PodcastModel m) => m.loadingFeed);
+    final libraryModel = di<LibraryModel>();
+    final playerModel = di<PlayerModel>();
+    final podcastModel = di<PodcastModel>();
 
     return SliverGrid.builder(
       itemCount: searchResultItems.length,
@@ -85,29 +91,33 @@ class _SliverPodcastSearchResultsState
           width: audioCardDimension,
         );
 
+        final feedUrl = podcastItem.feedUrl;
+
+        void loadPodcast({required bool play}) {
+          if (feedUrl == null) {
+            showSnackBar(
+              context: context,
+              content: const PodcastSearchEmptyFeedSnackBarContent(),
+            );
+          } else {
+            podcastModel.loadPodcast(
+              context: context,
+              feedUrl: feedUrl,
+              itemImageUrl: art,
+              genre: podcastItem.primaryGenreName,
+              playerModel: play ? playerModel : null,
+              libraryModel: libraryModel,
+            );
+          }
+        }
+
         return AudioCard(
           bottom: AudioCardBottom(
             text: podcastItem.collectionName ?? podcastItem.trackName,
           ),
           image: image,
-          onPlay: loadingFeed
-              ? null
-              : () => searchAndPushPodcastPage(
-                    context: context,
-                    feedUrl: podcastItem.feedUrl,
-                    itemImageUrl: art,
-                    genre: podcastItem.primaryGenreName,
-                    play: true,
-                  ),
-          onTap: loadingFeed
-              ? null
-              : () => searchAndPushPodcastPage(
-                    context: context,
-                    feedUrl: podcastItem.feedUrl,
-                    itemImageUrl: art,
-                    genre: podcastItem.primaryGenreName,
-                    play: false,
-                  ),
+          onPlay: loadingFeed ? null : () => loadPodcast(play: true),
+          onTap: loadingFeed ? null : () => loadPodcast(play: false),
         );
       },
     );
diff --git a/lib/search/view/sliver_radio_search_results.dart b/lib/search/view/sliver_radio_search_results.dart
index 71d5716b4..c1e3517d0 100644
--- a/lib/search/view/sliver_radio_search_results.dart
+++ b/lib/search/view/sliver_radio_search_results.dart
@@ -11,6 +11,7 @@ import '../../common/view/snackbars.dart';
 import '../../l10n/l10n.dart';
 import '../../player/player_model.dart';
 import '../../radio/radio_model.dart';
+import '../../radio/view/radio_connect_snackbar.dart';
 import '../search_model.dart';
 
 class SliverRadioSearchResults extends StatefulWidget
@@ -38,9 +39,11 @@ class _SliverRadioSearchResultsState extends State<SliverRadioSearchResults> {
           if (mounted && model.showConnectSnackBar) {
             showSnackBar(
               context: context,
-              snackBar: buildConnectSnackBar(
+              content: RadioConnectSnackbar(
                 connectedHost: connectedHost,
-                context: context,
+              ),
+              duration: Duration(
+                seconds: connectedHost == null ? 10 : 3,
               ),
             );
           }
@@ -97,7 +100,7 @@ class _SliverRadioSearchResultsState extends State<SliverRadioSearchResults> {
           audioPageType: AudioPageType.radioSearch,
           isPlayerPlaying: playing,
           selected: currentAudio == station,
-          pageId: station.description!,
+          pageId: station.uuid!,
           audio: station,
           onTap: station.uuid == null
               ? null
diff --git a/needs_translation.json b/needs_translation.json
index 6785a984c..e2c86aaab 100644
--- a/needs_translation.json
+++ b/needs_translation.json
@@ -857,10 +857,6 @@
     "regionZimbabwe"
   ],
 
-  "it": [
-    "disconnectedFrom"
-  ],
-
   "nl": [
     "shuffle",
     "repeat",
diff --git a/test/podcast_service_test.dart b/test/podcast_service_test.dart
index e00eb737a..50a4b300b 100644
--- a/test/podcast_service_test.dart
+++ b/test/podcast_service_test.dart
@@ -6,7 +6,6 @@ import 'package:musicpod/common/data/podcast_genre.dart';
 import 'package:musicpod/library/library_service.dart';
 import 'package:musicpod/notifications/notifications_service.dart';
 import 'package:musicpod/podcasts/podcast_service.dart';
-import 'package:musicpod/podcasts/podcast_utils.dart';
 import 'package:musicpod/settings/settings_service.dart';
 import 'package:podcast_search/podcast_search.dart';
 
@@ -43,7 +42,7 @@ Future<void> main() async {
     final feedUrl = result?.items.first.feedUrl;
     List<Audio>? episodes;
     if (feedUrl != null) {
-      episodes = await findEpisodes(feedUrl: feedUrl);
+      episodes = await service.findEpisodes(feedUrl: feedUrl);
     }
 
     expect(episodes?.last.url == episodeOneAudio.url, true);
diff --git a/test/podcast_service_test.mocks.dart b/test/podcast_service_test.mocks.dart
index df6b806e2..4883ceab6 100644
--- a/test/podcast_service_test.mocks.dart
+++ b/test/podcast_service_test.mocks.dart
@@ -3,14 +3,14 @@
 // Do not manually edit this file.
 
 // ignore_for_file: no_leading_underscores_for_library_prefixes
-import 'dart:async' as _i4;
+import 'dart:async' as _i3;
 
-import 'package:dio/dio.dart' as _i2;
 import 'package:mockito/mockito.dart' as _i1;
 import 'package:musicpod/common/data/audio.dart' as _i7;
+import 'package:musicpod/common/data/close_btn_action.dart' as _i5;
 import 'package:musicpod/library/library_service.dart' as _i6;
-import 'package:musicpod/notifications/notifications_service.dart' as _i3;
-import 'package:musicpod/settings/settings_service.dart' as _i5;
+import 'package:musicpod/notifications/notifications_service.dart' as _i2;
+import 'package:musicpod/settings/settings_service.dart' as _i4;
 
 // ignore_for_file: type=lint
 // ignore_for_file: avoid_redundant_argument_values
@@ -25,27 +25,17 @@ import 'package:musicpod/settings/settings_service.dart' as _i5;
 // ignore_for_file: camel_case_types
 // ignore_for_file: subtype_of_sealed_class
 
-class _FakeDio_0 extends _i1.SmartFake implements _i2.Dio {
-  _FakeDio_0(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
-}
-
 /// A class which mocks [NotificationsService].
 ///
 /// See the documentation for Mockito's code generation for more information.
 class MockNotificationsService extends _i1.Mock
-    implements _i3.NotificationsService {
+    implements _i2.NotificationsService {
   MockNotificationsService() {
     _i1.throwOnMissingStub(this);
   }
 
   @override
-  _i4.Future<void> notify({
+  _i3.Future<void> notify({
     required String? message,
     String? uri,
   }) =>
@@ -58,34 +48,34 @@ class MockNotificationsService extends _i1.Mock
             #uri: uri,
           },
         ),
-        returnValue: _i4.Future<void>.value(),
-        returnValueForMissingStub: _i4.Future<void>.value(),
-      ) as _i4.Future<void>);
+        returnValue: _i3.Future<void>.value(),
+        returnValueForMissingStub: _i3.Future<void>.value(),
+      ) as _i3.Future<void>);
 
   @override
-  _i4.Future<void> dispose() => (super.noSuchMethod(
+  _i3.Future<void> dispose() => (super.noSuchMethod(
         Invocation.method(
           #dispose,
           [],
         ),
-        returnValue: _i4.Future<void>.value(),
-        returnValueForMissingStub: _i4.Future<void>.value(),
-      ) as _i4.Future<void>);
+        returnValue: _i3.Future<void>.value(),
+        returnValueForMissingStub: _i3.Future<void>.value(),
+      ) as _i3.Future<void>);
 }
 
 /// A class which mocks [SettingsService].
 ///
 /// See the documentation for Mockito's code generation for more information.
-class MockSettingsService extends _i1.Mock implements _i5.SettingsService {
+class MockSettingsService extends _i1.Mock implements _i4.SettingsService {
   MockSettingsService() {
     _i1.throwOnMissingStub(this);
   }
 
   @override
-  _i4.Stream<bool> get themeIndexChanged => (super.noSuchMethod(
-        Invocation.getter(#themeIndexChanged),
-        returnValue: _i4.Stream<bool>.empty(),
-      ) as _i4.Stream<bool>);
+  _i3.Stream<bool> get propertiesChanged => (super.noSuchMethod(
+        Invocation.getter(#propertiesChanged),
+        returnValue: _i3.Stream<bool>.empty(),
+      ) as _i3.Stream<bool>);
 
   @override
   int get themeIndex => (super.noSuchMethod(
@@ -100,22 +90,10 @@ class MockSettingsService extends _i1.Mock implements _i5.SettingsService {
       ) as bool);
 
   @override
-  _i4.Stream<bool> get neverShowFailedImportsChanged => (super.noSuchMethod(
-        Invocation.getter(#neverShowFailedImportsChanged),
-        returnValue: _i4.Stream<bool>.empty(),
-      ) as _i4.Stream<bool>);
-
-  @override
-  _i4.Stream<bool> get recentPatchNotesDisposedChanged => (super.noSuchMethod(
-        Invocation.getter(#recentPatchNotesDisposedChanged),
-        returnValue: _i4.Stream<bool>.empty(),
-      ) as _i4.Stream<bool>);
-
-  @override
-  _i4.Stream<bool> get usePodcastIndexChanged => (super.noSuchMethod(
-        Invocation.getter(#usePodcastIndexChanged),
-        returnValue: _i4.Stream<bool>.empty(),
-      ) as _i4.Stream<bool>);
+  bool get enableDiscordRPC => (super.noSuchMethod(
+        Invocation.getter(#enableDiscordRPC),
+        returnValue: false,
+      ) as bool);
 
   @override
   bool get usePodcastIndex => (super.noSuchMethod(
@@ -124,22 +102,10 @@ class MockSettingsService extends _i1.Mock implements _i5.SettingsService {
       ) as bool);
 
   @override
-  _i4.Stream<bool> get podcastIndexApiKeyChanged => (super.noSuchMethod(
-        Invocation.getter(#podcastIndexApiKeyChanged),
-        returnValue: _i4.Stream<bool>.empty(),
-      ) as _i4.Stream<bool>);
-
-  @override
-  _i4.Stream<bool> get podcastIndexApiSecretChanged => (super.noSuchMethod(
-        Invocation.getter(#podcastIndexApiSecretChanged),
-        returnValue: _i4.Stream<bool>.empty(),
-      ) as _i4.Stream<bool>);
-
-  @override
-  _i4.Stream<bool> get directoryChanged => (super.noSuchMethod(
-        Invocation.getter(#directoryChanged),
-        returnValue: _i4.Stream<bool>.empty(),
-      ) as _i4.Stream<bool>);
+  _i5.CloseBtnAction get closeBtnActionIndex => (super.noSuchMethod(
+        Invocation.getter(#closeBtnActionIndex),
+        returnValue: _i5.CloseBtnAction.alwaysAsk,
+      ) as _i5.CloseBtnAction);
 
   @override
   void setThemeIndex(int? value) => super.noSuchMethod(
@@ -159,6 +125,15 @@ class MockSettingsService extends _i1.Mock implements _i5.SettingsService {
         returnValueForMissingStub: null,
       );
 
+  @override
+  void setEnableDiscordRPC(bool? value) => super.noSuchMethod(
+        Invocation.method(
+          #setEnableDiscordRPC,
+          [value],
+        ),
+        returnValueForMissingStub: null,
+      );
+
   @override
   bool recentPatchNotesDisposed(String? version) => (super.noSuchMethod(
         Invocation.method(
@@ -169,24 +144,24 @@ class MockSettingsService extends _i1.Mock implements _i5.SettingsService {
       ) as bool);
 
   @override
-  _i4.Future<void> disposePatchNotes(String? version) => (super.noSuchMethod(
+  _i3.Future<void> disposePatchNotes(String? version) => (super.noSuchMethod(
         Invocation.method(
           #disposePatchNotes,
           [version],
         ),
-        returnValue: _i4.Future<void>.value(),
-        returnValueForMissingStub: _i4.Future<void>.value(),
-      ) as _i4.Future<void>);
+        returnValue: _i3.Future<void>.value(),
+        returnValueForMissingStub: _i3.Future<void>.value(),
+      ) as _i3.Future<void>);
 
   @override
-  _i4.Future<void> setUsePodcastIndex(bool? value) => (super.noSuchMethod(
+  _i3.Future<void> setUsePodcastIndex(bool? value) => (super.noSuchMethod(
         Invocation.method(
           #setUsePodcastIndex,
           [value],
         ),
-        returnValue: _i4.Future<void>.value(),
-        returnValueForMissingStub: _i4.Future<void>.value(),
-      ) as _i4.Future<void>);
+        returnValue: _i3.Future<void>.value(),
+        returnValueForMissingStub: _i3.Future<void>.value(),
+      ) as _i3.Future<void>);
 
   @override
   void setPodcastIndexApiKey(String? value) => super.noSuchMethod(
@@ -207,24 +182,44 @@ class MockSettingsService extends _i1.Mock implements _i5.SettingsService {
       );
 
   @override
-  _i4.Future<void> setDirectory(String? directory) => (super.noSuchMethod(
+  _i3.Future<void> setDirectory(String? directory) => (super.noSuchMethod(
         Invocation.method(
           #setDirectory,
           [directory],
         ),
-        returnValue: _i4.Future<void>.value(),
-        returnValueForMissingStub: _i4.Future<void>.value(),
-      ) as _i4.Future<void>);
+        returnValue: _i3.Future<void>.value(),
+        returnValueForMissingStub: _i3.Future<void>.value(),
+      ) as _i3.Future<void>);
 
   @override
-  _i4.Future<void> dispose() => (super.noSuchMethod(
+  _i3.Future<void> setDownloadsCustomDir(String? directory) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #setDownloadsCustomDir,
+          [directory],
+        ),
+        returnValue: _i3.Future<void>.value(),
+        returnValueForMissingStub: _i3.Future<void>.value(),
+      ) as _i3.Future<void>);
+
+  @override
+  void setCloseBtnActionIndex(_i5.CloseBtnAction? value) => super.noSuchMethod(
+        Invocation.method(
+          #setCloseBtnActionIndex,
+          [value],
+        ),
+        returnValueForMissingStub: null,
+      );
+
+  @override
+  _i3.Future<void> dispose() => (super.noSuchMethod(
         Invocation.method(
           #dispose,
           [],
         ),
-        returnValue: _i4.Future<void>.value(),
-        returnValueForMissingStub: _i4.Future<void>.value(),
-      ) as _i4.Future<void>);
+        returnValue: _i3.Future<void>.value(),
+        returnValueForMissingStub: _i3.Future<void>.value(),
+      ) as _i3.Future<void>);
 }
 
 /// A class which mocks [LibraryService].
@@ -236,13 +231,10 @@ class MockLibraryService extends _i1.Mock implements _i6.LibraryService {
   }
 
   @override
-  _i2.Dio get dio => (super.noSuchMethod(
-        Invocation.getter(#dio),
-        returnValue: _FakeDio_0(
-          this,
-          Invocation.getter(#dio),
-        ),
-      ) as _i2.Dio);
+  _i3.Stream<bool> get propertiesChanged => (super.noSuchMethod(
+        Invocation.getter(#propertiesChanged),
+        returnValue: _i3.Stream<bool>.empty(),
+      ) as _i3.Stream<bool>);
 
   @override
   List<_i7.Audio> get likedAudios => (super.noSuchMethod(
@@ -250,12 +242,6 @@ class MockLibraryService extends _i1.Mock implements _i6.LibraryService {
         returnValue: <_i7.Audio>[],
       ) as List<_i7.Audio>);
 
-  @override
-  _i4.Stream<bool> get likedAudiosChanged => (super.noSuchMethod(
-        Invocation.getter(#likedAudiosChanged),
-        returnValue: _i4.Stream<bool>.empty(),
-      ) as _i4.Stream<bool>);
-
   @override
   Map<String, List<_i7.Audio>> get starredStations => (super.noSuchMethod(
         Invocation.getter(#starredStations),
@@ -268,72 +254,30 @@ class MockLibraryService extends _i1.Mock implements _i6.LibraryService {
         returnValue: 0,
       ) as int);
 
-  @override
-  _i4.Stream<bool> get starredStationsChanged => (super.noSuchMethod(
-        Invocation.getter(#starredStationsChanged),
-        returnValue: _i4.Stream<bool>.empty(),
-      ) as _i4.Stream<bool>);
-
   @override
   Set<String> get favRadioTags => (super.noSuchMethod(
         Invocation.getter(#favRadioTags),
         returnValue: <String>{},
       ) as Set<String>);
 
-  @override
-  _i4.Stream<bool> get favTagsChanged => (super.noSuchMethod(
-        Invocation.getter(#favTagsChanged),
-        returnValue: _i4.Stream<bool>.empty(),
-      ) as _i4.Stream<bool>);
-
-  @override
-  _i4.Stream<bool> get lastCountryCodeChanged => (super.noSuchMethod(
-        Invocation.getter(#lastCountryCodeChanged),
-        returnValue: _i4.Stream<bool>.empty(),
-      ) as _i4.Stream<bool>);
-
   @override
   Set<String> get favCountryCodes => (super.noSuchMethod(
         Invocation.getter(#favCountryCodes),
         returnValue: <String>{},
       ) as Set<String>);
 
-  @override
-  _i4.Stream<bool> get favCountriesChanged => (super.noSuchMethod(
-        Invocation.getter(#favCountriesChanged),
-        returnValue: _i4.Stream<bool>.empty(),
-      ) as _i4.Stream<bool>);
-
-  @override
-  _i4.Stream<bool> get lastLanguageCodeChanged => (super.noSuchMethod(
-        Invocation.getter(#lastLanguageCodeChanged),
-        returnValue: _i4.Stream<bool>.empty(),
-      ) as _i4.Stream<bool>);
-
   @override
   Set<String> get favLanguageCodes => (super.noSuchMethod(
         Invocation.getter(#favLanguageCodes),
         returnValue: <String>{},
       ) as Set<String>);
 
-  @override
-  _i4.Stream<bool> get favLanguagesChanged => (super.noSuchMethod(
-        Invocation.getter(#favLanguagesChanged),
-        returnValue: _i4.Stream<bool>.empty(),
-      ) as _i4.Stream<bool>);
-
   @override
   Map<String, List<_i7.Audio>> get playlists => (super.noSuchMethod(
         Invocation.getter(#playlists),
         returnValue: <String, List<_i7.Audio>>{},
       ) as Map<String, List<_i7.Audio>>);
 
-  @override
-  _i4.Stream<bool> get playlistsChanged => (super.noSuchMethod(
-        Invocation.getter(#playlistsChanged),
-        returnValue: _i4.Stream<bool>.empty(),
-      ) as _i4.Stream<bool>);
-
   @override
   Map<String, String> get downloads => (super.noSuchMethod(
         Invocation.getter(#downloads),
@@ -346,12 +290,6 @@ class MockLibraryService extends _i1.Mock implements _i6.LibraryService {
         returnValue: 0,
       ) as int);
 
-  @override
-  _i4.Stream<bool> get downloadsChanged => (super.noSuchMethod(
-        Invocation.getter(#downloadsChanged),
-        returnValue: _i4.Stream<bool>.empty(),
-      ) as _i4.Stream<bool>);
-
   @override
   Map<String, List<_i7.Audio>> get podcasts => (super.noSuchMethod(
         Invocation.getter(#podcasts),
@@ -364,24 +302,6 @@ class MockLibraryService extends _i1.Mock implements _i6.LibraryService {
         returnValue: 0,
       ) as int);
 
-  @override
-  _i4.Stream<bool> get podcastsChanged => (super.noSuchMethod(
-        Invocation.getter(#podcastsChanged),
-        returnValue: _i4.Stream<bool>.empty(),
-      ) as _i4.Stream<bool>);
-
-  @override
-  _i4.Stream<bool> get ascendingPodcastsChanged => (super.noSuchMethod(
-        Invocation.getter(#ascendingPodcastsChanged),
-        returnValue: _i4.Stream<bool>.empty(),
-      ) as _i4.Stream<bool>);
-
-  @override
-  _i4.Stream<bool> get updatesChanged => (super.noSuchMethod(
-        Invocation.getter(#updatesChanged),
-        returnValue: _i4.Stream<bool>.empty(),
-      ) as _i4.Stream<bool>);
-
   @override
   Map<String, List<_i7.Audio>> get pinnedAlbums => (super.noSuchMethod(
         Invocation.getter(#pinnedAlbums),
@@ -394,12 +314,6 @@ class MockLibraryService extends _i1.Mock implements _i6.LibraryService {
         returnValue: 0,
       ) as int);
 
-  @override
-  _i4.Stream<bool> get albumsChanged => (super.noSuchMethod(
-        Invocation.getter(#albumsChanged),
-        returnValue: _i4.Stream<bool>.empty(),
-      ) as _i4.Stream<bool>);
-
   @override
   void addLikedAudio(
     _i7.Audio? audio, [
@@ -461,14 +375,14 @@ class MockLibraryService extends _i1.Mock implements _i6.LibraryService {
 
   @override
   void addStarredStation(
-    String? url,
+    String? uuid,
     List<_i7.Audio>? audios,
   ) =>
       super.noSuchMethod(
         Invocation.method(
           #addStarredStation,
           [
-            url,
+            uuid,
             audios,
           ],
         ),
@@ -476,19 +390,19 @@ class MockLibraryService extends _i1.Mock implements _i6.LibraryService {
       );
 
   @override
-  void unStarStation(String? name) => super.noSuchMethod(
+  void unStarStation(String? uuid) => super.noSuchMethod(
         Invocation.method(
           #unStarStation,
-          [name],
+          [uuid],
         ),
         returnValueForMissingStub: null,
       );
 
   @override
-  bool isStarredStation(String? url) => (super.noSuchMethod(
+  bool isStarredStation(String? uuid) => (super.noSuchMethod(
         Invocation.method(
           #isStarredStation,
-          [url],
+          [uuid],
         ),
         returnValue: false,
       ) as bool);
@@ -593,7 +507,7 @@ class MockLibraryService extends _i1.Mock implements _i6.LibraryService {
       );
 
   @override
-  _i4.Future<void> addPlaylist(
+  _i3.Future<void> addPlaylist(
     String? id,
     List<_i7.Audio>? audios,
   ) =>
@@ -605,12 +519,12 @@ class MockLibraryService extends _i1.Mock implements _i6.LibraryService {
             audios,
           ],
         ),
-        returnValue: _i4.Future<void>.value(),
-        returnValueForMissingStub: _i4.Future<void>.value(),
-      ) as _i4.Future<void>);
+        returnValue: _i3.Future<void>.value(),
+        returnValueForMissingStub: _i3.Future<void>.value(),
+      ) as _i3.Future<void>);
 
   @override
-  _i4.Future<void> updatePlaylist(
+  _i3.Future<void> updatePlaylist(
     String? id,
     List<_i7.Audio>? audios,
   ) =>
@@ -622,9 +536,9 @@ class MockLibraryService extends _i1.Mock implements _i6.LibraryService {
             audios,
           ],
         ),
-        returnValue: _i4.Future<void>.value(),
-        returnValueForMissingStub: _i4.Future<void>.value(),
-      ) as _i4.Future<void>);
+        returnValue: _i3.Future<void>.value(),
+        returnValueForMissingStub: _i3.Future<void>.value(),
+      ) as _i3.Future<void>);
 
   @override
   void removePlaylist(String? id) => super.noSuchMethod(
@@ -756,6 +670,15 @@ class MockLibraryService extends _i1.Mock implements _i6.LibraryService {
         returnValueForMissingStub: null,
       );
 
+  @override
+  void removeAllDownloads() => super.noSuchMethod(
+        Invocation.method(
+          #removeAllDownloads,
+          [],
+        ),
+        returnValueForMissingStub: null,
+      );
+
   @override
   void addPodcast(
     String? feedUrl,
@@ -773,7 +696,7 @@ class MockLibraryService extends _i1.Mock implements _i6.LibraryService {
       );
 
   @override
-  _i4.Future<void> updatePodcast(
+  _i3.Future<void> updatePodcast(
     String? feedUrl,
     List<_i7.Audio>? audios,
   ) =>
@@ -785,9 +708,9 @@ class MockLibraryService extends _i1.Mock implements _i6.LibraryService {
             audios,
           ],
         ),
-        returnValue: _i4.Future<void>.value(),
-        returnValueForMissingStub: _i4.Future<void>.value(),
-      ) as _i4.Future<void>);
+        returnValue: _i3.Future<void>.value(),
+        returnValueForMissingStub: _i3.Future<void>.value(),
+      ) as _i3.Future<void>);
 
   @override
   bool showPodcastAscending(String? feedUrl) => (super.noSuchMethod(
@@ -799,7 +722,7 @@ class MockLibraryService extends _i1.Mock implements _i6.LibraryService {
       ) as bool);
 
   @override
-  _i4.Future<void> reorderPodcast({
+  _i3.Future<void> reorderPodcast({
     required String? feedUrl,
     required bool? ascending,
   }) =>
@@ -812,9 +735,9 @@ class MockLibraryService extends _i1.Mock implements _i6.LibraryService {
             #ascending: ascending,
           },
         ),
-        returnValue: _i4.Future<void>.value(),
-        returnValueForMissingStub: _i4.Future<void>.value(),
-      ) as _i4.Future<void>);
+        returnValue: _i3.Future<void>.value(),
+        returnValueForMissingStub: _i3.Future<void>.value(),
+      ) as _i3.Future<void>);
 
   @override
   bool podcastUpdateAvailable(String? feedUrl) => (super.noSuchMethod(
@@ -887,31 +810,31 @@ class MockLibraryService extends _i1.Mock implements _i6.LibraryService {
       );
 
   @override
-  _i4.Future<bool> init() => (super.noSuchMethod(
+  _i3.Future<bool> init() => (super.noSuchMethod(
         Invocation.method(
           #init,
           [],
         ),
-        returnValue: _i4.Future<bool>.value(false),
-      ) as _i4.Future<bool>);
+        returnValue: _i3.Future<bool>.value(false),
+      ) as _i3.Future<bool>);
 
   @override
-  _i4.Future<void> setSelectedPageId(String? value) => (super.noSuchMethod(
+  _i3.Future<void> setSelectedPageId(String? value) => (super.noSuchMethod(
         Invocation.method(
           #setSelectedPageId,
           [value],
         ),
-        returnValue: _i4.Future<void>.value(),
-        returnValueForMissingStub: _i4.Future<void>.value(),
-      ) as _i4.Future<void>);
+        returnValue: _i3.Future<void>.value(),
+        returnValueForMissingStub: _i3.Future<void>.value(),
+      ) as _i3.Future<void>);
 
   @override
-  _i4.Future<void> dispose() => (super.noSuchMethod(
+  _i3.Future<void> dispose() => (super.noSuchMethod(
         Invocation.method(
           #dispose,
           [],
         ),
-        returnValue: _i4.Future<void>.value(),
-        returnValueForMissingStub: _i4.Future<void>.value(),
-      ) as _i4.Future<void>);
+        returnValue: _i3.Future<void>.value(),
+        returnValueForMissingStub: _i3.Future<void>.value(),
+      ) as _i3.Future<void>);
 }