Index: src/wp-admin/async-upload.php
===================================================================
--- src/wp-admin/async-upload.php	(revision 29314)
+++ src/wp-admin/async-upload.php	(working copy)
@@ -86,7 +86,7 @@
 
 $id = media_handle_upload( 'async-upload', $post_id );
 if ( is_wp_error($id) ) {
-	echo '<div class="error-div">
+	echo '<div class="error-div error">
 	<a class="dismiss" href="#" onclick="jQuery(this).parents(\'div.media-item\').slideUp(200, function(){jQuery(this).remove();});">' . __('Dismiss') . '</a>
 	<strong>' . sprintf(__('&#8220;%s&#8221; has failed to upload due to an error'), esc_html($_FILES['async-upload']['name']) ) . '</strong><br />' .
 	esc_html($id->get_error_message()) . '</div>';
Index: src/wp-admin/css/common.css
===================================================================
--- src/wp-admin/css/common.css	(revision 29314)
+++ src/wp-admin/css/common.css	(working copy)
@@ -559,8 +559,8 @@
 
 .wrap div.updated,
 .wrap div.error,
-.media-upload-form div.error {
-	margin: 5px 0 15px;
+.media-upload-form .error-div {
+	margin: 5px 0 2px;
 }
 
 div.updated {
Index: src/wp-admin/css/media.css
===================================================================
--- src/wp-admin/css/media.css	(revision 29314)
+++ src/wp-admin/css/media.css	(working copy)
@@ -122,6 +122,12 @@
 	background: #fff;
 }
 
+#media-items .media-item.error {
+	width: auto;
+	min-height: 0;
+	border-bottom: none;
+}
+
 .media-new-php #media-items {
 	margin: 1em 0;
 }
@@ -136,10 +142,6 @@
 	margin-left: 6px;
 }
 
-.media-item .error-div {
-	padding-left: 10px;
-}
-
 .media-item .pinkynail {
 	float: left;
 	margin: 2px 10px 0 3px;
@@ -208,22 +210,15 @@
 	display: block;
 }
 
-.media-upload-form .media-item.error {
-	margin: 0;
-	padding: 0;
+.media-item .error-div.error {
+	margin-bottom: 0;
+	padding: 10px 10px 10px 14px;
 }
 
-.media-upload-form .media-item.error p,
-.media-item .error-div {
-	line-height: 16px;
-	margin: 5px 10px;
-	padding: 0;
-}
-
 .media-item .error-div a.dismiss {
 	display: block;
 	float: right;
-	margin: 5px 4px 0 15px;
+	margin: 0 5px 0 15px;
 }
 
 /*------------------------------------------------------------------------------