diff --git a/lib/ui/screens/library_screen.dart b/lib/ui/screens/library_screen.dart
index 63aa350..aad9c1c 100644
--- a/lib/ui/screens/library_screen.dart
+++ b/lib/ui/screens/library_screen.dart
@@ -10,7 +10,7 @@ import 'package:groovybox/logic/lyrics_parser.dart';
 import 'package:groovybox/logic/window_helpers.dart';
 import 'package:groovybox/providers/audio_provider.dart';
 import 'package:groovybox/providers/watch_folder_provider.dart';
-import 'package:groovybox/ui/screens/settings_screen.dart';
+import 'package:groovybox/router.dart';
 import 'package:groovybox/ui/tabs/albums_tab.dart';
 import 'package:groovybox/ui/tabs/playlists_tab.dart';
 import 'package:groovybox/ui/widgets/track_tile.dart';
@@ -143,11 +143,7 @@ class LibraryScreen extends HookConsumerWidget {
                       actions: [
                         IconButton(
                           onPressed: () {
-                            Navigator.of(context).push(
-                              MaterialPageRoute(
-                                builder: (context) => SettingsScreen(),
-                              ),
-                            );
+                            ref.read(routerProvider).push(AppRoutes.settings);
                           },
                           icon: const Icon(Symbols.settings),
                         ),
@@ -156,8 +152,7 @@ class LibraryScreen extends HookConsumerWidget {
                           tooltip: 'Import Files',
                           onPressed: () async {
                             final result = await FilePicker.platform.pickFiles(
-                              type: FileType.custom,
-                              allowedExtensions: allAllowedExtensions,
+                              type: FileType.any,
                               allowMultiple: true,
                             );
                             if (result != null && result.files.isNotEmpty) {
@@ -306,13 +301,18 @@ class LibraryScreen extends HookConsumerWidget {
                     ],
                   ),
                   actions: [
+                    IconButton(
+                      onPressed: () {
+                        ref.read(routerProvider).push(AppRoutes.settings);
+                      },
+                      icon: const Icon(Symbols.settings),
+                    ),
                     IconButton(
                       icon: const Icon(Symbols.add_circle_outline),
                       tooltip: 'Import Files',
                       onPressed: () async {
                         final result = await FilePicker.platform.pickFiles(
-                          type: FileType.custom,
-                          allowedExtensions: allAllowedExtensions,
+                          type: FileType.any,
                           allowMultiple: true,
                         );
                         if (result != null && result.files.isNotEmpty) {
diff --git a/lib/ui/shell.dart b/lib/ui/shell.dart
index 7bd416e..07ce4ba 100644
--- a/lib/ui/shell.dart
+++ b/lib/ui/shell.dart
@@ -404,18 +404,20 @@ class Shell extends HookConsumerWidget {
       );
     }
 
-    return Shortcuts(
-      shortcuts: <LogicalKeySet, Intent>{
-        LogicalKeySet(LogicalKeyboardKey.escape): const PopIntent(),
-      },
-      child: Actions(
-        actions: <Type, Action<Intent>>{PopIntent: PopAction(ref)},
-        child: Stack(
-          fit: StackFit.expand,
-          children: [
-            Positioned.fill(child: child),
-            Positioned(left: 0, right: 0, bottom: 0, child: MiniPlayer()),
-          ],
+    return Material(
+      child: Shortcuts(
+        shortcuts: <LogicalKeySet, Intent>{
+          LogicalKeySet(LogicalKeyboardKey.escape): const PopIntent(),
+        },
+        child: Actions(
+          actions: <Type, Action<Intent>>{PopIntent: PopAction(ref)},
+          child: Stack(
+            fit: StackFit.expand,
+            children: [
+              Positioned.fill(child: child),
+              Positioned(left: 0, right: 0, bottom: 0, child: MiniPlayer()),
+            ],
+          ),
         ),
       ),
     );