diff --git a/lib/screens/common_widgets/button_navbar.dart b/lib/screens/common_widgets/button_navbar.dart
index b9ea8e61..39b7938a 100644
--- a/lib/screens/common_widgets/button_navbar.dart
+++ b/lib/screens/common_widgets/button_navbar.dart
@@ -29,7 +29,6 @@ class NavbarButton extends ConsumerWidget {
     final mobileScaffoldKeyNotifier =
         ref.watch(mobileScaffoldKeyStateProvider.notifier);
     final bool isSelected = railIdx == buttonIdx;
-    final Size size = isCompact ? const Size(56, 32) : const Size(65, 32);
     var onPress = isSelected
         ? null
         : () {
@@ -49,20 +48,20 @@ class NavbarButton extends ConsumerWidget {
         child: Column(
           mainAxisAlignment: MainAxisAlignment.center,
           children: [
-            TextButton(
-              style: isSelected
-                  ? TextButton.styleFrom(
-                      fixedSize: size,
-                      backgroundColor:
-                          Theme.of(context).colorScheme.secondaryContainer,
-                    )
-                  : TextButton.styleFrom(
-                      fixedSize: size,
-                    ),
-              onPressed: onPress,
-              child: Icon(
-                isSelected ? selectedIcon : icon,
-                color: Theme.of(context).colorScheme.onSurfaceVariant,
+            SizedBox(
+              height: isCompact ? 36 : 36,
+              child: TextButton(
+                style: TextButton.styleFrom(
+                  padding: EdgeInsets.zero,
+                  backgroundColor: isSelected
+                      ? Theme.of(context).colorScheme.secondaryContainer
+                      : null,
+                ),
+                onPressed: onPress,
+                child: Icon(
+                  isSelected ? selectedIcon : icon,
+                  color: Theme.of(context).colorScheme.onSurfaceVariant,
+                ),
               ),
             ),
             showLabel ? const SizedBox(height: 4) : const SizedBox.shrink(),
diff --git a/lib/screens/common_widgets/env_trigger_field.dart b/lib/screens/common_widgets/env_trigger_field.dart
index dcdbde3c..23f01d1b 100644
--- a/lib/screens/common_widgets/env_trigger_field.dart
+++ b/lib/screens/common_widgets/env_trigger_field.dart
@@ -106,6 +106,9 @@ class EnvironmentTriggerFieldState extends State<EnvironmentTriggerField> {
           onChanged: widget.onChanged,
           onSubmitted: widget.onFieldSubmitted,
           specialTextSpanBuilder: EnvRegExpSpanBuilder(),
+          onTapOutside: (event) {
+            focusNode.unfocus();
+          },
         );
       },
     );
diff --git a/lib/screens/history/history_requests.dart b/lib/screens/history/history_requests.dart
index 7927cd3c..49f6fc10 100644
--- a/lib/screens/history/history_requests.dart
+++ b/lib/screens/history/history_requests.dart
@@ -129,33 +129,34 @@ class Grabber extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    if (!isOnDesktopAndWeb) {
-      return const SizedBox.shrink();
-    }
     final ColorScheme colorScheme = Theme.of(context).colorScheme;
 
-    return GestureDetector(
-      onVerticalDragUpdate: onVerticalDragUpdate,
-      child: Container(
-        width: double.infinity,
-        decoration: BoxDecoration(
-          color: colorScheme.surfaceContainerLow,
-          borderRadius: const BorderRadius.only(
-              topLeft: Radius.circular(16), topRight: Radius.circular(16)),
-        ),
-        child: Align(
-          alignment: Alignment.topCenter,
-          child: Container(
-            margin: kPv10,
-            width: 80.0,
-            height: 6.0,
-            decoration: BoxDecoration(
-              color: colorScheme.surfaceContainerHighest,
-              borderRadius: BorderRadius.circular(8.0),
-            ),
+    final handle = Container(
+      width: double.infinity,
+      decoration: BoxDecoration(
+        color: colorScheme.surfaceContainerLow,
+        borderRadius: const BorderRadius.only(
+            topLeft: Radius.circular(16), topRight: Radius.circular(16)),
+      ),
+      child: Align(
+        alignment: Alignment.topCenter,
+        child: Container(
+          margin: kPv10,
+          width: 80.0,
+          height: 6.0,
+          decoration: BoxDecoration(
+            color: colorScheme.surfaceContainerHighest,
+            borderRadius: BorderRadius.circular(8.0),
           ),
         ),
       ),
     );
+    if (!isOnDesktopAndWeb) {
+      return handle;
+    }
+    return GestureDetector(
+      onVerticalDragUpdate: onVerticalDragUpdate,
+      child: handle,
+    );
   }
 }
diff --git a/lib/screens/history/history_widgets/his_url_card.dart b/lib/screens/history/history_widgets/his_url_card.dart
index f7fd89b3..f0e70a2e 100644
--- a/lib/screens/history/history_widgets/his_url_card.dart
+++ b/lib/screens/history/history_widgets/his_url_card.dart
@@ -21,7 +21,7 @@ class HistoryURLCard extends StatelessWidget {
 
     return LayoutBuilder(builder: (context, constraints) {
       final isCompact = constraints.maxWidth <= kMinWindowSize.width;
-      final isExpanded = constraints.maxWidth >= kMediumWindowWidth;
+      final isExpanded = constraints.maxWidth >= kMediumWindowWidth - 8;
       return Card(
         color: kColorTransparent,
         surfaceTintColor: kColorTransparent,
diff --git a/lib/widgets/button_group_filled.dart b/lib/widgets/button_group_filled.dart
index c27d96c5..722ed403 100644
--- a/lib/widgets/button_group_filled.dart
+++ b/lib/widgets/button_group_filled.dart
@@ -37,7 +37,7 @@ class FilledButtonGroup extends StatelessWidget {
         }
       }
       return ClipRRect(
-        borderRadius: kBorderRadius20,
+        borderRadius: BorderRadius.circular(88),
         child: Row(
           mainAxisSize: MainAxisSize.min,
           children: buttonsWithSpacers,