diff --git a/lib/extensions/string_x.dart b/lib/extensions/string_x.dart
index e57c5fc44..1a77ac75c 100644
--- a/lib/extensions/string_x.dart
+++ b/lib/extensions/string_x.dart
@@ -19,13 +19,22 @@ extension StringExtension on String {
   ({String? songName, String? artist}) get splitByDash {
     String? songName;
     String? artist;
-    final split = this.split(' - ');
+    var split = this.split(' - ');
     if (split.isNotEmpty) {
       artist = split.elementAtOrNull(0);
       songName = split.elementAtOrNull(1);
       if (split.length == 3 && songName != null) {
         songName = songName + (split.elementAtOrNull(2) ?? '');
       }
+    } else {
+      split = this.split('-');
+      if (split.isNotEmpty) {
+        artist = split.elementAtOrNull(0);
+        songName = split.elementAtOrNull(1);
+        if (split.length == 3 && songName != null) {
+          songName = songName + (split.elementAtOrNull(2) ?? '');
+        }
+      }
     }
     return (songName: songName, artist: artist);
   }
diff --git a/lib/library/library_service.dart b/lib/library/library_service.dart
index e97795bf2..eec09d4e4 100644
--- a/lib/library/library_service.dart
+++ b/lib/library/library_service.dart
@@ -2,12 +2,11 @@ import 'dart:async';
 import 'dart:io';
 
 import 'package:collection/collection.dart';
-import 'package:dio/dio.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 
+import '../common/data/audio.dart';
 import '../common/view/audio_filter.dart';
 import '../constants.dart';
-import '../common/data/audio.dart';
 import '../persistence_utils.dart';
 
 class LibraryService {
@@ -293,7 +292,6 @@ class LibraryService {
   ///
   /// Podcasts
   ///
-  final dio = Dio();
   Map<String, String> _downloads = {};
   Map<String, String> get downloads => _downloads;
   String? getDownload(String? url) => downloads[url];
@@ -496,7 +494,6 @@ class LibraryService {
   }
 
   Future<void> dispose() async {
-    dio.close();
     await _propertiesChangedController.close();
   }
 }
diff --git a/lib/main.dart b/lib/main.dart
index 8980f2545..9e1c1a73d 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -2,6 +2,7 @@ import 'dart:io';
 
 import 'package:connectivity_plus/connectivity_plus.dart';
 import 'package:desktop_notifications/desktop_notifications.dart';
+import 'package:dio/dio.dart';
 import 'package:flutter/material.dart';
 import 'package:github/github.dart';
 import 'package:gtk/gtk.dart';
@@ -29,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_service.dart';
 import 'radio/radio_model.dart';
 import 'radio/radio_service.dart';
 import 'search/search_model.dart';
@@ -72,9 +74,19 @@ void registerServicesAndViewModels({
   required String version,
 }) {
   di
-    ..registerLazySingleton(() => sharedPreferences)
+    ..registerLazySingleton<SharedPreferences>(() => sharedPreferences)
+    ..registerLazySingleton<Dio>(
+      () => Dio(),
+      dispose: (s) => s.close(),
+    )
+    ..registerLazySingleton<OnlineArtService>(
+      () => OnlineArtService(
+        dio: di<Dio>(),
+      ),
+    )
     ..registerLazySingleton<PlayerService>(
       () => PlayerService(
+        onlineArtService: di<OnlineArtService>(),
         controller: VideoController(
           Player(
             configuration: const PlayerConfiguration(title: kAppTitle),
@@ -160,11 +172,17 @@ void registerServicesAndViewModels({
       dispose: (s) => s.dispose(),
     )
     ..registerLazySingleton<RadioModel>(
-      () => RadioModel(radioService: di<RadioService>()),
+      () => RadioModel(
+        radioService: di<RadioService>(),
+        onlineArtService: di<OnlineArtService>(),
+      ),
       dispose: (s) => s.dispose(),
     )
     ..registerLazySingleton<DownloadModel>(
-      () => DownloadModel(di<LibraryService>()),
+      () => DownloadModel(
+        libraryService: di<LibraryService>(),
+        dio: di<Dio>(),
+      ),
     )
     ..registerLazySingleton<SearchModel>(
       () => SearchModel(
diff --git a/lib/online_album_art_utils.dart b/lib/online_album_art_utils.dart
deleted file mode 100644
index 023591101..000000000
--- a/lib/online_album_art_utils.dart
+++ /dev/null
@@ -1,92 +0,0 @@
-import 'dart:convert';
-
-import 'package:flutter/foundation.dart';
-import 'package:http/http.dart' as http;
-
-import 'constants.dart';
-import 'extensions/string_x.dart';
-
-Future<String?> fetchAlbumArt(String icyTitle) async {
-  return UrlStore().get(icyTitle) ??
-      UrlStore()
-          .put(key: icyTitle, url: await compute(_fetchAlbumArt, icyTitle));
-}
-
-Future<String?> _fetchAlbumArt(String icyTitle) async {
-  final songInfo = icyTitle.splitByDash;
-  if (songInfo.songName == null || songInfo.artist == null) return null;
-
-  final searchUrl = getAlbumArtServiceUri(songInfo);
-  if (searchUrl == null) return null;
-
-  try {
-    final searchResponse = await http.get(searchUrl, headers: kAlbumArtHeaders);
-
-    if (searchResponse.statusCode == 200) {
-      final searchData = jsonDecode(searchResponse.body);
-      final recordings = searchData['recordings'] as List;
-
-      final firstRecording = recordings.firstOrNull;
-
-      final releaseId = firstRecording == null
-          ? null
-          : firstRecording?['releases']?[0]?['id'];
-
-      if (releaseId == null) return null;
-
-      final albumArtUrl = await _fetchAlbumArtUrlFromReleaseId(releaseId);
-
-      return albumArtUrl;
-    }
-  } on Exception catch (_) {
-    return null;
-  }
-
-  return null;
-}
-
-Future<String?> _fetchAlbumArtUrlFromReleaseId(String releaseId) async {
-  final url = Uri.parse(
-    'https://coverartarchive.org/release/$releaseId',
-  );
-  try {
-    final response = await http.get(url, headers: kAlbumArtHeaders);
-
-    if (response.statusCode == 200) {
-      final data = jsonDecode(response.body);
-      final images = data['images'] as List;
-
-      if (images.isNotEmpty) {
-        final artwork = images[0];
-
-        return (artwork['image']) as String?;
-      }
-    }
-  } on Exception catch (_) {
-    return null;
-  }
-
-  return null;
-}
-
-Uri? getAlbumArtServiceUri(({String? artist, String? songName}) artInfo) {
-  final address =
-      'https://musicbrainz.org/ws/2/recording/?query=recording:"${artInfo.songName}"%20AND%20artist:"${artInfo.artist}"';
-  return Uri.tryParse(address);
-}
-
-class UrlStore {
-  static final UrlStore _instance = UrlStore._internal();
-  factory UrlStore() => _instance;
-  UrlStore._internal();
-
-  final _value = <String, String?>{};
-
-  String? put({required String key, String? url}) {
-    return _value.containsKey(key)
-        ? _value.update(key, (value) => url)
-        : _value.putIfAbsent(key, () => url);
-  }
-
-  String? get(String? icyTitle) => icyTitle == null ? null : _value[icyTitle];
-}
diff --git a/lib/player/player_service.dart b/lib/player/player_service.dart
index 3deedaef3..a55931466 100644
--- a/lib/player/player_service.dart
+++ b/lib/player/player_service.dart
@@ -18,15 +18,19 @@ import '../common/data/player_state.dart';
 import '../constants.dart';
 import '../extensions/string_x.dart';
 import '../local_audio/cover_store.dart';
-import '../online_album_art_utils.dart';
 import '../persistence_utils.dart';
+import '../radio/online_art_service.dart';
 
 typedef Queue = ({String name, List<Audio> audios});
 
 class PlayerService {
   PlayerService({
     required VideoController controller,
-  }) : _controller = controller;
+    required OnlineArtService onlineArtService,
+  })  : _controller = controller,
+        _onlineArtService = onlineArtService;
+
+  final OnlineArtService _onlineArtService;
 
   final VideoController _controller;
   VideoController get controller => _controller;
@@ -284,7 +288,7 @@ class PlayerService {
         );
 
         final songInfo = mpvMetaData.icyTitle.splitByDash;
-        fetchAlbumArt(mpvMetaData.icyTitle).then(
+        _onlineArtService.fetchAlbumArt(mpvMetaData.icyTitle).then(
           (albumArt) async {
             await _setMediaControlsMetaData(
               audio: (_audio ?? const Audio()).copyWith(
diff --git a/lib/podcasts/download_model.dart b/lib/podcasts/download_model.dart
index 6c62c6cb5..4c37d1fd1 100644
--- a/lib/podcasts/download_model.dart
+++ b/lib/podcasts/download_model.dart
@@ -10,9 +10,14 @@ import '../l10n/l10n.dart';
 import '../library/library_service.dart';
 
 class DownloadModel extends SafeChangeNotifier {
-  DownloadModel(this._service);
+  DownloadModel({
+    required LibraryService libraryService,
+    required Dio dio,
+  })  : _service = libraryService,
+        _dio = dio;
 
   final LibraryService _service;
+  final Dio _dio;
 
   final _values = <String, double?>{};
   final _cancelTokens = <String, CancelToken?>{};
@@ -66,8 +71,8 @@ class DownloadModel extends SafeChangeNotifier {
       return;
     }
 
-    _service.dio.interceptors.add(LogInterceptor());
-    _service.dio.options.headers = {HttpHeaders.acceptEncodingHeader: '*'};
+    _dio.interceptors.add(LogInterceptor());
+    _dio.options.headers = {HttpHeaders.acceptEncodingHeader: '*'};
 
     if (!Directory(downloadsDir).existsSync()) {
       Directory(downloadsDir).createSync();
@@ -112,7 +117,7 @@ class DownloadModel extends SafeChangeNotifier {
         ? _cancelTokens.update(url, (value) => CancelToken())
         : _cancelTokens.putIfAbsent(url, () => CancelToken());
     try {
-      return await _service.dio.download(
+      return await _dio.download(
         url,
         path,
         onReceiveProgress: (count, total) =>
diff --git a/lib/radio/online_art_service.dart b/lib/radio/online_art_service.dart
new file mode 100644
index 000000000..f46cb1133
--- /dev/null
+++ b/lib/radio/online_art_service.dart
@@ -0,0 +1,97 @@
+import 'package:dio/dio.dart';
+import 'package:flutter/foundation.dart';
+
+import '../constants.dart';
+import '../extensions/string_x.dart';
+
+const _kMusicBrainzAddress = 'https://musicbrainz.org/ws/2/recording/';
+const _kCoverArtArchiveAddress = 'https://coverartarchive.org/release/';
+
+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),
+        ),
+      );
+
+  final _value = <String, String?>{};
+
+  String? put({required String key, String? url}) {
+    return _value.containsKey(key)
+        ? _value.update(key, (value) => url)
+        : _value.putIfAbsent(key, () => url);
+  }
+
+  String? get(String? icyTitle) => icyTitle == null ? null : _value[icyTitle];
+}
+
+class _ComputeCapsule {
+  final String icyTitle;
+  final Dio dio;
+
+  _ComputeCapsule({required this.icyTitle, required this.dio});
+}
+
+Future<String?> _fetchAlbumArt(_ComputeCapsule capsule) async {
+  final dio = capsule.dio;
+  dio.options.headers = kAlbumArtHeaders;
+  final songInfo = capsule.icyTitle.splitByDash;
+  if (songInfo.songName == null || songInfo.artist == null) return null;
+
+  try {
+    final searchResponse = await dio.get(
+      _kMusicBrainzAddress,
+      queryParameters: {
+        'query':
+            'recording:"${songInfo.songName}"%20AND%20artist:"${songInfo.artist}"',
+      },
+    );
+
+    final recordings = searchResponse.data['recordings'] as List;
+
+    final firstRecording = recordings.firstOrNull;
+
+    final releaseId =
+        firstRecording == null ? null : firstRecording?['releases']?[0]?['id'];
+
+    if (releaseId == null) return null;
+
+    final albumArtUrl = await _fetchAlbumArtUrlFromReleaseId(
+      releaseId: releaseId,
+      dio: dio,
+    );
+
+    return albumArtUrl;
+  } on Exception catch (_) {
+    return null;
+  }
+}
+
+Future<String?> _fetchAlbumArtUrlFromReleaseId({
+  required String releaseId,
+  required Dio dio,
+}) async {
+  try {
+    dio.options.headers = kAlbumArtHeaders;
+    final response = await dio.get('$_kCoverArtArchiveAddress$releaseId');
+
+    final images = response.data['images'] as List;
+
+    if (images.isNotEmpty) {
+      final artwork = images[0];
+
+      return (artwork['image']) as String?;
+    }
+  } on Exception catch (_) {
+    return null;
+  }
+
+  return null;
+}
diff --git a/lib/radio/radio_model.dart b/lib/radio/radio_model.dart
index ff3a03a9a..752bae859 100644
--- a/lib/radio/radio_model.dart
+++ b/lib/radio/radio_model.dart
@@ -4,14 +4,20 @@ import 'package:safe_change_notifier/safe_change_notifier.dart';
 
 import '../common/data/audio.dart';
 import '../l10n/l10n.dart';
+import 'online_art_service.dart';
 import 'radio_service.dart';
 
 class RadioModel extends SafeChangeNotifier {
   final RadioService _radioService;
+  final OnlineArtService _onlineArtService;
 
   RadioModel({
     required RadioService radioService,
-  }) : _radioService = radioService;
+    required OnlineArtService onlineArtService,
+  })  : _radioService = radioService,
+        _onlineArtService = onlineArtService;
+
+  String? getCover(String icyTitle) => _onlineArtService.get(icyTitle);
 
   Future<void> clickStation(Audio? station) async {
     if (station?.description != null) {
diff --git a/lib/radio/view/icy_image.dart b/lib/radio/view/icy_image.dart
index ba29b5d9b..d95e4e0d2 100644
--- a/lib/radio/view/icy_image.dart
+++ b/lib/radio/view/icy_image.dart
@@ -1,14 +1,14 @@
 import 'package:flutter/material.dart';
 import 'package:watch_it/watch_it.dart';
 
+import '../../common/data/mpv_meta_data.dart';
 import '../../common/view/icons.dart';
+import '../../common/view/mpv_metadata_dialog.dart';
+import '../../common/view/safe_network_image.dart';
 import '../../constants.dart';
 import '../../l10n/l10n.dart';
-import '../../online_album_art_utils.dart';
 import '../../player/player_model.dart';
-import '../../common/data/mpv_meta_data.dart';
-import '../../common/view/mpv_metadata_dialog.dart';
-import '../../common/view/safe_network_image.dart';
+import '../radio_model.dart';
 
 class IcyImage extends StatelessWidget with WatchItMixin {
   const IcyImage({
@@ -44,7 +44,7 @@ class IcyImage extends StatelessWidget with WatchItMixin {
           onTap: () => showDialog(
             context: context,
             builder: (context) => MpvMetadataDialog(
-              image: UrlStore().get(mpvMetaData.icyTitle),
+              image: di<RadioModel>().getCover(mpvMetaData.icyTitle),
               mpvMetaData: mpvMetaData,
             ),
           ),
@@ -52,7 +52,7 @@ class IcyImage extends StatelessWidget with WatchItMixin {
             height: height,
             width: width,
             child: SafeNetworkImage(
-              url: UrlStore().get(mpvMetaData.icyTitle),
+              url: di<RadioModel>().getCover(mpvMetaData.icyTitle),
               fallBackIcon: fallBackWidget ?? Icon(Iconz().radio),
               filterQuality: FilterQuality.medium,
               fit: fit ?? BoxFit.fitHeight,
diff --git a/lib/radio/view/radio_history_tile.dart b/lib/radio/view/radio_history_tile.dart
index 3b04eb080..54b44bcf9 100644
--- a/lib/radio/view/radio_history_tile.dart
+++ b/lib/radio/view/radio_history_tile.dart
@@ -5,6 +5,7 @@ import 'package:yaru/constants.dart';
 import '../../common/data/audio.dart';
 import '../../common/data/mpv_meta_data.dart';
 import '../../common/view/icons.dart';
+import '../online_art_service.dart';
 import 'icy_image.dart';
 import '../../common/view/mpv_metadata_dialog.dart';
 import '../../common/view/tapable_text.dart';
@@ -13,7 +14,6 @@ import '../../extensions/build_context_x.dart';
 import '../../extensions/theme_data_x.dart';
 import '../../l10n/l10n.dart';
 import '../../library/library_model.dart';
-import '../../online_album_art_utils.dart';
 import '../../player/player_mixin.dart';
 import '../../search/search_model.dart';
 import 'station_page.dart';
@@ -59,7 +59,8 @@ class RadioHistoryTile extends StatelessWidget with PlayerMixin {
               onPressed: () => showDialog(
                 context: context,
                 builder: (context) {
-                  final image = UrlStore().get(entry.value.icyTitle);
+                  final image =
+                      di<OnlineArtService>().get(entry.value.icyTitle);
                   return MpvMetadataDialog(
                     mpvMetaData: entry.value,
                     image: image,
diff --git a/pubspec.lock b/pubspec.lock
index b78d6d2a0..cc108f832 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -676,7 +676,7 @@ packages:
     source: hosted
     version: "0.15.4"
   http:
-    dependency: "direct main"
+    dependency: transitive
     description:
       name: http
       sha256: b9c29a161230ee03d3ccf545097fccd9b87a5264228c5d348202e0f0c28f9010
diff --git a/pubspec.yaml b/pubspec.yaml
index 5d81772c9..aa5876b7a 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -40,7 +40,6 @@ dependencies:
   gtk: ^2.1.0
   handy_window: ^0.4.0
   html: ^0.15.4
-  http: ^1.2.1
   intl: ^0.19.0
   m3u_parser_nullsafe: ^1.0.3
   media_kit: ^1.1.10+1