Index: wp-includes/css/editor-buttons.dev.css
===================================================================
--- wp-includes/css/editor-buttons.dev.css	(revision 19621)
+++ wp-includes/css/editor-buttons.dev.css	(working copy)
@@ -147,6 +147,11 @@
 	margin: 0 6px 2px;
 }
 
+.wp_themeSkin table.mceToolbar:focus,
+.wp_themeSkin span.mceSeparator:focus {
+	outline: none;
+}
+
 .wp_themeSkin #content_toolbar1 {
 	margin-top: 2px;
 }
@@ -176,9 +181,6 @@
 	margin: 1px;
 	-webkit-border-radius: 2px;
 	border-radius: 2px;
-	-webkit-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.15), inset 0 0 2px 1px #fff;
-	-moz-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.15), inset 0 0 2px 1px #fff;
-	box-shadow: 0 1px 0 rgba(0, 0, 0, 0.15), inset 0 0 2px 1px #fff;
 }
 
 .wp_themeSkin a.mceButtonEnabled:hover {
@@ -189,19 +191,9 @@
 	margin: 0 0 0 1px;
 }
 
-
-.wp_themeSkin a.mceButton:active,
-.wp_themeSkin a.mceButtonActive,
-.wp_themeSkin a.mceButtonActive:hover,
-.wp_themeSkin a.mceButtonSelected {
-	-webkit-box-shadow:	 0 1px 1px rgba(0, 0, 0, 0.15), inset 0 0 2px 1px #fff;
-	-moz-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.15), inset 0 0 2px 1px #fff;
-	box-shadow: 0 1px 0 rgba(0, 0, 0, 0.15), inset 0 0 2px 1px #fff;
-}
-
 .wp_themeSkin .mceButtonDisabled .mceIcon {
-	opacity: 0.5;
-	filter: alpha(opacity=50);
+	opacity: 0.4;
+	filter: alpha(opacity=40);
 }
 
 /* Separator */
@@ -229,9 +221,6 @@
 	-webkit-border-top-left-radius: 2px;
 	border-bottom-left-radius: 2px;
 	border-top-left-radius: 2px;
-	-webkit-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.15), inset 0 0 2px 1px #fff;
-	-moz-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.15), inset 0 0 2px 1px #fff;
-	box-shadow: 0 1px 0 rgba(0, 0, 0, 0.15), inset 0 0 2px 1px #fff;
 	font-family: Arial, "Bitstream Vera Sans", Helvetica, Verdana, sans-serif;
 	font-size: 12px;
 	height: 20px;
@@ -253,9 +242,6 @@
 	-webkit-border-top-left-radius: 0;
 	border-bottom-left-radius: 0;
 	border-top-left-radius: 0;
-	-webkit-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.15), inset 0 0 2px 1px #fff;
-	-moz-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.15), inset 0 0 2px 1px #fff;
-	box-shadow: 0 1px 0 rgba(0, 0, 0, 0.15), inset 0 0 2px 1px #fff;
 }
 
 .wp_themeSkin .mceListBox .mceOpen span {
@@ -315,12 +301,6 @@
 	border-radius: 2px;
 }
 
-.wp_themeSkin table.mceSplitButton td a {
-	-webkit-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.15), inset 0 0 2px 1px #fff;
-	-moz-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.15), inset 0 0 2px 1px #fff;
-	box-shadow: 0 1px 0 rgba(0, 0, 0, 0.15), inset 0 0 2px 1px #fff;
-}
-
 .wp_themeSkin table.mceSplitButton:hover td {
 	background-image: inherit 0 -10px;
 }
@@ -414,7 +394,7 @@
 /* ColorSplitButton */
 .wp_themeSkin div.mceColorSplitMenu table {
 	background-color: #ebebeb;
-	border-color: #B2B2B2;
+	border-color: #bbb;
 }
 
 .wp_themeSkin .mceColorSplitMenu td {
@@ -426,7 +406,7 @@
 	width: 9px;
 	height: 9px;
 	overflow: hidden;
-	border-color: #B2B2B2;
+	border-color: #bbb;
 }
 
 .wp_themeSkin .mceColorSplitMenu td.mceMoreColors {
@@ -857,18 +837,11 @@
 .wp_themeSkin .mceButton,
 .wp_themeSkin .mceListBox .mceText,
 .wp_themeSkin .mceListBox .mceOpen {
-	border-color: #ccc;
-	background-color: #eee; /* Fallback */
-	background-image: -ms-linear-gradient(bottom, #ddd, #fff); /* IE10 */
-	background-image: -moz-linear-gradient(bottom, #ddd, #fff); /* Firefox */
-	background-image: -o-linear-gradient(bottom, #ddd, #fff); /* Opera */
-	background-image: -webkit-gradient(linear, left bottom, left top, from(#ddd), to(#fff)); /* old Webkit */
-	background-image: -webkit-linear-gradient(bottom, #ddd, #fff); /* new Webkit */
-	background-image: linear-gradient(bottom, #ddd, #fff); /* proposed W3C Markup */
+	border-color: transparent;
 }
 
 .wp_themeSkin a.mceButtonEnabled:hover {
-	border-color: #a0a0a0;
+	border-color: #bbb;
 	background: #ddd; /* Fallback */
 	background-image: -ms-linear-gradient(bottom, #ccc, #fff); /* IE10 */
 	background-image: -moz-linear-gradient(bottom, #ccc, #fff); /* Firefox */
@@ -885,17 +858,17 @@
 .wp_themeSkin a.mceButtonActive:active,
 .wp_themeSkin a.mceButtonActive:hover {
 	background-color: #ddd; /* Fallback */
-	background-image: -ms-linear-gradient(bottom, #eee, #bbb); /* IE10 */
-	background-image: -moz-linear-gradient(bottom, #eee, #bbb); /* Firefox */
-	background-image: -o-linear-gradient(bottom, #eee, #bbb); /* Opera */
-	background-image: -webkit-gradient(linear, left bottom, left top, from(#eee), to(#bbb)); /* old Webkit */
-	background-image: -webkit-linear-gradient(bottom, #eee, #bbb); /* new Webkit */
-	background-image: linear-gradient(bottom, #eee, #bbb); /* proposed W3C Markup */
-	border-color: #909090;
+	background-image: -ms-linear-gradient(bottom, #fff, #ccc); /* IE10 */
+	background-image: -moz-linear-gradient(bottom, #fff, #ccc); /* Firefox */
+	background-image: -o-linear-gradient(bottom, #fff, #ccc); /* Opera */
+	background-image: -webkit-gradient(linear, left bottom, left top, from(#fff), to(#ccc)); /* old Webkit */
+	background-image: -webkit-linear-gradient(bottom, #fff, #ccc); /* new Webkit */
+	background-image: linear-gradient(bottom, #fff, #ccc); /* proposed W3C Markup */
+	border-color: #bbb;
 }
 
 .wp_themeSkin .mceButtonDisabled {
-	border-color: #ccc !important;
+	border-color: transparent !important;
 }
 
 .wp_themeSkin .mceListBox .mceOpen {
@@ -909,14 +882,14 @@
 .wp_themeSkin .mceListBoxSelected .mceText,
 .wp_themeSkin table.mceListBoxEnabled:active .mceText {
 	background: #ccc;
-	border-color: #999;
+	border-color: #bbb;
 }
 
 .wp_themeSkin table.mceListBoxEnabled:hover .mceText,
 .wp_themeSkin .mceListBoxHover .mceText,
 .wp_themeSkin table.mceListBoxEnabled:hover .mceOpen,
 .wp_themeSkin .mceListBoxHover .mceOpen {
-	border-color: #909090;
+	border-color: #bbb;
 	background-color: #eee; /* Fallback */
 	background-image: -ms-linear-gradient(bottom, #ccc, #fff); /* IE10 */
 	background-image: -moz-linear-gradient(bottom, #ccc, #fff); /* Firefox */
@@ -929,25 +902,17 @@
 /* SplitButton */
 .wp_themeSkin .mceSplitButton a.mceAction,
 .wp_themeSkin .mceSplitButton a.mceOpen {
-	border-color: #ccc;
+	border-color: transparent;
 }
 
 .wp_themeSkin .mceSplitButton a.mceOpen:hover,
 .wp_themeSkin .mceSplitButtonSelected a.mceOpen,
 .wp_themeSkin table.mceSplitButtonEnabled:hover a.mceAction,
 .wp_themeSkin .mceSplitButton a.mceAction:hover {
-	border-color: #909090;
+	border-color: #bbb;
 }
-
-
-.wp_themeSkin table.mceSplitButton td {
-	background-color: #eee; /* Fallback */
-	background-image: -ms-linear-gradient(bottom, #ddd, #fff); /* IE10 */
-	background-image: -moz-linear-gradient(bottom, #ddd, #fff); /* Firefox */
-	background-image: -o-linear-gradient(bottom, #ddd, #fff); /* Opera */
-	background-image: -webkit-gradient(linear, left bottom, left top, from(#ddd), to(#fff)); /* old Webkit */
-	background-image: -webkit-linear-gradient(bottom, #ddd, #fff); /* new Webkit */
-	background-image: linear-gradient(bottom, #ddd, #fff); /* proposed W3C Markup */
+.wp_themeSkin .mceSplitButtonSelected a.mceOpen {
+	background-color: #bbb;
 }
 
 .wp_themeSkin table.mceSplitButton:hover td {
Index: wp-admin/css/colors-classic.dev.css
===================================================================
--- wp-admin/css/colors-classic.dev.css	(revision 19621)
+++ wp-admin/css/colors-classic.dev.css	(working copy)
@@ -879,6 +879,7 @@
 }
 
 /* Containers */
+.wp-editor-wrap .wp-editor-container,
 .wp-editor-wrap .wp_themeSkin table.mceLayout {
 	border-color: #bed1dd #bed1dd #d0dfe9;
 }
@@ -900,9 +901,9 @@
 }
 
 /* Button */
-.wp-editor-wrap .wp_themeSkin .mceButton {
-	border-color: #B0C8D7;
-	background-color: #cfdfe9; /* Fallback */
+.wp-editor-wrap .wp_themeSkin a.mceButtonEnabled:hover {
+	border-color: #B0C8D7 !important;
+	background-color: #c7d8e2; /* Fallback */
 	background-image: -ms-linear-gradient(bottom, #cfdfe9, #fff); /* IE10 */
 	background-image: -moz-linear-gradient(bottom, #cfdfe9, #fff); /* Firefox */
 	background-image: -o-linear-gradient(bottom, #cfdfe9, #fff); /* Opera */
@@ -911,50 +912,23 @@
 	background-image: linear-gradient(bottom, #cfdfe9, #fff); /* proposed W3C Markup */
 }
 
-.wp-editor-wrap .wp_themeSkin a.mceButtonEnabled:hover {
-	border-color: #5589AA !important;
-	background-color: #c9c9c9; /* Fallback */
-	background-image: -ms-linear-gradient(bottom, #bdccd5, #fff); /* IE10 */
-	background-image: -moz-linear-gradient(bottom, #bdccd5, #fff); /* Firefox */
-	background-image: -o-linear-gradient(bottom, #bdccd5, #fff); /* Opera */
-	background-image: -webkit-gradient(linear, left bottom, left top, from(#bdccd5), to(#fff)); /* old Webkit	 */
-	background-image: -webkit-linear-gradient(bottom, #bdccd5, #fff) !important; /* new Webkit */
-	background-image: linear-gradient(bottom, #bdccd5, #fff); /* proposed W3C Markup */
-}
-
 .wp-editor-wrap .wp_themeSkin a.mceButton:active,
 .wp-editor-wrap .wp_themeSkin a.mceButtonEnabled:active,
 .wp-editor-wrap .wp_themeSkin a.mceButtonSelected:active,
 .wp-editor-wrap .wp_themeSkin a.mceButtonActive,
 .wp-editor-wrap .wp_themeSkin a.mceButtonActive:active,
 .wp-editor-wrap .wp_themeSkin a.mceButtonActive:hover {
-	background: #B0C8D7 !important;
+	background: #c7d8e2; /* Fallback */
 	background-image: -ms-linear-gradient(bottom, #fff, #cfdfe9); /* IE10 */
 	background-image: -moz-linear-gradient(bottom, #fff, #cfdfe9); /* Firefox */
 	background-image: -o-linear-gradient(bottom, #fff, #cfdfe9); /* Opera */
 	background-image: -webkit-gradient(linear, left bottom, left top, from(#fff), to(#cfdfe9)); /* old Webkit	 */
 	background-image: -webkit-linear-gradient(bottom, #fff, #cfdfe9) !important; /* new Webkit */
 	background-image: linear-gradient(bottom, #fff, #cfdfe9); /* proposed W3C Markup */
-	border-color: #5589AA !important;
-}
-
-.wp-editor-wrap .wp_themeSkin .mceButtonDisabled {
 	border-color: #B0C8D7 !important;
 }
 
 /* ListBox */
-.wp-editor-wrap .wp_themeSkin .mceListBox .mceText,
-.wp-editor-wrap .wp_themeSkin .mceListBox .mceOpen	{
-	border-color: #B0C8D7;
-	background-color: #cfdfe9; /* Fallback */
-	background-image: -ms-linear-gradient(bottom, #cfdfe9, #fff); /* IE10 */
-	background-image: -moz-linear-gradient(bottom, #cfdfe9, #fff); /* Firefox */
-	background-image: -o-linear-gradient(bottom, #cfdfe9, #fff); /* Opera */
-	background-image: -webkit-gradient(linear, left bottom, left top, from(#cfdfe9), to(#fff)); /* old Webkit	*/
-	background-image: -webkit-linear-gradient(bottom, #cfdfe9, #fff) !important; /* new Webkit */
-	background-image: linear-gradient(bottom, #cfdfe9, #fff); /* proposed W3C Markup */
-}
-
 .wp-editor-wrap .wp_themeSkin .mceListBox .mceOpen {
 	border-left: 0px !important;
 }
@@ -965,8 +939,8 @@
 .wp-editor-wrap .wp_themeSkin .mceListBoxSelected .mceOpen,
 .wp-editor-wrap .wp_themeSkin .mceListBoxSelected .mceText,
 .wp-editor-wrap .wp_themeSkin table.mceListBoxEnabled:active .mceText {
-	background: #B0C8D7;
-	border-color: #5589AA !important;
+	background: #c7d8e2;
+	border-color: #B0C8D7 !important;
 }
 
 /* List Box Hover */
@@ -974,8 +948,8 @@
 .wp-editor-wrap .wp_themeSkin .mceListBoxHover .mceText,
 .wp-editor-wrap .wp_themeSkin table.mceListBoxEnabled:hover .mceOpen,
 .wp-editor-wrap .wp_themeSkin .mceListBoxHover .mceOpen {
-	border-color: #5589AA !important;
-	background-color: #c9c9c9; /* Fallback */
+	border-color: #B0C8D7 !important;
+	background-color: #c7d8e2; /* Fallback */
 	background-image: -ms-linear-gradient(bottom, #cfdfe9, #fff); /* IE10 */
 	background-image: -moz-linear-gradient(bottom, #cfdfe9, #fff); /* Firefox */
 	background-image: -o-linear-gradient(bottom, #cfdfe9, #fff); /* Opera */
@@ -990,29 +964,13 @@
 }
 
 /* SplitButton */
-.wp-editor-wrap .wp_themeSkin .mceSplitButton a.mceAction,
-.wp-editor-wrap .wp_themeSkin .mceSplitButton a.mceOpen {
-	border-color: #B0C8D7;
-}
-
 .wp-editor-wrap .wp_themeSkin .mceSplitButton a.mceOpen:hover,
 .wp-editor-wrap .wp_themeSkin .mceSplitButtonSelected a.mceOpen,
 .wp-editor-wrap .wp_themeSkin table.mceSplitButtonEnabled:hover a.mceAction,
 .wp-editor-wrap .wp_themeSkin .mceSplitButton a.mceAction:hover {
-	border-color: #5589AA !important;
+	border-color: #B0C8D7 !important;
 }
 
-
-.wp-editor-wrap .wp_themeSkin table.mceSplitButton td {
-	background-color: #cfdfe9; /* Fallback */
-	background-image: -ms-linear-gradient(bottom, #cfdfe9, #fff); /* IE10 */
-	background-image: -moz-linear-gradient(bottom, #cfdfe9, #fff); /* Firefox */
-	background-image: -o-linear-gradient(bottom, #cfdfe9, #fff); /* Opera */
-	background-image: -webkit-gradient(linear, left bottom, left top, from(#cfdfe9), to(#fff)); /* old Webkit	*/
-	background-image: -webkit-linear-gradient(bottom, #cfdfe9, #fff) !important; /* new Webkit */
-	background-image: linear-gradient(bottom, #cfdfe9, #fff); /* proposed W3C Markup */
-}
-
 .wp-editor-wrap .wp_themeSkin table.mceSplitButton:hover td {
 	background-image: -ms-linear-gradient(bottom, #cfdfe9, #fff); /* IE10 */
 	background-image: -moz-linear-gradient(bottom, #cfdfe9, #fff); /* Firefox */