diff --git a/edit-post/components/header/header-toolbar/style.scss b/edit-post/components/header/header-toolbar/style.scss
index 1ddcd35846a25d..fd6245e5dd299a 100644
--- a/edit-post/components/header/header-toolbar/style.scss
+++ b/edit-post/components/header/header-toolbar/style.scss
@@ -11,8 +11,10 @@
 	display: inline-flex;
 	align-items: center;
 
-	.editor-block-switcher .components-toolbar {
-		border: none;
+	@include break-large() {
+		.editor-block-switcher .components-toolbar {
+			border-left: 1px solid $light-gray-500;
+		}
 	}
 }
 
diff --git a/editor/components/block-list/style.scss b/editor/components/block-list/style.scss
index 7dc0ba1d3c6d25..2f3e02146ef939 100644
--- a/editor/components/block-list/style.scss
+++ b/editor/components/block-list/style.scss
@@ -803,11 +803,8 @@
 .editor-block-contextual-toolbar .editor-block-toolbar {
 	width: 100%;
 	background: $white;
-
-	// use opacity to work in various editor styles
-	background-clip: padding-box;
-	box-sizing: padding-box;
 	border: 1px solid $light-gray-500;
+	border-right: none;
 
 	// this prevents floats from messing up the position
 	position: absolute;
diff --git a/editor/components/block-switcher/style.scss b/editor/components/block-switcher/style.scss
index dc791a3a3322e3..fee495149a69f8 100644
--- a/editor/components/block-switcher/style.scss
+++ b/editor/components/block-switcher/style.scss
@@ -1,9 +1,5 @@
 .editor-block-switcher {
 	position: relative;
-
-	.components-toolbar {
-		border-left: none;
-	}
 }
 
 .editor-block-switcher__toggle {
@@ -12,9 +8,6 @@
 	padding: 8px;
 	border-radius: 0;
 
-	// Add a right border to show as separator in the block toolbar.
-	border-right: 1px solid $light-gray-700;
-
 	&:focus:before {
 		top: -3px;
 		right: -3px;
diff --git a/editor/components/block-toolbar/style.scss b/editor/components/block-toolbar/style.scss
index 2a34b83327b758..8b1c5641f4238f 100644
--- a/editor/components/block-toolbar/style.scss
+++ b/editor/components/block-toolbar/style.scss
@@ -13,6 +13,9 @@
 
 	.components-toolbar {
 		border: none;
+
+		// Add a right border to show as separator in the block toolbar.
+		border-right: 1px solid $light-gray-500;
 	}
 
 	// this should probably have its own class