Index: src/wp-admin/css/common.css
===================================================================
--- src/wp-admin/css/common.css	(revision 29066)
+++ src/wp-admin/css/common.css	(working copy)
@@ -2642,10 +2642,6 @@
 		-webkit-tap-highlight-color: rgba(0, 0, 0, 0) !important;
 	}
 
-	#wpwrap {
-		background: #f0f0f0;
-	}
-
 	#wpcontent {
 		position: relative;
 		margin-left: 0;
Index: src/wp-admin/js/editor-expand.js
===================================================================
--- src/wp-admin/js/editor-expand.js	(revision 29066)
+++ src/wp-admin/js/editor-expand.js	(working copy)
@@ -285,7 +285,7 @@
 			$top.css( {
 				position: 'fixed',
 				top: adminBarHeight + toolsHeight,
-				width: editorWidth - ( visual ? 0 : 38 ),
+				width: $editor.parent().width() - ( $top.outerWidth() - $top.width() ),
 				borderTop: '1px solid #e5e5e5'
 			} );
 
@@ -310,7 +310,6 @@
 				$tools.css( {
 					position: 'absolute',
 					top: 0,
-					borderTop: 'none',
 					width: $contentWrap.width()
 				} );
 			// Handle scrolling down.
@@ -319,14 +318,12 @@
 
 				$top.css( {
 					position: 'absolute',
-					top: window.pageYOffset - $editor.offset().top + adminBarHeight + $tools.outerHeight(),
-					borderTop: 'none'
+					top: editorHeight - buffer,
 				} );
 
 				$tools.css( {
 					position: 'absolute',
-					top: window.pageYOffset - $contentWrap.offset().top + adminBarHeight,
-					borderTop: 'none',
+					top: editorHeight - buffer + 1, // border
 					width: $contentWrap.width()
 				} );
 			}
Index: src/wp-includes/css/editor.css
===================================================================
--- src/wp-includes/css/editor.css	(revision 29066)
+++ src/wp-includes/css/editor.css	(working copy)
@@ -756,7 +756,7 @@
 	position: relative;
 }
 
-.wp-editor-tools {
+#wp-content-editor-tools {
 	background-color: #f1f1f1;
 	padding-top: 20px;
 	position: relative;