diff --git a/wp-includes/css/media-views.css b/wp-includes/css/media-views.css
index 06b8535639..c08dfbc1b9 100644
--- a/wp-includes/css/media-views.css
+++ b/wp-includes/css/media-views.css
@@ -442,15 +442,16 @@
 	width: 70%;
 	margin: 10px auto;
 	padding: 2px;
-	border: 2px solid #dfdfdf;
+	border: 2px solid #ccc;
 	border-radius: 8px;
+	background: #fff;
 }
 
 .media-progress-bar div {
 	height: 8px;
 	min-width: 8px;
 	width: 0;
-	background: #dfdfdf;
+	background: #ccc;
 	border-radius: 10px;
 	-webkit-transition: width 200ms;
 	-moz-transition:    width 200ms;
diff --git a/wp-includes/media.php b/wp-includes/media.php
index 491ab76bb6..40c5e1a27f 100644
--- a/wp-includes/media.php
+++ b/wp-includes/media.php
@@ -1329,13 +1329,13 @@ function wp_print_media_templates( $attachment ) {
 
 	<script type="text/html" id="tmpl-attachment">
 		<div class="attachment-preview type-<%- type %> subtype-<%- subtype %> <%- orientation %>">
-			<% if ( 'image' === type ) { %>
+			<% if ( uploading ) { %>
+				<div class="media-progress-bar"><div></div></div>
+			<% } else if ( 'image' === type ) { %>
 				<div class="thumbnail">
 					<img src="<%- url %>" width="<%- width %>" height="<%- height %>" draggable="false"
 					style="top:<%- top %>px; left:<%- left %>px;" />
 				</div>
-			<% } else if ( uploading ) { %>
-				<div class="media-progress-bar"><div></div></div>
 			<% } else { %>
 				<img src="<%- icon %>" class="icon" draggable="false" />
 				<div class="filename"><%- filename %></div>