diff --git a/packages/block-editor/src/components/block-toolbar/style.scss b/packages/block-editor/src/components/block-toolbar/style.scss
index 4a8bfc6f307316..6a747fa59cd8af 100644
--- a/packages/block-editor/src/components/block-toolbar/style.scss
+++ b/packages/block-editor/src/components/block-toolbar/style.scss
@@ -82,10 +82,6 @@
 			width: $button-size-small !important;
 			margin: 0 !important;
 		}
-
-		&:focus::before {
-			right: $grid-unit-05 !important;
-		}
 	}
 
 	// Match the parent selector button.
@@ -158,10 +154,6 @@
 			width: 0 !important;
 			height: 0 !important;
 		}
-
-		&:focus::before {
-			right: $grid-unit-05 !important;
-		}
 	}
 
 	// Parent selector overrides
diff --git a/packages/components/src/toolbar/style.scss b/packages/components/src/toolbar/style.scss
index a0b7815d356b5c..d24a3317328d64 100644
--- a/packages/components/src/toolbar/style.scss
+++ b/packages/components/src/toolbar/style.scss
@@ -72,12 +72,12 @@
 		}
 
 		// Ensure the icon buttons remain square.
-		&.has-icon {
+		// This needs specificity.
+		&.has-icon.has-icon {
 			// Reduce the default padding when a button only has an icon.
-			padding-left: $grid-unit-10;
-			padding-right: $grid-unit-10;
+			padding-left: $grid-unit-15;
+			padding-right: $grid-unit-15;
 			min-width: $block-toolbar-height;
-			justify-content: center;
 		}
 
 		// @todo: We should extract the tabs styles to the tabs component itself