diff --git a/src/wp-includes/class-wp-editor.php b/src/wp-includes/class-wp-editor.php
index 7583a738f1..e62762363d 100644
--- a/src/wp-includes/class-wp-editor.php
+++ b/src/wp-includes/class-wp-editor.php
@@ -168,7 +168,13 @@ final class _WP_Editors {
 			$buttons .= '<a id="' . $editor_id . '-tmce" class="wp-switch-editor switch-tmce" onclick="switchEditors.switchto(this);">' . __('Visual') . "</a>\n";
 		}
 
-		echo '<div id="wp-' . $editor_id . '-wrap" class="wp-core-ui wp-editor-wrap ' . $switch_class . '">';
+		$wrap_class = 'wp-core-ui wp-editor-wrap ' . $switch_class;
+
+		if ( $set['dfw'] ) {
+			$wrap_class .= ' has-dfw';
+		}
+
+		echo '<div id="wp-' . $editor_id . '-wrap" class="' . $wrap_class . '">';
 
 		if ( self::$editor_buttons_css ) {
 			wp_print_styles('editor-buttons');
diff --git a/src/wp-includes/css/editor.css b/src/wp-includes/css/editor.css
index f033e7b949..dae7e0edb8 100644
--- a/src/wp-includes/css/editor.css
+++ b/src/wp-includes/css/editor.css
@@ -144,10 +144,14 @@ div.mce-panel {
 div.mce-toolbar-grp {
 	border-bottom: 1px solid #dedede;
 	background: #f5f5f5;
-	padding: 3px 35px 3px 3px;
+	padding: 3px;
 	position: relative;
 }
 
+.has-dfw div.mce-toolbar-grp .mce-toolbar.mce-first {
+	padding-right: 32px;
+}
+
 .mce-toolbar .mce-btn-group {
 	margin: 0;
 }
@@ -177,8 +181,8 @@ div.mce-path {
 	border: 1px solid transparent;
 	margin: 2px;
 	background-image: none;
-	-webkit-border-radius: 3px;
-	border-radius: 3px;
+	-webkit-border-radius: 2px;
+	border-radius: 2px;
 	-webkit-filter: none;
 	filter: none;
 }
@@ -200,11 +204,18 @@ div.mce-path {
 #wp-fullscreen-buttons .mce-btn.mce-active,
 .mce-toolbar .mce-btn-group .mce-btn:active,
 #wp-fullscreen-buttons .mce-btn:active {
-	background: #eee;
+	background: #ebebeb;
 	border-color: #999;
-	color: #333;
-	-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 );
+	-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 i.mce-ico {
+	color: #555;
 }
 
 .mce-toolbar .mce-btn-group .mce-btn.mce-disabled:hover,
@@ -243,7 +254,7 @@ div.mce-path {
 }
 
 .mce-toolbar .mce-colorbutton .mce-preview {
-	margin-left: -16px;
+	margin-left: -17px;
 	padding: 0;
 	width: 18px;
 }
@@ -266,6 +277,18 @@ div.mce-path {
 
 .mce-panel .mce-btn i.mce-caret {
 	border-top: 6px solid #777;
+	margin-left: 2px;
+	margin-right: 2px;
+}
+
+.mce-listbox i.mce-caret {
+	right: 6px;
+}
+
+.mce-panel .mce-btn button.mce-open i.mce-caret,
+.mce-panel .mce-btn.mce-listbox i.mce-caret {
+	margin-left: 0;
+	margin-right: 0;
 }
 
 .mce-panel .mce-btn:hover i.mce-caret {
@@ -443,6 +466,12 @@ div.mce-menu .mce-menu-item-sep,
 	text-shadow: 0 -1px 0 rgba(0,0,0,0.1);
 }
 
+.mce-menubtn.mce-fixed-width button span {
+	width: auto;
+	max-width: 80px;
+	padding-right: 16px;
+}
+
 /* Charmap modal */
 .mce-charmap {
 	margin: 3px;
@@ -738,11 +767,6 @@ i.mce-i-hr:before {
 	box-shadow: none;
 }
 
-.quicktags-toolbar {
-	border-bottom: 1px solid #dedede;
-	background: #f5f5f5;
-}
-
 .wp-editor-tabs {
 	float: right;
 }
@@ -844,10 +868,14 @@ i.mce-i-hr:before {
 
 /* Quicktags */
 .quicktags-toolbar {
-	border-bottom-style: solid;
-	border-bottom-width: 1px;
-	padding: 3px 35px 3px 3px;
+	padding: 3px;
 	position: relative;
+	border-bottom: 1px solid #dedede;
+	background: #f5f5f5;
+}
+
+.has-dfw .quicktags-toolbar {
+	padding-right: 35px;
 }
 
 .wp-core-ui .quicktags-toolbar input.button.button-small {