diff --git a/src/wp-admin/css/media.css b/src/wp-admin/css/media.css
index 5621117711..03ce1f816d 100644
--- a/src/wp-admin/css/media.css
+++ b/src/wp-admin/css/media.css
@@ -697,6 +697,7 @@ audio, video {
 
 .mejs-container {
 	width: 100%;
+	max-width: 100%;
 }
 
 /* =Media Queries
diff --git a/src/wp-includes/css/media-views.css b/src/wp-includes/css/media-views.css
index de769b6057..be3179adf3 100644
--- a/src/wp-includes/css/media-views.css
+++ b/src/wp-includes/css/media-views.css
@@ -1577,6 +1577,11 @@ video#inline-media-node {
 	word-wrap: break-word;
 }
 
+.edit-attachment-frame .attachment-info .filename {
+	font-weight: normal;
+	color: #666;
+}
+
 .attachment-info .thumbnail {
 	position: relative;
 	float: left;
@@ -1587,6 +1592,10 @@ video#inline-media-node {
 	margin-bottom: 5px;
 }
 
+.edit-attachment-frame .attachment-info .thumbnail {
+	margin-bottom: 12px;
+}
+
 .uploading .attachment-info .thumbnail {
 	width: 120px;
 	height: 80px;
@@ -2766,7 +2775,7 @@ video#inline-media-node {
 }
 
 .edit-attachment-frame .wp-media-wrapper {
-	margin-top: 20px;
+	margin-bottom: 12px;
 }
 
 .edit-attachment-frame .attachment-fields {
diff --git a/src/wp-includes/media-template.php b/src/wp-includes/media-template.php
index e730d4ab7c..4dda581d26 100644
--- a/src/wp-includes/media-template.php
+++ b/src/wp-includes/media-template.php
@@ -277,39 +277,10 @@ function wp_print_media_templates() {
 					<div class="media-progress-bar"><div></div></div>
 				<# } else if ( 'image' === data.type ) { #>
 					<img src="{{ data.sizes.full.url }}" draggable="false" />
-				<# } else { #>
+				<# } else if ( -1 === jQuery.inArray( data.type, [ 'audio', 'video' ] ) ) { #>
 					<img src="{{ data.icon }}" class="icon" draggable="false" />
 				<# } #>
 			</div>
-			<div class="details">
-				<div class="filename">{{ data.filename }}</div>
-				<div class="uploaded">{{ data.dateFormatted }}</div>
-
-				<div class="file-size">{{ data.filesizeHumanReadable }}</div>
-				<# if ( 'image' === data.type && ! data.uploading ) { #>
-					<# if ( data.width && data.height ) { #>
-						<div class="dimensions">{{ data.width }} &times; {{ data.height }}</div>
-					<# } #>
-				<# } #>
-
-				<# if ( data.fileLength ) { #>
-					<div class="file-length"><?php _e( 'Length:' ); ?> {{ data.fileLength }}</div>
-				<# } #>
-
-				<# if ( ! data.uploading && data.can.remove ) { #>
-					<?php if ( MEDIA_TRASH ): ?>
-						<a class="trash-attachment" href="#"><?php _e( 'Trash' ); ?></a>
-					<?php else: ?>
-						<a class="delete-attachment" href="#"><?php _e( 'Delete Permanently' ); ?></a>
-					<?php endif; ?>
-				<# } #>
-
-				<div class="compat-meta">
-					<# if ( data.compat && data.compat.meta ) { #>
-						{{{ data.compat.meta }}}
-					<# } #>
-				</div>
-			</div>
 			<# if ( 'audio' === data.type ) { #>
 			<div class="wp-media-wrapper">
 				<audio style="visibility: hidden" controls class="wp-audio-shortcode" width="100%" preload="none">
@@ -325,6 +296,36 @@ function wp_print_media_templates() {
 				</video>
 			</div>
 			<# } #>
+			<div class="details">
+				<div class="filename"><strong><?php _e( 'File name:' ); ?></strong> {{ data.filename }}</div>
+				<div class="filename"><strong><?php _e( 'File type:' ); ?></strong> {{ data.mime }}</div>
+				<div class="uploaded"><strong><?php _e( 'Uploaded on:' ); ?></strong> {{ data.dateFormatted }}</div>
+
+				<div class="file-size"><strong><?php _e( 'File size:' ); ?></strong> {{ data.filesizeHumanReadable }}</div>
+				<# if ( 'image' === data.type && ! data.uploading ) { #>
+					<# if ( data.width && data.height ) { #>
+						<div class="dimensions"><strong><?php _e( 'Dimensions:' ); ?></strong> {{ data.width }} &times; {{ data.height }}</div>
+					<# } #>
+				<# } #>
+
+				<# if ( data.fileLength ) { #>
+					<div class="file-length"><strong><?php _e( 'Length:' ); ?></strong> {{ data.fileLength }}</div>
+				<# } #>
+
+				<# if ( ! data.uploading && data.can.remove ) { #>
+					<?php if ( MEDIA_TRASH ): ?>
+						<a class="trash-attachment" href="#"><?php _e( 'Trash' ); ?></a>
+					<?php else: ?>
+						<a class="delete-attachment" href="#"><?php _e( 'Delete Permanently' ); ?></a>
+					<?php endif; ?>
+				<# } #>
+
+				<div class="compat-meta">
+					<# if ( data.compat && data.compat.meta ) { #>
+						{{{ data.compat.meta }}}
+					<# } #>
+				</div>
+			</div>
 		</div>
 		<div class="attachment-fields">
 			<label class="setting" data-setting="url">