change drawer location; change drawer position; unify toolbar icon colors;

app/lib/features/geckoview/features/browser/presentation/screens/browser.dart

@@ -456,7 +456,7 @@ class BrowserScreen extends HookConsumerWidget {
         child: Scaffold(
           // Minimal scaffold - only for Material overlay support (SnackBars)
           resizeToAvoidBottomInset: false,
-          drawer: const BrowserNavigationDrawer(),
+          endDrawer: const BrowserNavigationDrawer(),
           body: Stack(
             children: [
               // Layer 0: Browser content

app/lib/features/geckoview/features/browser/presentation/widgets/browser_modules/bottom_app_bar.dart

@@ -439,6 +439,7 @@ class ContextualToolbar extends HookConsumerWidget {
           TabMenu(
             controller: useMenuController(),
             selectedTabId: selectedTabId!,
+            enableNavigationButtons: false,
             builder: (context, controller, child) {
               return ToolbarButton(
                 onTap: () {
@@ -555,6 +556,8 @@ class QuickTabSwitcher extends HookConsumerWidget {
               enableFetchFeeds: false,
               enableDesktopMode: false,
               enableReaderMode: false,
+              enableReloadButton: false,
+              enableNavigationButtons: false,
               builder: (context, controller, _) {
                 return InkWell(
                   onLongPress: () {
@@ -645,7 +648,7 @@ class NavigationMenuButton extends StatelessWidget {
   Widget build(BuildContext context) {
     return ToolbarButton(
       onTap: () {
-        Scaffold.of(context).openDrawer();
+        Scaffold.of(context).openEndDrawer();
       },
       child: const Icon(Icons.menu),
     );

app/lib/features/geckoview/features/browser/presentation/widgets/tab_menu.dart

@@ -61,6 +61,8 @@ class TabMenu extends HookConsumerWidget {
   final bool enableShare;
   final bool enableExport;
   final bool enableCloseTab;
+  final bool enableReloadButton;
+  final bool enableNavigationButtons;
 
   const TabMenu({
     super.key,
@@ -77,6 +79,8 @@ class TabMenu extends HookConsumerWidget {
     this.enableShare = true,
     this.enableExport = true,
     this.enableCloseTab = true,
+    this.enableReloadButton = true,
+    this.enableNavigationButtons = true,
   });
 
   @override
@@ -453,55 +457,57 @@ class TabMenu extends HookConsumerWidget {
             leadingIcon: const Icon(MdiIcons.tabMinus),
             child: const Text('Close Tab'),
           ),
-        const Divider(),
-        MenuItemButton(
-          onPressed: () async {
-            final sessionController = ref.read(
-              tabSessionProvider(tabId: selectedTabId).notifier,
-            );
+        if (enableReloadButton || enableNavigationButtons) const Divider(),
+        if (enableReloadButton)
+          MenuItemButton(
+            onPressed: () async {
+              final sessionController = ref.read(
+                tabSessionProvider(tabId: selectedTabId).notifier,
+              );
 
-            await sessionController.reload();
-            controller.close();
-          },
-          leadingIcon: const Icon(Icons.refresh),
-          child: const Text('Reload'),
-        ),
-        Consumer(
-          builder: (context, ref, child) {
-            final history = ref.watch(
-              tabStateProvider(
-                selectedTabId,
-              ).select((value) => value?.historyState),
-            );
+              await sessionController.reload();
+              controller.close();
+            },
+            leadingIcon: const Icon(Icons.refresh),
+            child: const Text('Reload'),
+          ),
+        if (enableNavigationButtons)
+          Consumer(
+            builder: (context, ref, child) {
+              final history = ref.watch(
+                tabStateProvider(
+                  selectedTabId,
+                ).select((value) => value?.historyState),
+              );
 
-            final isLoading = ref.watch(
-              selectedTabStateProvider.select(
-                (state) => state?.isLoading ?? false,
-              ),
-            );
-
-            return Row(
-              children: [
-                Expanded(
-                  child: NavigateBackButton(
-                    selectedTabId: selectedTabId,
-                    isLoading: isLoading,
-                    menuControllerToClose: controller,
-                    canGoBack: history?.canGoBack == true,
-                  ),
+              final isLoading = ref.watch(
+                selectedTabStateProvider.select(
+                  (state) => state?.isLoading ?? false,
                 ),
-                const SizedBox(height: 48, child: VerticalDivider()),
-                Expanded(
-                  child: NavigateForwardButton(
-                    selectedTabId: selectedTabId,
-                    menuControllerToClose: controller,
-                    canGoForward: history?.canGoForward == true,
+              );
+
+              return Row(
+                children: [
+                  Expanded(
+                    child: NavigateBackButton(
+                      selectedTabId: selectedTabId,
+                      isLoading: isLoading,
+                      menuControllerToClose: controller,
+                      canGoBack: history?.canGoBack == true,
+                    ),
                   ),
-                ),
-              ],
-            );
-          },
-        ),
+                  const SizedBox(height: 48, child: VerticalDivider()),
+                  Expanded(
+                    child: NavigateForwardButton(
+                      selectedTabId: selectedTabId,
+                      menuControllerToClose: controller,
+                      canGoForward: history?.canGoForward == true,
+                    ),
+                  ),
+                ],
+              );
+            },
+          ),
       ],
     );
   }

app/lib/features/geckoview/features/browser/presentation/widgets/tabs_action_button.dart

@@ -57,18 +57,17 @@ class TabsActionButton extends HookConsumerWidget {
             selectedContainerDataProvider.select((value) => value.value?.color),
           );
 
+    final iconColor = isActive
+        ? theme.colorScheme.primary
+        : theme.colorScheme.onSurfaceVariant;
+
     return ToolbarButton(
       onTap: onTap,
       onDoubleTap: onDoubleTap,
       onLongPress: onLongPress,
       child: Container(
         decoration: BoxDecoration(
-          border: Border.all(
-            width: 2.0,
-            color: isActive
-                ? theme.colorScheme.primary
-                : DefaultTextStyle.of(context).style.color!,
-          ),
+          border: Border.all(width: 2.0, color: iconColor),
           borderRadius: BorderRadius.circular(5.0),
           color: containerColor.mapNotNull(ContainerColors.forAppBar),
         ),
@@ -82,7 +81,7 @@ class TabsActionButton extends HookConsumerWidget {
                 style: TextStyle(
                   fontWeight: FontWeight.bold,
                   fontSize: 14.0,
-                  color: isActive ? theme.colorScheme.primary : null,
+                  color: iconColor,
                 ),
               );
             },
@@ -92,10 +91,19 @@ class TabsActionButton extends HookConsumerWidget {
                     style: TextStyle(
                       fontWeight: FontWeight.bold,
                       fontSize: 14.0,
-                      color: isActive ? theme.colorScheme.primary : null,
+                      color: iconColor,
                     ),
                   )
-                : const Skeletonizer(child: Text('00')),
+                : Skeletonizer(
+                    child: Text(
+                      '0',
+                      style: TextStyle(
+                        fontWeight: FontWeight.bold,
+                        fontSize: 14.0,
+                        color: iconColor,
+                      ),
+                    ),
+                  ),
             error: (error, stackTrace) {
               logger.e(
                 'Could not determine tab count',
@@ -108,7 +116,7 @@ class TabsActionButton extends HookConsumerWidget {
                 style: TextStyle(
                   fontWeight: FontWeight.bold,
                   fontSize: 14.0,
-                  color: isActive ? theme.colorScheme.primary : null,
+                  color: iconColor,
                 ),
               );
             },

app/lib/features/geckoview/features/browser/presentation/widgets/toolbar_button.dart

@@ -35,13 +35,19 @@ class ToolbarButton extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
+    final theme = Theme.of(context);
+    final iconColor = theme.colorScheme.onSurfaceVariant;
+
     return InkWell(
       onTap: onTap,
       onDoubleTap: onDoubleTap,
       onLongPress: onLongPress,
       child: Padding(
         padding: const EdgeInsets.symmetric(horizontal: 8.0, vertical: 15.0),
-        child: child,
+        child: IconTheme(
+          data: IconThemeData(color: iconColor),
+          child: child,
+        ),
       ),
     );
   }