diff --git a/src/wp-includes/css/media-views.css b/src/wp-includes/css/media-views.css
index 7c027067d0..2935f5c827 100644
--- a/src/wp-includes/css/media-views.css
+++ b/src/wp-includes/css/media-views.css
@@ -753,9 +753,9 @@
 .attachment-preview.type-audio .thumbnail,
 .attachment-preview.type-video .thumbnail {
 	z-index: 1;
-	margin: 5%;
-	max-width: 90%;
-	max-height: 90%;
+	margin: 1%;
+	max-width: 98%;
+	max-height: 98%;
 }
 
 .media-frame-content .attachment-preview.type-audio .icon,
diff --git a/src/wp-includes/media-template.php b/src/wp-includes/media-template.php
index 74f0d8f146..b41357185f 100644
--- a/src/wp-includes/media-template.php
+++ b/src/wp-includes/media-template.php
@@ -403,8 +403,9 @@ function wp_print_media_templates() {
 			<# } else {
 				if ( data.thumb && data.thumb.src && data.thumb.src !== data.icon ) {
 				#><img src="{{ data.thumb.src }}" class="thumbnail" draggable="false" /><#
+				} else {
+				#><img src="{{ data.icon }}" class="icon" draggable="false" /><#
 				} #>
-				<img src="{{ data.icon }}" class="icon" draggable="false" />
 				<div class="filename">
 					<div>{{ data.filename }}</div>
 				</div>