diff --git a/package-lock.json b/package-lock.json
index 1dc3524f02f505..bcdf2b7c22994c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -10488,7 +10488,7 @@
 				},
 				"yargs": {
 					"version": "11.1.0",
-					"resolved": "http://registry.npmjs.org/yargs/-/yargs-11.1.0.tgz",
+					"resolved": "https://registry.npmjs.org/yargs/-/yargs-11.1.0.tgz",
 					"integrity": "sha512-NwW69J42EsCSanF8kyn5upxvjp5ds+t3+udGBeTbFnERA+lF541DDpMawzo4z6W/QrzNM18D+BPMiOBibnFV5A==",
 					"dev": true,
 					"requires": {
@@ -11722,7 +11722,7 @@
 				},
 				"yargs": {
 					"version": "11.1.0",
-					"resolved": "http://registry.npmjs.org/yargs/-/yargs-11.1.0.tgz",
+					"resolved": "https://registry.npmjs.org/yargs/-/yargs-11.1.0.tgz",
 					"integrity": "sha512-NwW69J42EsCSanF8kyn5upxvjp5ds+t3+udGBeTbFnERA+lF541DDpMawzo4z6W/QrzNM18D+BPMiOBibnFV5A==",
 					"dev": true,
 					"requires": {
diff --git a/packages/editor/src/components/block-switcher/index.js b/packages/editor/src/components/block-switcher/index.js
index 4a7413fb364227..d7da4cdcebc992 100644
--- a/packages/editor/src/components/block-switcher/index.js
+++ b/packages/editor/src/components/block-switcher/index.js
@@ -68,15 +68,11 @@ export class BlockSwitcher extends Component {
 
 		if ( ! hasBlockStyles && ! possibleBlockTransformations.length ) {
 			return (
-				<Toolbar>
-					<IconButton
-						disabled
-						className="editor-block-switcher__no-switcher-icon"
-						label={ __( 'Block icon' ) }
-					>
-						<BlockIcon icon={ icon } showColors />
-					</IconButton>
-				</Toolbar>
+				<div className="components-block-switcher" aria-hidden="true">
+					<span className="components-block-switcher__icon">
+						<BlockIcon icon={ blockType.icon } showColors />
+					</span>
+				</div>
 			);
 		}
 
diff --git a/packages/editor/src/components/block-switcher/style.scss b/packages/editor/src/components/block-switcher/style.scss
index 0f062116d1b002..0aadc135a35d65 100644
--- a/packages/editor/src/components/block-switcher/style.scss
+++ b/packages/editor/src/components/block-switcher/style.scss
@@ -3,15 +3,25 @@
 	height: $icon-button-size;
 }
 
+.components-block-switcher {
+	background-color: $white;
+	border: 1px solid $light-gray-500;
+	border-left: 0;
+}
+
 .components-icon-button.editor-block-switcher__toggle,
-.components-icon-button.editor-block-switcher__no-switcher-icon {
-	margin: 0;
+.components-icon-button.editor-block-switcher__no-switcher-icon,
+.components-block-switcher__icon {
 	display: block;
 	height: $icon-button-size;
 	padding: 3px;
+	margin: 0;
 }
 
-.components-icon-button.editor-block-switcher__no-switcher-icon {
+.components-icon-button.editor-block-switcher__no-switcher-icon,
+.components-block-switcher__icon {
+	align-items: center;
+	display: flex;
 	width: $icon-button-size + 6px + 6px;
 
 	.editor-block-icon {