diff --git src/wp-includes/js/tinymce/plugins/wpeditimage/plugin.js src/wp-includes/js/tinymce/plugins/wpeditimage/plugin.js
index 8ef748f..0c48ee5 100644
--- src/wp-includes/js/tinymce/plugins/wpeditimage/plugin.js
+++ src/wp-includes/js/tinymce/plugins/wpeditimage/plugin.js
@@ -348,8 +348,9 @@ tinymce.PluginManager.add( 'wpeditimage', function( editor ) {
 		dom.setAttrib( node, 'data-wp-imgselect', 1 );
 		position = dom.getPos( node, editor.getBody() );
 
-		toolbarHtml = '<div class="dashicons dashicons-edit edit" data-mce-bogus="1"></div> ' +
-			'<div class="dashicons dashicons-no-alt remove" data-mce-bogus="1"></div>';
+		toolbarHtml = '<div class="wrapper" data-mce-bogus="1">' +
+			'<div class="dashicons dashicons-format-image edit" data-mce-bogus="1"></div> ' +
+			'<div class="dashicons dashicons-no-alt remove" data-mce-bogus="1"></div></div>';
 
 		toolbar = dom.create( 'div', {
 			'id': 'wp-image-toolbar',
@@ -361,7 +362,8 @@ tinymce.PluginManager.add( 'wpeditimage', function( editor ) {
 
 		dom.setStyles( toolbar, {
 			top: position.y,
-			left: position.x
+			left: position.x,
+			width: node.width
 		});
 	}
 
diff --git src/wp-includes/js/tinymce/skins/wordpress/wp-content.css src/wp-includes/js/tinymce/skins/wordpress/wp-content.css
index 6cf1b07..f8e83da 100644
--- src/wp-includes/js/tinymce/skins/wordpress/wp-content.css
+++ src/wp-includes/js/tinymce/skins/wordpress/wp-content.css
@@ -160,15 +160,34 @@ img::selection {
 
 #wp-image-toolbar {
 	position: absolute;
+}
+
+#wp-image-toolbar .wrapper {
+	position: relative;
+	height: 33px;
 	background-color: #333; /* old IE */
-	padding: 4px;
+	background-color: rgba(0,0,0,0.3);
 }
 
 #wp-image-toolbar .dashicons {
+	position: absolute;
 	color: white;
+	width: 36px;
+	height: 32px;
+	line-height: 32px;
 	cursor: pointer;
 }
 
+#wp-image-toolbar div.dashicons-no-alt {
+	top: 0;
+	right: 0;
+}
+
+#wp-image-toolbar div.dashicons-format-image {
+	top: 0;
+	left: 0;
+}
+
 /* Image resize handles */
 .mce-content-body div.mce-resizehandle {
 	border-color: #777;
@@ -220,7 +239,6 @@ embed {
 	clip: rect(1px, 1px, 1px, 1px);
 	overflow: hidden;
 	outline: 0;
-	width: 100%;
 }
 
 /**
@@ -228,19 +246,21 @@ embed {
  */
 .wpview-type-gallery {
     position: relative;
+    padding: 0 0 12px;
     margin-bottom: 16px;
 	cursor: pointer;
 }
 
  .wpview-type-gallery:after {
     content: '';
-	display: table;
+    display: block;
+    height: 0;
     clear: both;
+    visibility: hidden;
 }
 
  .wpview-type-gallery.selected {
-	background-color: #f2f8ff;
-	outline: 1px solid #777;
+	background-color: #efefef;
 }
 
 .wpview-type-gallery .toolbar {
@@ -271,21 +291,13 @@ embed {
 
 .gallery {
 	margin: auto;
-	padding: 0.5em 0;
-	line-height: 1;
-	margin-left: -0.5em;
-	margin-right: -0.5em;
-	overflow-x: hidden;
+    line-height: 1;
 }
 
 .gallery .gallery-item {
 	float: left;
-	margin: 0;
+	margin: 10px 0 0 0;
 	text-align: center;
-	padding: 0.5em;
-	-webkit-box-sizing: border-box;
-	-moz-box-sizing: border-box;
-	box-sizing: border-box;
 }
 
 .gallery .gallery-caption,
@@ -293,51 +305,44 @@ embed {
 	margin: 0;
 }
 
-.gallery .gallery-caption {
-	font-size: 13px;
-	margin: 4px 0;
-}
-
 .gallery-columns-1 .gallery-item {
-	width: 100%;
+	width: 99%;
 }
 
 .gallery-columns-2 .gallery-item {
-	width: 50%;
+	width: 49.5%;
 }
 
 .gallery-columns-3 .gallery-item {
-	width: 33.333%;
+	width: 33%;
 }
 
 .gallery-columns-4 .gallery-item {
-	width: 25%;
+	width: 24.75%;
 }
 
 .gallery-columns-5 .gallery-item {
-	width: 20%;
+	width: 19.825%;
 }
 
 .gallery-columns-6 .gallery-item {
-	width: 16.667%;
+	width: 16%;
 }
 
 .gallery-columns-7 .gallery-item {
-	width: 14.285%;
+	width: 14%;
 }
 
 .gallery-columns-8 .gallery-item {
-	width: 12.5%;
+	width: 12%;
 }
 
 .gallery-columns-9 .gallery-item {
-	width: 11.111%;
+	width: 11%;
 }
 
 .gallery img {
 	border: 1px solid #cfcfcf;
-	max-width: 100%;
-	height: auto;
 }
 
 img.wp-oembed {
diff --git src/wp-includes/media-template.php src/wp-includes/media-template.php
index 345935a..d8d6423 100644
--- src/wp-includes/media-template.php
+++ src/wp-includes/media-template.php
@@ -905,7 +905,7 @@ function wp_print_media_templates() {
 
 	<script type="text/html" id="tmpl-editor-gallery">
 		<div class="toolbar">
-			<div class="dashicons dashicons-edit edit"></div>
+			<div class="dashicons dashicons-format-gallery edit"></div>
 			<div class="dashicons dashicons-no-alt remove"></div>
 		</div>
 		<div class="gallery gallery-columns-{{{ data.columns }}}">