Index: wp-includes/css/editor.css
===================================================================
--- wp-includes/css/editor.css	(revision 21678)
+++ wp-includes/css/editor.css	(working copy)
@@ -98,7 +98,7 @@
 
 .wp_themeSkin .mceStatusbar {
 	display: block;
-	font-family: Arial, "Bitstream Vera Sans", Helvetica, Verdana, sans-serif;
+	font-family: sans-serif;
 	font-size: 12px;
 	line-height: 16px;
 	padding: 0 0 0 8px;
@@ -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,8 +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;
-	box-shadow: 0 1px 0 rgba(0, 0, 0, 0.15), inset 0 0 2px 1px #fff;
 }
 
 .wp_themeSkin a.mceButtonEnabled:hover {
@@ -188,17 +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;
-	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 */
@@ -226,9 +221,7 @@
 	-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;
-	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-family: sans-serif;
 	font-size: 12px;
 	height: 20px;
 	line-height: 20px;
@@ -249,8 +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;
-	box-shadow: 0 1px 0 rgba(0, 0, 0, 0.15), inset 0 0 2px 1px #fff;
 }
 
 .wp_themeSkin .mceListBox .mceOpen span {
@@ -285,7 +276,7 @@
 }
 
 .wp_themeSkin select.mceListBox {
-	font-family: Arial, "Bitstream Vera Sans", Helvetica, Verdana, sans-serif;
+	font-family: sans-serif;
 	font-size: 12px;
 	border-color: #b2b2b2;
 	background-color: #fff;
@@ -300,7 +291,7 @@
 
 .wp_themeSkin .mceSplitButton {
 	display: block;
-	margin: 1px;
+	/*margin: 1px;*/
 	direction: ltr;
 }
 
@@ -310,11 +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;
-	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;
 }
@@ -336,9 +322,9 @@
 	width: 10px;
 	height: 20px;
 	background-image: url("../images/down_arrow.gif");
-	background-position: 1px 2px;
+	background-position: 0px 2px;
 	background-repeat: no-repeat;
-	padding: 1px;
+	padding: 1px 0;
 	border-left: 0 none !important;
 }
 
@@ -449,7 +435,7 @@
 /* ColorSplitButton */
 .wp_themeSkin div.mceColorSplitMenu table {
 	background-color: #ebebeb;
-	border-color: #B2B2B2;
+	border-color: #bbb;
 }
 
 .wp_themeSkin .mceColorSplitMenu td {
@@ -900,17 +886,11 @@
 .wp_themeSkin .mceButton,
 .wp_themeSkin .mceListBox .mceText,
 .wp_themeSkin .mceListBox .mceOpen {
-	border-color: #ccc;
-	background: #eee;
-	background-image: -webkit-gradient(linear, left bottom, left top, from(#ddd), to(#fff));
-	background-image: -webkit-linear-gradient(bottom, #ddd, #fff);
-	background-image:    -moz-linear-gradient(bottom, #ddd, #fff);
-	background-image:      -o-linear-gradient(bottom, #ddd, #fff);
-	background-image: linear-gradient(to top, #ddd, #fff);
+	border-color: transparent;
 }
 
 .wp_themeSkin a.mceButtonEnabled:hover {
-	border-color: #a0a0a0;
+	border-color: #bbb;
 	background: #eee;
 	background-image: -webkit-gradient(linear, left bottom, left top, from(#ccc), to(#fff));
 	background-image: -webkit-linear-gradient(bottom, #ccc, #fff);
@@ -925,17 +905,17 @@
 .wp_themeSkin a.mceButtonActive,
 .wp_themeSkin a.mceButtonActive:active,
 .wp_themeSkin a.mceButtonActive:hover {
-	border-color: #909090;
+	border-color: #bbb;
 	background: #ddd;
-	background-image: -webkit-gradient(linear, left bottom, left top, from(#eee), to(#bbb));
-	background-image: -webkit-linear-gradient(bottom, #eee, #bbb);
-	background-image:    -moz-linear-gradient(bottom, #eee, #bbb);
-	background-image:      -o-linear-gradient(bottom, #eee, #bbb);
-	background-image: linear-gradient(to top, #eee, #bbb);
+	background-image: -webkit-gradient(linear, left bottom, left top, from(#fff), to(#ccc));
+	background-image: -webkit-linear-gradient(bottom, #fff, #ccc);
+	background-image:    -moz-linear-gradient(bottom, #fff, #ccc);
+	background-image:      -o-linear-gradient(bottom, #fff, #ccc);
+	background-image: linear-gradient(to top, #fff, #ccc);
 }
 
 .wp_themeSkin .mceButtonDisabled {
-	border-color: #ccc !important;
+	border-color: transparent !important;
 }
 
 .wp_themeSkin .mceListBox .mceOpen {
@@ -949,14 +929,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: #eee;
 	background-image: -webkit-gradient(linear, left bottom, left top, from(#ccc), to(#fff));
 	background-image: -webkit-linear-gradient(bottom, #ccc, #fff);
@@ -968,26 +948,22 @@
 /* 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: #eee;
-	background-image: -webkit-gradient(linear, left bottom, left top, from(#ddd), to(#fff));
-	background-image: -webkit-linear-gradient(bottom, #ddd, #fff);
-	background-image:    -moz-linear-gradient(bottom, #ddd, #fff);
-	background-image:      -o-linear-gradient(bottom, #ddd, #fff);
-	background-image: linear-gradient(to top, #ddd, #fff);
+.wp_themeSkin .mceSplitButtonSelected a.mceOpen {
+	background-color: #bbb;
 }
 
-.wp_themeSkin table.mceSplitButton:hover td {
+.wp_themeSkin table.mceSplitButton:hover td.mceFirst,
+.wp_themeSkin table.mceSplitButton td.mceLast:hover {
 	background: #eee;
 	background-image: -webkit-gradient(linear, left bottom, left top, from(#ccc), to(#fff));
 	background-image: -webkit-linear-gradient(bottom, #ccc, #fff);
@@ -996,8 +972,21 @@
 	background-image: linear-gradient(to top, #ccc, #fff);
 }
 
+.wp_themeSkin table.mceSplitButton:active td.mceFirst,
+.wp_themeSkin table.mceSplitButton td.mceLast:active {
+	border-color: #bbb;
+	background: #ddd;
+	background-image: -webkit-gradient(linear, left bottom, left top, from(#fff), to(#ccc));
+	background-image: -webkit-linear-gradient(bottom, #fff, #ccc);
+	background-image:    -moz-linear-gradient(bottom, #fff, #ccc);
+	background-image:      -o-linear-gradient(bottom, #fff, #ccc);
+	background-image: linear-gradient(to top, #fff, #ccc);
+}
+
 .wp_themeSkin .mceSplitButtonActive {
 	background-color: #B2B2B2;
+	-webkit-border-radius: 3px;
+	border-radius: 3px;
 }
 
 .wp_themeSkin .mceColorSplitMenu a.mceMoreColors:hover {
Index: wp-admin/css/colors-classic.css
===================================================================
--- wp-admin/css/colors-classic.css	(revision 21678)
+++ wp-admin/css/colors-classic.css	(working copy)
@@ -947,6 +947,7 @@
 }
 
 /* Containers */
+.wp-editor-wrap .wp-editor-container,
 .wp-editor-wrap .wp_themeSkin table.mceLayout {
 	border-color: #bed1dd #bed1dd #d0dfe9;
 }
@@ -967,12 +968,9 @@
 	background-color: #f5f5f5;
 }
 
-/* Button */
-.wp-editor-wrap .wp_themeSkin .mceButton,
-.wp-editor-wrap .wp_themeSkin .mceListBox .mceText,
-.wp-editor-wrap .wp_themeSkin .mceListBox .mceOpen {
-	border-color: #b0c8d7;
-	background: #cfdfe9;
+.wp-editor-wrap .wp_themeSkin a.mceButtonEnabled:hover {
+	border-color: #bbb;
+	background: #eee;
 	background-image: -webkit-gradient(linear, left bottom, left top, from(#cfdfe9), to(#fff));
 	background-image: -webkit-linear-gradient(bottom, #cfdfe9, #fff);
 	background-image:    -moz-linear-gradient(bottom, #cfdfe9, #fff);
@@ -980,24 +978,14 @@
 	background-image: linear-gradient(to top, #cfdfe9, #fff);
 }
 
-.wp-editor-wrap .wp_themeSkin a.mceButtonEnabled:hover {
-	border-color: #5589aa;
-	background: #c9c9c9;
-	background-image: -webkit-gradient(linear, left bottom, left top, from(#bdccd5), to(#000));
-	background-image: -webkit-linear-gradient(bottom, #bdccd5, #fff);
-	background-image:    -moz-linear-gradient(bottom, #bdccd5, #fff);
-	background-image:      -o-linear-gradient(bottom, #bdccd5, #fff);
-	background-image: linear-gradient(to top, #bdccd5, #fff);
-}
-
 .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;
-	border-color: #5589aa;
+	background: #c7d8e2;
+	border-color: #b0c8d7;
 	background-image: -webkit-gradient(linear, left top, left bottom, from(#cfdfe9), to(#fff));
 	background-image: -webkit-linear-gradient(top, #cfdfe9, #fff);
 	background-image:    -moz-linear-gradient(top, #cfdfe9, #fff);
@@ -1005,10 +993,6 @@
 	background-image: linear-gradient(to bottom, #cfdfe9, #fff);
 }
 
-.wp-editor-wrap .wp_themeSkin .mceButtonDisabled {
-	border-color: #b0c8d7 !important;
-}
-
 .wp-editor-wrap .wp_themeSkin .mceListBox .mceOpen {
 	border-left: 0 !important;
 }
@@ -1019,16 +1003,16 @@
 .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;
+	background: #c7d8e2;
+	border-color: #B0C8D7;
 }
 
 .wp-editor-wrap .wp_themeSkin table.mceListBoxEnabled:hover .mceText,
 .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;
-	background: #c9c9c9;
+	border-color: #B0C8D7;
+	background: #c7d8e2;
 	background-image: -webkit-gradient(linear, left bottom, left top, from(#cfdfe9), to(#fff));
 	background-image: -webkit-linear-gradient(bottom, #cfdfe9, #fff);
 	background-image:    -moz-linear-gradient(bottom, #cfdfe9, #fff);
@@ -1036,41 +1020,42 @@
 	background-image: linear-gradient(to top, #cfdfe9, #fff);
 }
 
-/* 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;
+	border-color: #B0C8D7;
 }
 
-.wp-editor-wrap .wp_themeSkin table.mceSplitButton td {
-	background: #cfdfe9;
-	background-image: -webkit-gradient(linear, left bottom, left top, from(#cfdfe9), to(#fff));
-	background-image: -webkit-linear-gradient(bottom, #cfdfe9, #fff);
-	background-image:    -moz-linear-gradient(bottom, #cfdfe9, #fff);
-	background-image:      -o-linear-gradient(bottom, #cfdfe9, #fff);
-	background-image: linear-gradient(to top, #cfdfe9, #fff);
-}
-
-.wp-editor-wrap .wp_themeSkin table.mceSplitButton:hover td {
+.wp-editor-wrap .wp_themeSkin table.mceSplitButton:hover td.mceFirst,
+.wp-editor-wrap .wp_themeSkin table.mceSplitButton td.mceLast:hover {
 	background: #c9c9c9;
-	background-image: -webkit-gradient(linear, left bottom, left top, from(#bdccd5), to(#000));
+	background-image: -webkit-gradient(linear, left bottom, left top, from(#bdccd5), to(#fff));
 	background-image: -webkit-linear-gradient(bottom, #bdccd5, #fff);
 	background-image:    -moz-linear-gradient(bottom, #bdccd5, #fff);
 	background-image:      -o-linear-gradient(bottom, #bdccd5, #fff);
 	background-image: linear-gradient(to top, #bdccd5, #fff);
 }
 
+.wp-editor-wrap .wp_themeSkin table.mceSplitButton:active td.mceFirst,
+.wp-editor-wrap .wp_themeSkin table.mceSplitButton td.mceLast:active {
+	border-color: #bbb;
+	background: #c9c9c9;
+	background-image: -webkit-gradient(linear, left bottom, left top, from(#fff), to(#bdccd5));
+	background-image: -webkit-linear-gradient(bottom, #fff, #bdccd5);
+	background-image:    -moz-linear-gradient(bottom, #fff, #bdccd5);
+	background-image:      -o-linear-gradient(bottom, #fff, #bdccd5);
+	background-image: linear-gradient(to top, #fff, #bdccd5);
+}
+
 .wp-editor-wrap .wp_themeSkin .mceSplitButtonActive {
 	background-color: #b0c8d7;
 }
 
+.wp-editor-wrap .wp_themeSkin .mceSplitButtonSelected a.mceOpen {
+	background-color: #B0C8D7;
+}
+
 /* ColorSplitButton */
 .wp-editor-wrap .wp_themeSkin div.mceColorSplitMenu table {
 	background-color: #ebebeb;