diff --git a/editor/components/block-mover/style.scss b/editor/components/block-mover/style.scss
index 2e267f60b6899..964b96d7bc6c0 100644
--- a/editor/components/block-mover/style.scss
+++ b/editor/components/block-mover/style.scss
@@ -20,30 +20,15 @@
 		margin-bottom: 4px;
 	}
 
-	// unstyle inherited icon button styles
-	&:not(:disabled):hover,
-  	&:not(:disabled):active,
-	&:not(:disabled):focus {
-		box-shadow: none;
-		color: inherit;
-	}
-
-	// apply styles to SVG directly
-	.dashicon {
-		display: block;
-		position: relative; // Fixing the Safari bug for `<button>`s overflow
-		border-radius: 50%;
-	}
-
-	&:not(:disabled):hover .dashicon {
+	&:not(:disabled):hover {
 		@include button-style__hover;
 	}
 
-	&:not(:disabled):active .dashicon {
+	&:not(:disabled):active {
 		@include button-style__active;
 	}
 
-	&:not(:disabled):focus .dashicon {
+	&:not(:disabled):focus {
 		@include button-style__focus-active;
 	}
 }
diff --git a/editor/components/block-settings-menu/style.scss b/editor/components/block-settings-menu/style.scss
index f23fbce8ccee7..994784f7d9ea2 100644
--- a/editor/components/block-settings-menu/style.scss
+++ b/editor/components/block-settings-menu/style.scss
@@ -18,8 +18,11 @@
 .editor-block-settings-menu__toggle {
 	border-radius: 50%;
 	padding: 3px;
-	transform: rotate( 90deg );
 	width: auto;
+
+	.dashicon {
+		transform: rotate( 90deg );
+	}
 }
 
 .editor-block-settings-menu__control {