diff --git a/components/icon-button/style.scss b/components/icon-button/style.scss
index 71b1f1f5851baf..66c13a02c53d4f 100644
--- a/components/icon-button/style.scss
+++ b/components/icon-button/style.scss
@@ -22,4 +22,14 @@
 	&:not( :disabled ):hover {
 		@include button-style__hover;
 	}
+
+	&:not( :disabled ):active {
+		@include button-style__active;
+	}
+
+	&[aria-disabled=true]:focus,
+	&:disabled:focus {
+		box-shadow: none;
+	}
+
 }
diff --git a/editor/assets/stylesheets/_mixins.scss b/editor/assets/stylesheets/_mixins.scss
index 28c723bdc3140a..9afaf52f4c0cdd 100644
--- a/editor/assets/stylesheets/_mixins.scss
+++ b/editor/assets/stylesheets/_mixins.scss
@@ -121,27 +121,32 @@ $float-margin: calc( 50% - #{ $visual-editor-max-width-padding / 2 } );
 }
 
 @mixin button-style__hover {
-	color: $dark-gray-900;	// previously $blue-medium-500
+	color: $dark-gray-900;
+	box-shadow: inset 0 0 0 1px $light-gray-500, inset 0 0 0 2px $white, 0 1px 1px rgba( $dark-gray-900, .2 );
+}
+
+@mixin button-style__active() {
+	outline: none;
+	color: $dark-gray-900;
+	box-shadow: inset 0 0 0 1px $light-gray-700, inset 0 0 0 2px $white;
 }
 
 @mixin button-style__focus-active() {
 	outline: none;
-	box-shadow: inset 0 0 0 1px $dark-gray-500, inset 0 0 0 2px $white;
 	color: $dark-gray-900;
-	background: $light-gray-300;
+	box-shadow: inset 0 0 0 1px $dark-gray-300, inset 0 0 0 2px $white;
 }
 
 @mixin tab-style__focus-active() {
 	outline: none;
-	box-shadow: 0 0 0 1px $dark-gray-500;
 	color: $dark-gray-900;
-	background: $light-gray-300;
+	box-shadow: inset 0 0 0 1px $dark-gray-300;
 }
 
 @mixin input-style__focus-active() {
 	outline: none;
-	box-shadow: 0 0 0 1px $dark-gray-500;
 	color: $dark-gray-900;
+	box-shadow: 0 0 0 1px $dark-gray-300;
 }
 
 /**
diff --git a/editor/assets/stylesheets/main.scss b/editor/assets/stylesheets/main.scss
index b01d63b1bb69b8..7da712ccf3fb64 100644
--- a/editor/assets/stylesheets/main.scss
+++ b/editor/assets/stylesheets/main.scss
@@ -30,6 +30,7 @@ body.gutenberg-editor-page {
 
 	svg {
 		fill: currentColor;
+		outline: none;
 	}
 
 	ul#adminmenu a.wp-has-current-submenu:after,
diff --git a/editor/components/block-mover/style.scss b/editor/components/block-mover/style.scss
index 95856486b2897c..964b96d7bc6c00 100644
--- a/editor/components/block-mover/style.scss
+++ b/editor/components/block-mover/style.scss
@@ -16,11 +16,19 @@
 		pointer-events: none;
 	}
 
-	.dashicon {
-		display: block;
-	}
-
 	&:first-child {
 		margin-bottom: 4px;
 	}
+
+	&:not(:disabled):hover {
+		@include button-style__hover;
+	}
+
+	&:not(:disabled):active {
+		@include button-style__active;
+	}
+
+	&: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 f23fbce8ccee7c..994784f7d9ea2a 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 {
diff --git a/editor/edit-post/header/style.scss b/editor/edit-post/header/style.scss
index c22933766be8b7..566f825307a1ae 100644
--- a/editor/edit-post/header/style.scss
+++ b/editor/edit-post/header/style.scss
@@ -55,6 +55,7 @@
 		left: 1px;
 	}
 
+	&.is-toggled:hover,
 	&.is-toggled:focus {
 		outline: none;
 		box-shadow: 0 0 0 1px $dark-gray-500, inset 0 0 0 1px $white;