diff --git a/packages/block-editor/src/components/block-switcher/style.scss b/packages/block-editor/src/components/block-switcher/style.scss
index f98e9300a8037..3f9e896114a98 100644
--- a/packages/block-editor/src/components/block-switcher/style.scss
+++ b/packages/block-editor/src/components/block-switcher/style.scss
@@ -51,8 +51,6 @@
 .block-editor-block-toolbar .components-toolbar .components-button.block-editor-block-switcher__no-switcher-icon.has-icon.has-icon,
 .block-editor-block-toolbar .components-toolbar-group .components-button.block-editor-block-switcher__toggle.has-icon.has-icon,
 .block-editor-block-toolbar .components-toolbar .components-button.block-editor-block-switcher__toggle.has-icon.has-icon {
-	padding: 0;
-
 	.block-editor-block-icon {
 		height: 100%;
 		position: relative;
diff --git a/packages/block-editor/src/components/block-toolbar/style.scss b/packages/block-editor/src/components/block-toolbar/style.scss
index 56515e81e684e..7091dde2908af 100644
--- a/packages/block-editor/src/components/block-toolbar/style.scss
+++ b/packages/block-editor/src/components/block-toolbar/style.scss
@@ -53,11 +53,6 @@
 	// Switcher.
 	.block-editor-block-switcher .components-dropdown-menu__toggle,
 	.block-editor-block-switcher__no-switcher-icon {
-		min-width: $block-toolbar-height - $grid-unit-15 / 2 !important;
-		width: $block-toolbar-height - $grid-unit-15 / 2 !important;
-		padding-left: $grid-unit-15 - $border-width !important;
-		padding-right: $grid-unit-15 / 2 !important;
-
 		.block-editor-block-icon {
 			width: $button-size-small !important;
 			margin: 0 !important;
@@ -67,6 +62,11 @@
 			right: $grid-unit-05 !important;
 		}
 	}
+
+	// Compensate for width of block switcher.
+	.block-editor-block-mover {
+		margin-left: -$grid-unit-15 / 2;
+	}
 }
 
 .block-editor-block-toolbar,