diff --git a/lib/app/view/master_detail_page.dart b/lib/app/view/master_detail_page.dart
index 649149ed9..956cee4e3 100644
--- a/lib/app/view/master_detail_page.dart
+++ b/lib/app/view/master_detail_page.dart
@@ -54,7 +54,7 @@ class MasterDetailPage extends StatelessWidget with WatchItMixin {
                   ? masterScaffoldKey.currentState?.closeEndDrawer
                   : masterScaffoldKey.currentState?.closeDrawer,
               icon: Icon(
-                Iconz().close,
+                Iconz.close,
               ),
             ),
           ),
@@ -198,7 +198,7 @@ List<MasterItem> createMasterItems({required LibraryModel libraryModel}) {
     MasterItem(
       titleBuilder: (context) => Text(context.l10n.search),
       pageBuilder: (_) => const SearchPage(),
-      iconBuilder: (_) => Icon(Iconz().search),
+      iconBuilder: (_) => Icon(Iconz.search),
       pageId: kSearchPageId,
     ),
     MasterItem(
@@ -226,7 +226,7 @@ List<MasterItem> createMasterItems({required LibraryModel libraryModel}) {
       pageId: kPodcastsPageId,
     ),
     MasterItem(
-      iconBuilder: (selected) => Icon(Iconz().plus),
+      iconBuilder: (selected) => Icon(Iconz.plus),
       titleBuilder: (context) => Text(context.l10n.add),
       pageBuilder: (_) => const SizedBox.shrink(),
       pageId: kNewPlaylistPageId,
@@ -247,7 +247,7 @@ List<MasterItem> createMasterItems({required LibraryModel libraryModel}) {
         iconBuilder: (selected) => SideBarFallBackImage(
           color: getAlphabetColor(playlist.key),
           child: Icon(
-            Iconz().playlist,
+            Iconz.playlist,
           ),
         ),
       ),
diff --git a/lib/app/view/master_tile.dart b/lib/app/view/master_tile.dart
index 498a95e9d..9791271be 100644
--- a/lib/app/view/master_tile.dart
+++ b/lib/app/view/master_tile.dart
@@ -162,9 +162,7 @@ class __PlayAbleMasterTileState extends State<_PlayAbleMasterTile> {
                 child: IconButton(
                   onPressed: onPlay,
                   icon: Icon(
-                    isPlaying && isEnQueued
-                        ? Iconz().pause
-                        : Iconz().playFilled,
+                    isPlaying && isEnQueued ? Iconz.pause : Iconz.playFilled,
                     size: kTinyButtonIconSize,
                     color: context.t.colorScheme.primary,
                   ),
diff --git a/lib/app/view/splash_screen.dart b/lib/app/view/splash_screen.dart
index 30b0176a8..fa0eeb3e8 100644
--- a/lib/app/view/splash_screen.dart
+++ b/lib/app/view/splash_screen.dart
@@ -29,7 +29,7 @@ class SplashScreen extends StatelessWidget {
                     borderRadius: BorderRadius.circular(30),
                   ),
                   child: Icon(
-                    Iconz().musicNote,
+                    Iconz.musicNote,
                     size: 150,
                     color: Colors.white,
                   ),
diff --git a/lib/common/data/audio.dart b/lib/common/data/audio.dart
index 5f4e434cd..5fa997e86 100644
--- a/lib/common/data/audio.dart
+++ b/lib/common/data/audio.dart
@@ -39,7 +39,7 @@ class Audio {
   /// The artist(s) of the audio file or stream, for radio stations this is the language.
   final String? artist;
 
-  /// The album of the audio file or stream.
+  /// The album of the audio file or stream, for radio stations these are the tags.
   final String? album;
 
   /// The album artist(s) of the audio file or stream, for radio stations this is the codec.
@@ -264,7 +264,7 @@ class Audio {
       if (other.audioType != null &&
           other.audioType == AudioType.radio &&
           audioType == AudioType.radio) {
-        return other.description == description;
+        return other.uuid == uuid;
       }
 
       return (other.url != null && other.url == url) ||
@@ -275,7 +275,7 @@ class Audio {
   }
 
   @override
-  int get hashCode => path.hashCode ^ url.hashCode ^ description.hashCode;
+  int get hashCode => path.hashCode ^ url.hashCode ^ uuid.hashCode;
 
   factory Audio.fromMetadata({
     required String path,
@@ -311,12 +311,19 @@ class Audio {
   }
 
   String? get uuid => description;
-  String? get language => artist;
+  String get language => artist ?? '';
+  int get clicks => discTotal ?? 0;
+  int get bitRate => fileSize ?? 0;
+  List<String>? get tags => album?.isNotEmpty == false
+      ? null
+      : <String>[
+          for (final tag in album?.split(',') ?? <String>[]) tag,
+        ];
 
   factory Audio.fromStation(Station station) {
     return Audio(
       url: station.urlResolved,
-      title: station.name,
+      title: station.name.trim(),
       artist: station.language,
       album: station.tags ?? '',
       audioType: AudioType.radio,
@@ -325,6 +332,7 @@ class Audio {
       description: station.stationUUID,
       fileSize: station.bitrate,
       albumArtist: station.codec,
+      discTotal: station.clickCount,
     );
   }
 
@@ -360,12 +368,6 @@ class Audio {
     return id;
   }
 
-  List<String>? get tags => album?.isNotEmpty == false
-      ? null
-      : <String>[
-          for (final tag in album?.split(',') ?? <String>[]) tag,
-        ];
-
   bool get hasPathAndId =>
       albumId?.isNotEmpty == true &&
       path != null &&
diff --git a/lib/common/view/animated_like_icon.dart b/lib/common/view/animated_like_icon.dart
new file mode 100644
index 000000000..6ae8c10cd
--- /dev/null
+++ b/lib/common/view/animated_like_icon.dart
@@ -0,0 +1,67 @@
+import 'icons.dart';
+import 'package:flutter/material.dart';
+import 'package:yaru/yaru.dart';
+import 'theme.dart';
+
+class AnimatedStar extends StatelessWidget {
+  const AnimatedStar({
+    super.key,
+    required this.isStarred,
+    this.color,
+  });
+
+  final bool isStarred;
+  final Color? color;
+
+  @override
+  Widget build(BuildContext context) {
+    if (yaruStyled) {
+      return YaruAnimatedVectorIcon(
+        isStarred ? YaruAnimatedIcons.star_filled : YaruAnimatedIcons.star,
+        initialProgress: 1.0,
+        color: color,
+        size: iconSize,
+      );
+    } else {
+      return isStarred
+          ? Icon(
+              Iconz.starFilled,
+              size: iconSize,
+              color: isStarred ? color : null,
+            )
+          : Icon(
+              Iconz.star,
+              size: iconSize,
+              color: isStarred ? color : null,
+            );
+    }
+  }
+}
+
+class AnimatedHeart extends StatelessWidget {
+  const AnimatedHeart({
+    super.key,
+    required this.liked,
+    this.color,
+  });
+
+  final bool liked;
+  final Color? color;
+
+  @override
+  Widget build(BuildContext context) {
+    if (yaruStyled) {
+      return YaruAnimatedVectorIcon(
+        liked ? YaruAnimatedIcons.heart_filled : YaruAnimatedIcons.heart,
+        initialProgress: 1.0,
+        color: color,
+        size: iconSize,
+      );
+    } else {
+      return Icon(
+        liked ? Icons.favorite : Icons.favorite_outline,
+        color: color,
+      );
+    }
+  }
+}
diff --git a/lib/common/view/audio_card.dart b/lib/common/view/audio_card.dart
index eb44bea65..104ecb754 100644
--- a/lib/common/view/audio_card.dart
+++ b/lib/common/view/audio_card.dart
@@ -83,7 +83,7 @@ class _AudioCardState extends State<AudioCard> {
                               ? const EdgeInsets.only(left: 3)
                               : EdgeInsets.zero,
                           child: Icon(
-                            Iconz().playFilled,
+                            Iconz.playFilled,
                             color: contrastColor(theme.colorScheme.primary),
                           ),
                         ),
diff --git a/lib/common/view/audio_tile.dart b/lib/common/view/audio_tile.dart
index 3fe668735..58e9879fe 100644
--- a/lib/common/view/audio_tile.dart
+++ b/lib/common/view/audio_tile.dart
@@ -54,6 +54,7 @@ class _AudioTileState extends State<AudioTile> {
   @override
   Widget build(BuildContext context) {
     final theme = context.t;
+    final l10n = context.l10n;
     final playerModel = di<PlayerModel>();
     final liked = watchPropertyValue((LibraryModel m) => m.liked(widget.audio));
     final starred = watchPropertyValue(
@@ -61,10 +62,9 @@ class _AudioTileState extends State<AudioTile> {
     );
     final selectedColor = widget.selectedColor ?? theme.contrastyPrimary;
     final subTitle = switch (widget.audioPageType) {
-      AudioPageType.artist => widget.audio.album ?? context.l10n.unknown,
-      AudioPageType.radioSearch =>
-        '${widget.audio.artist ?? context.l10n.unknown}, ${widget.audio.albumArtist ?? ''}, ${widget.audio.fileSize ?? ''} kbps',
-      _ => widget.audio.artist ?? context.l10n.unknown,
+      AudioPageType.artist => widget.audio.album ?? l10n.unknown,
+      AudioPageType.radioSearch => _buildRadioSubTitle(widget.audio, l10n),
+      _ => widget.audio.artist ?? l10n.unknown,
     };
 
     var leading = !widget.showLeading
@@ -112,7 +112,7 @@ class _AudioTileState extends State<AudioTile> {
         title: Padding(
           padding: const EdgeInsets.only(right: kYaruPagePadding),
           child: Text(
-            widget.audio.title ?? context.l10n.unknown,
+            widget.audio.title ?? l10n.unknown,
             overflow: TextOverflow.ellipsis,
             maxLines: 1,
           ),
@@ -137,6 +137,12 @@ class _AudioTileState extends State<AudioTile> {
       ),
     );
   }
+
+  String _buildRadioSubTitle(
+    Audio audio,
+    AppLocalizations l10n,
+  ) =>
+      '${audio.albumArtist?.isNotEmpty == true ? '${audio.albumArtist}' : ''}${audio.bitRate > 0 ? ' • ${audio.fileSize} kbps' : ''}${audio.clicks > 0 ? ' • ${audio.clicks} ${l10n.clicks}' : ''}${audio.language.trim().isNotEmpty ? ' • ${audio.language}' : ''}';
 }
 
 class _AudioTileTrail extends StatelessWidget with WatchItMixin {
diff --git a/lib/common/view/audio_tile_image.dart b/lib/common/view/audio_tile_image.dart
index c69e4a610..8452a32d7 100644
--- a/lib/common/view/audio_tile_image.dart
+++ b/lib/common/view/audio_tile_image.dart
@@ -19,9 +19,9 @@ class AudioTileImage extends StatelessWidget {
   Widget build(BuildContext context) {
     final icon = Icon(
       switch (audio?.audioType) {
-        AudioType.radio => Iconz().radio,
-        AudioType.podcast => Iconz().podcast,
-        _ => Iconz().musicNote,
+        AudioType.radio => Iconz.radio,
+        AudioType.podcast => Iconz.podcast,
+        _ => Iconz.musicNote,
       },
       size: size / (1.65),
     );
diff --git a/lib/common/view/audio_tile_option_button.dart b/lib/common/view/audio_tile_option_button.dart
index 388a47e98..0b54892d7 100644
--- a/lib/common/view/audio_tile_option_button.dart
+++ b/lib/common/view/audio_tile_option_button.dart
@@ -51,7 +51,7 @@ class AudioTileOptionButton extends StatelessWidget {
                 );
               },
               child: YaruTile(
-                leading: Icon(Iconz().insertIntoQueue),
+                leading: Icon(Iconz.insertIntoQueue),
                 title: Text(context.l10n.playNext),
               ),
             ),
@@ -61,7 +61,7 @@ class AudioTileOptionButton extends StatelessWidget {
                 onTap: () =>
                     libraryModel.removeAudioFromPlaylist(playlistId, audio),
                 child: YaruTile(
-                  leading: Icon(Iconz().remove),
+                  leading: Icon(Iconz.remove),
                   title: Text('${context.l10n.removeFrom} $playlistId'),
                 ),
               ),
@@ -77,7 +77,7 @@ class AudioTileOptionButton extends StatelessWidget {
                 },
               ),
               child: YaruTile(
-                leading: Icon(Iconz().plus),
+                leading: Icon(Iconz.plus),
                 title: Text(
                   '${context.l10n.addToPlaylist} ...',
                 ),
@@ -91,7 +91,7 @@ class AudioTileOptionButton extends StatelessWidget {
               },
             ),
             child: YaruTile(
-              leading: Icon(Iconz().info),
+              leading: Icon(Iconz.info),
               title: Text(
                 '${context.l10n.showMetaData} ...',
               ),
@@ -117,7 +117,7 @@ class AudioTileOptionButton extends StatelessWidget {
             ),
         ];
       },
-      icon: Icon(Iconz().viewMore),
+      icon: Icon(Iconz.viewMore),
     );
   }
 }
@@ -129,39 +129,44 @@ class MetaDataDialog extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
+    final radio = audio.audioType == AudioType.radio;
+
     final items = <(String, String)>{
       (
-        context.l10n.title,
+        radio ? context.l10n.stationName : context.l10n.title,
         '${audio.title}',
       ),
       (
-        context.l10n.album,
-        '${audio.album}',
+        radio ? context.l10n.tags : context.l10n.album,
+        '${radio ? audio.album?.replaceAll(',', ', ') : audio.album}',
       ),
       (
-        context.l10n.artist,
-        '${audio.artist}',
+        radio ? context.l10n.language : context.l10n.artist,
+        '${radio ? audio.language : audio.artist}',
       ),
       (
-        context.l10n.albumArtists,
+        radio ? context.l10n.quality : context.l10n.albumArtists,
         '${audio.albumArtist}',
       ),
+      if (!radio)
+        (
+          context.l10n.trackNumber,
+          '${audio.trackNumber}',
+        ),
+      if (!radio)
+        (
+          context.l10n.diskNumber,
+          '${audio.discNumber}',
+        ),
       (
-        context.l10n.trackNumber,
-        '${audio.trackNumber}',
-      ),
-      (
-        context.l10n.diskNumber,
-        '${audio.discNumber}',
-      ),
-      (
-        context.l10n.totalDisks,
-        '${audio.discTotal}',
-      ),
-      (
-        context.l10n.genre,
-        '${audio.genre}',
+        radio ? context.l10n.clicks : context.l10n.totalDisks,
+        '${radio ? audio.clicks : audio.discTotal}',
       ),
+      if (!radio)
+        (
+          context.l10n.genre,
+          '${audio.genre}',
+        ),
       (
         context.l10n.url,
         (audio.url ?? ''),
diff --git a/lib/common/view/avatar_play_button.dart b/lib/common/view/avatar_play_button.dart
index 91c2994cc..36b78ae63 100644
--- a/lib/common/view/avatar_play_button.dart
+++ b/lib/common/view/avatar_play_button.dart
@@ -27,7 +27,7 @@ class AvatarPlayButton extends StatelessWidget with WatchItMixin {
       (PlayerModel m) => m.queueName != null && m.queueName == pageId,
     );
     final iconData =
-        isPlayerPlaying && pageIsQueue ? Iconz().pause : Iconz().playFilled;
+        isPlayerPlaying && pageIsQueue ? Iconz.pause : Iconz.playFilled;
 
     return Padding(
       padding: bigPlayButtonPadding,
diff --git a/lib/common/view/back_gesture.dart b/lib/common/view/back_gesture.dart
index 9d448c1e6..b035c70f0 100644
--- a/lib/common/view/back_gesture.dart
+++ b/lib/common/view/back_gesture.dart
@@ -128,7 +128,7 @@ class _BackGestureState extends State<BackGesture>
                                     BorderRadius.circular(_kButtonSize),
                               ),
                             ),
-                            child: Icon(Iconz().goBack),
+                            child: Icon(Iconz.goBack),
                           ),
                         ),
                       ),
diff --git a/lib/common/view/country_auto_complete.dart b/lib/common/view/country_auto_complete.dart
index 1bbdb95a4..675efd5d4 100644
--- a/lib/common/view/country_auto_complete.dart
+++ b/lib/common/view/country_auto_complete.dart
@@ -239,7 +239,7 @@ class _CountryTile extends StatelessWidget {
           favs?.contains(t.code) == false ? addFav(t) : removeFav(t);
         },
         icon: Icon(
-          favs?.contains(t.code) == true ? Iconz().starFilled : Iconz().star,
+          favs?.contains(t.code) == true ? Iconz.starFilled : Iconz.star,
         ),
       ),
     );
diff --git a/lib/common/view/explore_online_popup.dart b/lib/common/view/explore_online_popup.dart
index 0d55c1ca9..ffbacb17c 100644
--- a/lib/common/view/explore_online_popup.dart
+++ b/lib/common/view/explore_online_popup.dart
@@ -32,7 +32,7 @@ class ExploreOnlinePopup extends StatelessWidget with WatchItMixin {
           ),
         ),
       ],
-      icon: Icon(Iconz().explore),
+      icon: Icon(Iconz.explore),
     );
   }
 }
diff --git a/lib/common/view/header_bar.dart b/lib/common/view/header_bar.dart
index 068cc3bb1..66a20a18c 100644
--- a/lib/common/view/header_bar.dart
+++ b/lib/common/view/header_bar.dart
@@ -204,10 +204,10 @@ class SidebarButton extends StatelessWidget {
             masterScaffoldKey.currentState?.openDrawer();
           }
         },
-        icon: Iconz().sidebar == Iconz().materialSidebar
-            ? Transform.flip(flipX: true, child: Icon(Iconz().materialSidebar))
+        icon: Iconz.sidebar == Iconz.materialSidebar
+            ? Transform.flip(flipX: true, child: Icon(Iconz.materialSidebar))
             : Icon(
-                Iconz().sidebar,
+                Iconz.sidebar,
                 size: iconSize,
               ),
       ),
diff --git a/lib/common/view/icons.dart b/lib/common/view/icons.dart
index 81c1fefe6..4b8001592 100644
--- a/lib/common/view/icons.dart
+++ b/lib/common/view/icons.dart
@@ -1,18 +1,17 @@
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter_tabler_icons/flutter_tabler_icons.dart';
 import 'package:yaru/yaru.dart';
 
-import '../../extensions/build_context_x.dart';
 import 'theme.dart';
 
 class Iconz {
-  static final Iconz _instance = Iconz._internal();
-  factory Iconz() => _instance;
-
-  Iconz._internal();
+  static IconData get warning => yaruStyled
+      ? YaruIcons.warning_filled
+      : appleStyled
+          ? CupertinoIcons.exclamationmark_triangle_fill
+          : Icons.warning_rounded;
 
-  IconData get menu {
+  static IconData get menu {
     return yaruStyled
         ? YaruIcons.menu
         : appleStyled
@@ -20,9 +19,9 @@ class Iconz {
             : Icons.menu_rounded;
   }
 
-  IconData get materialSidebar => Icons.view_sidebar_rounded;
+  static IconData get materialSidebar => Icons.view_sidebar_rounded;
 
-  IconData get sidebar {
+  static IconData get sidebar {
     return yaruStyled
         ? YaruIcons.sidebar
         : appleStyled
@@ -30,7 +29,7 @@ class Iconz {
             : materialSidebar;
   }
 
-  IconData get updateAvailable {
+  static IconData get updateAvailable {
     return yaruStyled
         ? YaruIcons.update_available
         : appleStyled
@@ -38,7 +37,7 @@ class Iconz {
             : Icons.arrow_circle_up_rounded;
   }
 
-  IconData get remove {
+  static IconData get remove {
     return yaruStyled
         ? YaruIcons.minus
         : appleStyled
@@ -46,84 +45,84 @@ class Iconz {
             : Icons.remove_rounded;
   }
 
-  IconData get check => yaruStyled
+  static IconData get check => yaruStyled
       ? YaruIcons.checkmark
       : appleStyled
           ? CupertinoIcons.check_mark
           : Icons.check_rounded;
-  IconData get musicNote => yaruStyled
+  static IconData get musicNote => yaruStyled
       ? YaruIcons.music_note
       : appleStyled
           ? CupertinoIcons.double_music_note
           : Icons.music_note_rounded;
-  IconData get external => yaruStyled
+  static IconData get external => yaruStyled
       ? YaruIcons.external_link
       : appleStyled
           ? CupertinoIcons.link
           : Icons.link_rounded;
-  IconData get starFilled => yaruStyled
+  static IconData get starFilled => yaruStyled
       ? YaruIcons.star_filled
       : appleStyled
           ? CupertinoIcons.star_fill
           : Icons.star_rounded;
-  IconData get star => yaruStyled
+  static IconData get star => yaruStyled
       ? YaruIcons.star
       : appleStyled
           ? CupertinoIcons.star
           : Icons.star_outline_rounded;
-  IconData get offline => yaruStyled
+  static IconData get offline => yaruStyled
       ? YaruIcons.network_offline
       : appleStyled
           ? CupertinoIcons.wifi_slash
           : Icons.offline_bolt_rounded;
-  IconData get cloud => yaruStyled
+  static IconData get cloud => yaruStyled
       ? YaruIcons.cloud
       : appleStyled
           ? CupertinoIcons.cloud
           : Icons.cloud_outlined;
-  IconData get pause => yaruStyled
+  static IconData get pause => yaruStyled
       ? YaruIcons.media_pause
       : appleStyled
           ? CupertinoIcons.pause
           : Icons.pause_rounded;
 
-  IconData get playFilled => yaruStyled
+  static IconData get playFilled => yaruStyled
       ? YaruIcons.media_play
       : appleStyled
           ? CupertinoIcons.play_fill
           : Icons.play_arrow_rounded;
-  IconData get download => yaruStyled
+  static IconData get download => yaruStyled
       ? YaruIcons.download
       : appleStyled
           ? CupertinoIcons.down_arrow
           : Icons.download_outlined;
-  IconData get downloadFilled => yaruStyled
+  static IconData get downloadFilled => yaruStyled
       ? YaruIcons.download_filled
       : appleStyled
           ? CupertinoIcons.down_arrow
           : Icons.download_rounded;
-  IconData get podcast => yaruStyled
+  static IconData get podcast => yaruStyled
       ? YaruIcons.podcast
       : appleStyled
           ? CupertinoIcons.mic
           : Icons.podcasts_outlined;
-  IconData get podcastFilled => yaruStyled
+  static IconData get podcastFilled => yaruStyled
       ? YaruIcons.podcast_filled
       : appleStyled
           ? CupertinoIcons.mic_fill
           : Icons.podcasts_rounded;
-  IconData get radio => yaruStyled
+  static IconData get radio => yaruStyled
       ? YaruIcons.radio
       : appleStyled
           ? CupertinoIcons.antenna_radiowaves_left_right
           : Icons.radio_outlined;
-  IconData get radioFilled => yaruStyled
+  static IconData get radioFilled => yaruStyled
       ? YaruIcons.radio_filled
       : appleStyled
           ? CupertinoIcons.antenna_radiowaves_left_right
           : Icons.radio_rounded;
 
-  IconData get localAudio {
+  static IconData get localAudio {
     if (appleStyled) {
       if (isMobile) {
         return CupertinoIcons.device_phone_portrait;
@@ -137,7 +136,7 @@ class Iconz {
             : Icons.computer_rounded;
   }
 
-  IconData get localAudioFilled {
+  static IconData get localAudioFilled {
     if (appleStyled) {
       if (isMobile) {
         return CupertinoIcons.device_phone_portrait;
@@ -151,7 +150,7 @@ class Iconz {
             : Icons.computer_rounded;
   }
 
-  IconData get copy {
+  static IconData get copy {
     return yaruStyled
         ? YaruIcons.copy
         : appleStyled
@@ -159,7 +158,7 @@ class Iconz {
             : Icons.copy_rounded;
   }
 
-  IconData get explore {
+  static IconData get explore {
     return yaruStyled
         ? YaruIcons.compass
         : appleStyled
@@ -167,7 +166,7 @@ class Iconz {
             : Icons.explore_rounded;
   }
 
-  IconData get drag {
+  static IconData get drag {
     if (appleStyled) {
       return CupertinoIcons.move;
     }
@@ -177,193 +176,193 @@ class Iconz {
     return Icons.drag_handle_rounded;
   }
 
-  IconData get settings => yaruStyled
+  static IconData get settings => yaruStyled
       ? YaruIcons.settings
       : appleStyled
           ? CupertinoIcons.settings
           : Icons.settings_rounded;
 
-  IconData get addToLibrary => yaruStyled
+  static IconData get addToLibrary => yaruStyled
       ? YaruIcons.bell
       : appleStyled
           ? CupertinoIcons.bell
           : Icons.notifications_outlined;
-  IconData get removeFromLibrary => yaruStyled
+  static IconData get removeFromLibrary => yaruStyled
       ? YaruIcons.bell_filled
       : appleStyled
           ? CupertinoIcons.bell_fill
           : Icons.notifications_rounded;
-  IconData get refresh => yaruStyled
+  static IconData get refresh => yaruStyled
       ? YaruIcons.refresh
       : appleStyled
           ? CupertinoIcons.refresh
           : Icons.refresh_rounded;
-  IconData get replay => yaruStyled
+  static IconData get replay => yaruStyled
       ? YaruIcons.history
       : appleStyled
           ? CupertinoIcons.clock
           : Icons.history_rounded;
-  IconData get speakerLowFilled => yaruStyled
+  static IconData get speakerLowFilled => yaruStyled
       ? YaruIcons.speaker_low_filled
       : appleStyled
           ? CupertinoIcons.volume_off
           : Icons.volume_down_rounded;
-  IconData get speakerMediumFilled => yaruStyled
+  static IconData get speakerMediumFilled => yaruStyled
       ? YaruIcons.speaker_medium_filled
       : appleStyled
           ? CupertinoIcons.volume_down
           : Icons.volume_down_rounded;
-  IconData get speakerHighFilled => yaruStyled
+  static IconData get speakerHighFilled => yaruStyled
       ? YaruIcons.speaker_high_filled
       : appleStyled
           ? CupertinoIcons.volume_up
           : Icons.volume_up_rounded;
-  IconData get speakerMutedFilled => yaruStyled
+  static IconData get speakerMutedFilled => yaruStyled
       ? YaruIcons.speaker_muted_filled
       : appleStyled
           ? CupertinoIcons.volume_off
           : Icons.volume_off_rounded;
-  IconData get fullWindowExit => yaruStyled
+  static IconData get fullWindowExit => yaruStyled
       ? YaruIcons.arrow_down
       : appleStyled
           ? CupertinoIcons.arrow_down
           : Icons.arrow_downward_rounded;
-  IconData get fullWindow => yaruStyled
+  static IconData get fullWindow => yaruStyled
       ? YaruIcons.arrow_up
       : appleStyled
           ? CupertinoIcons.arrow_up
           : Icons.arrow_upward_rounded;
-  IconData get fullScreenExit => yaruStyled
+  static IconData get fullScreenExit => yaruStyled
       ? YaruIcons.fullscreen_exit
       : appleStyled
           ? CupertinoIcons.fullscreen_exit
           : Icons.fullscreen_exit_rounded;
-  IconData get fullScreen => yaruStyled
+  static IconData get fullScreen => yaruStyled
       ? YaruIcons.fullscreen
       : appleStyled
           ? CupertinoIcons.fullscreen
           : Icons.fullscreen_rounded;
-  IconData get repeatSingle => yaruStyled
+  static IconData get repeatSingle => yaruStyled
       ? YaruIcons.repeat_single
       : appleStyled
           ? CupertinoIcons.repeat_1
           : Icons.repeat_one_rounded;
-  IconData get shuffle => yaruStyled
+  static IconData get shuffle => yaruStyled
       ? YaruIcons.shuffle
       : appleStyled
           ? CupertinoIcons.shuffle
           : Icons.shuffle_rounded;
-  IconData get levelMiddle => yaruStyled
+  static IconData get levelMiddle => yaruStyled
       ? YaruIcons.meter_middle
       : appleStyled
           ? CupertinoIcons.speedometer
           : Icons.speed_rounded;
-  IconData get levelHigh => yaruStyled
+  static IconData get levelHigh => yaruStyled
       ? YaruIcons.meter_three_quarter
       : appleStyled
           ? CupertinoIcons.speedometer
           : Icons.speed_rounded;
-  IconData get levelLow => yaruStyled
+  static IconData get levelLow => yaruStyled
       ? YaruIcons.meter_quarter
       : appleStyled
           ? CupertinoIcons.speedometer
           : Icons.speed_rounded;
-  IconData get skipBackward => yaruStyled
+  static IconData get skipBackward => yaruStyled
       ? YaruIcons.skip_backward
       : appleStyled
           ? CupertinoIcons.backward_end
           : Icons.skip_previous_rounded;
-  IconData get skipForward => yaruStyled
+  static IconData get skipForward => yaruStyled
       ? YaruIcons.skip_forward
       : appleStyled
           ? CupertinoIcons.forward_end
           : Icons.skip_next_rounded;
-  IconData get goBack => yaruStyled
+  static IconData get goBack => yaruStyled
       ? YaruIcons.go_previous
       : appleStyled
           ? CupertinoIcons.back
           : Icons.arrow_back_rounded;
-  IconData get goNext => yaruStyled
+  static IconData get goNext => yaruStyled
       ? YaruIcons.go_next
       : appleStyled
           ? CupertinoIcons.forward
           : Icons.arrow_forward_rounded;
-  IconData get forward30 => yaruStyled
+  static IconData get forward30 => yaruStyled
       ? YaruIcons.redo
       : appleStyled
           ? CupertinoIcons.goforward_30
           : Icons.forward_30_rounded;
-  IconData get backward10 => yaruStyled
+  static IconData get backward10 => yaruStyled
       ? YaruIcons.undo
       : appleStyled
           ? CupertinoIcons.gobackward_10
           : Icons.replay_10_rounded;
-  IconData get goUp => yaruStyled
+  static IconData get goUp => yaruStyled
       ? YaruIcons.go_up
       : appleStyled
           ? CupertinoIcons.up_arrow
           : Icons.arrow_upward_rounded;
-  IconData get share => yaruStyled
+  static IconData get share => yaruStyled
       ? YaruIcons.share
       : appleStyled
           ? CupertinoIcons.share
           : Icons.share;
-  IconData get startPlayList => yaruStyled
+  static IconData get startPlayList => yaruStyled
       ? YaruIcons.playlist_play
       : appleStyled
           ? CupertinoIcons.play_circle
           : Icons.playlist_play_rounded;
-  IconData get playlist => yaruStyled
+  static IconData get playlist => yaruStyled
       ? YaruIcons.playlist
       : appleStyled
           ? CupertinoIcons.music_note_list
           : Icons.list_rounded;
-  IconData get pen => yaruStyled
+  static IconData get pen => yaruStyled
       ? YaruIcons.pen
       : appleStyled
           ? CupertinoIcons.pen
           : Icons.edit_rounded;
-  IconData get pin => yaruStyled
+  static IconData get pin => yaruStyled
       ? YaruIcons.pin
       : appleStyled
           ? CupertinoIcons.pin
           : Icons.push_pin_outlined;
-  IconData get pinFilled => yaruStyled
+  static IconData get pinFilled => yaruStyled
       ? YaruIcons.pin
       : appleStyled
           ? CupertinoIcons.pin_fill
           : Icons.push_pin_rounded;
-  IconData get heart => yaruStyled
+  static IconData get heart => yaruStyled
       ? YaruIcons.heart
       : appleStyled
           ? CupertinoIcons.heart
           : Icons.favorite_outline_rounded;
-  IconData get heartFilled => yaruStyled
+  static IconData get heartFilled => yaruStyled
       ? YaruIcons.heart_filled
       : appleStyled
           ? CupertinoIcons.heart_fill
           : Icons.favorite_rounded;
-  IconData get globe => yaruStyled
+  static IconData get globe => yaruStyled
       ? YaruIcons.globe
       : appleStyled
           ? CupertinoIcons.globe
           : Icons.link_rounded;
-  IconData get imageMissing => yaruStyled
+  static IconData get imageMissing => yaruStyled
       ? YaruIcons.image_missing
       : appleStyled
           ? CupertinoIcons.question_diamond
           : Icons.image_not_supported_outlined;
-  IconData get imageMissingFilled => yaruStyled
+  static IconData get imageMissingFilled => yaruStyled
       ? YaruIcons.image_missing_filled
       : appleStyled
           ? CupertinoIcons.question_diamond_fill
           : Icons.image_not_supported_rounded;
-  IconData get plus => yaruStyled
+  static IconData get plus => yaruStyled
       ? YaruIcons.plus
       : appleStyled
           ? CupertinoIcons.plus
           : Icons.add_rounded;
-  IconData get search => yaruStyled
+  static IconData get search => yaruStyled
       ? YaruIcons.search
       : appleStyled
           ? CupertinoIcons.search
@@ -373,150 +372,61 @@ class Iconz {
       : appleStyled
           ? CupertinoIcons.clear
           : Icons.clear_rounded;
-  IconData get viewMore => yaruStyled
+  static IconData get viewMore => yaruStyled
       ? YaruIcons.view_more
       : appleStyled
           ? CupertinoIcons.ellipsis_vertical
           : Icons.more_vert_rounded;
-  IconData? get close => yaruStyled
+  static IconData get close => yaruStyled
       ? YaruIcons.window_close
       : appleStyled
           ? CupertinoIcons.clear
           : Icons.clear_rounded;
-  IconData get list => yaruStyled
+  static IconData get list => yaruStyled
       ? YaruIcons.unordered_list
       : appleStyled
           ? CupertinoIcons.list_bullet
           : Icons.list_rounded;
-  IconData get grid => yaruStyled
+  static IconData get grid => yaruStyled
       ? YaruIcons.app_grid
       : appleStyled
           ? CupertinoIcons.square_grid_3x2_fill
           : Icons.grid_on_rounded;
-  IconData get move => yaruStyled
+  static IconData get move => yaruStyled
       ? YaruIcons.ordered_list
       : appleStyled
           ? CupertinoIcons.move
           : Icons.move_down_rounded;
-  IconData get materialAscending => Icons.sort_rounded;
-  IconData get ascending => yaruStyled
+  static IconData get materialAscending => Icons.sort_rounded;
+  static IconData get ascending => yaruStyled
       ? YaruIcons.sort_ascending
       : appleStyled
           ? CupertinoIcons.sort_up
           : materialAscending;
-  IconData get descending => yaruStyled
+  static IconData get descending => yaruStyled
       ? YaruIcons.sort_descending
       : appleStyled
           ? CupertinoIcons.sort_down
           : Icons.sort_rounded;
-  IconData get info => yaruStyled
+  static IconData get info => yaruStyled
       ? YaruIcons.information
       : appleStyled
           ? CupertinoIcons.info
           : Icons.info_rounded;
-  IconData get clearAll => yaruStyled
+  static IconData get clearAll => yaruStyled
       ? YaruIcons.edit_clear_all
       : appleStyled
           ? CupertinoIcons.paintbrush
           : Icons.cleaning_services_rounded;
 
-  IconData get insertIntoQueue => yaruStyled
+  static IconData get insertIntoQueue => yaruStyled
       ? YaruIcons.music_queue
       : appleStyled
           ? CupertinoIcons.plus_app
           : Icons.queue_rounded;
-  IconData get sleep => yaruStyled
+  static IconData get sleep => yaruStyled
       ? YaruIcons.clear_night
       : appleStyled
           ? CupertinoIcons.moon
           : Icons.mode_night_rounded;
-
-  Widget getAnimatedStar(bool isStarred, [Color? color]) {
-    if (yaruStyled) {
-      return YaruAnimatedVectorIcon(
-        isStarred ? YaruAnimatedIcons.star_filled : YaruAnimatedIcons.star,
-        initialProgress: 1.0,
-        color: color,
-        size: iconSize,
-      );
-    } else {
-      return isStarred
-          ? Icon(
-              Iconz().starFilled,
-              size: iconSize,
-              color: isStarred ? color : null,
-            )
-          : Icon(
-              Iconz().star,
-              size: iconSize,
-              color: isStarred ? color : null,
-            );
-    }
-  }
-
-  Widget getAnimatedHeartIcon({required bool liked, Color? color}) {
-    if (yaruStyled) {
-      return YaruAnimatedVectorIcon(
-        liked ? YaruAnimatedIcons.heart_filled : YaruAnimatedIcons.heart,
-        initialProgress: 1.0,
-        color: color,
-        size: iconSize,
-      );
-    } else {
-      return Icon(
-        liked ? Icons.favorite : Icons.favorite_outline,
-        color: color,
-      );
-    }
-  }
-}
-
-double get sideBarImageSize => 38;
-
-double get iconSize => yaruStyled
-    ? kYaruIconSize
-    : isMobile
-        ? 24.0
-        : 20.0;
-
-IconData getIconForTag(String tag) {
-  final tagsToIcons = <String, IconData>{
-    'metal': TablerIcons.guitar_pick,
-    'pop': TablerIcons.diamond,
-  };
-
-  return tagsToIcons[tag] ??
-      (yaruStyled
-          ? YaruIcons.music_note
-          : appleStyled
-              ? CupertinoIcons.double_music_note
-              : Icons.music_note);
-}
-
-class DisconnectedServerIcon extends StatelessWidget {
-  const DisconnectedServerIcon({super.key});
-
-  @override
-  Widget build(BuildContext context) {
-    final theme = context.t;
-
-    return Stack(
-      alignment: Alignment.center,
-      children: [
-        Icon(
-          Iconz().cloud,
-          color: theme.disabledColor,
-        ),
-        Positioned(
-          bottom: -2,
-          right: -2,
-          child: Icon(
-            Iconz().close,
-            color: theme.colorScheme.error,
-            size: 16,
-          ),
-        ),
-      ],
-    );
-  }
 }
diff --git a/lib/common/view/language_autocomplete.dart b/lib/common/view/language_autocomplete.dart
index 279fb1a01..5d3a9b18f 100644
--- a/lib/common/view/language_autocomplete.dart
+++ b/lib/common/view/language_autocomplete.dart
@@ -231,7 +231,7 @@ class _LanguageTile extends StatelessWidget {
           favs?.contains(t.isoCode) == false ? addFav(t) : removeFav(t);
         },
         icon: Icon(
-          favs?.contains(t.isoCode) == true ? Iconz().starFilled : Iconz().star,
+          favs?.contains(t.isoCode) == true ? Iconz.starFilled : Iconz.star,
         ),
       ),
     );
diff --git a/lib/common/view/like_all_icon.dart b/lib/common/view/like_all_icon.dart
index 14195b3aa..d9ff631b9 100644
--- a/lib/common/view/like_all_icon.dart
+++ b/lib/common/view/like_all_icon.dart
@@ -1,9 +1,10 @@
-import '../../library/library_model.dart';
-import '../data/audio.dart';
-import 'icons.dart';
 import 'package:flutter/material.dart';
 import 'package:watch_it/watch_it.dart';
 
+import '../../library/library_model.dart';
+import '../data/audio.dart';
+import 'animated_like_icon.dart';
+
 class LikeAllIcon extends StatelessWidget with WatchItMixin {
   const LikeAllIcon({super.key, required this.audios});
 
@@ -19,7 +20,7 @@ class LikeAllIcon extends StatelessWidget with WatchItMixin {
       onPressed: () => liked
           ? libraryModel.removeLikedAudios(audios)
           : libraryModel.addLikedAudios(audios),
-      icon: Iconz().getAnimatedHeartIcon(liked: liked),
+      icon: AnimatedHeart(liked: liked),
     );
   }
 }
diff --git a/lib/common/view/like_icon.dart b/lib/common/view/like_icon.dart
index 25e54d3d6..53bf2b323 100644
--- a/lib/common/view/like_icon.dart
+++ b/lib/common/view/like_icon.dart
@@ -1,12 +1,12 @@
 import 'package:flutter/material.dart';
 import 'package:watch_it/watch_it.dart';
 
-import '../data/audio.dart';
-import 'icons.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 'animated_like_icon.dart';
 
 class LikeIcon extends StatelessWidget with WatchItMixin {
   const LikeIcon({
@@ -49,7 +49,7 @@ class LikeIcon extends StatelessWidget with WatchItMixin {
       tooltip: liked
           ? context.l10n.removeFromFavorites
           : context.l10n.addToFavorites,
-      icon: Iconz().getAnimatedHeartIcon(
+      icon: AnimatedHeart(
         liked: liked,
         color: color,
       ),
@@ -95,7 +95,10 @@ class RadioLikeIcon extends StatelessWidget with WatchItMixin {
       tooltip: isStarredStation
           ? context.l10n.removeFromCollection
           : context.l10n.addToCollection,
-      icon: Iconz().getAnimatedStar(isStarredStation, color),
+      icon: AnimatedStar(
+        isStarred: isStarredStation,
+        color: color,
+      ),
       onPressed: onLike,
       color: color,
     );
diff --git a/lib/common/view/mpv_metadata_dialog.dart b/lib/common/view/mpv_metadata_dialog.dart
index fca567272..8ef42b678 100644
--- a/lib/common/view/mpv_metadata_dialog.dart
+++ b/lib/common/view/mpv_metadata_dialog.dart
@@ -31,7 +31,7 @@ class MpvMetadataDialog extends StatelessWidget {
             child: SizedBox(
               width: 250,
               child: SafeNetworkImage(
-                errorIcon: Icon(Iconz().imageMissing),
+                errorIcon: Icon(Iconz.imageMissing),
                 fit: BoxFit.fitHeight,
                 url: image,
               ),
diff --git a/lib/common/view/progress.dart b/lib/common/view/progress.dart
index ea8955801..37cc02418 100644
--- a/lib/common/view/progress.dart
+++ b/lib/common/view/progress.dart
@@ -1,7 +1,7 @@
-import '../../extensions/build_context_x.dart';
-import 'icons.dart';
 import 'package:flutter/material.dart';
 import 'package:yaru/yaru.dart';
+
+import '../../extensions/build_context_x.dart';
 import 'theme.dart';
 
 class SideBarProgress extends StatelessWidget {
diff --git a/lib/common/view/safe_network_image.dart b/lib/common/view/safe_network_image.dart
index b47b5ed02..ed7d80f68 100644
--- a/lib/common/view/safe_network_image.dart
+++ b/lib/common/view/safe_network_image.dart
@@ -36,7 +36,7 @@ class SafeNetworkImage extends StatelessWidget {
     final fallBack = Center(
       child: fallBackIcon ??
           Icon(
-            Iconz().musicNote,
+            Iconz.musicNote,
             size: height != null ? height! * 0.7 : null,
           ),
     );
@@ -46,7 +46,7 @@ class SafeNetworkImage extends StatelessWidget {
     final errorWidget = Center(
       child: errorIcon ??
           Icon(
-            Iconz().imageMissing,
+            Iconz.imageMissing,
             size: height != null ? height! * 0.7 : null,
             color: context.t.hintColor,
           ),
diff --git a/lib/common/view/search_button.dart b/lib/common/view/search_button.dart
index c33ab581b..ca49cb3bf 100644
--- a/lib/common/view/search_button.dart
+++ b/lib/common/view/search_button.dart
@@ -25,13 +25,13 @@ class SearchButton extends StatelessWidget {
             onPressed: onPressed,
             selectedIcon: icon ??
                 Icon(
-                  Iconz().search,
+                  Iconz.search,
                   color: context.t.colorScheme.primary,
                   size: iconSize,
                 ),
             icon: icon ??
                 Icon(
-                  Iconz().search,
+                  Iconz.search,
                   size: iconSize,
                 ),
           );
diff --git a/lib/common/view/share_button.dart b/lib/common/view/share_button.dart
index d8bce0148..945e3d777 100644
--- a/lib/common/view/share_button.dart
+++ b/lib/common/view/share_button.dart
@@ -45,7 +45,7 @@ class ShareButton extends StatelessWidget {
               );
             },
       icon: Icon(
-        Iconz().share,
+        Iconz.share,
         color: color,
         size: iconSize,
       ),
diff --git a/lib/common/view/side_bar_fall_back_image.dart b/lib/common/view/side_bar_fall_back_image.dart
index f0c2fc05e..b40dd0f68 100644
--- a/lib/common/view/side_bar_fall_back_image.dart
+++ b/lib/common/view/side_bar_fall_back_image.dart
@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:yaru/yaru.dart';
 
 import '../../extensions/build_context_x.dart';
-import 'icons.dart';
+import 'theme.dart';
 
 class SideBarFallBackImage extends StatelessWidget {
   const SideBarFallBackImage({
diff --git a/lib/common/view/stream_provider_share_button.dart b/lib/common/view/stream_provider_share_button.dart
index 8b78d4624..d0b31db14 100644
--- a/lib/common/view/stream_provider_share_button.dart
+++ b/lib/common/view/stream_provider_share_button.dart
@@ -57,7 +57,7 @@ class StreamProviderShareButton extends StatelessWidget {
       icon: Padding(
         padding: const EdgeInsets.only(bottom: 2),
         child: Icon(
-          onSearch != null ? Iconz().globe : iconData,
+          onSearch != null ? Iconz.globe : iconData,
           color: color,
         ),
       ),
diff --git a/lib/common/view/theme.dart b/lib/common/view/theme.dart
index 51bdcd173..0ce1f1c7f 100644
--- a/lib/common/view/theme.dart
+++ b/lib/common/view/theme.dart
@@ -10,7 +10,7 @@ import 'icons.dart';
 ThemeData? yaruDarkWithTweaks(YaruThemeData yaru) {
   return yaru.darkTheme?.copyWith(
     actionIconTheme: ActionIconThemeData(
-      backButtonIconBuilder: (context) => Icon(Iconz().goBack),
+      backButtonIconBuilder: (context) => Icon(Iconz.goBack),
     ),
     scaffoldBackgroundColor: yaru.darkTheme?.scaffoldBackgroundColor.scale(
       lightness: -0.35,
@@ -31,7 +31,7 @@ ThemeData? yaruDarkWithTweaks(YaruThemeData yaru) {
 ThemeData? yaruLightWithTweaks(YaruThemeData yaru) {
   return yaru.theme?.copyWith(
     actionIconTheme: ActionIconThemeData(
-      backButtonIconBuilder: (context) => Icon(Iconz().goBack),
+      backButtonIconBuilder: (context) => Icon(Iconz.goBack),
     ),
     cardColor: yaru.theme?.dividerColor.scale(
       lightness: -0.01,
@@ -215,6 +215,14 @@ Color? chipSelectionColor(ThemeData theme, bool loading) {
   return yaruStyled ? (loading ? theme.colorScheme.outline : null) : null;
 }
 
+double get iconSize => yaruStyled
+    ? kYaruIconSize
+    : isMobile
+        ? 24.0
+        : 20.0;
+
+double get sideBarImageSize => 38;
+
 double get likeButtonWidth => yaruStyled ? 62 : 70;
 
 double get progressStrokeWidth => 3.0;
diff --git a/lib/l10n/app_de.arb b/lib/l10n/app_de.arb
index d37692b09..251369b4d 100644
--- a/lib/l10n/app_de.arb
+++ b/lib/l10n/app_de.arb
@@ -346,7 +346,9 @@
     "doNotAskAgain": "Nicht mehr fragen",
     "skipToLivStream": "Zur Live-Übertragung springen",
     "searchSimilarStation": "Ähnlichen Sender suchen",
+    "clicks": "Clicks",
     "regionNone": "Keine",
+    "onlineArtError": "Die Albumkunst-Online-Suche ist momentan nicht verfügbar",
     "regionAfghanistan": "Afghanistan",
     "regionAlandislands": "Ålandinseln",
     "regionAlbania": "Albanien",
diff --git a/lib/l10n/app_en.arb b/lib/l10n/app_en.arb
index 987fa8dcd..24279e772 100644
--- a/lib/l10n/app_en.arb
+++ b/lib/l10n/app_en.arb
@@ -344,6 +344,8 @@
     "doNotAskAgain": "Do not ask again",
     "skipToLivStream": "Skip to live stream",
     "searchSimilarStation": "Search similar station",
+    "onlineArtError": "Online art lookup is currently not available",
+    "clicks": "Clicks",
     "regionNone": "None",
     "regionAfghanistan": "Afghanistan",
     "regionAlandislands": "Alandislands",
diff --git a/lib/library/library_model.dart b/lib/library/library_model.dart
index 967c8cd0e..3fa9f7c9e 100644
--- a/lib/library/library_model.dart
+++ b/lib/library/library_model.dart
@@ -66,18 +66,18 @@ class LibraryModel extends SafeChangeNotifier {
 
   Map<String, List<Audio>> get starredStations => _service.starredStations;
   int get starredStationsLength => _service.starredStations.length;
-  void addStarredStation(String url, List<Audio> audios) =>
-      _service.addStarredStation(url, audios);
+  void addStarredStation(String uuid, List<Audio> audios) =>
+      _service.addStarredStation(uuid, audios);
 
-  void unStarStation(String url) {
-    _service.unStarStation(url);
-    if (selectedPageId == url) {
+  void unStarStation(String uuid) {
+    _service.unStarStation(uuid);
+    if (selectedPageId == uuid) {
       pop();
     }
   }
 
-  bool isStarredStation(String? url) =>
-      url?.isNotEmpty == false ? false : _service.isStarredStation(url);
+  bool isStarredStation(String? uuid) =>
+      uuid?.isNotEmpty == false ? false : _service.isStarredStation(uuid);
 
   void addFavRadioTag(String value) => _service.addFavRadioTag(value);
   void removeRadioFavTag(String value) => _service.removeFavRadioTag(value);
diff --git a/lib/local_audio/view/album_page.dart b/lib/local_audio/view/album_page.dart
index eb1f10ef6..a650480db 100644
--- a/lib/local_audio/view/album_page.dart
+++ b/lib/local_audio/view/album_page.dart
@@ -72,7 +72,7 @@ class AlbumPageSideBarIcon extends StatelessWidget {
   Widget build(BuildContext context) {
     final fallBack = SideBarFallBackImage(
       child: Icon(
-        Iconz().startPlayList,
+        Iconz.startPlayList,
         color: getAlphabetColor(audio?.album ?? 'c'),
       ),
     );
@@ -153,7 +153,7 @@ class AlbumPageControlButton extends StatelessWidget {
                 pinnedAlbum ? context.l10n.unPinAlbum : context.l10n.pinAlbum,
             isSelected: libraryModel.isPinnedAlbum(id),
             icon: Icon(
-              pinnedAlbum ? Iconz().pinFilled : Iconz().pin,
+              pinnedAlbum ? Iconz.pinFilled : Iconz.pin,
             ),
             onPressed: () {
               if (libraryModel.isPinnedAlbum(id)) {
diff --git a/lib/local_audio/view/artist_page.dart b/lib/local_audio/view/artist_page.dart
index eaf827fbc..3de8cadd5 100644
--- a/lib/local_audio/view/artist_page.dart
+++ b/lib/local_audio/view/artist_page.dart
@@ -167,14 +167,14 @@ class _ArtistPageControlPanel extends StatelessWidget with WatchItMixin {
         children: [
           IconButton(
             icon: Icon(
-              Iconz().grid,
+              Iconz.grid,
             ),
             isSelected: useGridView,
             onPressed: () => setUseGridView(true),
           ),
           IconButton(
             icon: Icon(
-              Iconz().list,
+              Iconz.list,
             ),
             isSelected: !useGridView,
             onPressed: () => setUseGridView(false),
diff --git a/lib/local_audio/view/genre_page.dart b/lib/local_audio/view/genre_page.dart
index 383715dc4..7c98cdcb8 100644
--- a/lib/local_audio/view/genre_page.dart
+++ b/lib/local_audio/view/genre_page.dart
@@ -68,7 +68,7 @@ class _GenrePageState extends State<GenrePage> {
                   ..setSearchType(SearchType.radioTag)
                   ..search();
               }),
-              icon: Icon(Iconz().radio),
+              icon: Icon(Iconz.radio),
             ),
             const SizedBox(
               width: 5,
diff --git a/lib/local_audio/view/local_audio_page.dart b/lib/local_audio/view/local_audio_page.dart
index 617903002..c344ab941 100644
--- a/lib/local_audio/view/local_audio_page.dart
+++ b/lib/local_audio/view/local_audio_page.dart
@@ -145,15 +145,14 @@ class LocalAudioPageIcon extends StatelessWidget with WatchItMixin {
     final theme = context.t;
     if (audioType == AudioType.local) {
       return Icon(
-        Iconz().playFilled,
+        Iconz.playFilled,
         color: theme.colorScheme.primary,
       );
     }
 
     return Padding(
       padding: kMainPageIconPadding,
-      child:
-          selected ? Icon(Iconz().localAudioFilled) : Icon(Iconz().localAudio),
+      child: selected ? Icon(Iconz.localAudioFilled) : Icon(Iconz.localAudio),
     );
   }
 }
diff --git a/lib/main.dart b/lib/main.dart
index 9e1c1a73d..d17f2999e 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -30,6 +30,7 @@ import 'player/player_service.dart';
 import 'podcasts/download_model.dart';
 import 'podcasts/podcast_model.dart';
 import 'podcasts/podcast_service.dart';
+import 'radio/online_art_model.dart';
 import 'radio/online_art_service.dart';
 import 'radio/radio_model.dart';
 import 'radio/radio_service.dart';
@@ -83,6 +84,7 @@ void registerServicesAndViewModels({
       () => OnlineArtService(
         dio: di<Dio>(),
       ),
+      dispose: (s) => s.dispose(),
     )
     ..registerLazySingleton<PlayerService>(
       () => PlayerService(
@@ -191,5 +193,11 @@ void registerServicesAndViewModels({
         libraryService: di<LibraryService>(),
         localAudioService: di<LocalAudioService>(),
       )..init(),
+    )
+    ..registerLazySingleton<OnlineArtModel>(
+      () => OnlineArtModel(
+        service: di<OnlineArtService>(),
+      ),
+      dispose: (m) => m.dispose(),
     );
 }
diff --git a/lib/player/player_mixin.dart b/lib/player/player_mixin.dart
index d126f9034..38a439da1 100644
--- a/lib/player/player_mixin.dart
+++ b/lib/player/player_mixin.dart
@@ -14,18 +14,18 @@ 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
-      } ??
-      '';
+  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! : '');
+          : (audio?.title?.isNotEmpty == true ? audio!.title! : '').trim();
 
   void onTitleTap({
     Audio? audio,
diff --git a/lib/player/view/bottom_player.dart b/lib/player/view/bottom_player.dart
index c6ee2cbdd..10d3f99f1 100644
--- a/lib/player/view/bottom_player.dart
+++ b/lib/player/view/bottom_player.dart
@@ -113,7 +113,7 @@ class BottomPlayer extends StatelessWidget with WatchItMixin {
                           IconButton(
                             tooltip: context.l10n.fullWindow,
                             icon: Icon(
-                              Iconz().fullWindow,
+                              Iconz.fullWindow,
                               color: theme.colorScheme.onSurface,
                             ),
                             onPressed: () => appModel.setFullWindowMode(true),
diff --git a/lib/player/view/bottom_player_image.dart b/lib/player/view/bottom_player_image.dart
index fa0c46614..6e5dea1b1 100644
--- a/lib/player/view/bottom_player_image.dart
+++ b/lib/player/view/bottom_player_image.dart
@@ -4,7 +4,10 @@ import 'package:watch_it/watch_it.dart';
 
 import '../../app/app_model.dart';
 import '../../common/data/audio.dart';
+import '../../common/view/icons.dart';
+import '../../l10n/l10n.dart';
 import '../../local_audio/view/local_cover.dart';
+import '../../radio/online_art_model.dart';
 import 'player_fall_back_image.dart';
 import 'player_remote_source_image.dart';
 
@@ -72,9 +75,26 @@ class BottomPlayerImage extends StatelessWidget with WatchItMixin {
       );
     }
 
-    return AnimatedSwitcher(
-      duration: const Duration(milliseconds: 200),
-      child: child,
+    return Stack(
+      children: [
+        AnimatedSwitcher(
+          duration: const Duration(milliseconds: 200),
+          child: child,
+        ),
+        if (watchStream((OnlineArtModel s) => s.error).data != null &&
+            audio?.audioType == AudioType.radio)
+          Positioned(
+            bottom: 5,
+            right: 5,
+            child: Padding(
+              padding: const EdgeInsets.only(left: 5),
+              child: Tooltip(
+                message: context.l10n.onlineArtError,
+                child: Icon(Iconz.warning, color: Colors.yellowAccent),
+              ),
+            ),
+          ),
+      ],
     );
   }
 }
diff --git a/lib/player/view/full_height_player_top_controls.dart b/lib/player/view/full_height_player_top_controls.dart
index 9924c6a4a..7740baf09 100644
--- a/lib/player/view/full_height_player_top_controls.dart
+++ b/lib/player/view/full_height_player_top_controls.dart
@@ -10,10 +10,12 @@ import '../../common/data/audio.dart';
 import '../../common/view/icons.dart';
 import '../../common/view/like_icon.dart';
 import '../../common/view/share_button.dart';
+import '../../common/view/snackbars.dart';
 import '../../constants.dart';
 import '../../extensions/build_context_x.dart';
 import '../../l10n/l10n.dart';
 import '../../player/player_model.dart';
+import '../../radio/online_art_model.dart';
 import 'playback_rate_button.dart';
 import 'player_view.dart';
 import 'queue_button.dart';
@@ -54,18 +56,28 @@ class FullHeightPlayerTopControls extends StatelessWidget with WatchItMixin {
         alignment: WrapAlignment.end,
         spacing: 5.0,
         children: [
-          if (audio?.audioType != AudioType.podcast)
-            Padding(
-              padding: const EdgeInsets.only(left: 10),
-              child: switch (audio?.audioType) {
-                AudioType.local => LikeIcon(
-                    audio: audio,
-                    color: context.t.colorScheme.onSurface,
-                  ),
-                AudioType.radio => RadioLikeIcon(audio: audio),
-                _ => const SizedBox.shrink(),
-              },
+          if (watchStream((OnlineArtModel s) => s.error).data != null &&
+              audio?.audioType == AudioType.radio)
+            IconButton(
+              tooltip: context.l10n.onlineArtError,
+              onPressed: () => showSnackBar(
+                context: context,
+                snackBar: SnackBar(content: Text(context.l10n.onlineArtError)),
+              ),
+              icon: Icon(
+                Iconz.warning,
+                color: context.t.colorScheme.onSurface,
+              ),
             ),
+          if (audio?.audioType != AudioType.podcast)
+            switch (audio?.audioType) {
+              AudioType.local => LikeIcon(
+                  audio: audio,
+                  color: context.t.colorScheme.onSurface,
+                ),
+              AudioType.radio => RadioLikeIcon(audio: audio),
+              _ => const SizedBox.shrink(),
+            },
           if (showQueueButton) QueueButton(color: iconColor),
           ShareButton(
             audio: audio,
@@ -84,8 +96,8 @@ class FullHeightPlayerTopControls extends StatelessWidget with WatchItMixin {
                 : context.l10n.fullWindow,
             icon: Icon(
               playerPosition == PlayerPosition.fullWindow
-                  ? Iconz().fullWindowExit
-                  : Iconz().fullWindow,
+                  ? Iconz.fullWindowExit
+                  : Iconz.fullWindow,
               color: iconColor,
             ),
             onPressed: () {
diff --git a/lib/player/view/full_height_video_player.dart b/lib/player/view/full_height_video_player.dart
index 9167cac2c..789931efe 100644
--- a/lib/player/view/full_height_video_player.dart
+++ b/lib/player/view/full_height_video_player.dart
@@ -56,7 +56,7 @@ class FullHeightVideoPlayer extends StatelessWidget with WatchItMixin {
           message: context.l10n.leaveFullScreen,
           child: MaterialFullscreenButton(
             icon: Icon(
-              Iconz().fullScreenExit,
+              Iconz.fullScreenExit,
               color: baseColor,
             ),
           ),
@@ -77,7 +77,7 @@ class FullHeightVideoPlayer extends StatelessWidget with WatchItMixin {
             message: context.l10n.fullScreen,
             child: MaterialFullscreenButton(
               icon: Icon(
-                Iconz().fullScreen,
+                Iconz.fullScreen,
                 color: baseColor,
               ),
             ),
diff --git a/lib/player/view/play_button.dart b/lib/player/view/play_button.dart
index 25d26951a..5a75ffcb5 100644
--- a/lib/player/view/play_button.dart
+++ b/lib/player/view/play_button.dart
@@ -34,7 +34,7 @@ class PlayButton extends StatelessWidget with WatchItMixin {
               }
             },
       icon: Icon(
-        isPlaying ? Iconz().pause : Iconz().playFilled,
+        isPlaying ? Iconz.pause : Iconz.playFilled,
         color: iconColor ?? context.t.colorScheme.onSurface,
       ),
     );
diff --git a/lib/player/view/playback_rate_button.dart b/lib/player/view/playback_rate_button.dart
index 0b84a5c86..994087d6f 100644
--- a/lib/player/view/playback_rate_button.dart
+++ b/lib/player/view/playback_rate_button.dart
@@ -24,9 +24,9 @@ class PlaybackRateButton extends StatelessWidget with WatchItMixin {
     return PopupMenuButton(
       icon: Icon(
         switch (rate) {
-          2.0 => Iconz().levelHigh,
-          1.5 => Iconz().levelMiddle,
-          _ => Iconz().levelLow
+          2.0 => Iconz.levelHigh,
+          1.5 => Iconz.levelMiddle,
+          _ => Iconz.levelLow
         },
         color: !active
             ? theme.disabledColor
diff --git a/lib/player/view/player_fall_back_image.dart b/lib/player/view/player_fall_back_image.dart
index 2a9731e28..9f533d6b7 100644
--- a/lib/player/view/player_fall_back_image.dart
+++ b/lib/player/view/player_fall_back_image.dart
@@ -27,11 +27,11 @@ class PlayerFallBackImage extends StatelessWidget {
     final theme = context.t;
     IconData iconData;
     if (audio?.audioType == AudioType.radio) {
-      iconData = Iconz().radio;
+      iconData = Iconz.radio;
     } else if (audio?.audioType == AudioType.podcast) {
-      iconData = Iconz().podcast;
+      iconData = Iconz.podcast;
     } else {
-      iconData = Iconz().musicNote;
+      iconData = Iconz.musicNote;
     }
     return Center(
       child: Container(
diff --git a/lib/player/view/player_main_controls.dart b/lib/player/view/player_main_controls.dart
index d97ae01bb..484c10b95 100644
--- a/lib/player/view/player_main_controls.dart
+++ b/lib/player/view/player_main_controls.dart
@@ -51,7 +51,7 @@ class PlayerMainControls extends StatelessWidget with WatchItMixin {
         AudioType.radio => IconButton(
             tooltip: context.l10n.skipToLivStream,
             onPressed: di<PlayerModel>().playNext,
-            icon: Icon(Iconz().refresh),
+            icon: Icon(Iconz.refresh),
           ),
         _ => const SizedBox.shrink()
       },
@@ -62,7 +62,7 @@ class PlayerMainControls extends StatelessWidget with WatchItMixin {
           color: defaultColor,
           onPressed: !active ? null : () => di<PlayerModel>().playPrevious(),
           icon: Icon(
-            Iconz().skipBackward,
+            Iconz.skipBackward,
             color: defaultColor,
           ),
         ),
@@ -85,7 +85,7 @@ class PlayerMainControls extends StatelessWidget with WatchItMixin {
               ? null
               : () => di<PlayerModel>().playNext(),
           icon: Icon(
-            Iconz().skipForward,
+            Iconz.skipForward,
             color: defaultColor,
           ),
         ),
diff --git a/lib/player/view/queue_button.dart b/lib/player/view/queue_button.dart
index aa4d86130..e940e603c 100644
--- a/lib/player/view/queue_button.dart
+++ b/lib/player/view/queue_button.dart
@@ -24,7 +24,7 @@ class QueueButton extends StatelessWidget {
       padding: EdgeInsets.zero,
       tooltip: context.l10n.queue,
       icon: Icon(
-        Iconz().playlist,
+        Iconz.playlist,
         color: color ?? theme.colorScheme.onSurface,
       ),
       onPressed: () {
@@ -230,7 +230,7 @@ class _QueueTile extends StatelessWidget {
           ? IconButton(
               onPressed:
                   selected ? null : () => di<PlayerModel>().remove(audio),
-              icon: Icon(Iconz().close),
+              icon: Icon(Iconz.close),
             )
           : Visibility(
               visible: selected,
diff --git a/lib/player/view/repeat_button.dart b/lib/player/view/repeat_button.dart
index 6f80a71b8..5612dab58 100644
--- a/lib/player/view/repeat_button.dart
+++ b/lib/player/view/repeat_button.dart
@@ -24,7 +24,7 @@ class RepeatButton extends StatelessWidget with WatchItMixin {
       isSelected: repeatSingle,
       color: iconColor,
       tooltip: context.l10n.repeat,
-      icon: Icon(Iconz().repeatSingle),
+      icon: Icon(Iconz.repeatSingle),
       onPressed: !active ? null : () => setRepeatSingle(!repeatSingle),
     );
   }
diff --git a/lib/player/view/seek_button.dart b/lib/player/view/seek_button.dart
index cc51327bf..87c159b0a 100644
--- a/lib/player/view/seek_button.dart
+++ b/lib/player/view/seek_button.dart
@@ -23,7 +23,7 @@ class SeekButton extends StatelessWidget {
     final playerModel = di<PlayerModel>();
 
     final icon = Icon(
-      forward ? Iconz().forward30 : Iconz().backward10,
+      forward ? Iconz.forward30 : Iconz.backward10,
       color: iconColor,
     );
     return IconButton(
diff --git a/lib/player/view/shuffle_button.dart b/lib/player/view/shuffle_button.dart
index 2a2a90cf4..3f3c0e31f 100644
--- a/lib/player/view/shuffle_button.dart
+++ b/lib/player/view/shuffle_button.dart
@@ -24,7 +24,7 @@ class ShuffleButton extends StatelessWidget with WatchItMixin {
       tooltip: context.l10n.shuffle,
       color: iconColor,
       icon: Icon(
-        Iconz().shuffle,
+        Iconz.shuffle,
       ),
       onPressed: !active ? null : () => di<PlayerModel>().setShuffle(!shuffle),
     );
diff --git a/lib/player/view/volume_popup.dart b/lib/player/view/volume_popup.dart
index 0194322e1..6d25ef65c 100644
--- a/lib/player/view/volume_popup.dart
+++ b/lib/player/view/volume_popup.dart
@@ -25,13 +25,13 @@ class VolumeSliderPopup extends StatelessWidget with WatchItMixin {
     final setVolume = playerModel.setVolume;
     IconData iconData;
     if (volume != null && volume <= 0) {
-      iconData = Iconz().speakerMutedFilled;
+      iconData = Iconz.speakerMutedFilled;
     } else if (volume != null && volume <= 20) {
-      iconData = Iconz().speakerLowFilled;
+      iconData = Iconz.speakerLowFilled;
     } else if (volume != null && volume <= 50 && volume > 20) {
-      iconData = Iconz().speakerMediumFilled;
+      iconData = Iconz.speakerMediumFilled;
     } else {
-      iconData = Iconz().speakerHighFilled;
+      iconData = Iconz.speakerHighFilled;
     }
     return PopupMenuButton(
       color: theme.isLight
diff --git a/lib/playlists/view/add_to_playlist_dialog.dart b/lib/playlists/view/add_to_playlist_dialog.dart
index 49cf56cbd..e462e2c26 100644
--- a/lib/playlists/view/add_to_playlist_dialog.dart
+++ b/lib/playlists/view/add_to_playlist_dialog.dart
@@ -76,7 +76,7 @@ class _PlaylistTilesList extends StatelessWidget with WatchItMixin {
           onTap: () => playlistNavigatorKey.currentState?.pushNamed('/new'),
           leading: SideBarFallBackImage(
             color: Colors.transparent,
-            child: Icon(Iconz().plus),
+            child: Icon(Iconz.plus),
           ),
           title: Text(context.l10n.createNewPlaylist),
         ),
@@ -121,7 +121,7 @@ class _PlaylistTile extends StatelessWidget {
       },
       leading: SideBarFallBackImage(
         color: getAlphabetColor(playlistId),
-        child: Icon(Iconz().starFilled),
+        child: Icon(Iconz.starFilled),
       ),
       title: Text(playlistId),
     );
diff --git a/lib/playlists/view/liked_audio_page.dart b/lib/playlists/view/liked_audio_page.dart
index fe36c3401..0d902152b 100644
--- a/lib/playlists/view/liked_audio_page.dart
+++ b/lib/playlists/view/liked_audio_page.dart
@@ -49,7 +49,7 @@ class LikedAudioPage extends StatelessWidget with WatchItMixin {
       ),
       image: FallBackHeaderImage(
         child: Icon(
-          Iconz().heart,
+          Iconz.heart,
           size: 65,
         ),
       ),
@@ -65,7 +65,7 @@ class LikedAudioPageIcon extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return SideBarFallBackImage(
-      child: selected ? Icon(Iconz().heartFilled) : Icon(Iconz().heart),
+      child: selected ? Icon(Iconz.heartFilled) : Icon(Iconz.heart),
     );
   }
 }
diff --git a/lib/playlists/view/manual_add_dialog.dart b/lib/playlists/view/manual_add_dialog.dart
index 3005470cf..be94dd385 100644
--- a/lib/playlists/view/manual_add_dialog.dart
+++ b/lib/playlists/view/manual_add_dialog.dart
@@ -85,7 +85,7 @@ class SelectAddContent extends StatelessWidget {
                 onTap: () =>
                     manualAddNavigatorKey.currentState?.pushNamed(route.key),
                 contentPadding: const EdgeInsets.symmetric(horizontal: 10),
-                trailing: Icon(Iconz().goNext),
+                trailing: Icon(Iconz.goNext),
               );
 
               if (index != routes.length - 1) {
diff --git a/lib/playlists/view/playlist_page.dart b/lib/playlists/view/playlist_page.dart
index 90dff027a..fc73110ad 100644
--- a/lib/playlists/view/playlist_page.dart
+++ b/lib/playlists/view/playlist_page.dart
@@ -178,7 +178,7 @@ class _PlaylistHeaderImage extends StatelessWidget {
     Widget image;
     if (length == 0) {
       image = Icon(
-        Iconz().playlist,
+        Iconz.playlist,
         size: 65,
       );
     } else {
@@ -346,7 +346,7 @@ class _PlaylistControlPanel extends StatelessWidget with WatchItMixin {
         children: [
           IconButton(
             tooltip: context.l10n.editPlaylist,
-            icon: Icon(Iconz().pen),
+            icon: Icon(Iconz.pen),
             onPressed: () => showDialog(
               context: context,
               builder: (context) => AlertDialog(
@@ -366,13 +366,13 @@ class _PlaylistControlPanel extends StatelessWidget with WatchItMixin {
           ),
           IconButton(
             tooltip: context.l10n.clearPlaylist,
-            icon: Icon(Iconz().clearAll),
+            icon: Icon(Iconz.clearAll),
             onPressed: () => libraryModel.clearPlaylist(pageId),
           ),
           AvatarPlayButton(audios: audios, pageId: pageId),
           IconButton(
             tooltip: context.l10n.add,
-            icon: Icon(Iconz().plus),
+            icon: Icon(Iconz.plus),
             onPressed: () => showDialog(
               context: context,
               builder: (context) => PlaylistAddAudiosDialog(playlistId: pageId),
@@ -383,7 +383,7 @@ class _PlaylistControlPanel extends StatelessWidget with WatchItMixin {
             isSelected: allowReorder,
             onPressed: () =>
                 di<LocalAudioModel>().setAllowReorder(!allowReorder),
-            icon: Icon(Iconz().move),
+            icon: Icon(Iconz.move),
           ),
         ],
       ),
diff --git a/lib/podcasts/podcast_utils.dart b/lib/podcasts/podcast_utils.dart
index ef147416a..249de6fe4 100644
--- a/lib/podcasts/podcast_utils.dart
+++ b/lib/podcasts/podcast_utils.dart
@@ -5,11 +5,11 @@ import 'package:flutter/material.dart';
 import 'package:podcast_search/podcast_search.dart';
 import 'package:watch_it/watch_it.dart';
 
-import '../../common/view/icons.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';
diff --git a/lib/podcasts/view/download_button.dart b/lib/podcasts/view/download_button.dart
index 8a4b6b423..8eda62f84 100644
--- a/lib/podcasts/view/download_button.dart
+++ b/lib/podcasts/view/download_button.dart
@@ -46,7 +46,7 @@ class DownloadButton extends StatelessWidget with WatchItMixin {
               ? context.l10n.removeDownloadEpisode
               : context.l10n.downloadEpisode,
           icon: Icon(
-            download ? Iconz().downloadFilled : Iconz().download,
+            download ? Iconz.downloadFilled : Iconz.download,
             color: audio?.path != null ? theme.colorScheme.primary : null,
           ),
           onPressed: downloadsDir == null
diff --git a/lib/podcasts/view/podcast_audio_tile.dart b/lib/podcasts/view/podcast_audio_tile.dart
index d264301b9..288b73265 100644
--- a/lib/podcasts/view/podcast_audio_tile.dart
+++ b/lib/podcasts/view/podcast_audio_tile.dart
@@ -129,7 +129,7 @@ class PodcastAudioTile extends StatelessWidget {
                                   Text(context.l10n.insertedIntoQueue(text)),
                             );
                           },
-                          icon: Icon(Iconz().insertIntoQueue),
+                          icon: Icon(Iconz.insertIntoQueue),
                         ),
                         IconButton(
                           tooltip: context.l10n.replayEpisode,
@@ -139,7 +139,7 @@ class PodcastAudioTile extends StatelessWidget {
                                 ..removeLastPosition(audio.url!)
                                 ..setPosition(Duration.zero)
                                 ..seek(),
-                          icon: Icon(Iconz().replay),
+                          icon: Icon(Iconz.replay),
                         ),
                       ],
                     ),
diff --git a/lib/podcasts/view/podcast_genre_autocomplete.dart b/lib/podcasts/view/podcast_genre_autocomplete.dart
index 164256b38..610351b90 100644
--- a/lib/podcasts/view/podcast_genre_autocomplete.dart
+++ b/lib/podcasts/view/podcast_genre_autocomplete.dart
@@ -222,7 +222,7 @@ class _PodcastGenreTile extends StatelessWidget {
       //     favs?.contains(t.id) == false ? addFav(t) : removeFav(t);
       //   },
       //   icon: Icon(
-      //     favs?.contains(t.id) == true ? Iconz().starFilled : Iconz().star,
+      //     favs?.contains(t.id) == true ? Iconz.starFilled : Iconz.star,
       //   ),
       // ),
     );
diff --git a/lib/podcasts/view/podcast_page.dart b/lib/podcasts/view/podcast_page.dart
index 4738b6b2d..38608207e 100644
--- a/lib/podcasts/view/podcast_page.dart
+++ b/lib/podcasts/view/podcast_page.dart
@@ -227,12 +227,12 @@ class _PodcastPageImage extends StatelessWidget {
     final theme = context.t;
     var safeNetworkImage = SafeNetworkImage(
       fallBackIcon: Icon(
-        Iconz().podcast,
+        Iconz.podcast,
         size: 80,
         color: theme.hintColor,
       ),
       errorIcon: Icon(
-        Iconz().podcast,
+        Iconz.podcast,
         size: 80,
         color: theme.hintColor,
       ),
diff --git a/lib/podcasts/view/podcast_page_side_bar_icon.dart b/lib/podcasts/view/podcast_page_side_bar_icon.dart
index 33af9d0bc..e2a16e087 100644
--- a/lib/podcasts/view/podcast_page_side_bar_icon.dart
+++ b/lib/podcasts/view/podcast_page_side_bar_icon.dart
@@ -1,7 +1,9 @@
+import 'package:flutter/material.dart';
+
 import '../../common/view/icons.dart';
 import '../../common/view/safe_network_image.dart';
 import '../../common/view/side_bar_fall_back_image.dart';
-import 'package:flutter/material.dart';
+import '../../common/view/theme.dart';
 
 class PodcastPageSideBarIcon extends StatelessWidget {
   const PodcastPageSideBarIcon({super.key, this.imageUrl});
@@ -12,7 +14,7 @@ class PodcastPageSideBarIcon extends StatelessWidget {
   Widget build(BuildContext context) {
     if (imageUrl == null) {
       return SideBarFallBackImage(
-        child: Icon(Iconz().podcast),
+        child: Icon(Iconz.podcast),
       );
     }
 
@@ -26,11 +28,11 @@ class PodcastPageSideBarIcon extends StatelessWidget {
           fit: BoxFit.fitHeight,
           filterQuality: FilterQuality.medium,
           fallBackIcon: Icon(
-            Iconz().podcast,
+            Iconz.podcast,
             size: sideBarImageSize,
           ),
           errorIcon: Icon(
-            Iconz().podcast,
+            Iconz.podcast,
             size: sideBarImageSize,
           ),
         ),
diff --git a/lib/podcasts/view/podcast_refresh_button.dart b/lib/podcasts/view/podcast_refresh_button.dart
index 05766d1e3..0df498343 100644
--- a/lib/podcasts/view/podcast_refresh_button.dart
+++ b/lib/podcasts/view/podcast_refresh_button.dart
@@ -30,7 +30,7 @@ class PodcastRefreshButton extends StatelessWidget {
                 notify: ({required message}) =>
                     showSnackBar(context: context, content: Text(message)),
               ),
-      icon: Icon(Iconz().refresh),
+      icon: Icon(Iconz.refresh),
     );
   }
 }
diff --git a/lib/podcasts/view/podcast_reorder_button.dart b/lib/podcasts/view/podcast_reorder_button.dart
index b98d7dbe0..28378face 100644
--- a/lib/podcasts/view/podcast_reorder_button.dart
+++ b/lib/podcasts/view/podcast_reorder_button.dart
@@ -20,17 +20,17 @@ class PodcastReorderButton extends StatelessWidget with WatchItMixin {
       tooltip: context.l10n.reorder,
       onPressed: () => di<LibraryModel>()
           .reorderPodcast(feedUrl: feedUrl, ascending: !ascending),
-      icon: Iconz().ascending == Iconz().materialAscending && ascending
+      icon: Iconz.ascending == Iconz.materialAscending && ascending
           ? Transform.flip(
               flipX: true,
               child: Transform.rotate(
                 angle: pi,
                 child: Icon(
-                  Iconz().materialAscending,
+                  Iconz.materialAscending,
                 ),
               ),
             )
-          : Icon(ascending ? Iconz().ascending : Iconz().descending),
+          : Icon(ascending ? Iconz.ascending : Iconz.descending),
     );
   }
 }
diff --git a/lib/podcasts/view/podcast_replay_button.dart b/lib/podcasts/view/podcast_replay_button.dart
index 2693f83fe..fb73bb348 100644
--- a/lib/podcasts/view/podcast_replay_button.dart
+++ b/lib/podcasts/view/podcast_replay_button.dart
@@ -15,7 +15,7 @@ class PodcastReplayButton extends StatelessWidget {
     return IconButton(
       tooltip: context.l10n.replayAllEpisodes,
       onPressed: () => di<PlayerModel>().removeLastPositions(audios),
-      icon: Icon(Iconz().replay),
+      icon: Icon(Iconz.replay),
     );
   }
 }
diff --git a/lib/podcasts/view/podcast_sub_button.dart b/lib/podcasts/view/podcast_sub_button.dart
index c2467defa..c4fd9d485 100644
--- a/lib/podcasts/view/podcast_sub_button.dart
+++ b/lib/podcasts/view/podcast_sub_button.dart
@@ -35,7 +35,7 @@ class PodcastSubButton extends StatelessWidget with WatchItMixin {
       icon: checkingForUpdates
           ? const SideBarProgress()
           : Icon(
-              subscribed ? Iconz().removeFromLibrary : Iconz().addToLibrary,
+              subscribed ? Iconz.removeFromLibrary : Iconz.addToLibrary,
             ),
       onPressed: checkingForUpdates
           ? null
diff --git a/lib/podcasts/view/podcast_tile_play_button.dart b/lib/podcasts/view/podcast_tile_play_button.dart
index a6a7fa684..532486bd1 100644
--- a/lib/podcasts/view/podcast_tile_play_button.dart
+++ b/lib/podcasts/view/podcast_tile_play_button.dart
@@ -49,13 +49,13 @@ class PodcastTilePlayButton extends StatelessWidget {
             child: IconButton(
               icon: (isPlayerPlaying && selected)
                   ? Icon(
-                      Iconz().pause,
+                      Iconz.pause,
                     )
                   : Padding(
                       padding: appleStyled
                           ? const EdgeInsets.only(left: 3)
                           : EdgeInsets.zero,
-                      child: Icon(Iconz().playFilled),
+                      child: Icon(Iconz.playFilled),
                     ),
               onPressed: () {
                 if (selected) {
diff --git a/lib/podcasts/view/podcast_timer_button.dart b/lib/podcasts/view/podcast_timer_button.dart
index 12d2cdf52..d5e5d65da 100644
--- a/lib/podcasts/view/podcast_timer_button.dart
+++ b/lib/podcasts/view/podcast_timer_button.dart
@@ -21,7 +21,7 @@ class PodcastTimerButton extends StatelessWidget {
           context: context,
           builder: (context) => const _Dialog(),
         ),
-        icon: Icon(Iconz().sleep),
+        icon: Icon(Iconz.sleep),
       );
 }
 
diff --git a/lib/podcasts/view/podcasts_page.dart b/lib/podcasts/view/podcasts_page.dart
index 39b328448..ff43d47f6 100644
--- a/lib/podcasts/view/podcasts_page.dart
+++ b/lib/podcasts/view/podcasts_page.dart
@@ -89,14 +89,14 @@ class PodcastsPageIcon extends StatelessWidget with WatchItMixin {
 
     if (audioType == AudioType.podcast) {
       return Icon(
-        Iconz().playFilled,
+        Iconz.playFilled,
         color: theme.colorScheme.primary,
       );
     }
 
     return Padding(
       padding: kMainPageIconPadding,
-      child: selected ? Icon(Iconz().podcastFilled) : Icon(Iconz().podcast),
+      child: selected ? Icon(Iconz.podcastFilled) : Icon(Iconz.podcast),
     );
   }
 }
diff --git a/lib/radio/online_art_model.dart b/lib/radio/online_art_model.dart
new file mode 100644
index 000000000..f9c042147
--- /dev/null
+++ b/lib/radio/online_art_model.dart
@@ -0,0 +1,13 @@
+import 'dart:async';
+
+import 'package:safe_change_notifier/safe_change_notifier.dart';
+
+import 'online_art_service.dart';
+
+class OnlineArtModel extends SafeChangeNotifier {
+  OnlineArtModel({required OnlineArtService service}) : _service = service;
+
+  final OnlineArtService _service;
+
+  Stream<String?> get error => _service.error;
+}
diff --git a/lib/radio/online_art_service.dart b/lib/radio/online_art_service.dart
index f46cb1133..3e4586c61 100644
--- a/lib/radio/online_art_service.dart
+++ b/lib/radio/online_art_service.dart
@@ -1,3 +1,5 @@
+import 'dart:async';
+
 import 'package:dio/dio.dart';
 import 'package:flutter/foundation.dart';
 
@@ -11,15 +13,25 @@ class OnlineArtService {
   OnlineArtService({required Dio dio}) : _dio = dio;
   final Dio _dio;
 
-  Future<String?> fetchAlbumArt(String icyTitle) async =>
-      get(icyTitle) ??
-      put(
-        key: icyTitle,
-        url: await compute(
-          _fetchAlbumArt,
-          _ComputeCapsule(icyTitle: icyTitle, dio: _dio),
-        ),
-      );
+  Future<String?> fetchAlbumArt(String icyTitle) async {
+    _errorController.add(null);
+    return get(icyTitle) ??
+        put(
+          key: icyTitle,
+          url: await compute(
+            _fetchAlbumArt,
+            _ComputeCapsule(icyTitle: icyTitle, dio: _dio),
+          ).onError(
+            (e, s) {
+              if (kDebugMode) {
+                debugPrintStack(stackTrace: s);
+              }
+              _errorController.add('$e : $s');
+              return null;
+            },
+          ),
+        );
+  }
 
   final _value = <String, String?>{};
 
@@ -30,6 +42,13 @@ class OnlineArtService {
   }
 
   String? get(String? icyTitle) => icyTitle == null ? null : _value[icyTitle];
+
+  final _errorController = StreamController<String?>.broadcast();
+  Stream<String?> get error => _errorController.stream;
+
+  Future<void> dispose() async {
+    await _errorController.close();
+  }
 }
 
 class _ComputeCapsule {
@@ -69,8 +88,8 @@ Future<String?> _fetchAlbumArt(_ComputeCapsule capsule) async {
     );
 
     return albumArtUrl;
-  } on Exception catch (_) {
-    return null;
+  } on Exception {
+    rethrow;
   }
 }
 
@@ -89,8 +108,8 @@ Future<String?> _fetchAlbumArtUrlFromReleaseId({
 
       return (artwork['image']) as String?;
     }
-  } on Exception catch (_) {
-    return null;
+  } on Exception {
+    rethrow;
   }
 
   return null;
diff --git a/lib/radio/view/disconnected_server_icon.dart b/lib/radio/view/disconnected_server_icon.dart
new file mode 100644
index 000000000..cbe98c590
--- /dev/null
+++ b/lib/radio/view/disconnected_server_icon.dart
@@ -0,0 +1,31 @@
+import '../../common/view/icons.dart';
+import '../../extensions/build_context_x.dart';
+import 'package:flutter/cupertino.dart';
+
+class DisconnectedServerIcon extends StatelessWidget {
+  const DisconnectedServerIcon({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    final theme = context.t;
+
+    return Stack(
+      alignment: Alignment.center,
+      children: [
+        Icon(
+          Iconz.cloud,
+          color: theme.disabledColor,
+        ),
+        Positioned(
+          bottom: -2,
+          right: -2,
+          child: Icon(
+            Iconz.close,
+            color: theme.colorScheme.error,
+            size: 16,
+          ),
+        ),
+      ],
+    );
+  }
+}
diff --git a/lib/radio/view/icy_image.dart b/lib/radio/view/icy_image.dart
index d95e4e0d2..119ccac65 100644
--- a/lib/radio/view/icy_image.dart
+++ b/lib/radio/view/icy_image.dart
@@ -53,7 +53,7 @@ class IcyImage extends StatelessWidget with WatchItMixin {
             width: width,
             child: SafeNetworkImage(
               url: di<RadioModel>().getCover(mpvMetaData.icyTitle),
-              fallBackIcon: fallBackWidget ?? Icon(Iconz().radio),
+              fallBackIcon: fallBackWidget ?? Icon(Iconz.radio),
               filterQuality: FilterQuality.medium,
               fit: fit ?? BoxFit.fitHeight,
             ),
diff --git a/lib/radio/view/next_station_button.dart b/lib/radio/view/next_station_button.dart
index 5dca71f37..8d754705d 100644
--- a/lib/radio/view/next_station_button.dart
+++ b/lib/radio/view/next_station_button.dart
@@ -34,7 +34,7 @@ class NextStationButton extends StatelessWidget with WatchItMixin {
                 );
               });
             },
-      icon: Icon(Iconz().explore),
+      icon: Icon(Iconz.explore),
     );
   }
 }
diff --git a/lib/radio/view/radio_fall_back_icon.dart b/lib/radio/view/radio_fall_back_icon.dart
index b1db13d44..c0dcf6d5e 100644
--- a/lib/radio/view/radio_fall_back_icon.dart
+++ b/lib/radio/view/radio_fall_back_icon.dart
@@ -44,7 +44,7 @@ class RadioFallBackIcon extends StatelessWidget {
       child: Padding(
         padding: const EdgeInsets.only(bottom: 10),
         child: Icon(
-          Iconz().radio,
+          Iconz.radio,
           size: iconSize ?? 70,
           color: contrastColor(
             getAlphabetColor(
diff --git a/lib/radio/view/radio_history_tile.dart b/lib/radio/view/radio_history_tile.dart
index b7542d15f..52ac6b91c 100644
--- a/lib/radio/view/radio_history_tile.dart
+++ b/lib/radio/view/radio_history_tile.dart
@@ -67,7 +67,7 @@ class RadioHistoryTile extends StatelessWidget with PlayerMixin {
                 },
               ),
               icon: Icon(
-                Iconz().info,
+                Iconz.info,
               ),
             ),
       title: TapAbleText(
diff --git a/lib/radio/view/radio_lib_page.dart b/lib/radio/view/radio_lib_page.dart
index 9bfb0ee36..b7718ecb6 100644
--- a/lib/radio/view/radio_lib_page.dart
+++ b/lib/radio/view/radio_lib_page.dart
@@ -1,5 +1,7 @@
 import 'package:animated_emoji/animated_emoji.dart';
+import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter_tabler_icons/flutter_tabler_icons.dart';
 import 'package:radio_browser_api/radio_browser_api.dart';
 import 'package:watch_it/watch_it.dart';
 import 'package:yaru/yaru.dart';
@@ -8,7 +10,6 @@ import '../../common/data/audio.dart';
 import '../../common/view/adaptive_container.dart';
 import '../../common/view/audio_card.dart';
 import '../../common/view/audio_card_bottom.dart';
-import '../../common/view/icons.dart';
 import '../../common/view/no_search_result_page.dart';
 import '../../common/view/side_bar_fall_back_image.dart';
 import '../../common/view/theme.dart';
@@ -187,4 +188,18 @@ class TagGrid extends StatelessWidget with WatchItMixin {
       },
     );
   }
+
+  IconData getIconForTag(String tag) {
+    final tagsToIcons = <String, IconData>{
+      'metal': TablerIcons.guitar_pick,
+      'pop': TablerIcons.diamond,
+    };
+
+    return tagsToIcons[tag] ??
+        (yaruStyled
+            ? YaruIcons.music_note
+            : appleStyled
+                ? CupertinoIcons.double_music_note
+                : Icons.music_note);
+  }
 }
diff --git a/lib/radio/view/radio_page_copy_histoy_button.dart b/lib/radio/view/radio_page_copy_histoy_button.dart
index e4d13d683..8c7c8db99 100644
--- a/lib/radio/view/radio_page_copy_histoy_button.dart
+++ b/lib/radio/view/radio_page_copy_histoy_button.dart
@@ -36,7 +36,7 @@ class RadioPageCopyHistoryButton extends StatelessWidget with WatchItMixin {
                 ),
               );
             },
-      icon: Icon(Iconz().copy),
+      icon: Icon(Iconz.copy),
     );
   }
 }
diff --git a/lib/radio/view/radio_page_icon.dart b/lib/radio/view/radio_page_icon.dart
index 9db49a85b..ffc006e24 100644
--- a/lib/radio/view/radio_page_icon.dart
+++ b/lib/radio/view/radio_page_icon.dart
@@ -23,14 +23,14 @@ class RadioPageIcon extends StatelessWidget with WatchItMixin {
     final theme = context.t;
     if (audioType == AudioType.radio) {
       return Icon(
-        Iconz().playFilled,
+        Iconz.playFilled,
         color: theme.colorScheme.primary,
       );
     }
 
     return Padding(
       padding: kMainPageIconPadding,
-      child: selected ? Icon(Iconz().radioFilled) : Icon(Iconz().radio),
+      child: selected ? Icon(Iconz.radioFilled) : Icon(Iconz.radio),
     );
   }
 }
diff --git a/lib/radio/view/radio_page_star_button.dart b/lib/radio/view/radio_page_star_button.dart
index 84a4e5fff..b44792d93 100644
--- a/lib/radio/view/radio_page_star_button.dart
+++ b/lib/radio/view/radio_page_star_button.dart
@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:watch_it/watch_it.dart';
 
 import '../../common/data/audio.dart';
-import '../../common/view/icons.dart';
+import '../../common/view/animated_like_icon.dart';
 import '../../l10n/l10n.dart';
 import '../../library/library_model.dart';
 
@@ -29,7 +29,7 @@ class RadioPageStarButton extends StatelessWidget with WatchItMixin {
               ? () => libraryModel.unStarStation(station.description!)
               : () => libraryModel
                   .addStarredStation(station.description!, [station]),
-      icon: Iconz().getAnimatedStar(isStarred),
+      icon: AnimatedStar(isStarred: isStarred),
     );
   }
 }
diff --git a/lib/radio/view/radio_reconnect_button.dart b/lib/radio/view/radio_reconnect_button.dart
index f47f41ad7..e25eeff58 100644
--- a/lib/radio/view/radio_reconnect_button.dart
+++ b/lib/radio/view/radio_reconnect_button.dart
@@ -1,10 +1,10 @@
 import 'package:flutter/material.dart';
 import 'package:watch_it/watch_it.dart';
 
-import '../../common/view/icons.dart';
 import '../../common/view/snackbars.dart';
 import '../../l10n/l10n.dart';
 import '../radio_model.dart';
+import 'disconnected_server_icon.dart';
 
 class RadioReconnectButton extends StatelessWidget {
   const RadioReconnectButton({super.key});
diff --git a/lib/radio/view/station_page_icon.dart b/lib/radio/view/station_page_icon.dart
index 19df5c656..b1b696a88 100644
--- a/lib/radio/view/station_page_icon.dart
+++ b/lib/radio/view/station_page_icon.dart
@@ -1,10 +1,11 @@
+import 'package:flutter/material.dart';
+
 import '../../common/view/icons.dart';
 import '../../common/view/safe_network_image.dart';
 import '../../common/view/side_bar_fall_back_image.dart';
+import '../../common/view/theme.dart';
 import '../../extensions/build_context_x.dart';
 
-import 'package:flutter/material.dart';
-
 class StationPageIcon extends StatelessWidget {
   const StationPageIcon({
     super.key,
@@ -29,17 +30,17 @@ class StationPageIcon extends StatelessWidget {
           fallBackIcon: SideBarFallBackImage(
             color: fallBackColor,
             child: selected
-                ? Icon(Iconz().starFilled)
+                ? Icon(Iconz.starFilled)
                 : Icon(
-                    Iconz().star,
+                    Iconz.star,
                   ),
           ),
           errorIcon: SideBarFallBackImage(
             color: fallBackColor,
             child: selected
-                ? Icon(Iconz().imageMissingFilled)
+                ? Icon(Iconz.imageMissingFilled)
                 : Icon(
-                    Iconz().imageMissing,
+                    Iconz.imageMissing,
                   ),
           ),
           fit: BoxFit.fitHeight,
diff --git a/lib/radio/view/tag_auto_complete.dart b/lib/radio/view/tag_auto_complete.dart
index 99b2b7d34..5441b5900 100644
--- a/lib/radio/view/tag_auto_complete.dart
+++ b/lib/radio/view/tag_auto_complete.dart
@@ -200,7 +200,7 @@ class _TagTile extends StatelessWidget {
           favs?.contains(t.name) == false ? addFav(t) : removeFav(t);
         },
         icon: Icon(
-          favs?.contains(t.name) == true ? Iconz().starFilled : Iconz().star,
+          favs?.contains(t.name) == true ? Iconz.starFilled : Iconz.star,
         ),
       ),
     );
diff --git a/lib/search/view/search_page.dart b/lib/search/view/search_page.dart
index a4e04634a..02157e5e6 100644
--- a/lib/search/view/search_page.dart
+++ b/lib/search/view/search_page.dart
@@ -57,8 +57,10 @@ class SearchPage extends StatelessWidget with WatchItMixin {
         builder: (context, constraints) {
           return NotificationListener<UserScrollNotification>(
             onNotification: (notification) {
+              // TODO(#926): improve radio search limit increase by not overwriting the search results
+              // disabled for radio until then
               if (notification.direction == ScrollDirection.reverse &&
-                  audioType != AudioType.local) {
+                  audioType == AudioType.podcast) {
                 di<SearchModel>()
                   ..incrementLimit(8)
                   ..search();
diff --git a/lib/settings/view/settings_page.dart b/lib/settings/view/settings_page.dart
index ac2d9ff56..278f14b96 100644
--- a/lib/settings/view/settings_page.dart
+++ b/lib/settings/view/settings_page.dart
@@ -223,7 +223,7 @@ class _PodcastSectionState extends State<_PodcastSection> {
                     onPressed: () =>
                         model.setPodcastIndexApiKey(_keyController.text),
                     icon: Icon(
-                      Iconz().check,
+                      Iconz.check,
                       color: podcastIndexApiKey == _initialKey
                           ? theme.colorScheme.success
                           : theme.colorScheme.onSurface,
@@ -250,7 +250,7 @@ class _PodcastSectionState extends State<_PodcastSection> {
                     onPressed: () =>
                         model.setPodcastIndexApiSecret(_secretController.text),
                     icon: Icon(
-                      Iconz().check,
+                      Iconz.check,
                       color: podcastIndexApiSecret == _initialSecret
                           ? theme.colorScheme.success
                           : theme.colorScheme.onSurface,
diff --git a/lib/settings/view/settings_tile.dart b/lib/settings/view/settings_tile.dart
index 3e4f71c23..ddccbc3db 100644
--- a/lib/settings/view/settings_tile.dart
+++ b/lib/settings/view/settings_tile.dart
@@ -31,7 +31,7 @@ class SettingsTile extends StatelessWidget {
       child: Stack(
         children: [
           YaruMasterTile(
-            leading: Icon(Iconz().settings),
+            leading: Icon(Iconz.settings),
             title: Text(context.l10n.settings),
             onTap: () => showDialog(
               context: context,
@@ -73,7 +73,7 @@ class _UpdateButton extends StatelessWidget with WatchItMixin {
             ),
           ),
           icon: Icon(
-            Iconz().updateAvailable,
+            Iconz.updateAvailable,
             color: context.t.colorScheme.success,
           ),
         ),
diff --git a/macos/Flutter/GeneratedPluginRegistrant.swift b/macos/Flutter/GeneratedPluginRegistrant.swift
index 9e16b13bf..81a487bb9 100644
--- a/macos/Flutter/GeneratedPluginRegistrant.swift
+++ b/macos/Flutter/GeneratedPluginRegistrant.swift
@@ -18,7 +18,7 @@ import path_provider_foundation
 import screen_brightness_macos
 import screen_retriever
 import shared_preferences_foundation
-import sqflite
+import sqflite_darwin
 import super_native_extensions
 import system_theme
 import url_launcher_macos
diff --git a/macos/Podfile.lock b/macos/Podfile.lock
index a20ef2ae3..6e28aab90 100644
--- a/macos/Podfile.lock
+++ b/macos/Podfile.lock
@@ -31,7 +31,7 @@ PODS:
   - shared_preferences_foundation (0.0.1):
     - Flutter
     - FlutterMacOS
-  - sqflite (0.0.3):
+  - sqflite_darwin (0.0.4):
     - Flutter
     - FlutterMacOS
   - super_native_extensions (0.0.1):
@@ -61,7 +61,7 @@ DEPENDENCIES:
   - screen_brightness_macos (from `Flutter/ephemeral/.symlinks/plugins/screen_brightness_macos/macos`)
   - screen_retriever (from `Flutter/ephemeral/.symlinks/plugins/screen_retriever/macos`)
   - shared_preferences_foundation (from `Flutter/ephemeral/.symlinks/plugins/shared_preferences_foundation/darwin`)
-  - sqflite (from `Flutter/ephemeral/.symlinks/plugins/sqflite/darwin`)
+  - sqflite_darwin (from `Flutter/ephemeral/.symlinks/plugins/sqflite_darwin/darwin`)
   - super_native_extensions (from `Flutter/ephemeral/.symlinks/plugins/super_native_extensions/macos`)
   - system_theme (from `Flutter/ephemeral/.symlinks/plugins/system_theme/macos`)
   - url_launcher_macos (from `Flutter/ephemeral/.symlinks/plugins/url_launcher_macos/macos`)
@@ -99,8 +99,8 @@ EXTERNAL SOURCES:
     :path: Flutter/ephemeral/.symlinks/plugins/screen_retriever/macos
   shared_preferences_foundation:
     :path: Flutter/ephemeral/.symlinks/plugins/shared_preferences_foundation/darwin
-  sqflite:
-    :path: Flutter/ephemeral/.symlinks/plugins/sqflite/darwin
+  sqflite_darwin:
+    :path: Flutter/ephemeral/.symlinks/plugins/sqflite_darwin/darwin
   super_native_extensions:
     :path: Flutter/ephemeral/.symlinks/plugins/super_native_extensions/macos
   system_theme:
@@ -117,21 +117,21 @@ SPEC CHECKSUMS:
   audio_session: dea1f41890dbf1718f04a56f1d6150fd50039b72
   connectivity_plus: ddd7f30999e1faaef5967c23d5b6d503d10434db
   device_info_plus: ce1b7762849d3ec103d0e0517299f2db7ad60720
-  file_selector_macos: 54fdab7caa3ac3fc43c9fac4d7d8d231277f8cf2
+  file_selector_macos: cc3858c981fe6889f364731200d6232dac1d812d
   FlutterMacOS: 8f6f14fa908a6fb3fba0cd85dbd81ec4b251fb24
   irondash_engine_context: da62996ee25616d2f01bbeb85dc115d813359478
   media_kit_libs_macos_video: b3e2bbec2eef97c285f2b1baa7963c67c753fb82
   media_kit_native_event_loop: 81fd5b45192b72f8b5b69eaf5b540f45777eb8d5
   media_kit_video: c75b07f14d59706c775778e4dd47dd027de8d1e5
-  package_info_plus: fa739dd842b393193c5ca93c26798dff6e3d0e0c
+  package_info_plus: d2f71247aab4b6521434f887276093acc70d214c
   path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46
   screen_brightness_macos: 2d6d3af2165592d9a55ffcd95b7550970e41ebda
   screen_retriever: 59634572a57080243dd1bf715e55b6c54f241a38
   shared_preferences_foundation: fcdcbc04712aee1108ac7fda236f363274528f78
-  sqflite: 673a0e54cc04b7d6dba8d24fb8095b31c3a99eec
+  sqflite_darwin: a553b1fd6fe66f53bbb0fe5b4f5bab93f08d7a13
   super_native_extensions: 85efee3a7495b46b04befcfc86ed12069264ebf3
   system_theme: c7b9f6659a5caa26c9bc2284da096781e9a6fcbc
-  url_launcher_macos: 5f437abeda8c85500ceb03f5c1938a8c5a705399
+  url_launcher_macos: c82c93949963e55b228a30115bd219499a6fe404
   wakelock_plus: 4783562c9a43d209c458cb9b30692134af456269
   window_manager: 3a1844359a6295ab1e47659b1a777e36773cd6e8
 
diff --git a/needs_translation.json b/needs_translation.json
index 1f5cc5f1f..f88d3f218 100644
--- a/needs_translation.json
+++ b/needs_translation.json
@@ -21,6 +21,8 @@
     "doNotAskAgain",
     "skipToLivStream",
     "searchSimilarStation",
+    "onlineArtError",
+    "clicks",
     "regionNone",
     "regionAfghanistan",
     "regionAlandislands",
@@ -297,6 +299,8 @@
     "doNotAskAgain",
     "skipToLivStream",
     "searchSimilarStation",
+    "onlineArtError",
+    "clicks",
     "regionNone",
     "regionAfghanistan",
     "regionAlandislands",
@@ -549,6 +553,11 @@
     "regionZimbabwe"
   ],
 
+  "es": [
+    "onlineArtError",
+    "clicks"
+  ],
+
   "fr": [
     "local",
     "unPinAlbum",
@@ -562,6 +571,8 @@
     "doNotAskAgain",
     "skipToLivStream",
     "searchSimilarStation",
+    "onlineArtError",
+    "clicks",
     "regionNone",
     "regionAfghanistan",
     "regionAlandislands",
@@ -816,7 +827,9 @@
 
   "it": [
     "skipToLivStream",
-    "searchSimilarStation"
+    "searchSimilarStation",
+    "onlineArtError",
+    "clicks"
   ],
 
   "nl": [
@@ -1061,6 +1074,8 @@
     "doNotAskAgain",
     "skipToLivStream",
     "searchSimilarStation",
+    "onlineArtError",
+    "clicks",
     "regionNone",
     "regionAfghanistan",
     "regionAlandislands",
@@ -1375,6 +1390,8 @@
     "doNotAskAgain",
     "skipToLivStream",
     "searchSimilarStation",
+    "onlineArtError",
+    "clicks",
     "regionNone",
     "regionAfghanistan",
     "regionAlandislands",
@@ -1840,6 +1857,8 @@
     "doNotAskAgain",
     "skipToLivStream",
     "searchSimilarStation",
+    "onlineArtError",
+    "clicks",
     "regionNone",
     "regionAfghanistan",
     "regionAlandislands",
@@ -2305,6 +2324,8 @@
     "doNotAskAgain",
     "skipToLivStream",
     "searchSimilarStation",
+    "onlineArtError",
+    "clicks",
     "regionNone",
     "regionAfghanistan",
     "regionAlandislands",
@@ -2585,6 +2606,8 @@
     "doNotAskAgain",
     "skipToLivStream",
     "searchSimilarStation",
+    "onlineArtError",
+    "clicks",
     "regionNone",
     "regionAfghanistan",
     "regionAlandislands",
@@ -2839,7 +2862,9 @@
 
   "sk": [
     "skipToLivStream",
-    "searchSimilarStation"
+    "searchSimilarStation",
+    "onlineArtError",
+    "clicks"
   ],
 
   "sv": [
@@ -3045,6 +3070,8 @@
     "doNotAskAgain",
     "skipToLivStream",
     "searchSimilarStation",
+    "onlineArtError",
+    "clicks",
     "regionNone",
     "regionAfghanistan",
     "regionAlandislands",
@@ -3319,6 +3346,8 @@
     "doNotAskAgain",
     "skipToLivStream",
     "searchSimilarStation",
+    "onlineArtError",
+    "clicks",
     "regionNone",
     "regionAfghanistan",
     "regionAlandislands",
@@ -3575,14 +3604,18 @@
     "local",
     "unPinAlbum",
     "skipToLivStream",
-    "searchSimilarStation"
+    "searchSimilarStation",
+    "onlineArtError",
+    "clicks"
   ],
 
   "zh_CN": [
     "local",
     "unPinAlbum",
     "skipToLivStream",
-    "searchSimilarStation"
+    "searchSimilarStation",
+    "onlineArtError",
+    "clicks"
   ],
 
   "zh_HK": [
@@ -3599,6 +3632,8 @@
     "doNotAskAgain",
     "skipToLivStream",
     "searchSimilarStation",
+    "onlineArtError",
+    "clicks",
     "regionNone",
     "regionAfghanistan",
     "regionAlandislands",
@@ -3865,6 +3900,8 @@
     "doNotAskAgain",
     "skipToLivStream",
     "searchSimilarStation",
+    "onlineArtError",
+    "clicks",
     "regionNone",
     "regionAfghanistan",
     "regionAlandislands",
diff --git a/pubspec.lock b/pubspec.lock
index c413fa2a3..025573c97 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -187,10 +187,10 @@ packages:
     dependency: "direct dev"
     description:
       name: build_runner
-      sha256: dd09dd4e2b078992f42aac7f1a622f01882a8492fef08486b27ddde929c19f04
+      sha256: "028819cfb90051c6b5440c7e574d1896f8037e3c96cf17aaeb054c9311cfbf4d"
       url: "https://pub.dev"
     source: hosted
-    version: "2.4.12"
+    version: "2.4.13"
   build_runner_core:
     dependency: transitive
     description:
@@ -427,10 +427,10 @@ packages:
     dependency: "direct main"
     description:
       name: file
-      sha256: "5fc22d7c25582e38ad9a8515372cd9a93834027aacf1801cf01164dac0ffa08c"
+      sha256: a3b4f84adafef897088c160faf7dfffb7696046cb13ae90b508c2cbc95d3b8d4
       url: "https://pub.dev"
     source: hosted
-    version: "7.0.0"
+    version: "7.0.1"
   file_picker:
     dependency: "direct main"
     description:
@@ -451,34 +451,34 @@ packages:
     dependency: transitive
     description:
       name: file_selector_android
-      sha256: b8c9717a0177ca6fa035554b82cd6c83b838ddc66b7704eb6df0f77f027ecc90
+      sha256: "00aafa9ae05a8663d0b4f17abd2a02316911ca0f46f9b9dacb9578b324d99590"
       url: "https://pub.dev"
     source: hosted
-    version: "0.5.1+7"
+    version: "0.5.1+9"
   file_selector_ios:
     dependency: transitive
     description:
       name: file_selector_ios
-      sha256: "38ebf91ecbcfa89a9639a0854ccaed8ab370c75678938eebca7d34184296f0bb"
+      sha256: "94b98ad950b8d40d96fee8fa88640c2e4bd8afcdd4817993bd04e20310f45420"
       url: "https://pub.dev"
     source: hosted
-    version: "0.5.3"
+    version: "0.5.3+1"
   file_selector_linux:
     dependency: "direct main"
     description:
       name: file_selector_linux
-      sha256: "045d372bf19b02aeb69cacf8b4009555fb5f6f0b7ad8016e5f46dd1387ddd492"
+      sha256: "712ce7fab537ba532c8febdb1a8f167b32441e74acd68c3ccb2e36dcb52c4ab2"
       url: "https://pub.dev"
     source: hosted
-    version: "0.9.2+1"
+    version: "0.9.3"
   file_selector_macos:
     dependency: transitive
     description:
       name: file_selector_macos
-      sha256: f42eacb83b318e183b1ae24eead1373ab1334084404c8c16e0354f9a3e55d385
+      sha256: "271ab9986df0c135d45c3cdb6bd0faa5db6f4976d3e4b437cf7d0f258d941bfc"
       url: "https://pub.dev"
     source: hosted
-    version: "0.9.4"
+    version: "0.9.4+2"
   file_selector_platform_interface:
     dependency: transitive
     description:
@@ -499,10 +499,10 @@ packages:
     dependency: transitive
     description:
       name: file_selector_windows
-      sha256: "2ad726953f6e8affbc4df8dc78b77c3b4a060967a291e528ef72ae846c60fb69"
+      sha256: "8f5d2f6590d51ecd9179ba39c64f722edc15226cc93dcc8698466ad36a4a85a4"
       url: "https://pub.dev"
     source: hosted
-    version: "0.9.3+2"
+    version: "0.9.3+3"
   fixnum:
     dependency: transitive
     description:
@@ -549,18 +549,18 @@ packages:
     dependency: "direct main"
     description:
       name: flutter_markdown
-      sha256: a23c41ee57573e62fc2190a1f36a0480c4d90bde3a8a8d7126e5d5992fb53fb7
+      sha256: e17575ca576a34b46c58c91f9948891117a1bd97815d2e661813c7f90c647a78
       url: "https://pub.dev"
     source: hosted
-    version: "0.7.3+1"
+    version: "0.7.3+2"
   flutter_plugin_android_lifecycle:
     dependency: transitive
     description:
       name: flutter_plugin_android_lifecycle
-      sha256: "9ee02950848f61c4129af3d6ec84a1cfc0e47931abc746b03e7a3bc3e8ff6eda"
+      sha256: "9b78450b89f059e96c9ebb355fa6b3df1d6b330436e0b885fb49594c41721398"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.22"
+    version: "2.0.23"
   flutter_rust_bridge:
     dependency: transitive
     description:
@@ -581,10 +581,10 @@ packages:
     dependency: "direct main"
     description:
       name: flutter_tabler_icons
-      sha256: "8096ec5754fe9449723a093fdfce8f9c301999edaedb464c851466eaed3c6657"
+      sha256: "657c2201e12fa9121a12ddb4edb74d69290f803868eb6526f04102e6d49ec882"
       url: "https://pub.dev"
     source: hosted
-    version: "1.41.0"
+    version: "1.43.0"
   flutter_test:
     dependency: "direct dev"
     description: flutter
@@ -607,10 +607,10 @@ packages:
     dependency: transitive
     description:
       name: functional_listener
-      sha256: ee8ffc29b2448981d96addf44ac9b4af2ba4ca2627979e77d3e6fe59b967ca4f
+      sha256: c096db771b4ce7ba0f886cc4a761044b11e8276a7bc24cfc812dc4b2bc6f5b16
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.0"
+    version: "4.1.0"
   get_it:
     dependency: transitive
     description:
@@ -985,10 +985,10 @@ packages:
     dependency: "direct main"
     description:
       name: package_info_plus
-      sha256: a75164ade98cb7d24cfd0a13c6408927c6b217fa60dee5a7ff5c116a58f28918
+      sha256: "894f37107424311bdae3e476552229476777b8752c5a2a2369c0cb9a2d5442ef"
       url: "https://pub.dev"
     source: hosted
-    version: "8.0.2"
+    version: "8.0.3"
   package_info_plus_platform_interface:
     dependency: transitive
     description:
@@ -1033,10 +1033,10 @@ packages:
     dependency: transitive
     description:
       name: path_provider_android
-      sha256: "6f01f8e37ec30b07bc424b4deabac37cacb1bc7e2e515ad74486039918a37eb7"
+      sha256: c464428172cb986b758c6d1724c603097febb8fb855aa265aeecc9280c294d4a
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.10"
+    version: "2.2.12"
   path_provider_foundation:
     dependency: transitive
     description:
@@ -1298,18 +1298,18 @@ packages:
     dependency: transitive
     description:
       name: shared_preferences_android
-      sha256: "480ba4345773f56acda9abf5f50bd966f581dac5d514e5fc4a18c62976bbba7e"
+      sha256: "3b9febd815c9ca29c9e3520d50ec32f49157711e143b7a4ca039eb87e8ade5ab"
       url: "https://pub.dev"
     source: hosted
-    version: "2.3.2"
+    version: "2.3.3"
   shared_preferences_foundation:
     dependency: transitive
     description:
       name: shared_preferences_foundation
-      sha256: c4b35f6cb8f63c147312c054ce7c2254c8066745125264f0c88739c417fc9d9f
+      sha256: "07e050c7cd39bad516f8d64c455f04508d09df104be326d8c02551590a0d513d"
       url: "https://pub.dev"
     source: hosted
-    version: "2.5.2"
+    version: "2.5.3"
   shared_preferences_linux:
     dependency: transitive
     description:
@@ -1415,18 +1415,42 @@ packages:
     dependency: transitive
     description:
       name: sqflite
-      sha256: a43e5a27235518c03ca238e7b4732cf35eabe863a369ceba6cbefa537a66f16d
+      sha256: "79a297dc3cc137e758c6a4baf83342b039e5a6d2436fcdf3f96a00adaaf2ad62"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.4.0"
+  sqflite_android:
+    dependency: transitive
+    description:
+      name: sqflite_android
+      sha256: "78f489aab276260cdd26676d2169446c7ecd3484bbd5fead4ca14f3ed4dd9ee3"
       url: "https://pub.dev"
     source: hosted
-    version: "2.3.3+1"
+    version: "2.4.0"
   sqflite_common:
     dependency: transitive
     description:
       name: sqflite_common
-      sha256: "4058172e418eb7e7f2058dcb7657d451a8fc264afa0dea4dbd0f304a57131611"
+      sha256: "4468b24876d673418a7b7147e5a08a715b4998a7ae69227acafaab762e0e5490"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.5.4+5"
+  sqflite_darwin:
+    dependency: transitive
+    description:
+      name: sqflite_darwin
+      sha256: "769733dddf94622d5541c73e4ddc6aa7b252d865285914b6fcd54a63c4b4f027"
       url: "https://pub.dev"
     source: hosted
-    version: "2.5.4+3"
+    version: "2.4.1-1"
+  sqflite_platform_interface:
+    dependency: transitive
+    description:
+      name: sqflite_platform_interface
+      sha256: "8dd4515c7bdcae0a785b0062859336de775e8c65db81ae33dd5445f35be61920"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.4.0"
   stack_trace:
     dependency: transitive
     description:
@@ -1471,42 +1495,42 @@ packages:
     dependency: transitive
     description:
       name: super_clipboard
-      sha256: cfeb142360fac67e0da1ca339accb892eb790c6528a218a008eef1709d96ed0f
+      sha256: bfbfc602becb256c675c37332a0c5083a870f20806092938a247c36b3d6ecb88
       url: "https://pub.dev"
     source: hosted
-    version: "0.8.22"
+    version: "0.8.23"
   super_drag_and_drop:
     dependency: "direct main"
     description:
       name: super_drag_and_drop
-      sha256: "25158161d1b114ffba0d358c3508f5a4b88a18becacffcd785c17574670204d6"
+      sha256: f145e9cb129197f646a5e0e1dc6e97d70a521345354c1cf303e66482969782c6
       url: "https://pub.dev"
     source: hosted
-    version: "0.8.22"
+    version: "0.8.23"
   super_native_extensions:
     dependency: transitive
     description:
       name: super_native_extensions
-      sha256: "6a7cfb7d212da7023b86fb99c736081e9c2cd982265d15dc5fe6381a32dbc875"
+      sha256: "8fe12946dbee374937eacb8aea2658369e66306708319675fda641f7f13874ac"
       url: "https://pub.dev"
     source: hosted
-    version: "0.8.22"
+    version: "0.8.23"
   synchronized:
     dependency: transitive
     description:
       name: synchronized
-      sha256: "51b08572b9f091f8c3eb4d9d4be253f196ff0075d5ec9b10a884026d5b55d7bc"
+      sha256: "69fe30f3a8b04a0be0c15ae6490fc859a78ef4c43ae2dd5e8a623d45bfcf9225"
       url: "https://pub.dev"
     source: hosted
-    version: "3.3.0+2"
+    version: "3.3.0+3"
   system_theme:
     dependency: "direct main"
     description:
       name: system_theme
-      sha256: "9396b69e74cdd1524daf26c0c33f4968d5ada1ff948a31f031cf6398869b589f"
+      sha256: "5f93485401689601d4636a695f99f7c70a30873ee68c1d95025d908a3386be7e"
       url: "https://pub.dev"
     source: hosted
-    version: "3.1.1"
+    version: "3.1.2"
   system_theme_web:
     dependency: transitive
     description:
@@ -1575,18 +1599,18 @@ packages:
     dependency: "direct main"
     description:
       name: url_launcher
-      sha256: "21b704ce5fa560ea9f3b525b43601c678728ba46725bab9b01187b4831377ed3"
+      sha256: "9d06212b1362abc2f0f0d78e6f09f726608c74e3b9462e8368bb03314aa8d603"
       url: "https://pub.dev"
     source: hosted
-    version: "6.3.0"
+    version: "6.3.1"
   url_launcher_android:
     dependency: transitive
     description:
       name: url_launcher_android
-      sha256: e35a698ac302dd68e41f73250bd9517fe3ab5fa4f18fe4647a0872db61bacbab
+      sha256: "8fc3bae0b68c02c47c5c86fa8bfa74471d42687b0eded01b78de87872db745e2"
       url: "https://pub.dev"
     source: hosted
-    version: "6.3.10"
+    version: "6.3.12"
   url_launcher_ios:
     dependency: transitive
     description:
@@ -1607,10 +1631,10 @@ packages:
     dependency: transitive
     description:
       name: url_launcher_macos
-      sha256: "9a1a42d5d2d95400c795b2914c36fdcb525870c752569438e4ebb09a2b5d90de"
+      sha256: "769549c999acdb42b8bcfa7c43d72bf79a382ca7441ab18a808e101149daf672"
       url: "https://pub.dev"
     source: hosted
-    version: "3.2.0"
+    version: "3.2.1"
   url_launcher_platform_interface:
     dependency: transitive
     description:
@@ -1639,10 +1663,10 @@ packages:
     dependency: "direct overridden"
     description:
       name: uuid
-      sha256: f33d6bb662f0e4f79dcd7ada2e6170f3b3a2530c28fc41f49a411ddedd576a77
+      sha256: a5be9ef6618a7ac1e964353ef476418026db906c4facdedaa299b7a2e71690ff
       url: "https://pub.dev"
     source: hosted
-    version: "4.5.0"
+    version: "4.5.1"
   vector_math:
     dependency: transitive
     description:
@@ -1687,10 +1711,10 @@ packages:
     dependency: "direct main"
     description:
       name: watch_it
-      sha256: a45ea7d5e841e96f904896f4783cc1820257c591f130d1513e89eaceaa528a28
+      sha256: aadbf4ddff777434fc17645d68c5337fc259960f063b900fe83fb9a61b18cb08
       url: "https://pub.dev"
     source: hosted
-    version: "1.5.0"
+    version: "1.5.1"
   watcher:
     dependency: transitive
     description:
@@ -1703,10 +1727,10 @@ packages:
     dependency: transitive
     description:
       name: web
-      sha256: d43c1d6b787bf0afad444700ae7f4db8827f701bc61c255ac8d328c6f4d52062
+      sha256: cd3543bd5798f6ad290ea73d210f423502e71900302dde696f8bff84bf89a1cb
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.0"
+    version: "1.1.0"
   web_socket_channel:
     dependency: transitive
     description:
@@ -1719,10 +1743,10 @@ packages:
     dependency: "direct main"
     description:
       name: win32
-      sha256: "68d1e89a91ed61ad9c370f9f8b6effed9ae5e0ede22a270bdfa6daf79fc2290a"
+      sha256: "4d45dc9069dba4619dc0ebd93c7cec5e66d8482cb625a370ac806dcc8165f2ec"
       url: "https://pub.dev"
     source: hosted
-    version: "5.5.4"
+    version: "5.5.5"
   win32_registry:
     dependency: transitive
     description:
@@ -1743,10 +1767,10 @@ packages:
     dependency: "direct main"
     description:
       name: xdg_directories
-      sha256: faea9dee56b520b55a566385b84f2e8de55e7496104adada9962e0bd11bcff1d
+      sha256: "7a3f37b05d989967cdddcbb571f1ea834867ae2faa29725fd085180e0883aa15"
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.4"
+    version: "1.1.0"
   xml:
     dependency: transitive
     description: