diff --git a/src/js/_enqueues/lib/image-edit.js b/src/js/_enqueues/lib/image-edit.js
index 100f26e7e0..9c7c841eba 100644
--- a/src/js/_enqueues/lib/image-edit.js
+++ b/src/js/_enqueues/lib/image-edit.js
@@ -503,7 +503,7 @@
 
 			// If a response is returned, close the editor and show an error.
 			if ( ret.error ) {
-				$('#imgedit-response-' + postid).html('<div class="error"><p>' + ret.error + '</p></div>');
+				$('#imgedit-response-' + postid).html('<div class="error" role="alert"><p>' + ret.error + '</p></div>');
 				imageEdit.close(postid);
 				return;
 			}
@@ -517,7 +517,7 @@
 			}
 
 			if ( ret.msg ) {
-				$('#imgedit-response-' + postid).html('<div class="updated"><p>' + ret.msg + '</p></div>');
+				$('#imgedit-response-' + postid).html('<div class="updated" role="alert"><p>' + ret.msg + '</p></div>');
 			}
 
 			if ( self._view ) {
diff --git a/src/js/media/views/frame/select.js b/src/js/media/views/frame/select.js
index 5cb4a5402d..fd5a8512d2 100644
--- a/src/js/media/views/frame/select.js
+++ b/src/js/media/views/frame/select.js
@@ -62,6 +62,8 @@ Select = MediaFrame.extend(/** @lends wp.media.view.MediaFrame.Select.prototype
 	 * Create the default states on the frame.
 	 */
 	createStates: function() {
+		console.log("test");
+		this.on( 'content:render:edit-image', this.editState, this );
 		var options = this.options;
 
 		if ( this.options.states ) {
@@ -76,7 +78,8 @@ Select = MediaFrame.extend(/** @lends wp.media.view.MediaFrame.Select.prototype
 				multiple:  options.multiple,
 				title:     options.title,
 				priority:  20
-			})
+			}),
+				new wp.media.controller.EditImage( { model: this.options.editImage } ),
 		]);
 	},
 
diff --git a/src/wp-admin/css/edit.css b/src/wp-admin/css/edit.css
index 81eb38a585..bfe2ac8347 100644
--- a/src/wp-admin/css/edit.css
+++ b/src/wp-admin/css/edit.css
@@ -655,6 +655,12 @@ form#tags-filter {
 	margin-bottom: 20px;
 }
 
+.wp_attachment_details .attachment-content-description {
+	margin-top: 0.5385em;
+	display: inline-block;
+	min-height: 1.6923em;
+}
+
 /* Suggested text for privacy policy */
 .wp-privacy-policy-guide {
 	max-width: 1000px;
diff --git a/src/wp-admin/css/media.css b/src/wp-admin/css/media.css
index b2b640de9e..e567807169 100644
--- a/src/wp-admin/css/media.css
+++ b/src/wp-admin/css/media.css
@@ -800,6 +800,11 @@ border color while dragging a file over the uploader drop area */
 	margin-bottom: 5px;
 }
 
+.attachment-details .setting + .description a:focus {
+        /* Only visible in Windows High Contrast mode */
+        outline: 1px solid transparent;
+}
+
 .wp_attachment_details .attachment-alt-text-description {
 	margin-top: 5px;
 }
@@ -1114,10 +1119,14 @@ span.imgedit-scale-warn {
 	padding: 10px;
 }
 
+.imgedit-settings .imgedit-original-dimensions {
+	display: inline-block;
+}
+
 .imgedit-settings .imgedit-scale input[type="text"],
 .imgedit-settings .imgedit-crop-ratio input[type="text"],
 .imgedit-settings .imgedit-crop-sel input[type="text"] {
-	width: 50px;
+	width: 80px;
 	font-size: 14px;
 	padding: 5px 8px;
 }
@@ -1130,6 +1139,11 @@ span.imgedit-scale-warn {
 	color: #444;
 }
 
+.imgedit-settings .imgedit-scale-button-wrapper {
+	margin-top: 0.3077em;
+	display: block;
+}
+
 .imgedit-settings .imgedit-scale .button {
 	margin-bottom: 0;
 }
diff --git a/src/wp-admin/includes/image-edit.php b/src/wp-admin/includes/image-edit.php
index d474f8498b..39bc44975a 100644
--- a/src/wp-admin/includes/image-edit.php
+++ b/src/wp-admin/includes/image-edit.php
@@ -38,9 +38,9 @@ function wp_image_editor( $post_id, $msg = false ) {
 
 	if ( $msg ) {
 		if ( isset( $msg->error ) ) {
-			$note = "<div class='error'><p>$msg->error</p></div>";
+			$note = "<div class='error' tabindex='-1' role='alert'><p>$msg->error</p></div>";
 		} elseif ( isset( $msg->msg ) ) {
-			$note = "<div class='updated'><p>$msg->msg</p></div>";
+			$note = "<div class='updated' tabindex='-1' role='alert'><p>$msg->msg</p></div>";
 		}
 	}
 
@@ -62,7 +62,7 @@ function wp_image_editor( $post_id, $msg = false ) {
 			printf(
 				/* translators: %s: Image width and height in pixels. */
 				__( 'Original dimensions %s' ),
-				$meta['width'] . ' &times; ' . $meta['height']
+				'<span class="imgedit-original-dimensions">' . $meta['width'] . ' &times; ' . $meta['height'] . '</span>'
 			);
 			?>
 		</p>
@@ -78,7 +78,7 @@ function wp_image_editor( $post_id, $msg = false ) {
 		<label for="imgedit-scale-height-<?php echo $post_id; ?>" class="screen-reader-text"><?php _e( 'scale height' ); ?></label>
 		<input type="text" id="imgedit-scale-height-<?php echo $post_id; ?>" onkeyup="imageEdit.scaleChanged(<?php echo $post_id; ?>, 0, this)" onblur="imageEdit.scaleChanged(<?php echo $post_id; ?>, 0, this)" value="<?php echo isset( $meta['height'] ) ? $meta['height'] : 0; ?>" />
 		<span class="imgedit-scale-warn" id="imgedit-scale-warn-<?php echo $post_id; ?>">!</span>
-		<input id="imgedit-scale-button" type="button" onclick="imageEdit.action(<?php echo "$post_id, '$nonce'"; ?>, 'scale')" class="button button-primary" value="<?php esc_attr_e( 'Scale' ); ?>" />
+		<div class="imgedit-scale-button-wrapper"><input id="imgedit-scale-button" type="button" onclick="imageEdit.action(<?php echo "$post_id, '$nonce'"; ?>, 'scale')" class="button button-primary" value="<?php esc_attr_e( 'Scale' ); ?>" /></div>
 		</div>
 		</fieldset>
 
@@ -235,7 +235,7 @@ function wp_image_editor( $post_id, $msg = false ) {
 		<input type="hidden" id="imgedit-y-<?php echo $post_id; ?>" value="<?php echo isset( $meta['height'] ) ? $meta['height'] : 0; ?>" />
 
 		<div id="imgedit-crop-<?php echo $post_id; ?>" class="imgedit-crop-wrap">
-		<img id="image-preview-<?php echo $post_id; ?>" onload="imageEdit.imgLoaded('<?php echo $post_id; ?>')" src="<?php echo admin_url( 'admin-ajax.php', 'relative' ); ?>?action=imgedit-preview&amp;_ajax_nonce=<?php echo $nonce; ?>&amp;postid=<?php echo $post_id; ?>&amp;rand=<?php echo rand( 1, 99999 ); ?>" alt="" />
+		<img id="image-preview-<?php echo $post_id; ?>"  src="<?php echo admin_url( 'admin-ajax.php', 'relative' ); ?>?action=imgedit-preview&amp;_ajax_nonce=<?php echo $nonce; ?>&amp;postid=<?php echo $post_id; ?>&amp;rand=<?php echo rand( 1, 99999 ); ?>" alt="" />
 		</div>
 
 		<div class="imgedit-submit">
diff --git a/src/wp-admin/includes/media.php b/src/wp-admin/includes/media.php
index 61c4dac627..6987acb166 100644
--- a/src/wp-admin/includes/media.php
+++ b/src/wp-admin/includes/media.php
@@ -3207,7 +3207,7 @@ function edit_form_image_editor( $post ) {
 
 	?>
 
-	<label for="attachment_content"><strong><?php _e( 'Description' ); ?></strong>
+	<label for="attachment_content" class="attachment-content-description"><strong><?php _e( 'Description' ); ?></strong>
 	<?php
 
 	if ( preg_match( '#^(audio|video)/#', $post->post_mime_type ) ) {
diff --git a/src/wp-includes/css/editor.css b/src/wp-includes/css/editor.css
index f3e410449f..835407360a 100644
--- a/src/wp-includes/css/editor.css
+++ b/src/wp-includes/css/editor.css
@@ -1322,7 +1322,7 @@ i.mce-i-wp_code:before {
 	.wp-core-ui .quicktags-toolbar input.button.button-small {
 		/* .button-small is normally 11px, but a bit too small for these buttons. */
 		font-size: 12px;
-		height: 26px;
+		min-height: 26px;
 		line-height: 2;
 	}
 }