consolidate icons

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

@@ -29,6 +29,7 @@ import 'package:weblibre/features/geckoview/domain/controllers/bottom_sheet.dart
 import 'package:weblibre/features/geckoview/domain/providers/tab_state.dart';
 import 'package:weblibre/features/geckoview/features/browser/domain/entities/sheet.dart';
 import 'package:weblibre/features/geckoview/features/browser/presentation/widgets/tab_icon.dart';
+import 'package:weblibre/features/geckoview/features/browser/presentation/widgets/toolbar_button.dart';
 import 'package:weblibre/presentation/widgets/uri_breadcrumb.dart';
 
 class AppBarTitle extends HookConsumerWidget {
@@ -70,16 +71,14 @@ class AppBarTitle extends HookConsumerWidget {
 
     return Row(
       children: [
-        // Icon tap → opens site settings sheet
+        ToolbarButton(
-        GestureDetector(
           onTap: () {
             ref
                 .read(bottomSheetControllerProvider.notifier)
                 .show(SiteSettingsSheet(tabState: tabState));
           },
-          child: TabIcon(tabState: tabState),
+          child: TabIcon(tabState: tabState, iconSize: 24),
         ),
-        const SizedBox(width: 8),
         // Title/URL tap → opens search screen
         Expanded(
           child: GestureDetector(

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

@@ -45,6 +45,7 @@ import 'package:weblibre/features/geckoview/features/browser/presentation/widget
 import 'package:weblibre/features/geckoview/features/browser/presentation/widgets/tab_creation_menu.dart';
 import 'package:weblibre/features/geckoview/features/browser/presentation/widgets/tab_menu.dart';
 import 'package:weblibre/features/geckoview/features/browser/presentation/widgets/tabs_action_button.dart';
+import 'package:weblibre/features/geckoview/features/browser/presentation/widgets/toolbar_button.dart';
 import 'package:weblibre/features/geckoview/features/history/domain/repositories/history.dart';
 import 'package:weblibre/features/geckoview/features/readerview/presentation/controllers/readerable.dart';
 import 'package:weblibre/features/geckoview/features/readerview/presentation/widgets/reader_button.dart';
@@ -281,7 +282,7 @@ class BrowserTabBar extends HookConsumerWidget {
               child: AppBar(
                 primary: false,
                 automaticallyImplyLeading: false,
-                titleSpacing: 8.0,
+                titleSpacing: 0.0,
                 toolbarHeight: kToolbarHeight,
                 backgroundColor:
                     (containerColor != null && displayedSheet is! ViewTabsSheet)
@@ -314,7 +315,7 @@ class BrowserTabBar extends HookConsumerWidget {
                           visible: tabBarReaderView || readerabilityStateActive,
                           child: ReaderButton(
                             buttonBuilder: (isLoading, readerActive, icon) =>
-                                InkWell(
+                                ToolbarButton(
                                   onTap: isLoading
                                       ? null
                                       : () async {
@@ -325,13 +326,7 @@ class BrowserTabBar extends HookConsumerWidget {
                                               )
                                               .toggleReaderView(!readerActive);
                                         },
-                                  child: Padding(
+                                  child: icon,
-                                    padding: const EdgeInsets.symmetric(
-                                      vertical: 15.0,
-                                      horizontal: 8.0,
-                                    ),
-                                    child: icon,
-                                  ),
                                 ),
                           ),
                         );
@@ -340,15 +335,15 @@ class BrowserTabBar extends HookConsumerWidget {
                   if (showExtensionShortcut)
                     ExtensionShortcutMenu(
                       controller: extensionMenuController,
-                      child: IconButton(
+                      child: ToolbarButton(
-                        onPressed: () {
+                        onTap: () {
                           if (extensionMenuController.isOpen) {
                             extensionMenuController.close();
                           } else {
                             extensionMenuController.open();
                           }
                         },
-                        icon: const Icon(MdiIcons.puzzle),
+                        child: const Icon(MdiIcons.puzzle),
                       ),
                     ),
                   if (selectedTabId != null)
@@ -356,7 +351,7 @@ class BrowserTabBar extends HookConsumerWidget {
                       controller: trippleDotMenuController,
                       selectedTabId: selectedTabId,
                       builder: (context, controller, child) {
-                        return InkWell(
+                        return ToolbarButton(
                           onTap: () {
                             if (controller.isOpen) {
                               controller.close();
@@ -364,13 +359,7 @@ class BrowserTabBar extends HookConsumerWidget {
                               controller.open();
                             }
                           },
-                          child: const Padding(
+                          child: const Icon(MdiIcons.dotsVertical),
-                            padding: EdgeInsets.symmetric(
-                              horizontal: 8.0,
-                              vertical: 15.0,
-                            ),
-                            child: Icon(MdiIcons.dotsVertical),
-                          ),
                         );
                       },
                     ),

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

@@ -31,7 +31,7 @@ class TabIcon extends HookConsumerWidget {
 
   final double iconSize;
 
-  const TabIcon({super.key, required this.tabState, this.iconSize = 16});
+  const TabIcon({super.key, required this.tabState, required this.iconSize});
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {

app/lib/features/geckoview/features/browser/presentation/widgets/tab_view/tab_preview.dart

@@ -175,7 +175,7 @@ class GridTabPreview extends HookConsumerWidget {
             Row(
               children: [
                 const SizedBox(width: 6.0),
-                TabIcon(tabState: tabState),
+                TabIcon(tabState: tabState, iconSize: 16.0),
                 const SizedBox(width: 6.0),
                 Expanded(
                   child: Text(

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

@@ -22,6 +22,7 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:nullability/nullability.dart';
 import 'package:skeletonizer/skeletonizer.dart';
 import 'package:weblibre/core/logger.dart';
+import 'package:weblibre/features/geckoview/features/browser/presentation/widgets/toolbar_button.dart';
 import 'package:weblibre/features/geckoview/features/tabs/data/entities/container_filter.dart';
 import 'package:weblibre/features/geckoview/features/tabs/domain/providers.dart';
 import 'package:weblibre/features/geckoview/features/tabs/domain/providers/selected_container.dart';
@@ -56,64 +57,61 @@ class TabsActionButton extends HookConsumerWidget {
             selectedContainerDataProvider.select((value) => value.value?.color),
           );
 
-    return InkWell(
+    return ToolbarButton(
       onTap: onTap,
       onDoubleTap: onDoubleTap,
       onLongPress: onLongPress,
-      child: Padding(
+      child: Container(
-        padding: const EdgeInsets.symmetric(horizontal: 8.0, vertical: 15.0),
+        decoration: BoxDecoration(
-        child: Container(
+          border: Border.all(
-          decoration: BoxDecoration(
+            width: 2.0,
-            border: Border.all(
+            color: isActive
-              width: 2.0,
+                ? theme.colorScheme.primary
-              color: isActive
+                : DefaultTextStyle.of(context).style.color!,
-                  ? theme.colorScheme.primary
-                  : DefaultTextStyle.of(context).style.color!,
-            ),
-            borderRadius: BorderRadius.circular(5.0),
-            color: containerColor.mapNotNull(ContainerColors.forAppBar),
           ),
-          constraints: const BoxConstraints(minWidth: 25.0),
+          borderRadius: BorderRadius.circular(5.0),
-          child: Center(
+          color: containerColor.mapNotNull(ContainerColors.forAppBar),
-            child: tabCount.when(
+        ),
-              skipLoadingOnReload: true,
+        constraints: const BoxConstraints(minWidth: 25.0),
-              data: (count) {
+        child: Center(
-                return Text(
+          child: tabCount.when(
-                  count.toString(),
+            skipLoadingOnReload: true,
-                  style: TextStyle(
+            data: (count) {
-                    fontWeight: FontWeight.bold,
+              return Text(
-                    fontSize: 14.0,
+                count.toString(),
-                    color: isActive ? theme.colorScheme.primary : null,
+                style: TextStyle(
-                  ),
+                  fontWeight: FontWeight.bold,
-                );
+                  fontSize: 14.0,
-              },
+                  color: isActive ? theme.colorScheme.primary : null,
-              loading: () => (tabCount.hasValue)
+                ),
-                  ? Text(
+              );
-                      tabCount.value.toString(),
+            },
-                      style: TextStyle(
+            loading: () => (tabCount.hasValue)
-                        fontWeight: FontWeight.bold,
+                ? Text(
-                        fontSize: 14.0,
+                    tabCount.value.toString(),
-                        color: isActive ? theme.colorScheme.primary : null,
+                    style: TextStyle(
-                      ),
+                      fontWeight: FontWeight.bold,
-                    )
+                      fontSize: 14.0,
-                  : const Skeletonizer(child: Text('00')),
+                      color: isActive ? theme.colorScheme.primary : null,
-              error: (error, stackTrace) {
+                    ),
-                logger.e(
+                  )
-                  'Could not determine tab count',
+                : const Skeletonizer(child: Text('00')),
-                  error: error,
+            error: (error, stackTrace) {
-                  stackTrace: stackTrace,
+              logger.e(
-                );
+                'Could not determine tab count',
+                error: error,
+                stackTrace: stackTrace,
+              );
 
-                return Text(
+              return Text(
-                  '-1',
+                '-1',
-                  style: TextStyle(
+                style: TextStyle(
-                    fontWeight: FontWeight.bold,
+                  fontWeight: FontWeight.bold,
-                    fontSize: 14.0,
+                  fontSize: 14.0,
-                    color: isActive ? theme.colorScheme.primary : null,
+                  color: isActive ? theme.colorScheme.primary : null,
-                  ),
+                ),
-                );
+              );
-              },
+            },
-            ),
           ),
         ),
       ),

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

@@ -0,0 +1,29 @@
+import 'package:flutter/material.dart';
+
+class ToolbarButton extends StatelessWidget {
+  final Widget child;
+  final VoidCallback? onTap;
+  final VoidCallback? onDoubleTap;
+  final VoidCallback? onLongPress;
+
+  const ToolbarButton({
+    super.key,
+    required this.child,
+    this.onTap,
+    this.onDoubleTap,
+    this.onLongPress,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return InkWell(
+      onTap: onTap,
+      onDoubleTap: onDoubleTap,
+      onLongPress: onLongPress,
+      child: Padding(
+        padding: const EdgeInsets.symmetric(horizontal: 8.0, vertical: 15.0),
+        child: child,
+      ),
+    );
+  }
+}

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

@@ -330,7 +330,7 @@ class SearchScreen extends HookConsumerWidget {
                           label: (activeBang != null)
                               ? const Text('Search')
                               : const Text('Address / Search'),
-                          unfocusOnTapOutside: !isEditMode,
+                          unfocusOnTapOutside: false,
                           onSubmitted: (value) async {
                             if (value.isNotEmpty) {
                               var newUrl = uri_parser.tryParseUrl(

app/lib/features/geckoview/features/search/presentation/widgets/smart_bang_selector.dart

@@ -284,7 +284,8 @@ class _BangChipsList extends HookConsumerWidget {
       searchTextController.clear();
     } else {
       // Site tab - only clear if text is a valid URL
-      final hasSupportedScheme = uri_parser
+      final hasSupportedScheme =
+          uri_parser
               .tryParseUrl(searchTextController.text)
               .mapNotNull((uri) => uri.hasSupportedScheme) ??
           false;
@@ -318,8 +319,9 @@ class _BangChipsList extends HookConsumerWidget {
     WidgetRef ref,
     BangData bang,
   ) async {
-    final currentSelection =
+    final currentSelection = ref.read(
-        ref.read(selectedBangTriggerProvider(domain: domain));
+      selectedBangTriggerProvider(domain: domain),
+    );
 
     if (currentSelection == bang.toKey()) {
       // Clear selection if the deleted bang is currently selected