Index: src/wp-includes/css/editor.css
===================================================================
--- src/wp-includes/css/editor.css	(revision 36390)
+++ src/wp-includes/css/editor.css	(working copy)
@@ -377,7 +377,7 @@
 .qt-dfw:hover,
 .qt-dfw:focus {
 	background: #fafafa;
-	border-color: #999;
+	border-color: #656e77;
 	color: #23282d;
 	-webkit-box-shadow: inset 0 1px 0 #fff, 0 1px 0 rgba( 0, 0, 0, 0.08 );
 	box-shadow: inset 0 1px 0 #fff, 0 1px 0 rgba( 0, 0, 0, 0.08 );
@@ -388,17 +388,19 @@
 .mce-toolbar .mce-btn-group .mce-btn:active,
 .qt-dfw.active {
 	background: #ebebeb;
-	border-color: #999;
+	border-color: #656e77;
 	-webkit-box-shadow: inset 0 2px 5px -3px rgba( 0, 0, 0, 0.3 );
 	box-shadow: inset 0 2px 5px -3px rgba( 0, 0, 0, 0.3 );
 }
 
-.mce-toolbar .mce-btn-group .mce-btn.mce-active:hover {
-	border-color: #555;
+.mce-toolbar .mce-btn-group .mce-btn.mce-active:hover,
+.mce-toolbar .mce-btn-group .mce-btn.mce-active:focus {
+	border-color: #23282d;
 }
 
-.mce-toolbar .mce-btn-group .mce-btn.mce-active:hover i.mce-ico {
-	color: #555;
+.mce-toolbar .mce-btn-group .mce-btn.mce-active:hover i.mce-ico,
+.mce-toolbar .mce-btn-group .mce-btn.mce-active:focus i.mce-ico {
+	color: #23282d;
 }
 
 .mce-toolbar .mce-btn-group .mce-btn.mce-disabled:hover,
@@ -411,6 +413,10 @@
 	box-shadow: none;
 }
 
+.mce-toolbar .mce-btn-group .mce-btn.mce-disabled:focus {
+	border-color: #656e77;
+}
+
 .mce-toolbar .mce-btn-group .mce-first,
 .mce-toolbar .mce-btn-group .mce-last {
 	border-color: transparent;
@@ -449,6 +455,7 @@
 	left: 3px;
 	height: 3px;
 	width: 20px;
+	background: #656e77;
 }
 
 .mce-toolbar .mce-btn-group .mce-btn.mce-primary {
@@ -502,12 +509,13 @@
     box-shadow: inset 0 1px 1px -1px rgba(0, 0, 0, .2);
 }
 
-.mce-toolbar .mce-btn-group .mce-btn.mce-listbox:hover {
+.mce-toolbar .mce-btn-group .mce-btn.mce-listbox:hover,
+.mce-toolbar .mce-btn-group .mce-btn.mce-listbox:focus {
 	border-color: #b4b9be;
 }
 
 .mce-panel .mce-btn i.mce-caret {
-	border-top: 6px solid #777;
+	border-top: 6px solid #656e77;
 	margin-left: 2px;
 	margin-right: 2px;
 }
@@ -516,13 +524,14 @@
 	right: 4px;
 }
 
-.mce-panel .mce-btn:hover i.mce-caret {
-	border-top-color: #32373c;
+.mce-panel .mce-btn:hover i.mce-caret,
+.mce-panel .mce-btn:focus i.mce-caret {
+	border-top-color: #23282d;
 }
 
 .mce-panel .mce-active i.mce-caret {
 	border-top: 0;
-	border-bottom: 6px solid #32373c;
+	border-bottom: 6px solid #23282d;
 	margin-top: 7px;
 }
 
@@ -647,7 +656,7 @@
 .mce-window .mce-btn:hover,
 .mce-window .mce-btn:focus {
 	background: #fafafa;
-	border-color: #999;
+	border-color: #656e77;
 	color: #23282d;
 }
 
@@ -662,8 +671,8 @@
 
 .mce-window .mce-btn:active {
 	background: #eee;
-	border-color: #999;
-	color: #32373c;
+	border-color: #656e77;
+	color: #23282d;
 	-webkit-box-shadow: inset 0 2px 5px -3px rgba( 0, 0, 0, 0.5 );
 	box-shadow: inset 0 2px 5px -3px rgba( 0, 0, 0, 0.5 );
 }
@@ -778,7 +787,7 @@
 }
 
 .mce-toolbar .mce-ico {
-	color: #777;
+	color: #656e77;
 	line-height: 20px;
 	width: 20px;
 	height: 20px;
@@ -788,6 +797,10 @@
 	padding: 0;
 }
 
+.mce-toolbar .mce-active .mce-ico {
+	color: #32373c;
+}
+
 .qt-dfw {
 	color: #777;
 	line-height: 20px;
@@ -804,7 +817,7 @@
 .mce-toolbar .mce-btn:hover .mce-open,
 .mce-toolbar .mce-btn:focus .mce-open,
 .mce-toolbar .mce-btn.mce-active .mce-open {
-	border-left-color: #999;
+	border-left-color: #23282d;
 }
 
 i.mce-i-bold,