diff --git a/lib/app/app_model.dart b/lib/app/app_model.dart
index 48ff15658..9c2f479fe 100644
--- a/lib/app/app_model.dart
+++ b/lib/app/app_model.dart
@@ -2,8 +2,8 @@ import 'package:flutter/widgets.dart';
 import 'package:github/github.dart';
 import 'package:safe_change_notifier/safe_change_notifier.dart';
 
-import '../common/view/snackbars.dart';
 import '../constants.dart';
+import '../expose/expose_service.dart';
 import '../settings/settings_service.dart';
 
 class AppModel extends SafeChangeNotifier {
@@ -12,13 +12,24 @@ class AppModel extends SafeChangeNotifier {
     required SettingsService settingsService,
     required GitHub gitHub,
     required bool allowManualUpdates,
+    required ExposeService exposeService,
   })  : _countryCode = WidgetsBinding
             .instance.platformDispatcher.locale.countryCode
             ?.toLowerCase(),
         _gitHub = gitHub,
         _allowManualUpdates = allowManualUpdates,
         _settingsService = settingsService,
-        _version = appVersion;
+        _version = appVersion,
+        _exposeService = exposeService;
+
+  final ExposeService _exposeService;
+  Stream<String?> get errorStream => _exposeService.discordErrorStream;
+  Stream<bool> get isDiscordConnectedStream =>
+      _exposeService.isDiscordConnectedStream;
+
+  Future<void> connectToDiscord() async => _exposeService.connectToDiscord();
+  Future<void> disconnectFromDiscord() async =>
+      _exposeService.disconnectFromDiscord();
 
   final GitHub _gitHub;
   final SettingsService _settingsService;
@@ -55,7 +66,10 @@ class AppModel extends SafeChangeNotifier {
   bool? get updateAvailable => _updateAvailable;
   String? _onlineVersion;
   String? get onlineVersion => _onlineVersion;
-  Future<void> checkForUpdate(bool isOnline, BuildContext context) async {
+  Future<void> checkForUpdate({
+    required bool isOnline,
+    Function(String error)? onError,
+  }) async {
     _updateAvailable == null;
     notifyListeners();
 
@@ -66,9 +80,7 @@ class AppModel extends SafeChangeNotifier {
     }
     _onlineVersion = await getOnlineVersion().onError(
       (error, stackTrace) {
-        if (context.mounted) {
-          showSnackBar(context: context, content: Text(error.toString()));
-        }
+        onError?.call(error.toString());
         return null;
       },
     );
diff --git a/lib/app/view/scaffold.dart b/lib/app/view/scaffold.dart
index 74edda6ba..d44eea95b 100644
--- a/lib/app/view/scaffold.dart
+++ b/lib/app/view/scaffold.dart
@@ -1,9 +1,13 @@
 import 'package:flutter/material.dart';
+import 'package:flutter_tabler_icons/flutter_tabler_icons.dart';
 import 'package:watch_it/watch_it.dart';
 import 'package:yaru/yaru.dart';
 
+import '../../common/view/snackbars.dart';
+import '../../common/view/theme.dart';
 import '../../constants.dart';
 import '../../extensions/build_context_x.dart';
+import '../../l10n/l10n.dart';
 import '../../patch_notes/patch_notes_dialog.dart';
 import '../../player/view/player_view.dart';
 import '../app_model.dart';
@@ -23,7 +27,9 @@ class _MusicPodScaffoldState extends State<MusicPodScaffold> {
     super.initState();
     final appModel = di<AppModel>();
     appModel
-        .checkForUpdate(di<ConnectivityModel>().isOnline == true, context)
+        .checkForUpdate(
+      isOnline: di<ConnectivityModel>().isOnline == true,
+    )
         .then((_) {
       if (!appModel.recentPatchNotesDisposed() && mounted) {
         showDialog(
@@ -38,6 +44,32 @@ class _MusicPodScaffoldState extends State<MusicPodScaffold> {
   Widget build(BuildContext context) {
     final playerToTheRight = context.mediaQuerySize.width > kSideBarThreshHold;
     final isFullScreen = watchPropertyValue((AppModel m) => m.fullWindowMode);
+    final l10n = context.l10n;
+    registerStreamHandler(
+      select: (AppModel m) => m.isDiscordConnectedStream,
+      handler: (context, snapshot, cancel) {
+        if (!snapshot.hasData || snapshot.hasError) return;
+        showSnackBar(
+          context: context,
+          content: Row(
+            mainAxisSize: MainAxisSize.min,
+            children: space(
+              widthGap: 10,
+              children: [
+                Text(
+                  '${snapshot.data == true ? l10n.connectedTo : l10n.disconnectedFrom}'
+                  ' ${l10n.exposeToDiscordTitle}',
+                ),
+                Icon(
+                  TablerIcons.brand_discord_filled,
+                  color: context.theme.primaryColor,
+                ),
+              ],
+            ),
+          ),
+        );
+      },
+    );
 
     return Stack(
       alignment: Alignment.center,
diff --git a/lib/common/view/theme.dart b/lib/common/view/theme.dart
index 0ce1f1c7f..7156c52e6 100644
--- a/lib/common/view/theme.dart
+++ b/lib/common/view/theme.dart
@@ -286,11 +286,15 @@ double get audioCardDimension => kAudioCardDimension - (isMobile ? 15 : 0);
 
 double get bottomPlayerHeight => isMobile ? 80.0 : 90.0;
 
-List<Widget> space({double gap = 5, required Iterable<Widget> children}) =>
+List<Widget> space({
+  double widthGap = 5,
+  double heightGap = 5,
+  required Iterable<Widget> children,
+}) =>
     children
         .expand(
           (item) sync* {
-            yield SizedBox(width: gap);
+            yield SizedBox(width: widthGap);
             yield item;
           },
         )
diff --git a/lib/expose/expose_service.dart b/lib/expose/expose_service.dart
index 913a98c6f..2c053548a 100644
--- a/lib/expose/expose_service.dart
+++ b/lib/expose/expose_service.dart
@@ -1,3 +1,5 @@
+import 'dart:async';
+
 import 'package:flutter_discord_rpc/flutter_discord_rpc.dart';
 
 import '../constants.dart';
@@ -7,20 +9,41 @@ class ExposeService {
       : _discordRPC = discordRPC;
 
   final FlutterDiscordRPC? _discordRPC;
+  final _errorController = StreamController<String?>.broadcast();
+  Stream<String?> get discordErrorStream => _errorController.stream;
+  Stream<bool> get isDiscordConnectedStream =>
+      _discordRPC?.isConnectedStream ?? Stream.value(false);
 
   Future<void>? exposeTitleOnline({
     required String songDetails,
     required String state,
-  }) {
-    return _discordRPC?.setActivity(
-      activity: RPCActivity(
-        assets: RPCAssets(
-          largeText: songDetails,
-          smallText: kAppTitle,
-        ),
-        details: songDetails,
-        state: state,
-      ),
-    );
+  }) async {
+    try {
+      if (_discordRPC?.isConnected == false) {
+        await _discordRPC?.connect(autoRetry: true);
+      }
+      if (_discordRPC?.isConnected == true) {
+        await _discordRPC?.setActivity(
+          activity: RPCActivity(
+            assets: RPCAssets(
+              largeText: songDetails,
+              smallText: kAppTitle,
+            ),
+            details: songDetails,
+            state: state,
+          ),
+        );
+      }
+    } on Exception catch (_) {}
+  }
+
+  Future<void> connectToDiscord() async =>
+      _discordRPC?.connect(autoRetry: true);
+
+  Future<void> disconnectFromDiscord() async => _discordRPC?.disconnect();
+
+  Future<void> dispose() async {
+    await _discordRPC?.disconnect();
+    await _errorController.close();
   }
 }
diff --git a/lib/l10n/app_de.arb b/lib/l10n/app_de.arb
index f1c594ac9..8dfaa6cff 100644
--- a/lib/l10n/app_de.arb
+++ b/lib/l10n/app_de.arb
@@ -182,6 +182,7 @@
     "moreOptions": "Mehr Optionen",
     "noRadioServerFound": "Es wurde kein Radio-Server gefunden",
     "connectedTo": "Verbunden mit",
+    "disconnectedFrom": "Getrennt von",
     "tryReconnect": "Versuche Neuverbindung",
     "addedTo": "Hinzugefügt zu",
     "addToPlaylist": "Zu Wiedergabeliste hinzufügen",
@@ -352,7 +353,7 @@
     "clicks": "Clicks",
     "exposeOnlineHeadline": "Veröffentliche deine Höraktivität online",
     "exposeToDiscordTitle": "Discord",
-    "exposeToDiscordSubTitle": "Der Künstler und Titel des Lieds/Radio-Senders/Podcast das du gerade hörst wird online geteilt. Benötigt App-Neustart.",
+    "exposeToDiscordSubTitle": "Der Künstler und Titel des Lieds/Radio-Senders/Podcast das du gerade hörst wird online geteilt.",
     "featureDisabledOnPlatform": "Diese Funktion ist momentan nicht für dieses Betriebssystem aktiviert.",
     "regionNone": "Keine",
     "onlineArtError": "Die Albumkunst-Online-Suche ist momentan nicht verfügbar",
diff --git a/lib/l10n/app_en.arb b/lib/l10n/app_en.arb
index 041059509..1782eb865 100644
--- a/lib/l10n/app_en.arb
+++ b/lib/l10n/app_en.arb
@@ -182,6 +182,7 @@
     "moreOptions": "More options",
     "noRadioServerFound": "No radio server found",
     "connectedTo": "Connected to",
+    "disconnectedFrom": "Disconnected from",
     "tryReconnect": "Try reconnect",
     "addedTo": "Added to",
     "addToPlaylist": "Add to playlist",
@@ -351,7 +352,7 @@
     "clicks": "Clicks",
     "exposeOnlineHeadline": "Expose your listening activity online",
     "exposeToDiscordTitle": "Discord",
-    "exposeToDiscordSubTitle": "The artist and title of the song/station/podcast you are currently listening to are shared. Requires app restart.",
+    "exposeToDiscordSubTitle": "The artist and title of the song/station/podcast you are currently listening to are shared.",
     "featureDisabledOnPlatform": "This feature is currently disabled for this operating system.",
     "regionNone": "None",
     "regionAfghanistan": "Afghanistan",
diff --git a/lib/main.dart b/lib/main.dart
index 6ea47a0a8..357679ded 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -34,7 +34,6 @@ 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';
@@ -60,11 +59,8 @@ Future<void> main(List<String> args) async {
   final sharedPreferences = await SharedPreferences.getInstance();
   final version = (await PackageInfo.fromPlatform()).version;
 
-  final enableDiscord =
-      allowDiscordRPC && sharedPreferences.get(kEnableDiscordRPC) == true;
-  if (enableDiscord) {
+  if (allowDiscordRPC) {
     await FlutterDiscordRPC.initialize(kDiscordApplicationId);
-    FlutterDiscordRPC.instance.connect();
     di.registerLazySingleton<FlutterDiscordRPC>(
       () => FlutterDiscordRPC.instance,
       dispose: (s) {
@@ -80,7 +76,7 @@ Future<void> main(List<String> args) async {
     sharedPreferences: sharedPreferences,
     args: args,
     version: version,
-    enableDiscord: enableDiscord,
+    allowDiscordRPC: allowDiscordRPC,
     downloadsDefaultDir: downloadsDefaultDir,
   );
 
@@ -96,7 +92,7 @@ void registerServicesAndViewModels({
   required SharedPreferences sharedPreferences,
   required List<String> args,
   required String version,
-  required bool enableDiscord,
+  required bool allowDiscordRPC,
 }) {
   di
     ..registerLazySingleton<SharedPreferences>(() => sharedPreferences)
@@ -112,8 +108,9 @@ void registerServicesAndViewModels({
     )
     ..registerLazySingleton<ExposeService>(
       () => ExposeService(
-        discordRPC: enableDiscord ? di<FlutterDiscordRPC>() : null,
+        discordRPC: allowDiscordRPC ? di<FlutterDiscordRPC>() : null,
       ),
+      dispose: (s) => s.dispose(),
     )
     ..registerLazySingleton<PlayerService>(
       () => PlayerService(
@@ -181,7 +178,7 @@ void registerServicesAndViewModels({
     ..registerLazySingleton<PlayerModel>(
       () => PlayerModel(
         service: di<PlayerService>(),
-        connectivity: di<Connectivity>(),
+        onlineArtService: di<OnlineArtService>(),
       )..init(),
       dispose: (s) => s.dispose(),
     )
@@ -190,6 +187,7 @@ void registerServicesAndViewModels({
         appVersion: version,
         gitHub: di<GitHub>(),
         settingsService: di<SettingsService>(),
+        exposeService: di<ExposeService>(),
         allowManualUpdates: Platform.isLinux ? false : true,
       ),
       dispose: (s) => s.dispose(),
@@ -227,11 +225,5 @@ 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_model.dart b/lib/player/player_model.dart
index 9ee73a4a9..cab4879a2 100644
--- a/lib/player/player_model.dart
+++ b/lib/player/player_model.dart
@@ -7,41 +7,47 @@ import 'package:safe_change_notifier/safe_change_notifier.dart';
 
 import '../common/data/audio.dart';
 import '../common/data/mpv_meta_data.dart';
+import '../radio/online_art_service.dart';
 import 'player_service.dart';
 
 const rateValues = [.75, 1.0, 1.25, 1.5, 1.75, 2.0];
 
 class PlayerModel extends SafeChangeNotifier {
-  final PlayerService _service;
   PlayerModel({
     required PlayerService service,
-    required Connectivity connectivity,
-  }) : _service = service;
+    required OnlineArtService onlineArtService,
+  })  : _playerService = service,
+        _onlineArtService = onlineArtService;
 
-  VideoController get controller => _service.controller;
+  final PlayerService _playerService;
+  final OnlineArtService _onlineArtService;
+
+  VideoController get controller => _playerService.controller;
 
   StreamSubscription<bool>? _propertiesChangedSub;
   StreamSubscription<List<ConnectivityResult>>? _connectivitySubscription;
 
-  String? get queueName => _service.queue.name;
+  Stream<String?> get onlineArtError => _onlineArtService.error;
+
+  String? get queueName => _playerService.queue.name;
 
-  List<Audio> get queue => _service.queue.audios;
-  MpvMetaData? get mpvMetaData => _service.mpvMetaData;
+  List<Audio> get queue => _playerService.queue.audios;
+  MpvMetaData? get mpvMetaData => _playerService.mpvMetaData;
 
-  Audio? get audio => _service.audio;
+  Audio? get audio => _playerService.audio;
 
-  bool? get isVideo => _service.isVideo;
+  bool? get isVideo => _playerService.isVideo;
 
-  Audio? get nextAudio => _service.nextAudio;
+  Audio? get nextAudio => _playerService.nextAudio;
 
-  bool get isPlaying => _service.isPlaying;
+  bool get isPlaying => _playerService.isPlaying;
 
-  Duration? get duration => _service.duration;
+  Duration? get duration => _playerService.duration;
 
-  Duration? get position => _service.position;
-  void setPosition(Duration? value) => _service.setPosition(value);
+  Duration? get position => _playerService.position;
+  void setPosition(Duration? value) => _playerService.setPosition(value);
 
-  Duration? get buffer => _service.buffer;
+  Duration? get buffer => _playerService.buffer;
 
   Future<void> seekInSeconds(int seconds) async {
     if (position != null && position!.inSeconds + seconds >= 0) {
@@ -54,53 +60,54 @@ class PlayerModel extends SafeChangeNotifier {
     }
   }
 
-  bool get repeatSingle => _service.repeatSingle;
-  void setRepeatSingle(bool value) => _service.setRepeatSingle(value);
+  bool get repeatSingle => _playerService.repeatSingle;
+  void setRepeatSingle(bool value) => _playerService.setRepeatSingle(value);
 
-  bool get shuffle => _service.shuffle;
-  void setShuffle(bool value) => _service.setShuffle(value);
+  bool get shuffle => _playerService.shuffle;
+  void setShuffle(bool value) => _playerService.setShuffle(value);
 
-  double? get volume => _service.volume;
-  Future<void> setVolume(double value) async => _service.setVolume(value);
+  double? get volume => _playerService.volume;
+  Future<void> setVolume(double value) async => _playerService.setVolume(value);
 
-  double get rate => _service.rate;
-  Future<void> setRate(double value) async => _service.setRate(value);
+  double get rate => _playerService.rate;
+  Future<void> setRate(double value) async => _playerService.setRate(value);
 
-  Future<void> playOrPause() async => _service.playOrPause();
+  Future<void> playOrPause() async => _playerService.playOrPause();
 
-  Future<void> pause() async => _service.pause();
+  Future<void> pause() async => _playerService.pause();
 
-  Future<void> seek() async => _service.seek();
+  Future<void> seek() async => _playerService.seek();
 
-  Future<void> resume() async => _service.resume();
+  Future<void> resume() async => _playerService.resume();
 
   void init() => _propertiesChangedSub ??=
-      _service.propertiesChanged.listen((_) => notifyListeners());
+      _playerService.propertiesChanged.listen((_) => notifyListeners());
 
-  Future<void> playNext() async => _service.playNext();
+  Future<void> playNext() async => _playerService.playNext();
 
-  void insertIntoQueue(Audio audio) async => _service.insertIntoQueue(audio);
+  void insertIntoQueue(Audio audio) async =>
+      _playerService.insertIntoQueue(audio);
 
   void moveAudioInQueue(int oldIndex, int newIndex) async =>
-      _service.moveAudioInQueue(oldIndex, newIndex);
+      _playerService.moveAudioInQueue(oldIndex, newIndex);
 
-  void remove(Audio deleteMe) => _service.remove(deleteMe);
+  void remove(Audio deleteMe) => _playerService.remove(deleteMe);
 
-  Future<void> playPrevious() async => _service.playPrevious();
+  Future<void> playPrevious() async => _playerService.playPrevious();
 
   Future<void> startPlaylist({
     required List<Audio> audios,
     required String listName,
     int? index,
   }) async =>
-      _service.startPlaylist(
+      _playerService.startPlaylist(
         audios: audios,
         listName: listName,
         index: index,
       );
 
-  Color? get color => _service.color;
-  String? get remoteImageUrl => _service.remoteImageUrl;
+  Color? get color => _playerService.color;
+  String? get remoteImageUrl => _playerService.remoteImageUrl;
 
   bool _isUpNextExpanded = false;
   bool get isUpNextExpanded => _isUpNextExpanded;
@@ -110,20 +117,20 @@ class PlayerModel extends SafeChangeNotifier {
     notifyListeners();
   }
 
-  Map<String, Duration>? get lastPositions => _service.lastPositions;
-  Duration? getLastPosition(String? url) => _service.getLastPosition(url);
-  Future<void> safeLastPosition() => _service.safeLastPosition();
+  Map<String, Duration>? get lastPositions => _playerService.lastPositions;
+  Duration? getLastPosition(String? url) => _playerService.getLastPosition(url);
+  Future<void> safeLastPosition() => _playerService.safeLastPosition();
   Future<void> removeLastPosition(String key) =>
-      _service.removeLastPosition(key);
+      _playerService.removeLastPosition(key);
   Future<void> removeLastPositions(List<Audio> audios) =>
-      _service.removeLastPositions(audios);
+      _playerService.removeLastPositions(audios);
 
   int getRadioHistoryLength({String? filter}) =>
       filteredRadioHistory(filter: filter).length;
   Iterable<MapEntry<String, MpvMetaData>> filteredRadioHistory({
     required String? filter,
   }) {
-    return _service.radioHistory.entries.where(
+    return _playerService.radioHistory.entries.where(
       (e) => filter == null
           ? true
           : e.value.icyName.contains(filter) ||
@@ -144,7 +151,7 @@ class PlayerModel extends SafeChangeNotifier {
         .replaceAll(')', '');
   }
 
-  void setTimer(Duration duration) => _service.setTimer(duration);
+  void setTimer(Duration duration) => _playerService.setTimer(duration);
 
   @override
   Future<void> dispose() async {
diff --git a/lib/player/player_service.dart b/lib/player/player_service.dart
index 9939df1d7..37cd389d5 100644
--- a/lib/player/player_service.dart
+++ b/lib/player/player_service.dart
@@ -103,12 +103,16 @@ class PlayerService {
     _audio = value;
     _propertiesChangedController.add(true);
     _setMpvMetaData(null);
-    if (_audio?.audioType != null &&
-        _audio?.title != null &&
-        _audio?.artist != null) {
+    _exposeAudioOnline(_audio);
+  }
+
+  void _exposeAudioOnline(Audio? audio) {
+    if (audio?.audioType != null &&
+        audio?.title != null &&
+        audio?.artist != null) {
       _exposeService.exposeTitleOnline(
-        songDetails: '${_audio!.artist} - ${audio!.title}}',
-        state: switch (_audio!.audioType!) {
+        songDetails: '${audio!.artist} - ${audio.title}}',
+        state: switch (audio.audioType!) {
           AudioType.local => 'Local Music',
           AudioType.podcast => 'Podcast',
           AudioType.radio => 'Internet Radio',
diff --git a/lib/player/view/bottom_player_image.dart b/lib/player/view/bottom_player_image.dart
index 6e5dea1b1..6de7d30b3 100644
--- a/lib/player/view/bottom_player_image.dart
+++ b/lib/player/view/bottom_player_image.dart
@@ -7,7 +7,7 @@ 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_model.dart';
 import 'player_fall_back_image.dart';
 import 'player_remote_source_image.dart';
 
@@ -81,7 +81,7 @@ class BottomPlayerImage extends StatelessWidget with WatchItMixin {
           duration: const Duration(milliseconds: 200),
           child: child,
         ),
-        if (watchStream((OnlineArtModel s) => s.error).data != null &&
+        if (watchStream((PlayerModel s) => s.onlineArtError).data != null &&
             audio?.audioType == AudioType.radio)
           Positioned(
             bottom: 5,
diff --git a/lib/player/view/full_height_player_top_controls.dart b/lib/player/view/full_height_player_top_controls.dart
index af2ebcfe2..0b991253e 100644
--- a/lib/player/view/full_height_player_top_controls.dart
+++ b/lib/player/view/full_height_player_top_controls.dart
@@ -15,7 +15,6 @@ 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';
@@ -56,7 +55,7 @@ class FullHeightPlayerTopControls extends StatelessWidget with WatchItMixin {
         alignment: WrapAlignment.end,
         spacing: 5.0,
         children: [
-          if (watchStream((OnlineArtModel s) => s.error).data != null &&
+          if (watchStream((PlayerModel m) => m.onlineArtError).data != null &&
               audio?.audioType == AudioType.radio)
             IconButton(
               tooltip: context.l10n.onlineArtError,
diff --git a/lib/radio/online_art_model.dart b/lib/radio/online_art_model.dart
deleted file mode 100644
index f9c042147..000000000
--- a/lib/radio/online_art_model.dart
+++ /dev/null
@@ -1,13 +0,0 @@
-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/settings/settings_model.dart b/lib/settings/settings_model.dart
index 20f1622b3..8f63bc173 100644
--- a/lib/settings/settings_model.dart
+++ b/lib/settings/settings_model.dart
@@ -1,8 +1,8 @@
 import 'dart:async';
 import 'dart:io';
-import 'package:path/path.dart' as p;
 
 import 'package:github/github.dart';
+import 'package:path/path.dart' as p;
 import 'package:safe_change_notifier/safe_change_notifier.dart';
 
 import '../../external_path/external_path_service.dart';
diff --git a/lib/settings/view/settings_page.dart b/lib/settings/view/settings_page.dart
index ad8be753a..3b2de6cc7 100644
--- a/lib/settings/view/settings_page.dart
+++ b/lib/settings/view/settings_page.dart
@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:flutter_tabler_icons/flutter_tabler_icons.dart';
 import 'package:path/path.dart' as p;
 import 'package:url_launcher/url_launcher.dart';
 import 'package:watch_it/watch_it.dart';
@@ -13,6 +14,7 @@ import '../../common/view/drop_down_arrow.dart';
 import '../../common/view/global_keys.dart';
 import '../../common/view/icons.dart';
 import '../../common/view/progress.dart';
+import '../../common/view/snackbars.dart';
 import '../../common/view/tapable_text.dart';
 import '../../common/view/theme.dart';
 import '../../constants.dart';
@@ -404,8 +406,14 @@ class _AboutTileState extends State<_AboutTile> {
   @override
   void initState() {
     super.initState();
-    di<AppModel>()
-        .checkForUpdate(di<ConnectivityModel>().isOnline == true, context);
+    di<AppModel>().checkForUpdate(
+      isOnline: di<ConnectivityModel>().isOnline == true,
+      onError: (e) {
+        if (mounted) {
+          showSnackBar(context: context, content: Text(e));
+        }
+      },
+    );
   }
 
   @override
@@ -484,6 +492,11 @@ class _ExposeOnlineSection extends StatelessWidget with WatchItMixin {
   @override
   Widget build(BuildContext context) {
     final l10n = context.l10n;
+
+    final discordEnabled = allowDiscordRPC
+        ? watchPropertyValue((SettingsModel m) => m.enableDiscordRPC)
+        : false;
+
     return YaruSection(
       headline: Text(l10n.exposeOnlineHeadline),
       margin: const EdgeInsets.only(
@@ -494,18 +507,38 @@ class _ExposeOnlineSection extends StatelessWidget with WatchItMixin {
       child: Column(
         children: [
           YaruTile(
-            title: Text(l10n.exposeToDiscordTitle),
+            title: Row(
+              children: space(
+                children: [
+                  allowDiscordRPC
+                      ? const Icon(
+                          TablerIcons.brand_discord_filled,
+                        )
+                      : Icon(
+                          TablerIcons.brand_discord_filled,
+                          color: context.theme.disabledColor,
+                        ),
+                  Text(l10n.exposeToDiscordTitle),
+                ],
+              ),
+            ),
             subtitle: Text(
               allowDiscordRPC
                   ? l10n.exposeToDiscordSubTitle
                   : l10n.featureDisabledOnPlatform,
             ),
             trailing: CommonSwitch(
-              value: allowDiscordRPC
-                  ? watchPropertyValue((SettingsModel m) => m.enableDiscordRPC)
-                  : false,
+              value: discordEnabled,
               onChanged: allowDiscordRPC
-                  ? di<SettingsModel>().setEnableDiscordRPC
+                  ? (v) {
+                      di<SettingsModel>().setEnableDiscordRPC(v);
+                      final appModel = di<AppModel>();
+                      if (v) {
+                        appModel.connectToDiscord();
+                      } else {
+                        appModel.disconnectFromDiscord();
+                      }
+                    }
                   : null,
             ),
           ),
diff --git a/needs_translation.json b/needs_translation.json
index 851ebcad6..beb9b4c80 100644
--- a/needs_translation.json
+++ b/needs_translation.json
@@ -4,6 +4,7 @@
     "downloadsDirectory",
     "downloadsDirectoryDescription",
     "downloadsChangeWarning",
+    "disconnectedFrom",
     "unPinAlbum",
     "radioTagDisclaimerTitle",
     "radioTagDisclaimerSubTitle",
@@ -288,6 +289,7 @@
     "downloadsDirectory",
     "downloadsDirectoryDescription",
     "downloadsChangeWarning",
+    "disconnectedFrom",
     "unPinAlbum",
     "duration",
     "radioTagDisclaimerTitle",
@@ -571,6 +573,7 @@
     "downloadsDirectory",
     "downloadsDirectoryDescription",
     "downloadsChangeWarning",
+    "disconnectedFrom",
     "onlineArtError",
     "clicks",
     "exposeOnlineHeadline",
@@ -584,6 +587,7 @@
     "downloadsDirectory",
     "downloadsDirectoryDescription",
     "downloadsChangeWarning",
+    "disconnectedFrom",
     "unPinAlbum",
     "alwaysAsk",
     "hideToTray",
@@ -853,6 +857,10 @@
     "regionZimbabwe"
   ],
 
+  "it": [
+    "disconnectedFrom"
+  ],
+
   "nl": [
     "shuffle",
     "repeat",
@@ -933,6 +941,7 @@
     "moreOptions",
     "noRadioServerFound",
     "connectedTo",
+    "disconnectedFrom",
     "tryReconnect",
     "addedTo",
     "addToPlaylist",
@@ -1379,6 +1388,7 @@
     "downloadsDirectory",
     "downloadsDirectoryDescription",
     "downloadsChangeWarning",
+    "disconnectedFrom",
     "reorder",
     "move",
     "pinAlbum",
@@ -1730,6 +1740,7 @@
     "moreOptions",
     "noRadioServerFound",
     "connectedTo",
+    "disconnectedFrom",
     "tryReconnect",
     "addedTo",
     "addToPlaylist",
@@ -2204,6 +2215,7 @@
     "moreOptions",
     "noRadioServerFound",
     "connectedTo",
+    "disconnectedFrom",
     "tryReconnect",
     "addedTo",
     "addToPlaylist",
@@ -2636,6 +2648,7 @@
     "downloadsDirectory",
     "downloadsDirectoryDescription",
     "downloadsChangeWarning",
+    "disconnectedFrom",
     "unPinAlbum",
     "language",
     "duration",
@@ -2919,7 +2932,8 @@
   "sk": [
     "downloadsDirectory",
     "downloadsDirectoryDescription",
-    "downloadsChangeWarning"
+    "downloadsChangeWarning",
+    "disconnectedFrom"
   ],
 
   "sv": [
@@ -2963,6 +2977,7 @@
     "moreOptions",
     "noRadioServerFound",
     "connectedTo",
+    "disconnectedFrom",
     "tryReconnect",
     "addedTo",
     "addToPlaylist",
@@ -3391,6 +3406,7 @@
     "downloadsDirectory",
     "downloadsDirectoryDescription",
     "downloadsChangeWarning",
+    "disconnectedFrom",
     "unPinAlbum",
     "radioTagDisclaimerTitle",
     "radioTagDisclaimerSubTitle",
@@ -3674,6 +3690,7 @@
     "downloadsDirectory",
     "downloadsDirectoryDescription",
     "downloadsChangeWarning",
+    "disconnectedFrom",
     "unPinAlbum",
     "skipToLivStream",
     "searchSimilarStation",
@@ -3690,6 +3707,7 @@
     "downloadsDirectory",
     "downloadsDirectoryDescription",
     "downloadsChangeWarning",
+    "disconnectedFrom",
     "unPinAlbum",
     "skipToLivStream",
     "searchSimilarStation",
@@ -3706,6 +3724,7 @@
     "downloadsDirectory",
     "downloadsDirectoryDescription",
     "downloadsChangeWarning",
+    "disconnectedFrom",
     "unPinAlbum",
     "schedulePlaybackStopTimer",
     "alwaysAsk",
@@ -3981,6 +4000,7 @@
     "downloadsDirectory",
     "downloadsDirectoryDescription",
     "downloadsChangeWarning",
+    "disconnectedFrom",
     "unPinAlbum",
     "schedulePlaybackStopTimer",
     "alwaysAsk",