diff --git a/lib/ui/dialogs/general_popup_dialog.dart b/lib/ui/dialogs/general_popup_dialog.dart
index 6894f5ff..51b3fcd3 100644
--- a/lib/ui/dialogs/general_popup_dialog.dart
+++ b/lib/ui/dialogs/general_popup_dialog.dart
@@ -66,7 +66,7 @@ Future<void> showGeneralPopupDialog(
   (String, String)? albumToAddFrom,
   String? heroTag,
   String? additionalHero,
-  IconData trailingIcon = Broken.arrow_right_3,
+  IconData? trailingIcon,
 }) async {
   final isSingle = tracks.length == 1;
   forceSingleArtwork ??= isSingle;
@@ -769,6 +769,10 @@ Future<void> showGeneralPopupDialog(
         )
       : null;
 
+  final hasHeaderTap = isSingle;
+
+  if (hasHeaderTap && trailingIcon == null) trailingIcon = Broken.arrow_right_3;
+
   NamidaNavigator.inst.navigateDialog(
     onDisposing: () {
       numberOfRepeats.close();
@@ -884,8 +888,8 @@ Future<void> showGeneralPopupDialog(
                             ),
                           ),
                           const SizedBox(width: 16.0),
-                          Icon(trailingIcon),
-                          const SizedBox(width: 16.0),
+                          if (trailingIcon != null) Icon(trailingIcon),
+                          if (trailingIcon != null) const SizedBox(width: 16.0),
                         ],
                       ),
                     ),
diff --git a/pubspec.yaml b/pubspec.yaml
index cd4a2d73..a9c14a5a 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -8,32 +8,15 @@ environment:
   flutter: ^3.22.0
 
 dependency_overrides:
-  just_audio:
-    path: C:\Programming\Flutter\Forks\just_audio\just_audio
   just_audio_platform_interface:
-    path: C:\Programming\Flutter\Forks\just_audio\just_audio_platform_interface
-  basic_audio_handler:
-    path: C:\Programming\Flutter\_NEW_2023_Used_Packages\basic_audio_handler
-
-  # just_audio_platform_interface:
-  #   git:
-  #     url: https://github.com/MSOB7YY/just_audio
-  #     path: just_audio_platform_interface/
-  #     ref: video
+    git:
+      url: https://github.com/MSOB7YY/just_audio
+      path: just_audio_platform_interface/
+      ref: video
   on_audio_query_platform_interface:
     git:
       url: https://github.com/MSOB7YY/on_audio_query
       path: packages/on_audio_query_platform_interface
-  nampack:
-    path: ../_NEW_2023_Used_Packages/nampack
-  namico_login_manager:
-    path: ../_NEW_2023_Used_Packages/namico_login_manager
-  namico_subscription_manager:
-    path: ../_NEW_2023_Used_Packages/namico_subscription_manager
-  youtipie:
-    path: ../_NEW_2023_Used_Packages/youtipie
-  namico_db_wrapper:
-    path: ../_NEW_2023_Used_Packages/namico_db_wrapper
 
 dependencies:
   flutter: