diff --git a/lib/config/app_config.dart b/lib/config/app_config.dart
index bbeb5089f..fd376ff15 100644
--- a/lib/config/app_config.dart
+++ b/lib/config/app_config.dart
@@ -140,9 +140,7 @@ abstract class AppConfig {
   static bool swipeRightToLeftToReply = true;
   static bool? sendOnEnter;
   static bool showPresences = true;
-  // #Pangea
-  static bool displayNavigationRail = true;
-  // Pangea#
+  static bool displayNavigationRail = false;
   static bool experimentalVoip = false;
   static const bool hideTypingUsernames = false;
   static const bool hideAllStateEvents = false;
diff --git a/lib/config/setting_keys.dart b/lib/config/setting_keys.dart
index 3b0591f7f..19c30084f 100644
--- a/lib/config/setting_keys.dart
+++ b/lib/config/setting_keys.dart
@@ -32,10 +32,8 @@ abstract class SettingKeys {
       'chat.fluffy.swipeRightToLeftToReply';
   static const String experimentalVoip = 'chat.fluffy.experimental_voip';
   static const String showPresences = 'chat.fluffy.show_presences';
-  // #Pangea
   static const String displayNavigationRail =
       'chat.fluffy.display_navigation_rail';
-  // Pangea#
 }
 
 enum AppSettings<T> {
diff --git a/lib/l10n/intl_en.arb b/lib/l10n/intl_en.arb
index a184bfa1b..5f957b29f 100644
--- a/lib/l10n/intl_en.arb
+++ b/lib/l10n/intl_en.arb
@@ -4928,9 +4928,6 @@
   "ban": "Ban",
   "unban": "Unban",
   "kick": "Kick",
-  "approve": "Approve",
-  "youHaveKnocked": "You have knocked",
-  "pleaseWaitUntilInvited": "Please wait now, until someone from the room invites you.",
   "lemma": "Lemma",
   "grammarFeature": "Grammar feature",
   "grammarTag": "Grammar tag",
diff --git a/lib/pages/chat_list/chat_list_body.dart b/lib/pages/chat_list/chat_list_body.dart
index a0f8eb660..969f5ec55 100644
--- a/lib/pages/chat_list/chat_list_body.dart
+++ b/lib/pages/chat_list/chat_list_body.dart
@@ -183,9 +183,11 @@ class ChatListViewBody extends StatelessWidget {
                     //           ActiveFilter.messages
                     //         else
                     //           ActiveFilter.allChats,
+                    //         ActiveFilter.groups,
                     //         ActiveFilter.unread,
                     //         if (spaceDelegateCandidates.isNotEmpty &&
-                    //             !controller.widget.displayNavigationRail)
+                    //             !AppConfig.displayNavigationRail &&
+                    //             !FluffyThemes.isColumnMode(context))
                     //           ActiveFilter.spaces,
                     //       ]
                     //           .map(
@@ -197,9 +199,8 @@ class ChatListViewBody extends StatelessWidget {
                     //                 selected: filter == controller.activeFilter,
                     //                 onSelected: (_) =>
                     //                     controller.setActiveFilter(filter),
-                    //                 label: Text(
-                    //                   filter.toLocalizedString(context),
-                    //                 ),
+                    //                 label:
+                    //                     Text(filter.toLocalizedString(context)),
                     //               ),
                     //             ),
                     //           )
diff --git a/lib/pages/chat_list/chat_list_view.dart b/lib/pages/chat_list/chat_list_view.dart
index f94677942..168a60dbc 100644
--- a/lib/pages/chat_list/chat_list_view.dart
+++ b/lib/pages/chat_list/chat_list_view.dart
@@ -33,12 +33,8 @@ class ChatListView extends StatelessWidget {
       },
       child: Row(
         children: [
-          // #Pangea
-          // if (FluffyThemes.isColumnMode(context) &&
-          //     controller.widget.displayNavigationRail) ...[
           if (FluffyThemes.isColumnMode(context) ||
               AppConfig.displayNavigationRail) ...[
-            // Pangea#
             SpacesNavigationRail(
               activeSpaceId: controller.activeSpaceId,
               onGoToChats: controller.clearActiveSpace,
diff --git a/lib/pages/chat_list/navi_rail_item.dart b/lib/pages/chat_list/navi_rail_item.dart
index f221955e5..a68112cf8 100644
--- a/lib/pages/chat_list/navi_rail_item.dart
+++ b/lib/pages/chat_list/navi_rail_item.dart
@@ -62,14 +62,11 @@ class NaviRailItem extends StatelessWidget {
                 bottom: 8,
                 left: 0,
                 child: AnimatedContainer(
-                  // #Pangea
-                  // width: isSelected ? 8 : 0,
                   width: isSelected
-                      ? isColumnMode
+                      ? FluffyThemes.isColumnMode(context)
                           ? 8
                           : 4
                       : 0,
-                  // Pangea#
                   duration: FluffyThemes.animationDuration,
                   curve: FluffyThemes.animationCurve,
                   decoration: BoxDecoration(
diff --git a/lib/widgets/matrix.dart b/lib/widgets/matrix.dart
index 2d4a516fd..814cdb9d1 100644
--- a/lib/widgets/matrix.dart
+++ b/lib/widgets/matrix.dart
@@ -489,11 +489,9 @@ class MatrixState extends State<Matrix> with WidgetsBindingObserver {
     AppConfig.showPresences =
         store.getBool(SettingKeys.showPresences) ?? AppConfig.showPresences;
 
-    // #Pangea
     AppConfig.displayNavigationRail =
         store.getBool(SettingKeys.displayNavigationRail) ??
             AppConfig.displayNavigationRail;
-    // Pangea#
   }
 
   @override