diff --git a/lib/main.dart b/lib/main.dart
index 176634c..3825ee2 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -400,10 +400,10 @@ class _FritterAppState extends State<FritterApp> {
           routeHome: (context) => const DefaultPage(),
           routeGroup: (context) => const GroupScreen(),
           routeProfile: (context) => const ProfileScreen(),
-          routeSearch: (context) => const MainSearchScreen(),
+          routeSearch: (context) => const SearchScreen(),
           routeSettings: (context) => const SettingsScreen(),
           routeSettingsExport: (context) => const SettingsExportScreen(),
-          routeSettingsHome: (context) => const SettingsScreen(initialPage: 'home'),
+          routeSettingsHome: (context) => const SettingsHomeFragment(),
           routeStatus: (context) => const StatusScreen(),
           routeSubscriptionsImport: (context) => const SubscriptionImportScreen()
         },
diff --git a/lib/search/search.dart b/lib/search/search.dart
index a6d3a13..2c053f9 100644
--- a/lib/search/search.dart
+++ b/lib/search/search.dart
@@ -25,31 +25,31 @@ class SearchArguments {
   SearchArguments(this.initialTab, {this.query, this.focusInputOnOpen = false});
 }
 
-class MainSearchScreen extends StatelessWidget {
-  const MainSearchScreen({Key? key}) : super(key: key);
+class SearchScreen extends StatelessWidget {
+  const SearchScreen({Key? key}) : super(key: key);
 
   @override
   Widget build(BuildContext context) {
     final arguments = ModalRoute.of(context)!.settings.arguments as SearchArguments;
 
-    return _MainSearchScreen(
+    return _SearchScreen(
         initialTab: arguments.initialTab, query: arguments.query, focusInputOnOpen: arguments.focusInputOnOpen);
   }
 }
 
-class _MainSearchScreen extends StatefulWidget {
+class _SearchScreen extends StatefulWidget {
   final int initialTab;
   final String? query;
   final bool focusInputOnOpen;
 
-  const _MainSearchScreen({Key? key, required this.initialTab, this.query, this.focusInputOnOpen = false})
+  const _SearchScreen({Key? key, required this.initialTab, this.query, this.focusInputOnOpen = false})
       : super(key: key);
 
   @override
-  State<_MainSearchScreen> createState() => _MainSearchScreenState();
+  State<_SearchScreen> createState() => _SearchScreenState();
 }
 
-class _MainSearchScreenState extends State<_MainSearchScreen> with SingleTickerProviderStateMixin {
+class _SearchScreenState extends State<_SearchScreen> with SingleTickerProviderStateMixin {
   final TextEditingController _queryController = TextEditingController();
   final FocusNode _focusNode = FocusNode();