diff --git a/packages/block-editor/src/components/block-tools/style.scss b/packages/block-editor/src/components/block-tools/style.scss
index 06231eed749a91..c50c53ea055f65 100644
--- a/packages/block-editor/src/components/block-tools/style.scss
+++ b/packages/block-editor/src/components/block-tools/style.scss
@@ -131,13 +131,25 @@
 		background-color: $gray-900;
 		color: $gray-100;
 
+		&.block-editor-block-contextual-toolbar {
+			border-color: $gray-800;
+		}
+
 		button {
-			color: $gray-200;
-			background-color: $gray-900 !important;
+			color: $gray-300;
 
 			&:hover {
 				color: $white;
 			}
+
+			&:focus::before {
+				box-shadow: inset 0 0 0 1px $gray-900, 0 0 0 var(--wp-admin-border-width-focus) var(--wp-admin-theme-color);
+			}
+		}
+
+		.block-editor-block-parent-selector .block-editor-block-parent-selector__button {
+			border-color: $gray-800;
+			background-color: $gray-900;
 		}
 
 		.block-editor-block-switcher__toggle {
@@ -146,7 +158,7 @@
 
 		.components-toolbar-group,
 		.components-toolbar {
-			border-right-color: $gray-700 !important;
+			border-right-color: $gray-800 !important;
 		}
 
 		.is-pressed {