diff --git a/.fvmrc b/.fvmrc
index c0ef54d98..3135e2b9e 100644
--- a/.fvmrc
+++ b/.fvmrc
@@ -1,3 +1,3 @@
 {
-  "flutter": "3.32.0"
+  "flutter": "3.32.2"
 }
\ No newline at end of file
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 0a6532039..f54b3f5e5 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -5,7 +5,7 @@ on:
     branches: [main]
 
 env:
-  FLUTTER_VERSION: '3.32.0'
+  FLUTTER_VERSION: '3.32.2'
 
 jobs:
   analyze:
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 979c98c1a..67f245e4e 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -7,7 +7,7 @@ on:
   workflow_dispatch:
 
 env:
-  FLUTTER_VERSION: '3.32.0'
+  FLUTTER_VERSION: '3.32.2'
 
 jobs:
   release_with_macos_dmg:
diff --git a/lib/common/view/common_control_panel.dart b/lib/common/view/common_control_panel.dart
new file mode 100644
index 000000000..467f42d28
--- /dev/null
+++ b/lib/common/view/common_control_panel.dart
@@ -0,0 +1,36 @@
+import 'package:flutter/material.dart';
+import 'package:yaru/yaru.dart';
+
+import 'icons.dart';
+import 'theme.dart';
+
+class CommonControlPanel extends StatelessWidget {
+  const CommonControlPanel({
+    super.key,
+    required this.labels,
+    required this.isSelected,
+    required this.onSelected,
+  });
+
+  final List<Widget> labels;
+  final List<bool> isSelected;
+  final void Function(int index)? onSelected;
+
+  @override
+  Widget build(BuildContext context) => Align(
+    alignment: Alignment.center,
+    child: YaruChoiceChipBar(
+      clearOnSelect: false,
+      selectedFirst: false,
+      showCheckMarks: false,
+      style: YaruChoiceChipBarStyle.stack,
+      shrinkWrap: true,
+      goNextIcon: Icon(Iconz.goNext),
+      goPreviousIcon: Icon(Iconz.goBack),
+      chipHeight: chipHeight,
+      labels: labels,
+      isSelected: isSelected,
+      onSelected: onSelected,
+    ),
+  );
+}
diff --git a/lib/common/view/sliver_audio_tile_list.dart b/lib/common/view/sliver_audio_tile_list.dart
index 220eb0eda..85109ae03 100644
--- a/lib/common/view/sliver_audio_tile_list.dart
+++ b/lib/common/view/sliver_audio_tile_list.dart
@@ -16,6 +16,7 @@ class SliverAudioTileList extends StatelessWidget with WatchItMixin {
     this.onSubTitleTab,
     required this.audioPageType,
     this.selectedColor,
+    this.constraints,
   });
 
   final List<Audio> audios;
@@ -23,10 +24,11 @@ class SliverAudioTileList extends StatelessWidget with WatchItMixin {
   final AudioPageType audioPageType;
   final void Function(String text)? onSubTitleTab;
   final Color? selectedColor;
+  final BoxConstraints? constraints;
 
   @override
   Widget build(BuildContext context) {
-    final mqSize = context.mediaQuerySize.width;
+    final mqSize = constraints?.maxWidth ?? context.mediaQuerySize.width;
     final playerToTheRight = mqSize > kSideBarThreshHold;
     final width = playerToTheRight ? mqSize - kSideBarPlayerWidth : mqSize;
 
diff --git a/lib/common/view/sliver_body.dart b/lib/common/view/sliver_body.dart
new file mode 100644
index 000000000..e316a641f
--- /dev/null
+++ b/lib/common/view/sliver_body.dart
@@ -0,0 +1,58 @@
+import 'package:flutter/material.dart';
+
+import 'adaptive_container.dart';
+import 'sliver_filter_app_bar.dart';
+import 'theme.dart';
+import 'ui_constants.dart';
+
+class SliverBody extends StatelessWidget {
+  const SliverBody({
+    super.key,
+    required this.controlPanel,
+    required this.contentBuilder,
+    this.onStretchTrigger,
+    this.controlPanelSuffix,
+    this.onNotification,
+  });
+
+  final Widget controlPanel;
+  final Widget? controlPanelSuffix;
+
+  final Widget Function(BuildContext context, BoxConstraints constraints)
+  contentBuilder;
+  final Future<void> Function()? onStretchTrigger;
+  final bool Function(ScrollNotification event)? onNotification;
+
+  @override
+  Widget build(BuildContext context) => LayoutBuilder(
+    builder: (context, constraints) => NotificationListener(
+      onNotification: onNotification,
+      child: CustomScrollView(
+        slivers: [
+          SliverFilterAppBar(
+            padding: getAdaptiveHorizontalPadding(constraints: constraints)
+                .copyWith(
+                  bottom: filterPanelPadding.bottom,
+                  top: filterPanelPadding.top,
+                ),
+
+            title: controlPanel,
+            actions: [
+              if (controlPanelSuffix != null) ...[
+                controlPanelSuffix!,
+                const SizedBox(width: kSmallestSpace),
+              ],
+            ],
+            onStretchTrigger: onStretchTrigger,
+          ),
+          SliverPadding(
+            padding: getAdaptiveHorizontalPadding(
+              constraints: constraints,
+            ).copyWith(bottom: bottomPlayerPageGap),
+            sliver: contentBuilder(context, constraints),
+          ),
+        ],
+      ),
+    ),
+  );
+}
diff --git a/lib/l10n/app_localizations_et.dart b/lib/l10n/app_localizations_et.dart
index 8e57b4a37..0b391d97d 100644
--- a/lib/l10n/app_localizations_et.dart
+++ b/lib/l10n/app_localizations_et.dart
@@ -2159,9 +2159,10 @@ class AppLocalizationsEt extends AppLocalizations {
   }
 
   @override
-  String get useBlurredPlayerBackgroundTitle => 'Use blurred player background';
+  String get useBlurredPlayerBackgroundTitle =>
+      'Kasuta meediaesitajal hägustatud tausta';
 
   @override
   String get useBlurredPlayerBackgroundDescription =>
-      'This will blur the background of the player. This might lead to lower performance on some devices.';
+      'Selle valikuga kuvatakse meediaesitaja taust hägusena, kuid mõnedes seadmetes võib see tekitada jõudlusprobleeme.';
 }
diff --git a/lib/l10n/app_localizations_eu.dart b/lib/l10n/app_localizations_eu.dart
index 808b52b6e..8d9510136 100644
--- a/lib/l10n/app_localizations_eu.dart
+++ b/lib/l10n/app_localizations_eu.dart
@@ -2168,9 +2168,10 @@ class AppLocalizationsEu extends AppLocalizations {
   }
 
   @override
-  String get useBlurredPlayerBackgroundTitle => 'Use blurred player background';
+  String get useBlurredPlayerBackgroundTitle =>
+      'Erabili erreproduzitzailearen atzeko plano lausoa';
 
   @override
   String get useBlurredPlayerBackgroundDescription =>
-      'This will blur the background of the player. This might lead to lower performance on some devices.';
+      'Honek erreproduzitzailearen atzeko planoa lausotuko du. Honek errendimendua txikiagoa izan dezake gailu batzuetan.';
 }
diff --git a/lib/l10n/app_localizations_fr.dart b/lib/l10n/app_localizations_fr.dart
index a84de0df5..1d65e767c 100644
--- a/lib/l10n/app_localizations_fr.dart
+++ b/lib/l10n/app_localizations_fr.dart
@@ -2168,13 +2168,13 @@ class AppLocalizationsFr extends AppLocalizations {
 
   @override
   String downloadsOfLatestRelease(String latestRelease) {
-    return 'Downloaded $latestRelease times outside of snapstore and flathub';
+    return 'Téléchargé $latestRelease fois en dehors du snapstore et de flathub';
   }
 
   @override
-  String get useBlurredPlayerBackgroundTitle => 'Use blurred player background';
+  String get useBlurredPlayerBackgroundTitle => 'Flouter le fond du lecteur';
 
   @override
   String get useBlurredPlayerBackgroundDescription =>
-      'This will blur the background of the player. This might lead to lower performance on some devices.';
+      'Cela va flouter l\'arrière-plan du lecteur. Les performances de certains appareils peuvent être affectées.';
 }
diff --git a/lib/l10n/app_localizations_it.dart b/lib/l10n/app_localizations_it.dart
index 2d77f6082..bfa88d608 100644
--- a/lib/l10n/app_localizations_it.dart
+++ b/lib/l10n/app_localizations_it.dart
@@ -2155,9 +2155,10 @@ class AppLocalizationsIt extends AppLocalizations {
   }
 
   @override
-  String get useBlurredPlayerBackgroundTitle => 'Use blurred player background';
+  String get useBlurredPlayerBackgroundTitle =>
+      'Usa sfondo riproduttore sfocato';
 
   @override
   String get useBlurredPlayerBackgroundDescription =>
-      'This will blur the background of the player. This might lead to lower performance on some devices.';
+      'Ciò offuscerà lo sfondo del riproduttore. Ciò potrebbe portare in alcuni dispositivi a prestazioni più basse.';
 }
diff --git a/lib/l10n/app_localizations_sk.dart b/lib/l10n/app_localizations_sk.dart
index c1106f639..7d548e658 100644
--- a/lib/l10n/app_localizations_sk.dart
+++ b/lib/l10n/app_localizations_sk.dart
@@ -2157,9 +2157,10 @@ class AppLocalizationsSk extends AppLocalizations {
   }
 
   @override
-  String get useBlurredPlayerBackgroundTitle => 'Use blurred player background';
+  String get useBlurredPlayerBackgroundTitle =>
+      'Použiť rozmazané pozadie prehrávača';
 
   @override
   String get useBlurredPlayerBackgroundDescription =>
-      'This will blur the background of the player. This might lead to lower performance on some devices.';
+      'Týmto sa rozmaže pozadie prehrávača. Na niektorých zariadeniach to môže viesť k nižšiemu výkonu.';
 }
diff --git a/lib/l10n/app_localizations_sv.dart b/lib/l10n/app_localizations_sv.dart
index bfc0632f2..271acedc1 100644
--- a/lib/l10n/app_localizations_sv.dart
+++ b/lib/l10n/app_localizations_sv.dart
@@ -2152,9 +2152,10 @@ class AppLocalizationsSv extends AppLocalizations {
   }
 
   @override
-  String get useBlurredPlayerBackgroundTitle => 'Use blurred player background';
+  String get useBlurredPlayerBackgroundTitle =>
+      'Använd suddig bakgrund för spelaren';
 
   @override
   String get useBlurredPlayerBackgroundDescription =>
-      'This will blur the background of the player. This might lead to lower performance on some devices.';
+      'Detta gör spelarens bakgrund suddig. Detta kan leda till lägre prestanda på vissa enheter.';
 }
diff --git a/lib/l10n/app_localizations_zh.dart b/lib/l10n/app_localizations_zh.dart
index 3cfd1278e..50144b732 100644
--- a/lib/l10n/app_localizations_zh.dart
+++ b/lib/l10n/app_localizations_zh.dart
@@ -587,7 +587,7 @@ class AppLocalizationsZh extends AppLocalizations {
   String get system => '系统';
 
   @override
-  String get dark => '浅色';
+  String get dark => '深色';
 
   @override
   String get podcastProvider => '播客提供商';
diff --git a/lib/local_audio/view/local_audio_body.dart b/lib/local_audio/view/local_audio_body.dart
index fef276e4a..faa080855 100644
--- a/lib/local_audio/view/local_audio_body.dart
+++ b/lib/local_audio/view/local_audio_body.dart
@@ -19,6 +19,7 @@ class LocalAudioBody extends StatelessWidget {
     required this.playlists,
     this.noResultMessage,
     this.noResultIcon,
+    this.constraints,
   });
 
   final LocalAudioView localAudioView;
@@ -29,10 +30,12 @@ class LocalAudioBody extends StatelessWidget {
   final List<String>? genres;
   final List<String>? playlists;
   final Widget? noResultMessage, noResultIcon;
+  final BoxConstraints? constraints;
 
   @override
   Widget build(BuildContext context) => switch (localAudioView) {
     LocalAudioView.titles => TitlesView(
+      constraints: constraints,
       audios: titles,
       noResultMessage: noResultMessage,
       noResultIcon: noResultIcon,
diff --git a/lib/local_audio/view/local_audio_control_panel.dart b/lib/local_audio/view/local_audio_control_panel.dart
index 7b181ac81..1631ebf99 100644
--- a/lib/local_audio/view/local_audio_control_panel.dart
+++ b/lib/local_audio/view/local_audio_control_panel.dart
@@ -1,9 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:watch_it/watch_it.dart';
-import 'package:yaru/yaru.dart';
 
-import '../../common/view/icons.dart';
-import '../../common/view/ui_constants.dart';
+import '../../common/view/common_control_panel.dart';
 import '../../l10n/l10n.dart';
 import '../local_audio_model.dart';
 import '../local_audio_view.dart';
@@ -16,29 +14,16 @@ class LocalAudioControlPanel extends StatelessWidget with WatchItMixin {
     final index = watchPropertyValue((LocalAudioModel m) => m.localAudioindex);
     final audios = watchPropertyValue((LocalAudioModel m) => m.audios);
 
-    return Padding(
-      padding: const EdgeInsets.symmetric(horizontal: kSmallestSpace),
-      child: SingleChildScrollView(
-        scrollDirection: Axis.horizontal,
-        child: YaruChoiceChipBar(
-          showCheckMarks: false,
-          shrinkWrap: true,
-          goNextIcon: Icon(Iconz.goNext),
-          goPreviousIcon: Icon(Iconz.goBack),
-          style: YaruChoiceChipBarStyle.wrap,
-          selectedFirst: false,
-          clearOnSelect: false,
-          labels: LocalAudioView.values
-              .map((e) => Text(e.localize(context.l10n)))
-              .toList(),
-          isSelected: LocalAudioView.values
-              .map((e) => e == LocalAudioView.values[index])
-              .toList(),
-          onSelected: audios == null
-              ? null
-              : di<LocalAudioModel>().setLocalAudioindex,
-        ),
-      ),
+    return CommonControlPanel(
+      labels: LocalAudioView.values
+          .map((e) => Text(e.localize(context.l10n)))
+          .toList(),
+      isSelected: LocalAudioView.values
+          .map((e) => e == LocalAudioView.values[index])
+          .toList(),
+      onSelected: audios == null
+          ? null
+          : di<LocalAudioModel>().setLocalAudioindex,
     );
   }
 }
diff --git a/lib/local_audio/view/local_audio_page.dart b/lib/local_audio/view/local_audio_page.dart
index d419380c7..35a52628b 100644
--- a/lib/local_audio/view/local_audio_page.dart
+++ b/lib/local_audio/view/local_audio_page.dart
@@ -5,11 +5,10 @@ import 'package:watch_it/watch_it.dart';
 import '../../app/view/routing_manager.dart';
 import '../../common/data/audio_type.dart';
 import '../../common/page_ids.dart';
-import '../../common/view/adaptive_container.dart';
 import '../../common/view/header_bar.dart';
 import '../../common/view/no_search_result_page.dart';
 import '../../common/view/search_button.dart';
-import '../../common/view/sliver_filter_app_bar.dart';
+import '../../common/view/sliver_body.dart';
 import '../../common/view/theme.dart';
 import '../../common/view/ui_constants.dart';
 import '../../l10n/l10n.dart';
@@ -82,46 +81,30 @@ class _LocalAudioPageState extends State<LocalAudioPage> {
         ],
         title: Text(context.l10n.localAudio),
       ),
-      body: LayoutBuilder(
-        builder: (context, constraints) {
-          return CustomScrollView(
-            slivers: [
-              SliverFilterAppBar(
-                padding: getAdaptiveHorizontalPadding(constraints: constraints)
-                    .copyWith(
-                      bottom: filterPanelPadding.bottom,
-                      top: filterPanelPadding.top,
-                    ),
-                title: const LocalAudioControlPanel(),
+      body: SliverBody(
+        controlPanel: const LocalAudioControlPanel(),
+        contentBuilder: (context, constraints) =>
+            audios != null && audios.isEmpty
+            ? SliverNoSearchResultPage(
+                icon: const AnimatedEmoji(AnimatedEmojis.bird),
+                message: Column(
+                  mainAxisSize: MainAxisSize.min,
+                  children: [
+                    Text(context.l10n.noLocalTitlesFound),
+                    const SizedBox(height: kLargestSpace),
+                    const SettingsButton.important(scrollIndex: 2),
+                  ],
+                ),
+              )
+            : LocalAudioBody(
+                constraints: constraints,
+                localAudioView: localAudioView,
+                titles: audios,
+                albumIDs: allAlbumIDs,
+                artists: allArtists,
+                genres: allGenres,
+                playlists: playlists,
               ),
-              SliverPadding(
-                padding: getAdaptiveHorizontalPadding(
-                  constraints: constraints,
-                ).copyWith(bottom: bottomPlayerPageGap),
-                sliver: audios != null && audios.isEmpty
-                    ? SliverNoSearchResultPage(
-                        icon: const AnimatedEmoji(AnimatedEmojis.bird),
-                        message: Column(
-                          mainAxisSize: MainAxisSize.min,
-                          children: [
-                            Text(context.l10n.noLocalTitlesFound),
-                            const SizedBox(height: kLargestSpace),
-                            const SettingsButton.important(scrollIndex: 2),
-                          ],
-                        ),
-                      )
-                    : LocalAudioBody(
-                        localAudioView: localAudioView,
-                        titles: audios,
-                        albumIDs: allAlbumIDs,
-                        artists: allArtists,
-                        genres: allGenres,
-                        playlists: playlists,
-                      ),
-              ),
-            ],
-          );
-        },
       ),
     );
   }
diff --git a/lib/local_audio/view/titles_view.dart b/lib/local_audio/view/titles_view.dart
index 946992563..24cd0aeea 100644
--- a/lib/local_audio/view/titles_view.dart
+++ b/lib/local_audio/view/titles_view.dart
@@ -18,10 +18,12 @@ class TitlesView extends StatelessWidget with WatchItMixin {
     required this.audios,
     this.noResultMessage,
     this.noResultIcon,
+    this.constraints,
   });
 
   final List<Audio>? audios;
   final Widget? noResultMessage, noResultIcon;
+  final BoxConstraints? constraints;
 
   @override
   Widget build(BuildContext context) {
@@ -39,6 +41,7 @@ class TitlesView extends StatelessWidget with WatchItMixin {
     }
 
     return SliverAudioTileList(
+      constraints: constraints,
       audios: audios!,
       audioPageType: AudioPageType.allTitlesView,
       pageId: PageIDs.localAudio,
diff --git a/lib/podcasts/view/podcast_collection_control_panel.dart b/lib/podcasts/view/podcast_collection_control_panel.dart
index 7a7c1624c..4197bbef2 100644
--- a/lib/podcasts/view/podcast_collection_control_panel.dart
+++ b/lib/podcasts/view/podcast_collection_control_panel.dart
@@ -1,16 +1,13 @@
 import 'package:flutter/material.dart';
 import 'package:watch_it/watch_it.dart';
-import 'package:yaru/yaru.dart';
 
 import '../../app/connectivity_model.dart';
+import '../../common/view/common_control_panel.dart';
 import '../../common/view/confirm.dart';
-import '../../common/view/icons.dart';
 import '../../common/view/offline_page.dart';
-import '../../common/view/ui_constants.dart';
 import '../../custom_content/custom_content_model.dart';
 import '../../l10n/l10n.dart';
 import '../../library/library_model.dart';
-import '../../settings/view/settings_action.dart';
 import '../podcast_model.dart';
 
 class PodcastCollectionControlPanel extends StatelessWidget with WatchItMixin {
@@ -34,72 +31,52 @@ class PodcastCollectionControlPanel extends StatelessWidget with WatchItMixin {
       (CustomContentModel m) => m.processing,
     );
 
-    return Row(
-      spacing: kSmallestSpace,
-      children: [
-        const SizedBox(width: kSmallestSpace + 2 * kLargestSpace),
-        Expanded(
-          child: Center(
-            child: YaruChoiceChipBar(
-              showCheckMarks: false,
-              goNextIcon: Icon(Iconz.goNext),
-              goPreviousIcon: Icon(Iconz.goBack),
-              style: YaruChoiceChipBarStyle.wrap,
-              clearOnSelect: false,
-              selectedFirst: false,
-              labels: [
-                Text(context.l10n.newEpisodes),
-                Text(context.l10n.downloadsOnly),
-              ],
-              isSelected: [updatesOnly, downloadsOnly],
-              onSelected: processing || checkingForUpdates
-                  ? null
-                  : (index) {
-                      if (index == 0) {
-                        if (updatesOnly) {
-                          model.setUpdatesOnly(false);
-                        } else {
-                          if (di<LibraryModel>().podcastsLength > 10) {
-                            showDialog(
-                              context: context,
-                              builder: (context) => ConfirmationDialog(
-                                title: Text(context.l10n.checkForUpdates),
-                                confirmLabel: context.l10n.checkForUpdates,
-                                content: Text(
-                                  context.l10n.checkForUpdatesConfirm(
-                                    di<LibraryModel>().podcastsLength
-                                        .toString(),
-                                  ),
-                                ),
-                                onConfirm: () => model.update(
-                                  updateMessage:
-                                      context.l10n.newEpisodeAvailable,
-                                ),
-                              ),
-                            );
-                          } else {
-                            model.update(
-                              updateMessage: context.l10n.newEpisodeAvailable,
-                            );
-                          }
-                          model.setUpdatesOnly(true);
-                          model.setDownloadsOnly(false);
-                        }
-                      } else {
-                        if (downloadsOnly) {
-                          model.setDownloadsOnly(false);
-                        } else {
-                          model.setDownloadsOnly(true);
-                          model.setUpdatesOnly(false);
-                        }
-                      }
-                    },
-            ),
-          ),
-        ),
-        const SettingsButton.icon(scrollIndex: 1),
-        const SizedBox(width: kSmallestSpace),
+    return CommonControlPanel(
+      labels: [
+        Text(context.l10n.newEpisodes),
+        Text(context.l10n.downloadsOnly),
       ],
+      isSelected: [updatesOnly, downloadsOnly],
+      onSelected: processing || checkingForUpdates
+          ? null
+          : (index) {
+              if (index == 0) {
+                if (updatesOnly) {
+                  model.setUpdatesOnly(false);
+                } else {
+                  if (di<LibraryModel>().podcastsLength > 10) {
+                    showDialog(
+                      context: context,
+                      builder: (context) => ConfirmationDialog(
+                        title: Text(context.l10n.checkForUpdates),
+                        confirmLabel: context.l10n.checkForUpdates,
+                        content: Text(
+                          context.l10n.checkForUpdatesConfirm(
+                            di<LibraryModel>().podcastsLength.toString(),
+                          ),
+                        ),
+                        onConfirm: () => model.update(
+                          updateMessage: context.l10n.newEpisodeAvailable,
+                        ),
+                      ),
+                    );
+                  } else {
+                    model.update(
+                      updateMessage: context.l10n.newEpisodeAvailable,
+                    );
+                  }
+                  model.setUpdatesOnly(true);
+                  model.setDownloadsOnly(false);
+                }
+              } else {
+                if (downloadsOnly) {
+                  model.setDownloadsOnly(false);
+                } else {
+                  model.setDownloadsOnly(true);
+                  model.setUpdatesOnly(false);
+                }
+              }
+            },
     );
   }
 }
diff --git a/lib/podcasts/view/podcasts_collection_body.dart b/lib/podcasts/view/podcasts_collection_body.dart
index ee135d23a..8005d0ea5 100644
--- a/lib/podcasts/view/podcasts_collection_body.dart
+++ b/lib/podcasts/view/podcasts_collection_body.dart
@@ -7,7 +7,6 @@ import '../../app/view/routing_manager.dart';
 import '../../common/data/audio.dart';
 import '../../common/data/audio_type.dart';
 import '../../common/page_ids.dart';
-import '../../common/view/adaptive_container.dart';
 import '../../common/view/audio_card.dart';
 import '../../common/view/audio_card_bottom.dart';
 import '../../common/view/confirm.dart';
@@ -15,6 +14,7 @@ import '../../common/view/loading_grid.dart';
 import '../../common/view/no_search_result_page.dart';
 import '../../common/view/offline_page.dart';
 import '../../common/view/safe_network_image.dart';
+import '../../common/view/sliver_body.dart';
 import '../../common/view/theme.dart';
 import '../../custom_content/custom_content_model.dart';
 import '../../extensions/build_context_x.dart';
@@ -23,6 +23,7 @@ import '../../l10n/l10n.dart';
 import '../../library/library_model.dart';
 import '../../player/player_model.dart';
 import '../../search/search_model.dart';
+import '../../settings/view/settings_action.dart';
 import '../podcast_model.dart';
 import 'podcast_collection_control_panel.dart';
 
@@ -59,23 +60,35 @@ class PodcastsCollectionBody extends StatelessWidget with WatchItMixin {
         ? updatesLength
         : (downloadsOnly ? feedsWithDownloadLength : subsLength);
 
-    return Column(
-      crossAxisAlignment: CrossAxisAlignment.start,
-      children: [
-        Padding(
-          padding: const EdgeInsets.symmetric(vertical: 5),
-          child: Container(
-            alignment: Alignment.center,
-            height: context.theme.appBarTheme.toolbarHeight,
-            margin: filterPanelPadding,
-            child: const PodcastCollectionControlPanel(),
-          ),
-        ),
-        if (checkingForUpdates)
-          Expanded(child: LoadingGrid(limit: subsLength))
-        else if (subsLength == 0)
-          Expanded(
-            child: NoSearchResultPage(
+    return SliverBody(
+      controlPanel: const PodcastCollectionControlPanel(),
+      controlPanelSuffix: const SettingsButton.icon(scrollIndex: 1),
+      onStretchTrigger: () async {
+        if (checkingForUpdates || processing) return;
+        if (subsLength > 10) {
+          showDialog(
+            context: context,
+            builder: (context) => ConfirmationDialog(
+              title: Text(context.l10n.checkForUpdates),
+              confirmLabel: context.l10n.checkForUpdates,
+              content: Text(
+                context.l10n.checkForUpdatesConfirm(subsLength.toString()),
+              ),
+              onConfirm: () => di<PodcastModel>().update(
+                updateMessage: context.l10n.newEpisodeAvailable,
+              ),
+            ),
+          );
+        } else {
+          di<PodcastModel>().update(
+            updateMessage: context.l10n.newEpisodeAvailable,
+          );
+        }
+      },
+      contentBuilder: (context, constraints) => checkingForUpdates
+          ? SliverLoadingGrid(limit: subsLength)
+          : (subsLength == 0)
+          ? SliverNoSearchResultPage(
               icon: const AnimatedEmoji(AnimatedEmojis.faceInClouds),
               message: Column(
                 mainAxisSize: MainAxisSize.min,
@@ -94,109 +107,63 @@ class PodcastsCollectionBody extends StatelessWidget with WatchItMixin {
                   ),
                 ],
               ),
-            ),
-          )
-        else
-          Expanded(
-            child: LayoutBuilder(
-              builder: (context, constraints) {
-                return RefreshIndicator(
-                  onRefresh: () async {
-                    if (checkingForUpdates || processing) return;
-                    if (subsLength > 10) {
-                      showDialog(
-                        context: context,
-                        builder: (context) => ConfirmationDialog(
-                          title: Text(context.l10n.checkForUpdates),
-                          confirmLabel: context.l10n.checkForUpdates,
-                          content: Text(
-                            context.l10n.checkForUpdatesConfirm(
-                              subsLength.toString(),
-                            ),
-                          ),
-                          onConfirm: () => di<PodcastModel>().update(
-                            updateMessage: context.l10n.newEpisodeAvailable,
-                          ),
-                        ),
-                      );
-                    } else {
-                      di<PodcastModel>().update(
-                        updateMessage: context.l10n.newEpisodeAvailable,
-                      );
-                    }
-                  },
-                  child: GridView.builder(
-                    padding: getAdaptiveHorizontalPadding(
-                      constraints: constraints,
-                    ),
-                    itemCount: itemCount,
-                    gridDelegate: audioCardGridDelegate,
-                    itemBuilder: (context, index) {
-                      final List<Audio>? episodes;
-                      final String? feedUrl;
-                      if (updatesOnly) {
-                        feedUrl = subs
-                            .where(
-                              (e) => libraryModel.podcastUpdateAvailable(e),
-                            )
-                            .elementAtOrNull(index);
-                      } else if (downloadsOnly) {
-                        feedUrl = subs
-                            .where((e) => libraryModel.feedHasDownload(e))
-                            .elementAtOrNull(index);
-                      } else {
-                        feedUrl = subs.elementAtOrNull(index);
-                      }
+            )
+          : SliverGrid.builder(
+              itemCount: itemCount,
+              gridDelegate: audioCardGridDelegate,
+              itemBuilder: (context, index) {
+                final List<Audio>? episodes;
+                final String? feedUrl;
+                if (updatesOnly) {
+                  feedUrl = subs
+                      .where((e) => libraryModel.podcastUpdateAvailable(e))
+                      .elementAtOrNull(index);
+                } else if (downloadsOnly) {
+                  feedUrl = subs
+                      .where((e) => libraryModel.feedHasDownload(e))
+                      .elementAtOrNull(index);
+                } else {
+                  feedUrl = subs.elementAtOrNull(index);
+                }
 
-                      episodes = libraryModel.getPodcast(feedUrl);
+                episodes = libraryModel.getPodcast(feedUrl);
 
-                      if (feedUrl == null || episodes == null) {
-                        return const SizedBox.shrink();
-                      }
-                      final first = episodes.firstOrNull;
+                if (feedUrl == null || episodes == null) {
+                  return const SizedBox.shrink();
+                }
+                final first = episodes.firstOrNull;
 
-                      return AudioCard(
-                        key: ValueKey(feedUrl),
-                        image: SafeNetworkImage(
-                          url: first?.albumArtUrl ?? first?.imageUrl,
-                          fit: BoxFit.cover,
-                          height: audioCardDimension,
-                          width: audioCardDimension,
-                        ),
-                        bottom: AudioCardBottom(
-                          style: libraryModel.podcastUpdateAvailable(feedUrl)
-                              ? theme.textTheme.bodyMedium?.copyWith(
-                                      color: theme.colorScheme.primary,
-                                      fontWeight: FontWeight.bold,
-                                    ) ??
-                                    TextStyle(
-                                      color: theme.colorScheme.primary,
-                                      fontWeight: FontWeight.bold,
-                                    )
-                              : null,
-                          text:
-                              first?.album?.unEscapeHtml ??
-                              first?.title ??
-                              first.toString(),
-                        ),
-                        onPlay: () => di<PlayerModel>()
-                            .startPlaylist(
-                              audios: episodes!,
-                              listName: feedUrl!,
-                            )
-                            .then(
-                              (_) => libraryModel.removePodcastUpdate(feedUrl!),
-                            ),
-                        onTap: () =>
-                            di<RoutingManager>().push(pageId: feedUrl!),
-                      );
-                    },
+                return AudioCard(
+                  key: ValueKey(feedUrl),
+                  image: SafeNetworkImage(
+                    url: first?.albumArtUrl ?? first?.imageUrl,
+                    fit: BoxFit.cover,
+                    height: audioCardDimension,
+                    width: audioCardDimension,
+                  ),
+                  bottom: AudioCardBottom(
+                    style: libraryModel.podcastUpdateAvailable(feedUrl)
+                        ? theme.textTheme.bodyMedium?.copyWith(
+                                color: theme.colorScheme.primary,
+                                fontWeight: FontWeight.bold,
+                              ) ??
+                              TextStyle(
+                                color: theme.colorScheme.primary,
+                                fontWeight: FontWeight.bold,
+                              )
+                        : null,
+                    text:
+                        first?.album?.unEscapeHtml ??
+                        first?.title ??
+                        first.toString(),
                   ),
+                  onPlay: () => di<PlayerModel>()
+                      .startPlaylist(audios: episodes!, listName: feedUrl!)
+                      .then((_) => libraryModel.removePodcastUpdate(feedUrl!)),
+                  onTap: () => di<RoutingManager>().push(pageId: feedUrl!),
                 );
               },
             ),
-          ),
-      ],
     );
   }
 }
diff --git a/lib/radio/view/radio_lib_page.dart b/lib/radio/view/radio_lib_page.dart
index 7c92f92a6..072a03202 100644
--- a/lib/radio/view/radio_lib_page.dart
+++ b/lib/radio/view/radio_lib_page.dart
@@ -1,9 +1,10 @@
 import 'package:flutter/material.dart';
 import 'package:watch_it/watch_it.dart';
 
-import '../../common/view/adaptive_container.dart';
 import '../../common/view/progress.dart';
+import '../../common/view/sliver_body.dart';
 import '../../custom_content/custom_content_model.dart';
+import '../../settings/view/settings_action.dart';
 import '../radio_model.dart';
 import 'favorite_radio_tags_grid.dart';
 import 'radio_history_list.dart';
@@ -22,35 +23,17 @@ class RadioLibPage extends StatelessWidget with WatchItMixin {
       (CustomContentModel m) => m.processing,
     );
 
-    return Column(
-      children: [
-        const RadioLibPageControlPanel(),
-        Expanded(
-          child: processing
-              ? const Center(child: Progress())
-              : LayoutBuilder(
-                  builder: (context, constraints) {
-                    return CustomScrollView(
-                      slivers: [
-                        SliverPadding(
-                          padding: getAdaptiveHorizontalPadding(
-                            constraints: constraints,
-                          ),
-                          sliver: switch (radioCollectionView) {
-                            RadioCollectionView.stations =>
-                              const StarredStationsGrid(),
-                            RadioCollectionView.tags =>
-                              const FavoriteRadioTagsGrid(),
-                            RadioCollectionView.history =>
-                              const SliverRadioHistoryList(),
-                          },
-                        ),
-                      ],
-                    );
-                  },
-                ),
-        ),
-      ],
-    );
+    return processing
+        ? const Center(child: Progress())
+        : SliverBody(
+            controlPanel: const RadioLibPageControlPanel(),
+            controlPanelSuffix: const SettingsButton.icon(scrollIndex: 3),
+            contentBuilder: (context, constraints) =>
+                switch (radioCollectionView) {
+                  RadioCollectionView.stations => const StarredStationsGrid(),
+                  RadioCollectionView.tags => const FavoriteRadioTagsGrid(),
+                  RadioCollectionView.history => const SliverRadioHistoryList(),
+                },
+          );
   }
 }
diff --git a/lib/radio/view/radio_lib_page_control_panel.dart b/lib/radio/view/radio_lib_page_control_panel.dart
index d6f9d5dc7..9871f5793 100644
--- a/lib/radio/view/radio_lib_page_control_panel.dart
+++ b/lib/radio/view/radio_lib_page_control_panel.dart
@@ -1,13 +1,8 @@
 import 'package:flutter/material.dart';
 import 'package:watch_it/watch_it.dart';
-import 'package:yaru/yaru.dart';
 
-import '../../common/view/icons.dart';
-import '../../common/view/theme.dart';
-import '../../common/view/ui_constants.dart';
-import '../../extensions/build_context_x.dart';
+import '../../common/view/common_control_panel.dart';
 import '../../l10n/l10n.dart';
-import '../../settings/view/settings_action.dart';
 import '../radio_model.dart';
 
 class RadioLibPageControlPanel extends StatelessWidget with WatchItMixin {
@@ -20,47 +15,17 @@ class RadioLibPageControlPanel extends StatelessWidget with WatchItMixin {
     );
     final radioModel = di<RadioModel>();
 
-    return Padding(
-      padding: const EdgeInsets.symmetric(vertical: 5),
-      child: Container(
-        alignment: Alignment.center,
-        margin: filterPanelPadding,
-        height: context.theme.appBarTheme.toolbarHeight,
-        child: Row(
-          spacing: kSmallestSpace,
-          children: [
-            const SizedBox(width: kSmallestSpace + 2 * kLargestSpace),
-            Expanded(
-              child: Center(
-                child: SingleChildScrollView(
-                  scrollDirection: Axis.horizontal,
-                  child: YaruChoiceChipBar(
-                    showCheckMarks: false,
-                    goNextIcon: Icon(Iconz.goNext),
-                    goPreviousIcon: Icon(Iconz.goBack),
-                    selectedFirst: false,
-                    clearOnSelect: false,
-                    onSelected: (index) => radioModel.setRadioCollectionView(
-                      RadioCollectionView.values[index],
-                    ),
-                    style: YaruChoiceChipBarStyle.wrap,
-                    labels: [
-                      Text(context.l10n.station),
-                      Text(context.l10n.tags),
-                      Text(context.l10n.hearingHistory),
-                    ],
-                    isSelected: RadioCollectionView.values
-                        .map((e) => e == radioCollectionView)
-                        .toList(),
-                  ),
-                ),
-              ),
-            ),
-            const SettingsButton.icon(scrollIndex: 3),
-            const SizedBox(width: kSmallestSpace),
-          ],
-        ),
-      ),
+    return CommonControlPanel(
+      onSelected: (index) =>
+          radioModel.setRadioCollectionView(RadioCollectionView.values[index]),
+      labels: [
+        Text(context.l10n.station),
+        Text(context.l10n.tags),
+        Text(context.l10n.hearingHistory),
+      ],
+      isSelected: RadioCollectionView.values
+          .map((e) => e == radioCollectionView)
+          .toList(),
     );
   }
 }
diff --git a/lib/search/view/search_page.dart b/lib/search/view/search_page.dart
index da64cee8b..e95031e17 100644
--- a/lib/search/view/search_page.dart
+++ b/lib/search/view/search_page.dart
@@ -4,11 +4,10 @@ import 'package:watch_it/watch_it.dart';
 
 import '../../app/view/routing_manager.dart';
 import '../../common/data/audio_type.dart';
-import '../../common/view/adaptive_container.dart';
 import '../../common/view/header_bar.dart';
 import '../../common/view/progress.dart';
 import '../../common/view/search_button.dart';
-import '../../common/view/sliver_filter_app_bar.dart';
+import '../../common/view/sliver_body.dart';
 import '../../common/view/theme.dart';
 import '../../common/view/ui_constants.dart';
 import '../../extensions/taget_platform_x.dart';
@@ -57,72 +56,48 @@ class SearchPage extends StatelessWidget with WatchItMixin {
           ),
         ],
       ),
-      body: LayoutBuilder(
-        builder: (context, constraints) {
-          return NotificationListener<ScrollNotification>(
-            onNotification: (notification) {
-              if (audioType == AudioType.local) return true;
+      body: SliverBody(
+        controlPanel: switch (audioType) {
+          AudioType.podcast => const SliverPodcastFilterBar(),
+          _ => const SearchTypeFilterBar(),
+        },
+        contentBuilder: (context, constraints) => switch (audioType) {
+          AudioType.radio => const SliverRadioSearchResults(),
+          AudioType.podcast => const SliverPodcastSearchResults(),
+          AudioType.local => const SliverLocalSearchResult(),
+        },
+        onStretchTrigger: () async {
+          WidgetsBinding.instance.addPostFrameCallback((timeStamp) async {
+            if (context.mounted) {
+              return di<SearchModel>().search();
+            }
+          });
+        },
+        onNotification: (ScrollNotification notification) {
+          if (audioType == AudioType.local) return true;
 
-              if (notification is UserScrollNotification) {
-                if (notification.metrics.axisDirection == AxisDirection.down &&
-                    notification.direction == ScrollDirection.reverse &&
-                    notification.metrics.pixels >=
-                        notification.metrics.maxScrollExtent * 0.6) {
-                  di<SearchModel>()
-                    ..incrementLimit(8)
-                    ..search();
-                }
-              } else if (notification is ScrollEndNotification) {
-                final metrics = notification.metrics;
-                if (metrics.atEdge) {
-                  final isAtBottom = metrics.pixels != 0;
-                  if (isAtBottom) {
-                    di<SearchModel>()
-                      ..incrementLimit(16)
-                      ..search();
-                  }
-                }
+          if (notification is UserScrollNotification) {
+            if (notification.metrics.axisDirection == AxisDirection.down &&
+                notification.direction == ScrollDirection.reverse &&
+                notification.metrics.pixels >=
+                    notification.metrics.maxScrollExtent * 0.6) {
+              di<SearchModel>()
+                ..incrementLimit(8)
+                ..search();
+            }
+          } else if (notification is ScrollEndNotification) {
+            final metrics = notification.metrics;
+            if (metrics.atEdge) {
+              final isAtBottom = metrics.pixels != 0;
+              if (isAtBottom) {
+                di<SearchModel>()
+                  ..incrementLimit(16)
+                  ..search();
               }
+            }
+          }
 
-              return true;
-            },
-            child: CustomScrollView(
-              slivers: [
-                SliverFilterAppBar(
-                  padding:
-                      getAdaptiveHorizontalPadding(
-                        constraints: constraints,
-                      ).copyWith(
-                        bottom: filterPanelPadding.bottom,
-                        top: filterPanelPadding.top,
-                      ),
-                  onStretchTrigger: () async {
-                    WidgetsBinding.instance.addPostFrameCallback((
-                      timeStamp,
-                    ) async {
-                      if (context.mounted) {
-                        return di<SearchModel>().search();
-                      }
-                    });
-                  },
-                  title: switch (audioType) {
-                    AudioType.podcast => const SliverPodcastFilterBar(),
-                    _ => const SearchTypeFilterBar(),
-                  },
-                ),
-                SliverPadding(
-                  padding: getAdaptiveHorizontalPadding(
-                    constraints: constraints,
-                  ).copyWith(bottom: bottomPlayerPageGap),
-                  sliver: switch (audioType) {
-                    AudioType.radio => const SliverRadioSearchResults(),
-                    AudioType.podcast => const SliverPodcastSearchResults(),
-                    AudioType.local => const SliverLocalSearchResult(),
-                  },
-                ),
-              ],
-            ),
-          );
+          return true;
         },
       ),
     );
diff --git a/lib/search/view/sliver_podcast_filter_bar.dart b/lib/search/view/sliver_podcast_filter_bar.dart
index 2f1579624..62e1d493c 100644
--- a/lib/search/view/sliver_podcast_filter_bar.dart
+++ b/lib/search/view/sliver_podcast_filter_bar.dart
@@ -1,9 +1,8 @@
 import 'package:flutter/material.dart';
 import 'package:watch_it/watch_it.dart';
-import 'package:yaru/yaru.dart';
 
 import '../../common/data/podcast_genre.dart';
-import '../../common/view/icons.dart';
+import '../../common/view/common_control_panel.dart';
 import '../../l10n/l10n.dart';
 import '../../settings/settings_model.dart';
 import '../search_model.dart';
@@ -25,21 +24,14 @@ class SliverPodcastFilterBar extends StatelessWidget with WatchItMixin {
 
     final setPodcastGenre = searchModel.setPodcastGenre;
 
-    return Padding(
-      padding: const EdgeInsets.symmetric(horizontal: 5),
-      child: YaruChoiceChipBar(
-        showCheckMarks: false,
-        goNextIcon: Icon(Iconz.goNext),
-        goPreviousIcon: Icon(Iconz.goBack),
-        style: YaruChoiceChipBarStyle.stack,
-        labels: genres.map((e) => Text(e.localize(context.l10n))).toList(),
-        isSelected: genres.map((e) => e == podcastGenre).toList(),
-        onSelected: (i) {
-          searchModel.setSearchQuery(null);
-          setPodcastGenre(PodcastGenre.values.elementAt(i));
-          searchModel.search();
-        },
-      ),
+    return CommonControlPanel(
+      labels: genres.map((e) => Text(e.localize(context.l10n))).toList(),
+      isSelected: genres.map((e) => e == podcastGenre).toList(),
+      onSelected: (i) {
+        searchModel.setSearchQuery(null);
+        setPodcastGenre(PodcastGenre.values.elementAt(i));
+        searchModel.search();
+      },
     );
   }
 }
diff --git a/lib/search/view/sliver_search_type_filter_bar.dart b/lib/search/view/sliver_search_type_filter_bar.dart
index f9bff90c6..3365469c2 100644
--- a/lib/search/view/sliver_search_type_filter_bar.dart
+++ b/lib/search/view/sliver_search_type_filter_bar.dart
@@ -1,8 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:watch_it/watch_it.dart';
-import 'package:yaru/yaru.dart';
 
-import '../../common/view/icons.dart';
+import '../../common/view/common_control_panel.dart';
 import '../../l10n/l10n.dart';
 import '../../local_audio/local_search_result.dart';
 import '../search_model.dart';
@@ -21,36 +20,24 @@ class SearchTypeFilterBar extends StatelessWidget with WatchItMixin {
     );
     final searchQuery = watchPropertyValue((SearchModel m) => m.searchQuery);
 
-    return Padding(
-      padding: const EdgeInsets.symmetric(horizontal: 5),
-      child: SingleChildScrollView(
-        scrollDirection: Axis.horizontal,
-        child: YaruChoiceChipBar(
-          showCheckMarks: false,
-          goNextIcon: Icon(Iconz.goNext),
-          goPreviousIcon: Icon(Iconz.goBack),
-          style: YaruChoiceChipBarStyle.wrap,
-          clearOnSelect: false,
-          selectedFirst: false,
-          onSelected: (i) {
-            searchModel.setSearchType(searchTypes.elementAt(i));
-            searchModel.search(manualFilter: true);
-          },
-          labels: searchTypes
-              .map(
-                (e) => Text(
-                  getChipText(
-                    searchType: e,
-                    context: context,
-                    localSearchResult: localSearchResult,
-                    searchQuery: searchQuery,
-                  ),
-                ),
-              )
-              .toList(),
-          isSelected: searchTypes.map((e) => e == searchType).toList(),
-        ),
-      ),
+    return CommonControlPanel(
+      onSelected: (i) {
+        searchModel.setSearchType(searchTypes.elementAt(i));
+        searchModel.search(manualFilter: true);
+      },
+      labels: searchTypes
+          .map(
+            (e) => Text(
+              getChipText(
+                searchType: e,
+                context: context,
+                localSearchResult: localSearchResult,
+                searchQuery: searchQuery,
+              ),
+            ),
+          )
+          .toList(),
+      isSelected: searchTypes.map((e) => e == searchType).toList(),
     );
   }
 
diff --git a/linux/flutter/generated_plugin_registrant.cc b/linux/flutter/generated_plugin_registrant.cc
index 8ce7720f0..9a01bc127 100644
--- a/linux/flutter/generated_plugin_registrant.cc
+++ b/linux/flutter/generated_plugin_registrant.cc
@@ -16,6 +16,7 @@
 #include <super_native_extensions/super_native_extensions_plugin.h>
 #include <system_theme/system_theme_plugin.h>
 #include <url_launcher_linux/url_launcher_plugin.h>
+#include <volume_controller/volume_controller_plugin.h>
 #include <window_manager/window_manager_plugin.h>
 #include <yaru_window_linux/yaru_window_linux_plugin.h>
 
@@ -50,6 +51,9 @@ void fl_register_plugins(FlPluginRegistry* registry) {
   g_autoptr(FlPluginRegistrar) url_launcher_linux_registrar =
       fl_plugin_registry_get_registrar_for_plugin(registry, "UrlLauncherPlugin");
   url_launcher_plugin_register_with_registrar(url_launcher_linux_registrar);
+  g_autoptr(FlPluginRegistrar) volume_controller_registrar =
+      fl_plugin_registry_get_registrar_for_plugin(registry, "VolumeControllerPlugin");
+  volume_controller_plugin_register_with_registrar(volume_controller_registrar);
   g_autoptr(FlPluginRegistrar) window_manager_registrar =
       fl_plugin_registry_get_registrar_for_plugin(registry, "WindowManagerPlugin");
   window_manager_plugin_register_with_registrar(window_manager_registrar);
diff --git a/linux/flutter/generated_plugins.cmake b/linux/flutter/generated_plugins.cmake
index 4bb4aab5f..535ca35a3 100644
--- a/linux/flutter/generated_plugins.cmake
+++ b/linux/flutter/generated_plugins.cmake
@@ -13,6 +13,7 @@ list(APPEND FLUTTER_PLUGIN_LIST
   super_native_extensions
   system_theme
   url_launcher_linux
+  volume_controller
   window_manager
   yaru_window_linux
 )
diff --git a/pubspec.lock b/pubspec.lock
index eae751921..1494806a8 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -214,10 +214,10 @@ packages:
     dependency: transitive
     description:
       name: built_value
-      sha256: ea90e81dc4a25a043d9bee692d20ed6d1c4a1662a28c03a96417446c093ed6b4
+      sha256: "082001b5c3dc495d4a42f1d5789990505df20d8547d42507c29050af6933ee27"
       url: "https://pub.dev"
     source: hosted
-    version: "8.9.5"
+    version: "8.10.1"
   cached_network_image:
     dependency: "direct main"
     description:
@@ -262,10 +262,10 @@ packages:
     dependency: transitive
     description:
       name: checked_yaml
-      sha256: feb6bed21949061731a7a75fc5d2aa727cf160b91af9a3e464c5e3a32e28b5ff
+      sha256: "959525d3162f249993882720d52b7e0c833978df229be20702b33d48d91de70f"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.3"
+    version: "2.0.4"
   cli_util:
     dependency: transitive
     description:
@@ -486,10 +486,10 @@ packages:
     dependency: transitive
     description:
       name: file_selector_macos
-      sha256: "271ab9986df0c135d45c3cdb6bd0faa5db6f4976d3e4b437cf7d0f258d941bfc"
+      sha256: "8c9250b2bd2d8d4268e39c82543bacbaca0fda7d29e0728c3c4bbb7c820fd711"
       url: "https://pub.dev"
     source: hosted
-    version: "0.9.4+2"
+    version: "0.9.4+3"
   file_selector_platform_interface:
     dependency: transitive
     description:
@@ -571,10 +571,10 @@ packages:
     dependency: "direct dev"
     description:
       name: flutter_launcher_icons
-      sha256: bfa04787c85d80ecb3f8777bde5fc10c3de809240c48fa061a2c2bf15ea5211c
+      sha256: "10f13781741a2e3972126fae08393d3c4e01fa4cd7473326b94b72cf594195e7"
       url: "https://pub.dev"
     source: hosted
-    version: "0.14.3"
+    version: "0.14.4"
   flutter_lints:
     dependency: "direct dev"
     description:
@@ -914,7 +914,7 @@ packages:
     dependency: "direct main"
     description:
       path: media_kit
-      ref: HEAD
+      ref: c9617f570b8c0ba02857e721997f78c053a856c1
       resolved-ref: c9617f570b8c0ba02857e721997f78c053a856c1
       url: "https://github.com/media-kit/media-kit"
     source: git
@@ -955,7 +955,7 @@ packages:
     dependency: "direct main"
     description:
       path: "libs/universal/media_kit_libs_video"
-      ref: HEAD
+      ref: c9617f570b8c0ba02857e721997f78c053a856c1
       resolved-ref: c9617f570b8c0ba02857e721997f78c053a856c1
       url: "https://github.com/media-kit/media-kit"
     source: git
@@ -972,7 +972,7 @@ packages:
     dependency: "direct main"
     description:
       path: media_kit_video
-      ref: HEAD
+      ref: c9617f570b8c0ba02857e721997f78c053a856c1
       resolved-ref: c9617f570b8c0ba02857e721997f78c053a856c1
       url: "https://github.com/media-kit/media-kit"
     source: git
@@ -1294,10 +1294,10 @@ packages:
     dependency: transitive
     description:
       name: rss_dart
-      sha256: "81d45b53c88eac17991edf2ecdd468423c542c0290fa2950a3bea9affa0e956b"
+      sha256: "562f6740fb133e5349eddbf733b65fb8ddeee220040ac964aad23bc891f4fb15"
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.12"
+    version: "1.0.13"
   rxdart:
     dependency: transitive
     description:
@@ -1771,10 +1771,10 @@ packages:
     dependency: transitive
     description:
       name: volume_controller
-      sha256: e82fd689bb8e1fe8e64be3fa5946ff8699058f8cf9f4c1679acdba20cda7f5bd
+      sha256: d75039e69c0d90e7810bfd47e3eedf29ff8543ea7a10392792e81f9bded7edf5
       url: "https://pub.dev"
     source: hosted
-    version: "3.3.3"
+    version: "3.4.0"
   wakelock_plus:
     dependency: transitive
     description:
@@ -1883,11 +1883,11 @@ packages:
     dependency: "direct main"
     description:
       path: "."
-      ref: "2f131c78f73807de48ce60f23ae75bd4881ad2dc"
-      resolved-ref: "2f131c78f73807de48ce60f23ae75bd4881ad2dc"
+      ref: "8103703947b001fa2abe03f0a23261d397cee1c7"
+      resolved-ref: "8103703947b001fa2abe03f0a23261d397cee1c7"
       url: "https://github.com/ubuntu/yaru.dart"
     source: git
-    version: "7.0.0"
+    version: "8.0.0"
   yaru_window:
     dependency: "direct main"
     description:
@@ -1930,4 +1930,4 @@ packages:
     version: "0.0.3+1"
 sdks:
   dart: ">=3.8.0 <4.0.0"
-  flutter: ">=3.32.0"
+  flutter: ">=3.32.2"
diff --git a/pubspec.yaml b/pubspec.yaml
index 10347115d..2e73b9300 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -6,7 +6,7 @@ publish_to: "none"
 
 environment:
   sdk: ">=3.8.0 <4.0.0"
-  flutter: ">=3.32.0"
+  flutter: ">=3.32.2"
 
 dependencies:
   animated_emoji: ^3.1.0
@@ -91,7 +91,7 @@ dependencies:
   yaru:
     git:
       url: https://github.com/ubuntu/yaru.dart
-      ref: 2f131c78f73807de48ce60f23ae75bd4881ad2dc
+      ref: 8103703947b001fa2abe03f0a23261d397cee1c7
   yaru_window: ^0.2.1+1
   yaru_window_linux: ^0.2.0+1
 
@@ -127,11 +127,14 @@ dependency_overrides:
     git:
       url: https://github.com/media-kit/media-kit
       path: media_kit
+      ref: c9617f570b8c0ba02857e721997f78c053a856c1
   media_kit_libs_video:
     git:
       url: https://github.com/media-kit/media-kit
       path: libs/universal/media_kit_libs_video
+      ref: c9617f570b8c0ba02857e721997f78c053a856c1
   media_kit_video:
     git:
       url: https://github.com/media-kit/media-kit
       path: media_kit_video
+      ref: c9617f570b8c0ba02857e721997f78c053a856c1
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 55cf86207..684003deb 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -42,7 +42,7 @@ slots:
 parts:
   mpv:
     source: https://github.com/mpv-player/mpv.git
-    source-tag: 'v0.36.0'
+    source-tag: "v0.36.0"
     plugin: meson
     meson-parameters:
       - --prefix=/usr
@@ -61,7 +61,7 @@ parts:
 
   flutter-git:
     source: https://github.com/flutter/flutter.git
-    source-tag: 3.32.0
+    source-tag: 3.32.2
     source-depth: 5
     plugin: nil
     override-build: |
@@ -80,8 +80,7 @@ parts:
       - unzip
       - xz-utils
       - zip
-    override-prime: ''
-  
+    override-prime: ""
 
   musicpod:
     after: [flutter-git, mpv]
@@ -149,7 +148,7 @@ parts:
       - libsrt1.4-gnutls
       - ocl-icd-libopencl1
       - on amd64:
-        - libmfx1
+          - libmfx1
     prime:
       - usr/lib/*/blas/libblas.so*
       - usr/lib/*/lapack/liblapack.so*