diff --git a/super_editor/lib/src/default_editor/document_gestures_touch_android.dart b/super_editor/lib/src/default_editor/document_gestures_touch_android.dart
index 41628d06e..f3dc90af6 100644
--- a/super_editor/lib/src/default_editor/document_gestures_touch_android.dart
+++ b/super_editor/lib/src/default_editor/document_gestures_touch_android.dart
@@ -1611,6 +1611,9 @@ class SuperEditorAndroidControlsOverlayManagerState extends State<SuperEditorAnd
           link: _controlsController!.collapsedHandleFocalPoint,
           leaderAnchor: Alignment.bottomCenter,
           followerAnchor: Alignment.topCenter,
+          // Use the offset to account for the invisible expanded touch region around the handle.
+          offset: -Offset(0, AndroidSelectionHandle.defaultTouchRegionExpansion.top) *
+              MediaQuery.devicePixelRatioOf(context),
           child: AnimatedOpacity(
             // When the controller doesn't want the handle to be visible, hide it.
             opacity: shouldShow ? 1.0 : 0.0,
@@ -1658,6 +1661,9 @@ class SuperEditorAndroidControlsOverlayManagerState extends State<SuperEditorAnd
             link: _controlsController!.upstreamHandleFocalPoint,
             leaderAnchor: Alignment.bottomLeft,
             followerAnchor: Alignment.topRight,
+            // Use the offset to account for the invisible expanded touch region around the handle.
+            offset:
+                -AndroidSelectionHandle.defaultTouchRegionExpansion.topRight * MediaQuery.devicePixelRatioOf(context),
             child: GestureDetector(
               onTapDown: (_) {
                 // Register tap down to win gesture arena ASAP.
@@ -1687,6 +1693,9 @@ class SuperEditorAndroidControlsOverlayManagerState extends State<SuperEditorAnd
             link: _controlsController!.downstreamHandleFocalPoint,
             leaderAnchor: Alignment.bottomRight,
             followerAnchor: Alignment.topLeft,
+            // Use the offset to account for the invisible expanded touch region around the handle.
+            offset:
+                -AndroidSelectionHandle.defaultTouchRegionExpansion.topLeft * MediaQuery.devicePixelRatioOf(context),
             child: GestureDetector(
               onTapDown: (_) {
                 // Register tap down to win gesture arena ASAP.
diff --git a/super_editor/lib/src/infrastructure/platforms/android/selection_handles.dart b/super_editor/lib/src/infrastructure/platforms/android/selection_handles.dart
index 30c54f732..5fd2fffca 100644
--- a/super_editor/lib/src/infrastructure/platforms/android/selection_handles.dart
+++ b/super_editor/lib/src/infrastructure/platforms/android/selection_handles.dart
@@ -3,28 +3,71 @@ import 'dart:math';
 import 'package:flutter/material.dart';
 import 'package:super_editor/src/infrastructure/touch_controls.dart';
 
+/// An Android-style mobile selection drag handle.
+///
+/// Android renders three different types of handles: collapsed, upstream, and downstream.
+///
+/// All three types of handles look like 3/4 of a circle combined with 1/4 of a square (with
+/// a pointy corner). The primary difference between each handle appearance is the way the
+/// pointy corner is directed.
+///
+///  * Collapsed: The pointy corner points up.
+///  * Upstream: The pointy corner points to the upper right (marking the start of a selection).
+///  * Downstream: The pointy corner points to the upper left (marking the end of a selection).
 class AndroidSelectionHandle extends StatelessWidget {
+  static const defaultTouchRegionExpansion = EdgeInsets.only(left: 16, right: 16, bottom: 16);
+
   const AndroidSelectionHandle({
     Key? key,
     required this.handleType,
     required this.color,
     this.radius = 10,
+    this.touchRegionExpansion = defaultTouchRegionExpansion,
+    this.showDebugTouchRegion = false,
   }) : super(key: key);
 
+  /// The type of handle, e.g., collapsed, upstream, downstream.
   final HandleType handleType;
+
+  /// The color of the handle.
   final Color color;
+
+  /// The radius of the handle - each handle is essentially a circle with one pointy
+  /// corner.
   final double radius;
 
+  /// Invisible space added around the handle to increase the touch area the handle.
+  ///
+  /// This invisible area expands the intrinsic size of the handle, and therefore the
+  /// visual handle will no longer be aligned exactly with the content that's following.
+  /// The parent layout needs to adjust the positioning of the handle to account for
+  /// the [touchRegionExpansion].
+  final EdgeInsets touchRegionExpansion;
+
+  /// Whether to render the [touchRegionExpansion] with a translucent color for visual
+  /// debugging.
+  final bool showDebugTouchRegion;
+
   @override
   Widget build(BuildContext context) {
+    late final Widget handle;
     switch (handleType) {
       case HandleType.collapsed:
-        return _buildCollapsed();
+        handle = _buildCollapsed();
       case HandleType.upstream:
-        return _buildUpstream();
+        handle = _buildUpstream();
       case HandleType.downstream:
-        return _buildDownstream();
+        handle = _buildDownstream();
     }
+
+    return Container(
+      padding: touchRegionExpansion,
+      decoration: BoxDecoration(
+        shape: BoxShape.circle,
+        color: showDebugTouchRegion ? Colors.red.withOpacity(0.5) : Colors.transparent,
+      ),
+      child: handle,
+    );
   }
 
   Widget _buildCollapsed() {
diff --git a/super_editor/lib/src/super_textfield/android/_editing_controls.dart b/super_editor/lib/src/super_textfield/android/_editing_controls.dart
index 119e9ed4c..627f49e0b 100644
--- a/super_editor/lib/src/super_textfield/android/_editing_controls.dart
+++ b/super_editor/lib/src/super_textfield/android/_editing_controls.dart
@@ -716,22 +716,26 @@ class _AndroidEditingOverlayControlsState extends State<AndroidEditingOverlayCon
     required void Function(DragStartDetails) onPanStart,
   }) {
     late Offset fractionalTranslation;
+    late final Offset expandedTouchAreaAdjustment;
     switch (handleType) {
       case HandleType.collapsed:
         fractionalTranslation = const Offset(-0.5, 0.0);
+        expandedTouchAreaAdjustment = Offset(0, -AndroidSelectionHandle.defaultTouchRegionExpansion.top);
         break;
       case HandleType.upstream:
         fractionalTranslation = const Offset(-1.0, 0.0);
+        expandedTouchAreaAdjustment = -AndroidSelectionHandle.defaultTouchRegionExpansion.topRight;
         break;
       case HandleType.downstream:
         fractionalTranslation = Offset.zero;
+        expandedTouchAreaAdjustment = -AndroidSelectionHandle.defaultTouchRegionExpansion.topLeft;
         break;
     }
 
     return CompositedTransformFollower(
       key: handleKey,
       link: widget.textContentLayerLink,
-      offset: followerOffset,
+      offset: followerOffset + expandedTouchAreaAdjustment,
       child: FractionalTranslation(
         translation: fractionalTranslation,
         child: GestureDetector(
diff --git a/super_editor/test/super_editor/mobile/super_editor_android_overlay_controls_test.dart b/super_editor/test/super_editor/mobile/super_editor_android_overlay_controls_test.dart
index d52843493..ecbc868d8 100644
--- a/super_editor/test/super_editor/mobile/super_editor_android_overlay_controls_test.dart
+++ b/super_editor/test/super_editor/mobile/super_editor_android_overlay_controls_test.dart
@@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:flutter_test_robots/flutter_test_robots.dart';
 import 'package:flutter_test_runners/flutter_test_runners.dart';
+import 'package:super_editor/src/infrastructure/platforms/android/selection_handles.dart';
 import 'package:super_editor/super_editor.dart';
 import 'package:super_editor/super_editor_test.dart';
 import 'package:super_text_layout/super_text_layout.dart';
@@ -114,6 +115,29 @@ void main() {
       expect(SuperEditorInspector.isMobileToolbarVisible(), isFalse);
     });
 
+    testWidgetsOnAndroid("does not show toolbar upon first tap", (tester) async {
+      await tester //
+          .createDocument()
+          .withTwoEmptyParagraphs()
+          .pump();
+
+      // Place the caret at the beginning of the document.
+      await tester.placeCaretInParagraph("1", 0);
+
+      // Ensure the toolbar isn't visible.
+      expect(SuperEditorInspector.isMobileToolbarVisible(), isFalse);
+
+      // Wait for the collapsed handle to disappear so that it doesn't cover the
+      // line below.
+      await tester.pump(const Duration(seconds: 5));
+
+      // Place the caret at the beginning of the second paragraph, at the same offset.
+      await tester.placeCaretInParagraph("2", 0);
+
+      // Ensure the toolbar isn't visible.
+      expect(SuperEditorInspector.isMobileToolbarVisible(), isFalse);
+    });
+
     testWidgetsOnAndroid("shows toolbar when selection is expanded", (tester) async {
       await _pumpSingleParagraphApp(tester);
 
@@ -196,11 +220,13 @@ void main() {
       expect(SuperEditorInspector.findAllMobileDragHandles(), findsExactly(2));
       expect(
         tester.getTopLeft(SuperEditorInspector.findMobileDownstreamDragHandle()),
-        offsetMoreOrLessEquals(documentLayout.getGlobalOffsetFromDocumentOffset(selectedPositionRect.bottomRight)),
+        offsetMoreOrLessEquals(documentLayout.getGlobalOffsetFromDocumentOffset(selectedPositionRect.bottomRight) -
+            Offset(AndroidSelectionHandle.defaultTouchRegionExpansion.left, 0)),
       );
       expect(
         tester.getTopRight(SuperEditorInspector.findMobileUpstreamDragHandle()),
-        offsetMoreOrLessEquals(documentLayout.getGlobalOffsetFromDocumentOffset(selectedPositionRect.bottomRight)),
+        offsetMoreOrLessEquals(documentLayout.getGlobalOffsetFromDocumentOffset(selectedPositionRect.bottomRight) +
+            Offset(AndroidSelectionHandle.defaultTouchRegionExpansion.right, 0)),
       );
 
       // Release the drag handle.
diff --git a/super_editor/test_goldens/editor/components/goldens/paragraph_alignments.png b/super_editor/test_goldens/editor/components/goldens/paragraph_alignments.png
index 8d4b56c9a..79a1cf020 100644
Binary files a/super_editor/test_goldens/editor/components/goldens/paragraph_alignments.png and b/super_editor/test_goldens/editor/components/goldens/paragraph_alignments.png differ
diff --git a/super_editor/test_goldens/editor/components/goldens/super_editor_list_item_ordered_aligns_dot_with_text_with_font_sizes.png b/super_editor/test_goldens/editor/components/goldens/super_editor_list_item_ordered_aligns_dot_with_text_with_font_sizes.png
index 17f20732c..e250633d5 100644
Binary files a/super_editor/test_goldens/editor/components/goldens/super_editor_list_item_ordered_aligns_dot_with_text_with_font_sizes.png and b/super_editor/test_goldens/editor/components/goldens/super_editor_list_item_ordered_aligns_dot_with_text_with_font_sizes.png differ
diff --git a/super_editor/test_goldens/editor/components/goldens/super_editor_list_item_ordered_aligns_dot_with_text_with_font_sizes_and_line_multiplier.png b/super_editor/test_goldens/editor/components/goldens/super_editor_list_item_ordered_aligns_dot_with_text_with_font_sizes_and_line_multiplier.png
index ee63c850c..17ec27c8f 100644
Binary files a/super_editor/test_goldens/editor/components/goldens/super_editor_list_item_ordered_aligns_dot_with_text_with_font_sizes_and_line_multiplier.png and b/super_editor/test_goldens/editor/components/goldens/super_editor_list_item_ordered_aligns_dot_with_text_with_font_sizes_and_line_multiplier.png differ
diff --git a/super_editor/test_goldens/editor/components/goldens/super_editor_list_item_unordered_aligns_dot_with_text_with_font_sizes.png b/super_editor/test_goldens/editor/components/goldens/super_editor_list_item_unordered_aligns_dot_with_text_with_font_sizes.png
index 5ee5bd687..5b492791e 100644
Binary files a/super_editor/test_goldens/editor/components/goldens/super_editor_list_item_unordered_aligns_dot_with_text_with_font_sizes.png and b/super_editor/test_goldens/editor/components/goldens/super_editor_list_item_unordered_aligns_dot_with_text_with_font_sizes.png differ
diff --git a/super_editor/test_goldens/editor/components/goldens/super_editor_list_item_unordered_aligns_dot_with_text_with_font_sizes_and_line_multiplier.png b/super_editor/test_goldens/editor/components/goldens/super_editor_list_item_unordered_aligns_dot_with_text_with_font_sizes_and_line_multiplier.png
index 53da55311..68bbb50df 100644
Binary files a/super_editor/test_goldens/editor/components/goldens/super_editor_list_item_unordered_aligns_dot_with_text_with_font_sizes_and_line_multiplier.png and b/super_editor/test_goldens/editor/components/goldens/super_editor_list_item_unordered_aligns_dot_with_text_with_font_sizes_and_line_multiplier.png differ
diff --git a/super_editor/test_goldens/editor/components/goldens/text_with_hint.png b/super_editor/test_goldens/editor/components/goldens/text_with_hint.png
index ef44bbfd6..e4791b7ea 100644
Binary files a/super_editor/test_goldens/editor/components/goldens/text_with_hint.png and b/super_editor/test_goldens/editor/components/goldens/text_with_hint.png differ
diff --git a/super_editor/test_goldens/editor/goldens/super-editor-android-custom-caret-width.png b/super_editor/test_goldens/editor/goldens/super-editor-android-custom-caret-width.png
new file mode 100644
index 000000000..d064a94ef
Binary files /dev/null and b/super_editor/test_goldens/editor/goldens/super-editor-android-custom-caret-width.png differ
diff --git a/super_editor/test_goldens/editor/goldens/text-scaling-blockquote.png b/super_editor/test_goldens/editor/goldens/text-scaling-blockquote.png
index 8cd541294..dd5499802 100644
Binary files a/super_editor/test_goldens/editor/goldens/text-scaling-blockquote.png and b/super_editor/test_goldens/editor/goldens/text-scaling-blockquote.png differ
diff --git a/super_editor/test_goldens/editor/goldens/text-scaling-header.png b/super_editor/test_goldens/editor/goldens/text-scaling-header.png
index f90849fb5..37c9a8b4e 100644
Binary files a/super_editor/test_goldens/editor/goldens/text-scaling-header.png and b/super_editor/test_goldens/editor/goldens/text-scaling-header.png differ
diff --git a/super_editor/test_goldens/editor/goldens/text-scaling-ordered-list.png b/super_editor/test_goldens/editor/goldens/text-scaling-ordered-list.png
index f3e993e64..629a2c747 100644
Binary files a/super_editor/test_goldens/editor/goldens/text-scaling-ordered-list.png and b/super_editor/test_goldens/editor/goldens/text-scaling-ordered-list.png differ
diff --git a/super_editor/test_goldens/editor/goldens/text-scaling-paragraph.png b/super_editor/test_goldens/editor/goldens/text-scaling-paragraph.png
index ef610112c..5d08240a0 100644
Binary files a/super_editor/test_goldens/editor/goldens/text-scaling-paragraph.png and b/super_editor/test_goldens/editor/goldens/text-scaling-paragraph.png differ
diff --git a/super_editor/test_goldens/editor/mobile/goldens/mobile-selection_android_double-tap-text.png b/super_editor/test_goldens/editor/mobile/goldens/mobile-selection_android_double-tap-text.png
index 12011446b..8bf99f389 100644
Binary files a/super_editor/test_goldens/editor/mobile/goldens/mobile-selection_android_double-tap-text.png and b/super_editor/test_goldens/editor/mobile/goldens/mobile-selection_android_double-tap-text.png differ
diff --git a/super_editor/test_goldens/editor/mobile/goldens/mobile-selection_android_drag-base-upstream.png b/super_editor/test_goldens/editor/mobile/goldens/mobile-selection_android_drag-base-upstream.png
index b28109fbf..2916c0c70 100644
Binary files a/super_editor/test_goldens/editor/mobile/goldens/mobile-selection_android_drag-base-upstream.png and b/super_editor/test_goldens/editor/mobile/goldens/mobile-selection_android_drag-base-upstream.png differ
diff --git a/super_editor/test_goldens/editor/mobile/goldens/mobile-selection_android_drag-collapsed-downstream.png b/super_editor/test_goldens/editor/mobile/goldens/mobile-selection_android_drag-collapsed-downstream.png
index d8a3ce926..b135e3a66 100644
Binary files a/super_editor/test_goldens/editor/mobile/goldens/mobile-selection_android_drag-collapsed-downstream.png and b/super_editor/test_goldens/editor/mobile/goldens/mobile-selection_android_drag-collapsed-downstream.png differ
diff --git a/super_editor/test_goldens/editor/mobile/goldens/mobile-selection_android_drag-collapsed-upstream.png b/super_editor/test_goldens/editor/mobile/goldens/mobile-selection_android_drag-collapsed-upstream.png
index e4f90bb6d..53b812c5a 100644
Binary files a/super_editor/test_goldens/editor/mobile/goldens/mobile-selection_android_drag-collapsed-upstream.png and b/super_editor/test_goldens/editor/mobile/goldens/mobile-selection_android_drag-collapsed-upstream.png differ
diff --git a/super_editor/test_goldens/editor/mobile/goldens/mobile-selection_android_drag-extent-downstream.png b/super_editor/test_goldens/editor/mobile/goldens/mobile-selection_android_drag-extent-downstream.png
index 062051a19..a14c3811c 100644
Binary files a/super_editor/test_goldens/editor/mobile/goldens/mobile-selection_android_drag-extent-downstream.png and b/super_editor/test_goldens/editor/mobile/goldens/mobile-selection_android_drag-extent-downstream.png differ
diff --git a/super_editor/test_goldens/editor/mobile/goldens/mobile-selection_android_drag-extent-upstream.png b/super_editor/test_goldens/editor/mobile/goldens/mobile-selection_android_drag-extent-upstream.png
index 48ec045ee..7176fe3ff 100644
Binary files a/super_editor/test_goldens/editor/mobile/goldens/mobile-selection_android_drag-extent-upstream.png and b/super_editor/test_goldens/editor/mobile/goldens/mobile-selection_android_drag-extent-upstream.png differ
diff --git a/super_editor/test_goldens/editor/mobile/goldens/mobile-selection_android_single-tap-text.png b/super_editor/test_goldens/editor/mobile/goldens/mobile-selection_android_single-tap-text.png
index 583223033..b8bd32706 100644
Binary files a/super_editor/test_goldens/editor/mobile/goldens/mobile-selection_android_single-tap-text.png and b/super_editor/test_goldens/editor/mobile/goldens/mobile-selection_android_single-tap-text.png differ
diff --git a/super_editor/test_goldens/editor/mobile/goldens/mobile-selection_android_trip-tap-text.png b/super_editor/test_goldens/editor/mobile/goldens/mobile-selection_android_trip-tap-text.png
index dede52bce..1b187dd98 100644
Binary files a/super_editor/test_goldens/editor/mobile/goldens/mobile-selection_android_trip-tap-text.png and b/super_editor/test_goldens/editor/mobile/goldens/mobile-selection_android_trip-tap-text.png differ
diff --git a/super_editor/test_goldens/editor/mobile/goldens/mobile-selection_ios_double-tap-text.png b/super_editor/test_goldens/editor/mobile/goldens/mobile-selection_ios_double-tap-text.png
index 3579bb903..cb16a59ed 100644
Binary files a/super_editor/test_goldens/editor/mobile/goldens/mobile-selection_ios_double-tap-text.png and b/super_editor/test_goldens/editor/mobile/goldens/mobile-selection_ios_double-tap-text.png differ
diff --git a/super_editor/test_goldens/editor/mobile/goldens/mobile-selection_ios_drag-base-upstream.png b/super_editor/test_goldens/editor/mobile/goldens/mobile-selection_ios_drag-base-upstream.png
index 314b07b8e..ff2eb68de 100644
Binary files a/super_editor/test_goldens/editor/mobile/goldens/mobile-selection_ios_drag-base-upstream.png and b/super_editor/test_goldens/editor/mobile/goldens/mobile-selection_ios_drag-base-upstream.png differ
diff --git a/super_editor/test_goldens/editor/mobile/goldens/mobile-selection_ios_drag-collapsed-downstream.png b/super_editor/test_goldens/editor/mobile/goldens/mobile-selection_ios_drag-collapsed-downstream.png
index d2c67d92c..d9b4bd6fb 100644
Binary files a/super_editor/test_goldens/editor/mobile/goldens/mobile-selection_ios_drag-collapsed-downstream.png and b/super_editor/test_goldens/editor/mobile/goldens/mobile-selection_ios_drag-collapsed-downstream.png differ
diff --git a/super_editor/test_goldens/editor/mobile/goldens/mobile-selection_ios_drag-collapsed-upstream.png b/super_editor/test_goldens/editor/mobile/goldens/mobile-selection_ios_drag-collapsed-upstream.png
index b0f553517..a8f06fda1 100644
Binary files a/super_editor/test_goldens/editor/mobile/goldens/mobile-selection_ios_drag-collapsed-upstream.png and b/super_editor/test_goldens/editor/mobile/goldens/mobile-selection_ios_drag-collapsed-upstream.png differ
diff --git a/super_editor/test_goldens/editor/mobile/goldens/mobile-selection_ios_drag-extent-downstream.png b/super_editor/test_goldens/editor/mobile/goldens/mobile-selection_ios_drag-extent-downstream.png
index 204e47e0d..92076c33d 100644
Binary files a/super_editor/test_goldens/editor/mobile/goldens/mobile-selection_ios_drag-extent-downstream.png and b/super_editor/test_goldens/editor/mobile/goldens/mobile-selection_ios_drag-extent-downstream.png differ
diff --git a/super_editor/test_goldens/editor/mobile/goldens/mobile-selection_ios_drag-extent-upstream.png b/super_editor/test_goldens/editor/mobile/goldens/mobile-selection_ios_drag-extent-upstream.png
index f1c9bfd8d..c963cf56f 100644
Binary files a/super_editor/test_goldens/editor/mobile/goldens/mobile-selection_ios_drag-extent-upstream.png and b/super_editor/test_goldens/editor/mobile/goldens/mobile-selection_ios_drag-extent-upstream.png differ
diff --git a/super_editor/test_goldens/editor/mobile/goldens/mobile-selection_ios_single-tap-text.png b/super_editor/test_goldens/editor/mobile/goldens/mobile-selection_ios_single-tap-text.png
index adfdc2143..a6e83a291 100644
Binary files a/super_editor/test_goldens/editor/mobile/goldens/mobile-selection_ios_single-tap-text.png and b/super_editor/test_goldens/editor/mobile/goldens/mobile-selection_ios_single-tap-text.png differ
diff --git a/super_editor/test_goldens/editor/mobile/goldens/mobile-selection_ios_trip-tap-text.png b/super_editor/test_goldens/editor/mobile/goldens/mobile-selection_ios_trip-tap-text.png
index ead72ca7c..11c3e56a2 100644
Binary files a/super_editor/test_goldens/editor/mobile/goldens/mobile-selection_ios_trip-tap-text.png and b/super_editor/test_goldens/editor/mobile/goldens/mobile-selection_ios_trip-tap-text.png differ
diff --git a/super_editor/test_goldens/editor/mobile/goldens/supereditor_android_collapsed_handle_color.png b/super_editor/test_goldens/editor/mobile/goldens/supereditor_android_collapsed_handle_color.png
index ec8ac589b..178c8edbe 100644
Binary files a/super_editor/test_goldens/editor/mobile/goldens/supereditor_android_collapsed_handle_color.png and b/super_editor/test_goldens/editor/mobile/goldens/supereditor_android_collapsed_handle_color.png differ
diff --git a/super_editor/test_goldens/editor/mobile/goldens/supereditor_android_expanded_handle_color.png b/super_editor/test_goldens/editor/mobile/goldens/supereditor_android_expanded_handle_color.png
index 1c2e7d522..e512b7c57 100644
Binary files a/super_editor/test_goldens/editor/mobile/goldens/supereditor_android_expanded_handle_color.png and b/super_editor/test_goldens/editor/mobile/goldens/supereditor_android_expanded_handle_color.png differ
diff --git a/super_editor/test_goldens/editor/mobile/goldens/supereditor_ios_collapsed_handle_color.png b/super_editor/test_goldens/editor/mobile/goldens/supereditor_ios_collapsed_handle_color.png
index c78b50cc5..6cf783865 100644
Binary files a/super_editor/test_goldens/editor/mobile/goldens/supereditor_ios_collapsed_handle_color.png and b/super_editor/test_goldens/editor/mobile/goldens/supereditor_ios_collapsed_handle_color.png differ
diff --git a/super_editor/test_goldens/editor/mobile/goldens/supereditor_ios_expanded_handle_color.png b/super_editor/test_goldens/editor/mobile/goldens/supereditor_ios_expanded_handle_color.png
index 5ec107817..4313e25ac 100644
Binary files a/super_editor/test_goldens/editor/mobile/goldens/supereditor_ios_expanded_handle_color.png and b/super_editor/test_goldens/editor/mobile/goldens/supereditor_ios_expanded_handle_color.png differ
diff --git a/super_editor/test_goldens/editor/mobile/mobile_selection_test.dart b/super_editor/test_goldens/editor/mobile/mobile_selection_test.dart
index d7efc5019..1d192f6b0 100644
--- a/super_editor/test_goldens/editor/mobile/mobile_selection_test.dart
+++ b/super_editor/test_goldens/editor/mobile/mobile_selection_test.dart
@@ -101,6 +101,7 @@ void main() {
             );
             await tester.pumpAndSettle();
           },
+          maxPixelMismatchCount: 51,
         );
 
         _testParagraphSelection(
@@ -115,10 +116,20 @@ void main() {
 
             final dragDelta = SuperEditorInspector.findDeltaBetweenCharactersInTextNode("1", 34, 28);
             final handleRectGlobal = SuperEditorInspector.findMobileCaretDragHandle().globalRect;
-            await tester.dragFrom(handleRectGlobal.center, dragDelta);
+
+            // Calculate the center of the visual handle, accounting for addition of invisible
+            // touch area expansion. The touch area only expands below the handle, not above
+            // the handle, so using the "center" of the widget would product a point that's
+            // too far down. The invisible height below the handle is about the same height as
+            // the handle, so we'll use the 25% y-value of the whole widget, which is roughly
+            // at the 50% y-value of the visible handle.
+            final centerOfVisualHandle =
+                Offset(handleRectGlobal.center.dx, handleRectGlobal.top + handleRectGlobal.height / 4);
+
+            await tester.dragFrom(centerOfVisualHandle, dragDelta);
 
             // Update the drag line for debug purposes
-            dragLine.value = _Line(handleRectGlobal.center, handleRectGlobal.center + dragDelta);
+            dragLine.value = _Line(handleRectGlobal.center, centerOfVisualHandle + dragDelta);
 
             // Even though this is a golden test, we verify the final selection
             // to make it easier to spot rendering problems vs selection problems.
@@ -132,6 +143,7 @@ void main() {
               ),
             );
           },
+          maxPixelMismatchCount: 51,
         );
 
         _testParagraphSelection(
@@ -163,6 +175,7 @@ void main() {
               ),
             );
           },
+          maxPixelMismatchCount: 51,
         );
 
         _testParagraphSelection(
diff --git a/super_editor/test_goldens/editor/text_entry/goldens/super-editor_text-entry_composing-region-shows-underline_paragraph_android_1.png b/super_editor/test_goldens/editor/text_entry/goldens/super-editor_text-entry_composing-region-shows-underline_paragraph_android_1.png
index b110176c3..a6687f764 100644
Binary files a/super_editor/test_goldens/editor/text_entry/goldens/super-editor_text-entry_composing-region-shows-underline_paragraph_android_1.png and b/super_editor/test_goldens/editor/text_entry/goldens/super-editor_text-entry_composing-region-shows-underline_paragraph_android_1.png differ
diff --git a/super_editor/test_goldens/editor/text_entry/goldens/super-editor_text-entry_composing-region-shows-underline_paragraph_android_2.png b/super_editor/test_goldens/editor/text_entry/goldens/super-editor_text-entry_composing-region-shows-underline_paragraph_android_2.png
index 6bcf228ea..860295af3 100644
Binary files a/super_editor/test_goldens/editor/text_entry/goldens/super-editor_text-entry_composing-region-shows-underline_paragraph_android_2.png and b/super_editor/test_goldens/editor/text_entry/goldens/super-editor_text-entry_composing-region-shows-underline_paragraph_android_2.png differ
diff --git a/super_editor/test_goldens/editor/text_entry/goldens/super-editor_text-entry_composing-region-shows-underline_paragraph_iOS_1.png b/super_editor/test_goldens/editor/text_entry/goldens/super-editor_text-entry_composing-region-shows-underline_paragraph_iOS_1.png
index 5d88ab6ae..9b08fa745 100644
Binary files a/super_editor/test_goldens/editor/text_entry/goldens/super-editor_text-entry_composing-region-shows-underline_paragraph_iOS_1.png and b/super_editor/test_goldens/editor/text_entry/goldens/super-editor_text-entry_composing-region-shows-underline_paragraph_iOS_1.png differ
diff --git a/super_editor/test_goldens/editor/text_entry/goldens/super-editor_text-entry_composing-region-shows-underline_paragraph_iOS_2.png b/super_editor/test_goldens/editor/text_entry/goldens/super-editor_text-entry_composing-region-shows-underline_paragraph_iOS_2.png
index 6bea74301..e5a9142d0 100644
Binary files a/super_editor/test_goldens/editor/text_entry/goldens/super-editor_text-entry_composing-region-shows-underline_paragraph_iOS_2.png and b/super_editor/test_goldens/editor/text_entry/goldens/super-editor_text-entry_composing-region-shows-underline_paragraph_iOS_2.png differ
diff --git a/super_editor/test_goldens/editor/text_entry/goldens/super-editor_text-entry_composing-region-shows-underline_task_android_1.png b/super_editor/test_goldens/editor/text_entry/goldens/super-editor_text-entry_composing-region-shows-underline_task_android_1.png
index 74a64dc2e..c5be6fe5f 100644
Binary files a/super_editor/test_goldens/editor/text_entry/goldens/super-editor_text-entry_composing-region-shows-underline_task_android_1.png and b/super_editor/test_goldens/editor/text_entry/goldens/super-editor_text-entry_composing-region-shows-underline_task_android_1.png differ
diff --git a/super_editor/test_goldens/editor/text_entry/goldens/super-editor_text-entry_composing-region-shows-underline_task_android_2.png b/super_editor/test_goldens/editor/text_entry/goldens/super-editor_text-entry_composing-region-shows-underline_task_android_2.png
index c7954efaf..7855b6176 100644
Binary files a/super_editor/test_goldens/editor/text_entry/goldens/super-editor_text-entry_composing-region-shows-underline_task_android_2.png and b/super_editor/test_goldens/editor/text_entry/goldens/super-editor_text-entry_composing-region-shows-underline_task_android_2.png differ
diff --git a/super_editor/test_goldens/editor/text_entry/goldens/super-editor_text-entry_composing-region-shows-underline_task_iOS_1.png b/super_editor/test_goldens/editor/text_entry/goldens/super-editor_text-entry_composing-region-shows-underline_task_iOS_1.png
index d054ebd4f..8f1c39565 100644
Binary files a/super_editor/test_goldens/editor/text_entry/goldens/super-editor_text-entry_composing-region-shows-underline_task_iOS_1.png and b/super_editor/test_goldens/editor/text_entry/goldens/super-editor_text-entry_composing-region-shows-underline_task_iOS_1.png differ
diff --git a/super_editor/test_goldens/editor/text_entry/goldens/super-editor_text-entry_composing-region-shows-underline_task_iOS_2.png b/super_editor/test_goldens/editor/text_entry/goldens/super-editor_text-entry_composing-region-shows-underline_task_iOS_2.png
index dc53c7b82..64b661d8d 100644
Binary files a/super_editor/test_goldens/editor/text_entry/goldens/super-editor_text-entry_composing-region-shows-underline_task_iOS_2.png and b/super_editor/test_goldens/editor/text_entry/goldens/super-editor_text-entry_composing-region-shows-underline_task_iOS_2.png differ
diff --git a/super_editor/test_goldens/super_textfield/goldens/super-text-field_composing-region-shows-underline_android_1.png b/super_editor/test_goldens/super_textfield/goldens/super-text-field_composing-region-shows-underline_android_1.png
index 497c6e5b6..7b157df51 100644
Binary files a/super_editor/test_goldens/super_textfield/goldens/super-text-field_composing-region-shows-underline_android_1.png and b/super_editor/test_goldens/super_textfield/goldens/super-text-field_composing-region-shows-underline_android_1.png differ
diff --git a/super_editor/test_goldens/super_textfield/goldens/super-text-field_composing-region-shows-underline_android_2.png b/super_editor/test_goldens/super_textfield/goldens/super-text-field_composing-region-shows-underline_android_2.png
index 2cb3615e0..4a66ae2ae 100644
Binary files a/super_editor/test_goldens/super_textfield/goldens/super-text-field_composing-region-shows-underline_android_2.png and b/super_editor/test_goldens/super_textfield/goldens/super-text-field_composing-region-shows-underline_android_2.png differ
diff --git a/super_editor/test_goldens/super_textfield/goldens/super-text-field_composing-region-shows-underline_iOS_1.png b/super_editor/test_goldens/super_textfield/goldens/super-text-field_composing-region-shows-underline_iOS_1.png
index 497c6e5b6..7b157df51 100644
Binary files a/super_editor/test_goldens/super_textfield/goldens/super-text-field_composing-region-shows-underline_iOS_1.png and b/super_editor/test_goldens/super_textfield/goldens/super-text-field_composing-region-shows-underline_iOS_1.png differ
diff --git a/super_editor/test_goldens/super_textfield/goldens/super-text-field_composing-region-shows-underline_iOS_2.png b/super_editor/test_goldens/super_textfield/goldens/super-text-field_composing-region-shows-underline_iOS_2.png
index 2cb3615e0..4a66ae2ae 100644
Binary files a/super_editor/test_goldens/super_textfield/goldens/super-text-field_composing-region-shows-underline_iOS_2.png and b/super_editor/test_goldens/super_textfield/goldens/super-text-field_composing-region-shows-underline_iOS_2.png differ
diff --git a/super_editor/test_goldens/super_textfield/goldens/super-text-field_composing-region-shows-underline_macOS_1.png b/super_editor/test_goldens/super_textfield/goldens/super-text-field_composing-region-shows-underline_macOS_1.png
index 7e37fa352..8b33d3cc8 100644
Binary files a/super_editor/test_goldens/super_textfield/goldens/super-text-field_composing-region-shows-underline_macOS_1.png and b/super_editor/test_goldens/super_textfield/goldens/super-text-field_composing-region-shows-underline_macOS_1.png differ
diff --git a/super_editor/test_goldens/super_textfield/goldens/super-text-field_composing-region-shows-underline_macOS_2.png b/super_editor/test_goldens/super_textfield/goldens/super-text-field_composing-region-shows-underline_macOS_2.png
index 7184f10f9..48985d3c1 100644
Binary files a/super_editor/test_goldens/super_textfield/goldens/super-text-field_composing-region-shows-underline_macOS_2.png and b/super_editor/test_goldens/super_textfield/goldens/super-text-field_composing-region-shows-underline_macOS_2.png differ
diff --git a/super_editor/test_goldens/super_textfield/goldens/super-text-field_composing-region-underline-shows-nothing_linux.png b/super_editor/test_goldens/super_textfield/goldens/super-text-field_composing-region-underline-shows-nothing_linux.png
index 7184f10f9..48985d3c1 100644
Binary files a/super_editor/test_goldens/super_textfield/goldens/super-text-field_composing-region-underline-shows-nothing_linux.png and b/super_editor/test_goldens/super_textfield/goldens/super-text-field_composing-region-underline-shows-nothing_linux.png differ
diff --git a/super_editor/test_goldens/super_textfield/goldens/super-text-field_composing-region-underline-shows-nothing_windows.png b/super_editor/test_goldens/super_textfield/goldens/super-text-field_composing-region-underline-shows-nothing_windows.png
index 7184f10f9..48985d3c1 100644
Binary files a/super_editor/test_goldens/super_textfield/goldens/super-text-field_composing-region-underline-shows-nothing_windows.png and b/super_editor/test_goldens/super_textfield/goldens/super-text-field_composing-region-underline-shows-nothing_windows.png differ
diff --git a/super_editor/test_goldens/super_textfield/goldens/super_textfield_empty_hint_padding.png b/super_editor/test_goldens/super_textfield/goldens/super_textfield_empty_hint_padding.png
index 1c9aea65c..aeb94e9cb 100644
Binary files a/super_editor/test_goldens/super_textfield/goldens/super_textfield_empty_hint_padding.png and b/super_editor/test_goldens/super_textfield/goldens/super_textfield_empty_hint_padding.png differ
diff --git a/super_editor/test_goldens/super_textfield/goldens/super_textfield_font_height.png b/super_editor/test_goldens/super_textfield/goldens/super_textfield_font_height.png
index 4768db5b9..7fe241b3f 100644
Binary files a/super_editor/test_goldens/super_textfield/goldens/super_textfield_font_height.png and b/super_editor/test_goldens/super_textfield/goldens/super_textfield_font_height.png differ
diff --git a/super_editor/test_goldens/super_textfield/goldens/super_textfield_ios_toolbar_pointing_down_collapsed.png b/super_editor/test_goldens/super_textfield/goldens/super_textfield_ios_toolbar_pointing_down_collapsed.png
index 0239614cd..0db1708eb 100644
Binary files a/super_editor/test_goldens/super_textfield/goldens/super_textfield_ios_toolbar_pointing_down_collapsed.png and b/super_editor/test_goldens/super_textfield/goldens/super_textfield_ios_toolbar_pointing_down_collapsed.png differ
diff --git a/super_editor/test_goldens/super_textfield/goldens/super_textfield_ios_toolbar_pointing_down_expanded.png b/super_editor/test_goldens/super_textfield/goldens/super_textfield_ios_toolbar_pointing_down_expanded.png
index 062b53c8b..0c59c8372 100644
Binary files a/super_editor/test_goldens/super_textfield/goldens/super_textfield_ios_toolbar_pointing_down_expanded.png and b/super_editor/test_goldens/super_textfield/goldens/super_textfield_ios_toolbar_pointing_down_expanded.png differ
diff --git a/super_editor/test_goldens/super_textfield/goldens/super_textfield_ios_toolbar_pointing_up_collapsed.png b/super_editor/test_goldens/super_textfield/goldens/super_textfield_ios_toolbar_pointing_up_collapsed.png
index e06a292e7..ebf735417 100644
Binary files a/super_editor/test_goldens/super_textfield/goldens/super_textfield_ios_toolbar_pointing_up_collapsed.png and b/super_editor/test_goldens/super_textfield/goldens/super_textfield_ios_toolbar_pointing_up_collapsed.png differ
diff --git a/super_editor/test_goldens/super_textfield/goldens/super_textfield_ios_toolbar_pointing_up_expanded.png b/super_editor/test_goldens/super_textfield/goldens/super_textfield_ios_toolbar_pointing_up_expanded.png
index b60a373ab..d3f44c000 100644
Binary files a/super_editor/test_goldens/super_textfield/goldens/super_textfield_ios_toolbar_pointing_up_expanded.png and b/super_editor/test_goldens/super_textfield/goldens/super_textfield_ios_toolbar_pointing_up_expanded.png differ
diff --git a/super_editor/test_goldens/super_textfield/goldens/super_textfield_scrolled_down.png b/super_editor/test_goldens/super_textfield/goldens/super_textfield_scrolled_down.png
index df0174753..999a2ed3b 100644
Binary files a/super_editor/test_goldens/super_textfield/goldens/super_textfield_scrolled_down.png and b/super_editor/test_goldens/super_textfield/goldens/super_textfield_scrolled_down.png differ
diff --git a/super_editor/test_goldens/super_textfield/goldens/super_textfield_scrolled_up.png b/super_editor/test_goldens/super_textfield/goldens/super_textfield_scrolled_up.png
index c560f4639..3c836170d 100644
Binary files a/super_editor/test_goldens/super_textfield/goldens/super_textfield_scrolled_up.png and b/super_editor/test_goldens/super_textfield/goldens/super_textfield_scrolled_up.png differ