diff --git a/platform/diff-impl/tests/testData/diff/painting/new.ui/borderLineMarker.png b/platform/diff-impl/tests/testData/diff/painting/new.ui/borderLineMarker.png
index 0e39d8a1a731..31f55f3fb2fd 100644
Binary files a/platform/diff-impl/tests/testData/diff/painting/new.ui/borderLineMarker.png and b/platform/diff-impl/tests/testData/diff/painting/new.ui/borderLineMarker.png differ
diff --git a/platform/diff-impl/tests/testData/diff/painting/new.ui/emptyRange.png b/platform/diff-impl/tests/testData/diff/painting/new.ui/emptyRange.png
index 46c3618a80fd..c3d7fede5825 100644
Binary files a/platform/diff-impl/tests/testData/diff/painting/new.ui/emptyRange.png and b/platform/diff-impl/tests/testData/diff/painting/new.ui/emptyRange.png differ
diff --git a/platform/diff-impl/tests/testData/diff/painting/new.ui/emptyRangeFirstLine.png b/platform/diff-impl/tests/testData/diff/painting/new.ui/emptyRangeFirstLine.png
index c7bd47f0fb13..1f0527aa02b0 100644
Binary files a/platform/diff-impl/tests/testData/diff/painting/new.ui/emptyRangeFirstLine.png and b/platform/diff-impl/tests/testData/diff/painting/new.ui/emptyRangeFirstLine.png differ
diff --git a/platform/diff-impl/tests/testData/diff/painting/new.ui/emptyRangeLastEmptyLine.png b/platform/diff-impl/tests/testData/diff/painting/new.ui/emptyRangeLastEmptyLine.png
index e7abe1a7b869..739e51766c9e 100644
Binary files a/platform/diff-impl/tests/testData/diff/painting/new.ui/emptyRangeLastEmptyLine.png and b/platform/diff-impl/tests/testData/diff/painting/new.ui/emptyRangeLastEmptyLine.png differ
diff --git a/platform/diff-impl/tests/testData/diff/painting/new.ui/emptyRangeLastLineSoftWraps.png b/platform/diff-impl/tests/testData/diff/painting/new.ui/emptyRangeLastLineSoftWraps.png
index 2ba9602446c2..9264be546271 100644
Binary files a/platform/diff-impl/tests/testData/diff/painting/new.ui/emptyRangeLastLineSoftWraps.png and b/platform/diff-impl/tests/testData/diff/painting/new.ui/emptyRangeLastLineSoftWraps.png differ
diff --git a/platform/diff-impl/tests/testData/diff/painting/new.ui/emptyRangeWithInlayAbove1.png b/platform/diff-impl/tests/testData/diff/painting/new.ui/emptyRangeWithInlayAbove1.png
index 243bb0434423..87781931e6be 100644
Binary files a/platform/diff-impl/tests/testData/diff/painting/new.ui/emptyRangeWithInlayAbove1.png and b/platform/diff-impl/tests/testData/diff/painting/new.ui/emptyRangeWithInlayAbove1.png differ
diff --git a/platform/diff-impl/tests/testData/diff/painting/new.ui/emptyRangeWithInlayAbove2.png b/platform/diff-impl/tests/testData/diff/painting/new.ui/emptyRangeWithInlayAbove2.png
index 5f95fee94ea6..44c1da0c3ab2 100644
Binary files a/platform/diff-impl/tests/testData/diff/painting/new.ui/emptyRangeWithInlayAbove2.png and b/platform/diff-impl/tests/testData/diff/painting/new.ui/emptyRangeWithInlayAbove2.png differ
diff --git a/platform/diff-impl/tests/testData/diff/painting/new.ui/emptyRangeWithInlayBelow1.png b/platform/diff-impl/tests/testData/diff/painting/new.ui/emptyRangeWithInlayBelow1.png
index 243bb0434423..87781931e6be 100644
Binary files a/platform/diff-impl/tests/testData/diff/painting/new.ui/emptyRangeWithInlayBelow1.png and b/platform/diff-impl/tests/testData/diff/painting/new.ui/emptyRangeWithInlayBelow1.png differ
diff --git a/platform/diff-impl/tests/testData/diff/painting/new.ui/emptyRangeWithInlayBelow2.png b/platform/diff-impl/tests/testData/diff/painting/new.ui/emptyRangeWithInlayBelow2.png
index 5f95fee94ea6..44c1da0c3ab2 100644
Binary files a/platform/diff-impl/tests/testData/diff/painting/new.ui/emptyRangeWithInlayBelow2.png and b/platform/diff-impl/tests/testData/diff/painting/new.ui/emptyRangeWithInlayBelow2.png differ
diff --git a/platform/diff-impl/tests/testData/diff/painting/new.ui/lastEmptyLineChanged.png b/platform/diff-impl/tests/testData/diff/painting/new.ui/lastEmptyLineChanged.png
index bed467a9e2af..c9bffc235797 100644
Binary files a/platform/diff-impl/tests/testData/diff/painting/new.ui/lastEmptyLineChanged.png and b/platform/diff-impl/tests/testData/diff/painting/new.ui/lastEmptyLineChanged.png differ
diff --git a/platform/diff-impl/tests/testData/diff/painting/new.ui/lastLineChanged.png b/platform/diff-impl/tests/testData/diff/painting/new.ui/lastLineChanged.png
index 4fcf3a0597d3..a3ae79e553e5 100644
Binary files a/platform/diff-impl/tests/testData/diff/painting/new.ui/lastLineChanged.png and b/platform/diff-impl/tests/testData/diff/painting/new.ui/lastLineChanged.png differ
diff --git a/platform/diff-impl/tests/testData/diff/painting/new.ui/lastLineSoftWraps.png b/platform/diff-impl/tests/testData/diff/painting/new.ui/lastLineSoftWraps.png
index aa0c3cab9507..5279911d28ca 100644
Binary files a/platform/diff-impl/tests/testData/diff/painting/new.ui/lastLineSoftWraps.png and b/platform/diff-impl/tests/testData/diff/painting/new.ui/lastLineSoftWraps.png differ
diff --git a/platform/diff-impl/tests/testData/diff/painting/new.ui/lineMarker.png b/platform/diff-impl/tests/testData/diff/painting/new.ui/lineMarker.png
index 2fa861c99046..a68c851a2e62 100644
Binary files a/platform/diff-impl/tests/testData/diff/painting/new.ui/lineMarker.png and b/platform/diff-impl/tests/testData/diff/painting/new.ui/lineMarker.png differ
diff --git a/platform/diff-impl/tests/testData/diff/painting/new.ui/newlineChanged.png b/platform/diff-impl/tests/testData/diff/painting/new.ui/newlineChanged.png
index 05af738652a8..f2b2703bb341 100644
Binary files a/platform/diff-impl/tests/testData/diff/painting/new.ui/newlineChanged.png and b/platform/diff-impl/tests/testData/diff/painting/new.ui/newlineChanged.png differ
diff --git a/platform/diff-impl/tests/testData/diff/painting/new.ui/oneLetterChanged.png b/platform/diff-impl/tests/testData/diff/painting/new.ui/oneLetterChanged.png
index 7300464dfe1e..9cd608bb5f4b 100644
Binary files a/platform/diff-impl/tests/testData/diff/painting/new.ui/oneLetterChanged.png and b/platform/diff-impl/tests/testData/diff/painting/new.ui/oneLetterChanged.png differ
diff --git a/platform/diff-impl/tests/testData/diff/painting/new.ui/rangeWithInlayAbove1.png b/platform/diff-impl/tests/testData/diff/painting/new.ui/rangeWithInlayAbove1.png
index bee4d397f486..bf9a40ef2a39 100644
Binary files a/platform/diff-impl/tests/testData/diff/painting/new.ui/rangeWithInlayAbove1.png and b/platform/diff-impl/tests/testData/diff/painting/new.ui/rangeWithInlayAbove1.png differ
diff --git a/platform/diff-impl/tests/testData/diff/painting/new.ui/rangeWithInlayAbove2.png b/platform/diff-impl/tests/testData/diff/painting/new.ui/rangeWithInlayAbove2.png
index bee4d397f486..bf9a40ef2a39 100644
Binary files a/platform/diff-impl/tests/testData/diff/painting/new.ui/rangeWithInlayAbove2.png and b/platform/diff-impl/tests/testData/diff/painting/new.ui/rangeWithInlayAbove2.png differ
diff --git a/platform/diff-impl/tests/testData/diff/painting/new.ui/rangeWithInlayBelow1.png b/platform/diff-impl/tests/testData/diff/painting/new.ui/rangeWithInlayBelow1.png
index 62c806d57c50..b03918349b7d 100644
Binary files a/platform/diff-impl/tests/testData/diff/painting/new.ui/rangeWithInlayBelow1.png and b/platform/diff-impl/tests/testData/diff/painting/new.ui/rangeWithInlayBelow1.png differ
diff --git a/platform/diff-impl/tests/testData/diff/painting/new.ui/rangeWithInlayBelow2.png b/platform/diff-impl/tests/testData/diff/painting/new.ui/rangeWithInlayBelow2.png
index 62c806d57c50..b03918349b7d 100644
Binary files a/platform/diff-impl/tests/testData/diff/painting/new.ui/rangeWithInlayBelow2.png and b/platform/diff-impl/tests/testData/diff/painting/new.ui/rangeWithInlayBelow2.png differ
diff --git a/platform/diff-impl/tests/testData/diff/painting/new.ui/rangeWithInlayInside.png b/platform/diff-impl/tests/testData/diff/painting/new.ui/rangeWithInlayInside.png
index 3e8dd942c9b4..864cdc7a8efd 100644
Binary files a/platform/diff-impl/tests/testData/diff/painting/new.ui/rangeWithInlayInside.png and b/platform/diff-impl/tests/testData/diff/painting/new.ui/rangeWithInlayInside.png differ
diff --git a/platform/diff-impl/tests/testData/diff/painting/new.ui/wholeLineChanged.png b/platform/diff-impl/tests/testData/diff/painting/new.ui/wholeLineChanged.png
index 84e9f50046b7..1bdf14aaa609 100644
Binary files a/platform/diff-impl/tests/testData/diff/painting/new.ui/wholeLineChanged.png and b/platform/diff-impl/tests/testData/diff/painting/new.ui/wholeLineChanged.png differ
diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorGutterLayout.java b/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorGutterLayout.java
index 651d11e4f716..579fec8cfbd8 100644
--- a/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorGutterLayout.java
+++ b/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorGutterLayout.java
@@ -200,7 +200,7 @@ public final class EditorGutterLayout {
     );
 
     List<GutterArea> lineNumbersAreas = List.of(
-      areaGap()
+      areaGap(gapBeforeLineMarkersWidth())
         .as(EditorMouseEventArea.LINE_NUMBERS_AREA)
         .showIf(this::isLineNumbersShown),
       area(LINE_NUMBERS_AREA, () -> myEditorGutter.myLineNumberAreaWidth)
@@ -269,6 +269,10 @@ public final class EditorGutterLayout {
     return layout;
   }
 
+  private static int gapBeforeLineMarkersWidth() {
+    return JBUI.CurrentTheme.Editor.Gutter.gapAfterVcsMarkersWidth();
+  }
+
   private static @NotNull GutterArea areaGap() {
     return area(GAP_BETWEEN_AREAS, EditorGutterComponentImpl::getGapBetweenAreas);
   }
diff --git a/platform/platform-tests/testData/editor/painting/new.ui/blockInlaysInAnEmptyEditor.png b/platform/platform-tests/testData/editor/painting/new.ui/blockInlaysInAnEmptyEditor.png
index b19646be6e82..46a702029ff1 100644
Binary files a/platform/platform-tests/testData/editor/painting/new.ui/blockInlaysInAnEmptyEditor.png and b/platform/platform-tests/testData/editor/painting/new.ui/blockInlaysInAnEmptyEditor.png differ
diff --git a/platform/platform-tests/testData/editor/painting/new.ui/caretAtFoldRegion.png b/platform/platform-tests/testData/editor/painting/new.ui/caretAtFoldRegion.png
index 4cac85a5e33d..e35edaf96b02 100644
Binary files a/platform/platform-tests/testData/editor/painting/new.ui/caretAtFoldRegion.png and b/platform/platform-tests/testData/editor/painting/new.ui/caretAtFoldRegion.png differ
diff --git a/platform/platform-tests/testData/editor/painting/new.ui/customFoldRegion.png b/platform/platform-tests/testData/editor/painting/new.ui/customFoldRegion.png
index f3599ca8a55c..acb09698d091 100644
Binary files a/platform/platform-tests/testData/editor/painting/new.ui/customFoldRegion.png and b/platform/platform-tests/testData/editor/painting/new.ui/customFoldRegion.png differ
diff --git a/platform/platform-tests/testData/editor/painting/new.ui/customFoldRegionWithCaret.png b/platform/platform-tests/testData/editor/painting/new.ui/customFoldRegionWithCaret.png
index 71cabee04132..f617235e9b23 100644
Binary files a/platform/platform-tests/testData/editor/painting/new.ui/customFoldRegionWithCaret.png and b/platform/platform-tests/testData/editor/painting/new.ui/customFoldRegionWithCaret.png differ
diff --git a/platform/platform-tests/testData/editor/painting/new.ui/customFoldRegionWithCaretAtEnd.png b/platform/platform-tests/testData/editor/painting/new.ui/customFoldRegionWithCaretAtEnd.png
index 71cabee04132..f617235e9b23 100644
Binary files a/platform/platform-tests/testData/editor/painting/new.ui/customFoldRegionWithCaretAtEnd.png and b/platform/platform-tests/testData/editor/painting/new.ui/customFoldRegionWithCaretAtEnd.png differ
diff --git a/platform/platform-tests/testData/editor/painting/new.ui/emptyEditorWithGutterIcon.png b/platform/platform-tests/testData/editor/painting/new.ui/emptyEditorWithGutterIcon.png
index d2a57d79e01e..3c91040b8593 100644
Binary files a/platform/platform-tests/testData/editor/painting/new.ui/emptyEditorWithGutterIcon.png and b/platform/platform-tests/testData/editor/painting/new.ui/emptyEditorWithGutterIcon.png differ
diff --git a/platform/platform-tests/testData/editor/painting/new.ui/softWrappedLineHighlighterWithBlockInlay.png b/platform/platform-tests/testData/editor/painting/new.ui/softWrappedLineHighlighterWithBlockInlay.png
index bacb71671200..50b5ab4725a2 100644
Binary files a/platform/platform-tests/testData/editor/painting/new.ui/softWrappedLineHighlighterWithBlockInlay.png and b/platform/platform-tests/testData/editor/painting/new.ui/softWrappedLineHighlighterWithBlockInlay.png differ