diff --git a/src/wp-admin/css/colors/_admin.scss b/src/wp-admin/css/colors/_admin.scss
index ca1908d402..0b02251009 100644
--- a/src/wp-admin/css/colors/_admin.scss
+++ b/src/wp-admin/css/colors/_admin.scss
@@ -90,8 +90,9 @@ textarea:focus {
 
 	.button.focus,
 	.button:focus {
-		border-color: $highlight-color;
-		box-shadow: 0 0 0 1px $highlight-color;
+		border-color: #7e8993;
+		color: darken( #32373c, 5% );
+		box-shadow: 0 0 0 1px #32373c;
 	}
 
 	.button:active {
@@ -105,6 +106,7 @@ textarea:focus {
 	.button.active:hover {
 		border-color: darken( $button-color, 5% );
 		color: darken( $button-text-color, 5% );
+		box-shadow: inset 0 2px 5px -3px darken( $button-color, 5% );
 	}
 
 	.button-primary {
diff --git a/src/wp-admin/css/colors/_mixins.scss b/src/wp-admin/css/colors/_mixins.scss
index 7e6d4d4e88..4d0c079d1f 100644
--- a/src/wp-admin/css/colors/_mixins.scss
+++ b/src/wp-admin/css/colors/_mixins.scss
@@ -2,7 +2,7 @@
  * Button mixin- creates a button effect with correct
  * highlights/shadows, based on a base color.
  */
-@mixin button( $button-color, $text-color: #fff ) {
+@mixin button( $button-color, $button-text-color: #fff ) {
 	background: $button-color;
 	border-color: $button-color;
 	color: $button-text-color;