diff --git a/wp-admin/css/colors-classic.css b/wp-admin/css/colors-classic.css
index 1e79848330..b1bafbab5f 100644
--- a/wp-admin/css/colors-classic.css
+++ b/wp-admin/css/colors-classic.css
@@ -1005,323 +1005,110 @@ table.widefat .spam a:hover,
 	color: #333;
 }
 
-/* TinyMCE */
-#post-status-info {
-	background-color: #eff8ff;
-}
-
-.wp-editor-wrap .wp_themeSkin *,
-.wp-editor-wrap .wp_themeSkin a:hover,
-.wp-editor-wrap .wp_themeSkin a:link,
-.wp-editor-wrap .wp_themeSkin a:visited,
-.wp-editor-wrap .wp_themeSkin a:active {
-	color: #000;
-}
-
-.wp-editor-wrap .quicktags-toolbar input {
-	background: #fff;
-	background-image: -webkit-gradient(linear, left bottom, left top, from(#e5f0f8), to(#fff));
-	background-image: -webkit-linear-gradient(bottom, #e5f0f8, #fff);
-	background-image:    -moz-linear-gradient(bottom, #e5f0f8, #fff);
-	background-image:      -o-linear-gradient(bottom, #e5f0f8, #fff);
-	background-image: linear-gradient(to top, #e5f0f8, #fff);
-}
-
-/* Containers */
 .wp-editor-wrap .wp-editor-container,
 .wp-editor-wrap .wp_themeSkin table.mceLayout {
-	border-color: #bed1dd #bed1dd #d0dfe9;
+	border-color: #d1e5ee #d1e5ee #d0dfe9;
 }
 
-#editorcontainer #content,
-#editorcontainer .wp-editor-wrap .wp_themeSkin .mceIframeContainer {
-	-webkit-box-shadow: inset 1px 1px 2px rgba( 0, 0, 0, 0.1 );
-	box-shadow: inset 1px 1px 2px rgba( 0, 0, 0, 0.1 );
+#editorcontainer {
+	border-color: #d1e5ee #d1e5ee #d0dfe9;
 }
 
-.wp-editor-wrap .wp_themeSkin iframe {
-	background: transparent;
+#post-status-info {
+	border-color: #d0dfe9 #d1e5ee #d1e5ee;
 }
 
-/* Layout */
-.wp-editor-wrap .wp_themeSkin .mceStatusbar {
-	color: #000;
-	background-color: #f5f5f5;
-}
-
-.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);
-	background-image:      -o-linear-gradient(bottom, #cfdfe9, #fff);
-	background-image: linear-gradient(to top, #cfdfe9, #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: #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);
-	background-image:      -o-linear-gradient(top, #cfdfe9, #fff);
-	background-image: linear-gradient(to bottom, #cfdfe9, #fff);
-}
-
-.wp-editor-wrap .wp_themeSkin .mceListBox .mceOpen {
-	border-left: 0 !important;
-}
-
-.wp-editor-wrap .wp_themeSkin table.mceListBoxEnabled:hover .mceOpen,
-.wp-editor-wrap .wp_themeSkin .mceListBoxHover .mceOpen,
-.wp-editor-wrap .wp_themeSkin .mceListBoxHover:active .mceOpen,
-.wp-editor-wrap .wp_themeSkin .mceListBoxSelected .mceOpen,
-.wp-editor-wrap .wp_themeSkin .mceListBoxSelected .mceText,
-.wp-editor-wrap .wp_themeSkin table.mceListBoxEnabled:active .mceText {
-	border-color: #B0C8D7;
-	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 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: #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);
-	background-image:      -o-linear-gradient(bottom, #cfdfe9, #fff);
-	background-image: linear-gradient(to top, #cfdfe9, #fff);
-}
-
-.wp-editor-wrap .wp_themeSkin .mceSplitButton:hover a.mceOpen,
-.wp-editor-wrap .wp_themeSkin .mceSplitButtonSelected a.mceOpen,
-.wp-editor-wrap .wp_themeSkin .mceSplitButtonSelected a.mceAction,
-.wp-editor-wrap .wp_themeSkin table.mceSplitButtonEnabled:hover a.mceAction,
-.wp-editor-wrap .wp_themeSkin .mceSplitButton a.mceAction:hover {
-	border-color: #B0C8D7;
-}
-
-.wp-editor-wrap .wp_themeSkin .mceSplitButtonSelected td {
-	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 table.mceSplitButton:hover td {
-	border-color: #bbb;
-	background: #c9c9c9;
-	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 td a.mceAction,
-.wp-editor-wrap .wp_themeSkin .mceSplitButtonActive td a.mceOpen {
-	border-color: #B0C8D7;
-}
-
-.wp-editor-wrap .wp_themeSkin .mceSplitButtonActive td {
-	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);
-}
-
-/* ColorSplitButton */
-.wp-editor-wrap .wp_themeSkin div.mceColorSplitMenu table {
-	background-color: #ebebeb;
-	border-color: #b2b2b2;
-}
-
-.wp-editor-wrap .wp_themeSkin .mceColorSplitMenu a {
-	border-color: #b2b2b2;
-}
-
-.wp-editor-wrap .wp_themeSkin .mceColorSplitMenu a.mceMoreColors {
-	border-color: #fff;
-}
-
-.wp-editor-wrap .wp_themeSkin .mceColorSplitMenu a.mceMoreColors:hover {
-	border-color: #0A246A;
-	background-color: #B6BDD2;
-}
-
-.wp-editor-wrap .wp_themeSkin a.mceMoreColors:hover {
-	border-color: #0A246A;
-}
-
-/* Menu */
-.wp-editor-wrap .wp_themeSkin .mceMenu {
-	border-color: #ddd;
-}
-
-.wp-editor-wrap .wp_themeSkin .mceMenu table {
-	background-color: #ebeaeb;
-}
-
-.wp-editor-wrap .wp_themeSkin .mceMenu .mceText {
-	color: #000;
-}
-
-.wp-editor-wrap .wp_themeSkin .mceMenu .mceMenuItemEnabled a:hover,
-.wp-editor-wrap .wp_themeSkin .mceMenu .mceMenuItemActive {
-	background-color: #f5f5f5;
-}
-
-.wp-editor-wrap .wp_themeSkin td.mceMenuItemSeparator {
-	background-color: #aaa;
-}
-
-.wp-editor-wrap .wp_themeSkin .mceMenuItemTitle a {
-	background-color: #ccc;
-	border-bottom-color: #aaa;
-}
-
-.wp-editor-wrap .wp_themeSkin .mceMenuItemTitle span.mceText {
-	color: #000;
-}
-
-.wp-editor-wrap .wp_themeSkin .mceMenuItemDisabled .mceText {
-	color: #888;
-}
-
-.wp-admin #mceModalBlocker {
-	background: #000;
-}
-
-.wp-admin .clearlooks2 .mceFocus .mceTop .mceLeft {
-	background: #444444;
-	border-left: 1px solid #999;
-	border-top: 1px solid #999;
-	-webkit-border-top-left-radius: 3px;
-	border-top-left-radius: 3px;
-}
-
-.wp-admin .clearlooks2 .mceFocus .mceTop .mceRight {
-	background: #444444;
-	border-right: 1px solid #999;
-	border-top: 1px solid #999;
-	-webkit-border-top-right-radius: 3px;
-	border-top-right-radius: 3px;
-}
-
-.wp-admin .clearlooks2 .mceMiddle .mceLeft {
-	background: #f1f1f1;
-	border-left: 1px solid #999;
-}
-
-.wp-admin .clearlooks2 .mceMiddle .mceRight {
-	background: #f1f1f1;
-	border-right: 1px solid #999;
-}
-
-.wp-admin .clearlooks2 .mceBottom {
-	background: #f1f1f1;
-	border-bottom: 1px solid #999;
-}
-
-.wp-admin .clearlooks2 .mceBottom .mceLeft {
-	background: #f1f1f1;
-	border-bottom: 1px solid #999;
-	border-left: 1px solid #999;
-}
-
-.wp-admin .clearlooks2 .mceBottom .mceCenter {
-	background: #f1f1f1;
-	border-bottom: 1px solid #999;
-}
-
-.wp-admin .clearlooks2 .mceBottom .mceRight {
-	background: #f1f1f1;
-	border-bottom: 1px solid #999;
-	border-right: 1px solid #999;
-}
-
-.wp-admin .clearlooks2 .mceFocus .mceTop span {
-	color: #e5e5e5;
-}
+/* TinyMCE */
 
 .wp-editor-wrap .wp-switch-editor {
-	background-color: #f5fafd;
-	border-color: #d1e5ee #d1e5ee #d1e5ee;
-	color: #999
+	background-color: #d3e9f2;
+	border-color: #d1e5ee #d1e5ee #d3e9f2;
+	color: #888;
 }
 
 .wp-editor-wrap.tmce-active .switch-tmce,
 .wp-editor-wrap.html-active .switch-html {
-	background-color: #eff8ff;
-	border-color: #d1e5ee #d1e5ee #eff8ff;
-	color: #333;
-}
-
-.wp-editor-wrap .quicktags-toolbar input {
-	color: #464646;
-	border-color: #b1c6cf;
-	background: #fff;
-	background-image: -webkit-gradient(linear, left bottom, left top, from(#e5f0f8), to(#fff));
-	background-image: -webkit-linear-gradient(bottom, #e5f0f8, #fff);
-	background-image:    -moz-linear-gradient(bottom, #e5f0f8, #fff);
-	background-image:      -o-linear-gradient(bottom, #e5f0f8, #fff);
-	background-image: linear-gradient(to top, #e5f0f8, #fff);
-}
-
-.wp-editor-wrap .quicktags-toolbar input:hover {
-	border-color: #5589aa;
-	background: #e0f1ff;
+	background: #f7fcfe !important;
+	border-color: #d1e5ee #d1e5ee #f7fcfe !important;
 }
 
 .wp-editor-wrap .quicktags-toolbar,
 .wp-editor-wrap .wp_themeSkin tr.mceFirst td.mceToolbar {
-	border-bottom: 1px solid #ccc;
-	background: #eff8ff;
-	background-image: -webkit-gradient(linear, left bottom, left top, from(#cfdfe9), to(#eff8ff));
-	background-image: -webkit-linear-gradient(bottom, #cfdfe9, #eff8ff);
-	background-image:    -moz-linear-gradient(bottom, #cfdfe9, #eff8ff);
-	background-image:      -o-linear-gradient(bottom, #cfdfe9, #eff8ff);
-	background-image: linear-gradient(to top, #cfdfe9, #eff8ff);
+	border-color: #d0dfe9;
+	background-color: #f5fafd;
+	background-image: -webkit-gradient(linear, left bottom, left top, from(#eff8ff), to(#f7fcfe));
+	background-image: -webkit-linear-gradient(bottom, #eff8ff, #f7fcfe);
+	background-image:    -moz-linear-gradient(bottom, #eff8ff, #f7fcfe);
+	background-image:      -o-linear-gradient(bottom, #eff8ff, #f7fcfe);
+	background-image: linear-gradient(to top, #eff8ff, #f7fcfe);
+}
+
+.wp_themeSkin table.mceListBox {
+	border-color: #d1e5ee;
+}
+
+.wp_themeSkin table.mceListBoxEnabled:hover,
+.wp_themeSkin table.mceListBoxEnabled:active,
+.wp_themeSkin table.mceListBoxHover,
+.wp_themeSkin table.mceListBoxHover:active,
+.wp_themeSkin table.mceListBoxSelected {
+	border-color: #b8cfdf;
+}
+
+.wp_themeSkin a.mceButtonEnabled:hover {
+	border-color: #c3d2dc !important;
+	background: #f4f9fc;
+	background-image: -webkit-gradient(linear, left bottom, left top, from(#f4f9fc), to(#fff)) !important;
+	background-image: -webkit-linear-gradient(bottom, #f4f9fc, #fff) !important;
+	background-image:    -moz-linear-gradient(bottom, #f4f9fc, #fff) !important;
+	background-image:      -o-linear-gradient(bottom, #f4f9fc, #fff) !important;
+	background-image: linear-gradient(to top, #f4f9fc, #fff) !important;
+}
+
+.wp_themeSkin a.mceButton:active,
+.wp_themeSkin a.mceButtonEnabled:active,
+.wp_themeSkin a.mceButtonSelected:active,
+.wp_themeSkin a.mceButtonActive,
+.wp_themeSkin a.mceButtonActive:active,
+.wp_themeSkin a.mceButtonActive:hover {
+	border-color: #8f9da9 #c3d2dc #c3d2dc #8f9da9 !important;
+	background: #f4f9fc;
+	background-image: -webkit-gradient(linear, left bottom, left top, from(#fff), to(#f4f9fc)) !important;
+	background-image: -webkit-linear-gradient(bottom, #fff, #f4f9fc) !important;
+	background-image:    -moz-linear-gradient(bottom, #fff, #f4f9fc) !important;
+	background-image:      -o-linear-gradient(bottom, #fff, #f4f9fc) !important;
+	background-image: linear-gradient(to top, #fff, #f4f9fc) !important;
+}
+
+.wp_themeSkin .mceSplitButton:hover a.mceOpen,
+.wp_themeSkin .mceSplitButtonSelected a.mceOpen,
+.wp_themeSkin .mceSplitButtonSelected a.mceAction,
+.wp_themeSkin table.mceSplitButtonEnabled:hover a.mceAction,
+.wp_themeSkin .mceSplitButton a.mceAction:hover {
+	border-color: #c3d2dc !important;
+}
+
+.wp_themeSkin table.mceSplitButton:hover td {
+	border-color: #f4f9fc;
+	background: #eee;
+	background-image: -webkit-gradient(linear, left bottom, left top, from(#f4f9fc), to(#fff)) !important;
+	background-image: -webkit-linear-gradient(bottom, #f4f9fc, #fff) !important;
+	background-image:    -moz-linear-gradient(bottom, #f4f9fc, #fff) !important;
+	background-image:      -o-linear-gradient(bottom, #f4f9fc, #fff) !important;
+	background-image: linear-gradient(to top, #f4f9fc, #fff) !important;
+}
+
+.wp_themeSkin .mceSplitButtonSelected td {
+	background: #f4f9fc;
+	background-image: -webkit-gradient(linear, left bottom, left top, from(#fff), to(#f4f9fc)) !important;
+	background-image: -webkit-linear-gradient(bottom, #fff, #f4f9fc) !important;
+	background-image:    -moz-linear-gradient(bottom, #fff, #f4f9fc) !important;
+	background-image:      -o-linear-gradient(bottom, #fff, #f4f9fc) !important;
+	background-image: linear-gradient(to top, #fff, #f4f9fc) !important;
 }
 
 /* end TinyMCE */
 
-#editorcontainer {
-	border-color: #bdccd5 #bdccd5 #d0dfe9;
-}
-
-#post-status-info {
-	border-color: #d0dfe9 #bdccd5 #bdccd5;
-}
-
 .editwidget .widget-inside {
 	border-color: #d0dfe9;
 }
diff --git a/wp-includes/css/editor.css b/wp-includes/css/editor.css
index a88400f9eb..0e100228de 100644
--- a/wp-includes/css/editor.css
+++ b/wp-includes/css/editor.css
@@ -45,7 +45,7 @@
 .wp_themeSkin a:link,
 .wp_themeSkin a:visited,
 .wp_themeSkin a:active {
-	color: #000;
+	color: #555;
 }
 
 /* Containers */
@@ -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,13 @@
 	margin: 0 6px 2px;
 }
 
+.wp_themeSkin table.mceToolbar :active,
+.wp_themeSkin table.mceToolbar :focus,
+.wp_themeSkin table.mceToolbar:focus,
+.wp_themeSkin span.mceSeparator:focus {
+	outline: none;
+}
+
 .wp_themeSkin #content_toolbar1 {
 	margin-top: 2px;
 }
@@ -176,8 +183,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 +193,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.2;
+	filter: alpha(opacity=20);
 }
 
 /* Separator */
@@ -218,17 +215,15 @@
 }
 
 .wp_themeSkin .mceListBox .mceText {
-	padding: 1px 2px 1px 5px;
+	padding: 1px 4px 1px 5px;
+	width: 70px;
 	text-align: left;
 	text-decoration: none;
-	width: 70px;
 	-webkit-border-bottom-left-radius: 2px;
 	-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;
@@ -238,10 +233,14 @@
 .wp_themeSkin .mceListBox {
 	margin: 1px;
 	direction: ltr;
+	background-color: #fff;
+	border: 1px solid #ddd;
+	-webkit-box-shadow: inset 0 1px 1px -1px rgba(0, 0, 0, .2);
+	box-shadow:         inset 0 1px 1px -1px rgba(0, 0, 0, .2);
 }
 
 .wp_themeSkin .mceListBox .mceOpen {
-	width: 14px;
+	width: 12px;
 	height: 20px;
 	border-collapse: separate;
 	padding: 1px;
@@ -249,26 +248,26 @@
 	-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 {
-	display: block;
-	width: 14px;
-	height: 20px;
-	background-image: url("../images/down_arrow.gif");
-	background-position: 2px 1px;
-	background-repeat: no-repeat;
+.wp_themeSkin .mceListBox .mceFirst a {
+	border-style: solid;
+	border-width: 1px;
+	border-bottom-right-radius: 2px;
+	border-top-right-radius: 2px;
 }
 
-.wp_themeSkin table.mceListBoxEnabled:hover .mceText,
-.wp_themeSkin .mceListBoxHover .mceText,
-.wp_themeSkin .mceListBoxSelected .mceText,
-.wp_themeSkin table.mceListBoxEnabled:hover .mceOpen,
+/*.wp_themeSkin .mceListBox .mceLast {
+	display: none;
+}*/
+
+.wp_themeSkin .mceListBox .mceOpen,
 .wp_themeSkin .mceListBoxHover .mceOpen,
-.wp_themeSkin .mceListBoxSelected .mceOpen {
-	background-image: none;
+.wp_themeSkin .mceListBoxSelected .mceOpen,
+.wp_themeSkin table.mceListBoxEnabled .mceOpen {
+	background-image: url("../images/down_arrow.gif");
+	background-position: 3px 1px;
+	background-repeat: no-repeat;
 }
 
 .wp_themeSkin .mceListBoxDisabled .mceText {
@@ -285,7 +284,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 +299,6 @@
 
 .wp_themeSkin .mceSplitButton {
 	display: block;
-	margin: 1px;
 	direction: ltr;
 }
 
@@ -310,11 +308,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;
 }
@@ -323,6 +316,7 @@
 	height: 20px;
 	width: 20px;
 	padding: 1px 2px;
+	border-right: 0 none !important;
 }
 
 .wp_themeSkin .mceSplitButton span.mceAction {
@@ -333,13 +327,22 @@
 }
 
 .wp_themeSkin .mceSplitButton a.mceOpen {
-	width: 10px;
+	width: 11px;
 	height: 20px;
-	background-image: url("../images/down_arrow.gif");
-	background-position: 1px 2px;
+	background-position: 0px 2px;
 	background-repeat: no-repeat;
-	padding: 1px;
-	border-left: 0 none !important;
+	padding: 1px 0;
+}
+
+.wp_themeSkin .mceSplitButtonActive a.mceOpen,
+.wp_themeSkin .mceSplitButtonSelected a.mceOpen,
+.wp_themeSkin .mceSplitButton a.mceOpen:hover {
+	width: 12px;
+	border-left: 1px solid transparent !important;
+	background-position: 2px 2px !important;
+	position: relative;
+	left: -1px;
+	margin-right: -1px;
 }
 
 .wp_themeSkin .mceSplitButton span.mceOpen {
@@ -449,7 +452,7 @@
 /* ColorSplitButton */
 .wp_themeSkin div.mceColorSplitMenu table {
 	background-color: #ebebeb;
-	border-color: #B2B2B2;
+	border-color: #bbb;
 }
 
 .wp_themeSkin .mceColorSplitMenu td {
@@ -870,12 +873,6 @@
 .wp_themeSkin a.mceButtonSelected,
 .wp_themeSkin .mceListBox .mceText,
 .wp_themeSkin .mceListBox .mceOpen,
-.wp_themeSkin table.mceListBoxEnabled:hover .mceText,
-.wp_themeSkin .mceListBoxHover .mceText,
-.wp_themeSkin .mceListBoxSelected .mceText,
-.wp_themeSkin table.mceListBoxEnabled:hover .mceOpen,
-.wp_themeSkin .mceListBoxHover .mceOpen,
-.wp_themeSkin .mceListBoxSelected .mceOpen,
 .wp_themeSkin select.mceListBox,
 .wp_themeSkin .mceSplitButton a.mceAction,
 .wp_themeSkin .mceSplitButton a.mceOpen,
@@ -892,31 +889,30 @@
 	border-style: solid;
 	border-width: 1px;
 }
-
+.wp_themeSkin .mceListBox .mceText {
+	border-right: 0 none;
+}
 .wp_themeSkin iframe {
 	background: transparent;
 }
 
-.wp_themeSkin .mceButton,
+.wp_themeSkin .mceButton {
+	border-color: transparent;
+}
+
 .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);
-	background-image:    -moz-linear-gradient(bottom, #ccc, #fff);
-	background-image:      -o-linear-gradient(bottom, #ccc, #fff);
-	background-image: linear-gradient(to top, #ccc, #fff);
+	background-image: -webkit-gradient(linear, left bottom, left top, from(#e5e5e5), to(#fff));
+	background-image: -webkit-linear-gradient(bottom, #e5e5e5, #fff);
+	background-image:    -moz-linear-gradient(bottom, #e5e5e5, #fff);
+	background-image:      -o-linear-gradient(bottom, #e5e5e5, #fff);
+	background-image: linear-gradient(to top, #e5e5e5, #fff);
 }
 
 .wp_themeSkin a.mceButton:active,
@@ -925,70 +921,73 @@
 .wp_themeSkin a.mceButtonActive,
 .wp_themeSkin a.mceButtonActive:active,
 .wp_themeSkin a.mceButtonActive:hover {
-	border-color: #909090;
-	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);
+	outline: none;
+	border-color: #999 #ccc #ccc #999;
+	background: #eee;
+	background-image: -webkit-gradient(linear, left bottom, left top, from(#f6f6f6), to(#e3e3e3));
+	background-image: -webkit-linear-gradient(bottom, #f6f6f6, #e3e3e3);
+	background-image:    -moz-linear-gradient(bottom, #f6f6f6, #e3e3e3);
+	background-image:      -o-linear-gradient(bottom, #f6f6f6, #e3e3e3);
+	background-image: linear-gradient(to top, #f6f6f6, #e3e3e3);
 }
 
 .wp_themeSkin .mceButtonDisabled {
-	border-color: #ccc !important;
+	border-color: transparent !important;
 }
 
 .wp_themeSkin .mceListBox .mceOpen {
 	border-left: 0 !important;
 }
 
-.wp_themeSkin table.mceListBoxEnabled:hover .mceOpen,
-.wp_themeSkin .mceListBoxHover .mceOpen,
-.wp_themeSkin .mceListBoxHover:active .mceOpen,
-.wp_themeSkin .mceListBoxSelected .mceOpen,
-.wp_themeSkin .mceListBoxSelected .mceText,
-.wp_themeSkin table.mceListBoxEnabled:active .mceText {
-	background: #ccc;
-	border-color: #999;
-}
-
-.wp_themeSkin table.mceListBoxEnabled:hover .mceText,
-.wp_themeSkin .mceListBoxHover .mceText,
-.wp_themeSkin table.mceListBoxEnabled:hover .mceOpen,
-.wp_themeSkin .mceListBoxHover .mceOpen {
-	border-color: #909090;
-	background: #eee;
-	background-image: -webkit-gradient(linear, left bottom, left top, from(#ccc), to(#fff));
-	background-image: -webkit-linear-gradient(bottom, #ccc, #fff);
-	background-image:    -moz-linear-gradient(bottom, #ccc, #fff);
-	background-image:      -o-linear-gradient(bottom, #ccc, #fff);
-	background-image: linear-gradient(to top, #ccc, #fff);
+.wp_themeSkin .mceListBoxEnabled:hover,
+.wp_themeSkin .mceListBoxEnabled:active,
+.wp_themeSkin .mceListBoxHover,
+.wp_themeSkin .mceListBoxHover:active,
+.wp_themeSkin .mceListBoxSelected {
+	-webkit-box-shadow: inset 0 1px 1px -1px rgba(0, 0, 0, .3);
+	box-shadow:         inset 0 1px 1px -1px rgba(0, 0, 0, .3);
+	border-color: #bbb;
 }
 
 /* SplitButton */
+.wp_themeSkin .mceSplitButton .mceLast span.mceOpen .mceIconOnly {
+	display: block !important;
+}
+
 .wp_themeSkin .mceSplitButton a.mceAction,
 .wp_themeSkin .mceSplitButton a.mceOpen {
-	border-color: #ccc;
+	border-color: transparent;
 }
 
-.wp_themeSkin .mceSplitButton a.mceOpen:hover,
+.wp_themeSkin .mceSplitButton:hover a.mceOpen,
 .wp_themeSkin .mceSplitButtonSelected a.mceOpen,
+.wp_themeSkin .mceSplitButtonSelected a.mceAction,
 .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 .mceSplitButtonEnabled a.mceOpen,
+.wp_themeSkin .mceSplitButtonSelected a.mceOpen,
+.wp_themeSkin .mceSplitButtonActive a.mceOpen,
+.wp_themeSkin .mceSplitButtonEnabled:hover a.mceOpen {
+	background-image: url("../images/down_arrow.gif");
+	background-position: 1px 2px;
+	background-repeat: no-repeat;
+}
+
+.wp_themeSkin .mceSplitButtonSelected td {
+	background-color: #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 table.mceSplitButton:hover td {
-	background: #eee;
+	border-color: #bbb;
+	background-color: #eee;
 	background-image: -webkit-gradient(linear, left bottom, left top, from(#ccc), to(#fff));
 	background-image: -webkit-linear-gradient(bottom, #ccc, #fff);
 	background-image:    -moz-linear-gradient(bottom, #ccc, #fff);
@@ -996,8 +995,31 @@
 	background-image: linear-gradient(to top, #ccc, #fff);
 }
 
-.wp_themeSkin .mceSplitButtonActive {
-	background-color: #B2B2B2;
+.wp_themeSkin table.mceSplitButton:active td.mceFirst,
+.wp_themeSkin table.mceSplitButton td.mceLast:active {
+	border-color: #bbb;
+	background-color: #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 td a.mceAction,
+.wp_themeSkin .mceSplitButtonActive td a.mceOpen {
+	border-color: #bbb;
+}
+
+.wp_themeSkin .mceSplitButtonActive td {
+	background-color: #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);
+	-webkit-border-radius: 3px;
+	border-radius: 3px;
 }
 
 .wp_themeSkin .mceColorSplitMenu a.mceMoreColors:hover {
@@ -1059,13 +1081,13 @@
 
 .quicktags-toolbar,
 .wp_themeSkin tr.mceFirst td.mceToolbar {
-	border-bottom: 1px solid #ccc;
-	background: #e9e9e9;
-	background-image: -webkit-gradient(linear, left bottom, left top, from(#ddd), to(#e9e9e9));
-	background-image: -webkit-linear-gradient(bottom, #ddd, #e9e9e9);
-	background-image:    -moz-linear-gradient(bottom, #ddd, #e9e9e9);
-	background-image:      -o-linear-gradient(bottom, #ddd, #e9e9e9);
-	background-image: linear-gradient(to top, #ddd, #e9e9e9);
+	border-bottom: 1px solid #d1d1d1;
+	background: #eee;
+	background-image: -webkit-gradient(linear, left bottom, left top, from(#e5e5e5), to(#f4f4f4));
+	background-image: -webkit-linear-gradient(bottom, #e5e5e5, #f4f4f4);
+	background-image:    -moz-linear-gradient(bottom, #e5e5e5, #f4f4f4);
+	background-image:      -o-linear-gradient(bottom, #e5e5e5, #f4f4f4);
+	background-image: linear-gradient(to top, #e5e5e5, #f4f4f4);
 }
 
 .wp-switch-editor {
@@ -1104,9 +1126,9 @@ html[dir="rtl"] .wp-switch-editor {
 
 .tmce-active .switch-tmce,
 .html-active .switch-html {
-	border-color: #ccc #ccc #e9e9e9;
-	background-color: #e9e9e9;
-	color: #333;
+	border-color: #ccc #ccc #f4f4f4;
+	background-color: #f4f4f4;
+	color: #555;
 }
 
 .wp-media-buttons {