diff --git a/packages/block-editor/src/components/block-switcher/index.js b/packages/block-editor/src/components/block-switcher/index.js
index 7c580817f8370f..e376eeb44eafb5 100644
--- a/packages/block-editor/src/components/block-switcher/index.js
+++ b/packages/block-editor/src/components/block-switcher/index.js
@@ -149,7 +149,11 @@ export const BlockSwitcherDropdownMenu = ( { clientIds, blocks } ) => {
 							<>
 								<BlockIcon
 									icon={ icon }
-									className="block-editor-block-switcher__toggle"
+									className={
+										isReusable || isTemplate
+											? 'block-editor-block-switcher__toggle-with-text'
+											: 'block-editor-block-switcher__toggle'
+									}
 									showColors
 								/>
 								{ ( isReusable || isTemplate ) && (
diff --git a/packages/block-editor/src/components/block-switcher/style.scss b/packages/block-editor/src/components/block-switcher/style.scss
index 7cd0d3afd74936..09f1dfa4df7894 100644
--- a/packages/block-editor/src/components/block-switcher/style.scss
+++ b/packages/block-editor/src/components/block-switcher/style.scss
@@ -21,7 +21,7 @@
 }
 
 .block-editor-block-switcher__toggle-text {
-	margin-left: $grid-unit-10;
+	margin-right: $grid-unit-10;
 
 	// Account for double label when show-text-buttons is set.
 	.show-icon-labels & {
diff --git a/packages/block-editor/src/components/block-toolbar/style.scss b/packages/block-editor/src/components/block-toolbar/style.scss
index ab941db127d9f6..7b106cfc6d9fb8 100644
--- a/packages/block-editor/src/components/block-toolbar/style.scss
+++ b/packages/block-editor/src/components/block-toolbar/style.scss
@@ -79,6 +79,10 @@
 		.block-editor-block-icon {
 			width: $button-size-small !important;
 			margin: 0 !important;
+
+			&.block-editor-block-switcher__toggle-with-text {
+				width: $grid-unit-50 !important;
+			}
 		}
 
 		&:focus::before {