diff --git a/src/js/media/views/uploader/inline.js b/src/js/media/views/uploader/inline.js
index 636f50029e..57016aec49 100644
--- a/src/js/media/views/uploader/inline.js
+++ b/src/js/media/views/uploader/inline.js
@@ -106,21 +106,16 @@ UploaderInline = View.extend(/** @lends wp.media.view.UploaderInline.prototype *
 			$placeholder;
 
 		if ( this.controller.uploader ) {
-			$placeholder = this.$('.browser-container');
+			$placeholder = this.$('.browser');
 
 			// Check if we've already replaced the placeholder.
 			if ( $placeholder[0] === $browser[0] ) {
 				return;
 			}
 
-			var browserLabel = $placeholder.find( 'label' );
-			var browserInput = $placeholder.find( 'input' );
-
-			browserLabel.attr( 'for', $browser[0].id );
-			browserInput.attr( 'id', $browser[0].id );
-			$browser.removeAttr( 'id' );
-
-			$browser.append( browserLabel ).append( browserInput );
+			$browser.detach().text( $placeholder.text() );
+			$browser[0].className = $placeholder[0].className;
+			$browser[0].setAttribute( 'aria-labelledby', $browser[0].id + ' ' + $placeholder[0].getAttribute('aria-labelledby') );
 			$placeholder.replaceWith( $browser.show() );
 		}
 
diff --git a/src/js/media/views/uploader/window.js b/src/js/media/views/uploader/window.js
index 5e9f4ede57..84b158f7cc 100644
--- a/src/js/media/views/uploader/window.js
+++ b/src/js/media/views/uploader/window.js
@@ -27,7 +27,7 @@ UploaderWindow = wp.media.View.extend(/** @lends wp.media.view.UploaderWindow.pr
 	initialize: function() {
 		var uploader;
 
-		this.$browser = $( '<div class="browser-container">' ).hide().appendTo( 'body' );
+		this.$browser = $( '<button type="button" class="browser" />' ).hide().appendTo( 'body' );
 
 		uploader = this.options.uploader = _.defaults( this.options.uploader || {}, {
 			dropzone:  this.$el,
diff --git a/src/wp-admin/images/loading.gif b/src/wp-admin/images/loading.gif
index fdc589f809..7798e2146d 100644
Binary files a/src/wp-admin/images/loading.gif and b/src/wp-admin/images/loading.gif differ
diff --git a/src/wp-admin/images/media-button-image.gif b/src/wp-admin/images/media-button-image.gif
index 69efa7b484..f2ed1b6016 100644
Binary files a/src/wp-admin/images/media-button-image.gif and b/src/wp-admin/images/media-button-image.gif differ
diff --git a/src/wp-admin/images/media-button-video.gif b/src/wp-admin/images/media-button-video.gif
index 9b4a7963ea..0b8fb73b01 100644
Binary files a/src/wp-admin/images/media-button-video.gif and b/src/wp-admin/images/media-button-video.gif differ
diff --git a/src/wp-admin/images/resize-2x.gif b/src/wp-admin/images/resize-2x.gif
index e57f9bcd69..33cb6af2ee 100644
Binary files a/src/wp-admin/images/resize-2x.gif and b/src/wp-admin/images/resize-2x.gif differ
diff --git a/src/wp-admin/images/resize-rtl-2x.gif b/src/wp-admin/images/resize-rtl-2x.gif
index 483c23dcbe..c695627d3c 100644
Binary files a/src/wp-admin/images/resize-rtl-2x.gif and b/src/wp-admin/images/resize-rtl-2x.gif differ
diff --git a/src/wp-admin/images/resize-rtl.gif b/src/wp-admin/images/resize-rtl.gif
index 82502954e1..44345a54b6 100644
Binary files a/src/wp-admin/images/resize-rtl.gif and b/src/wp-admin/images/resize-rtl.gif differ
diff --git a/src/wp-admin/images/resize.gif b/src/wp-admin/images/resize.gif
index 5cb0939a68..cb8b9c91f6 100644
Binary files a/src/wp-admin/images/resize.gif and b/src/wp-admin/images/resize.gif differ
diff --git a/src/wp-admin/images/sort-2x.gif b/src/wp-admin/images/sort-2x.gif
index 941626c3ea..63eefb922f 100644
Binary files a/src/wp-admin/images/sort-2x.gif and b/src/wp-admin/images/sort-2x.gif differ
diff --git a/src/wp-admin/images/spinner-2x.gif b/src/wp-admin/images/spinner-2x.gif
index 26e28e1760..dcb5f9e559 100644
Binary files a/src/wp-admin/images/spinner-2x.gif and b/src/wp-admin/images/spinner-2x.gif differ
diff --git a/src/wp-admin/images/spinner.gif b/src/wp-admin/images/spinner.gif
index 88e8a9396f..fe6f79c1c5 100644
Binary files a/src/wp-admin/images/spinner.gif and b/src/wp-admin/images/spinner.gif differ
diff --git a/src/wp-admin/images/wpspin_light-2x.gif b/src/wp-admin/images/wpspin_light-2x.gif
index 08e47e8211..baacde979b 100644
Binary files a/src/wp-admin/images/wpspin_light-2x.gif and b/src/wp-admin/images/wpspin_light-2x.gif differ
diff --git a/src/wp-admin/images/wpspin_light.gif b/src/wp-admin/images/wpspin_light.gif
index fbf9be46c1..fd0f3d3c92 100644
Binary files a/src/wp-admin/images/wpspin_light.gif and b/src/wp-admin/images/wpspin_light.gif differ
diff --git a/src/wp-admin/includes/media.php b/src/wp-admin/includes/media.php
index 0d9bf1c607..b015836a8b 100644
--- a/src/wp-admin/includes/media.php
+++ b/src/wp-admin/includes/media.php
@@ -2246,7 +2246,7 @@ function media_upload_form( $errors = null ) {
 		<div class="drag-drop-inside">
 		<p class="drag-drop-info"><?php _e( 'Drop files to upload' ); ?></p>
 		<p><?php _ex( 'or', 'Uploader: Drop files here - or - Select Files' ); ?></p>
-		<p class="drag-drop-buttons"><label for="plupload-browse-button" id="plupload-browse-label" class="button button-hero"><?php esc_html_e( 'Select Files' ); ?></label><input id="plupload-browse-button" type="file" class="screen-reader-text" aria-labelledby="plupload-browse-label post-upload-info" /></p>
+		<p class="drag-drop-buttons"><input id="plupload-browse-button" type="button" value="<?php esc_attr_e( 'Select Files' ); ?>" class="button" /></p>
 		</div>
 	</div>
 	<?php
@@ -2288,7 +2288,7 @@ function media_upload_form( $errors = null ) {
 	?>
 	</div>
 
-<p class="max-upload-size" id="post-upload-info">
+<p class="max-upload-size">
 	<?php
 	/* translators: %s: Maximum allowed file size. */
 	printf( __( 'Maximum upload file size: %s.' ), esc_html( size_format( $max_upload_size ) ) );
diff --git a/src/wp-includes/css/buttons.css b/src/wp-includes/css/buttons.css
index 9fd8a7d645..6da6da51e0 100644
--- a/src/wp-includes/css/buttons.css
+++ b/src/wp-includes/css/buttons.css
@@ -133,9 +133,6 @@ TABLE OF CONTENTS:
 	color: #0a4b78;
 }
 
-/* Support focus state on label designed as button in media uploader. */
-.drag-drop-inside p.drag-drop-buttons:focus-within label.button,
-.uploader-inline-content div.browser-container:focus-within label.button,
 .wp-core-ui .button.focus,
 .wp-core-ui .button:focus,
 .wp-core-ui .button-secondary:focus {
diff --git a/src/wp-includes/images/smilies/icon_cry.gif b/src/wp-includes/images/smilies/icon_cry.gif
index b78b2b33fc..b674df4b57 100644
Binary files a/src/wp-includes/images/smilies/icon_cry.gif and b/src/wp-includes/images/smilies/icon_cry.gif differ
diff --git a/src/wp-includes/images/smilies/icon_lol.gif b/src/wp-includes/images/smilies/icon_lol.gif
index 83bcad32b5..a4c1345127 100644
Binary files a/src/wp-includes/images/smilies/icon_lol.gif and b/src/wp-includes/images/smilies/icon_lol.gif differ
diff --git a/src/wp-includes/images/smilies/icon_redface.gif b/src/wp-includes/images/smilies/icon_redface.gif
index c837b6276b..c69d895417 100644
Binary files a/src/wp-includes/images/smilies/icon_redface.gif and b/src/wp-includes/images/smilies/icon_redface.gif differ
diff --git a/src/wp-includes/images/spinner-2x.gif b/src/wp-includes/images/spinner-2x.gif
index 26e28e1760..dcb5f9e559 100644
Binary files a/src/wp-includes/images/spinner-2x.gif and b/src/wp-includes/images/spinner-2x.gif differ
diff --git a/src/wp-includes/images/spinner.gif b/src/wp-includes/images/spinner.gif
index 88e8a9396f..fe6f79c1c5 100644
Binary files a/src/wp-includes/images/spinner.gif and b/src/wp-includes/images/spinner.gif differ
diff --git a/src/wp-includes/images/w-logo-blue-white-bg.png b/src/wp-includes/images/w-logo-blue-white-bg.png
index 5a810177d6..4ed5a33390 100644
Binary files a/src/wp-includes/images/w-logo-blue-white-bg.png and b/src/wp-includes/images/w-logo-blue-white-bg.png differ
diff --git a/src/wp-includes/images/wpspin-2x.gif b/src/wp-includes/images/wpspin-2x.gif
index 08e47e8211..baacde979b 100644
Binary files a/src/wp-includes/images/wpspin-2x.gif and b/src/wp-includes/images/wpspin-2x.gif differ
diff --git a/src/wp-includes/images/wpspin.gif b/src/wp-includes/images/wpspin.gif
index fbf9be46c1..fd0f3d3c92 100644
Binary files a/src/wp-includes/images/wpspin.gif and b/src/wp-includes/images/wpspin.gif differ
diff --git a/src/wp-includes/media-template.php b/src/wp-includes/media-template.php
index 9efddc05ae..f89945d45b 100644
--- a/src/wp-includes/media-template.php
+++ b/src/wp-includes/media-template.php
@@ -252,10 +252,7 @@ function wp_print_media_templates() {
 			<div class="upload-ui">
 				<h2 class="upload-instructions drop-instructions"><?php _e( 'Drop files to upload' ); ?></h2>
 				<p class="upload-instructions drop-instructions"><?php _ex( 'or', 'Uploader: Drop files here - or - Select Files' ); ?></p>
-				<div class="browser-container">
-					<label class="button button-hero"><?php esc_html_e( 'Select Files' ); ?></label>
-					<input type="file" class="browser screen-reader-text" aria-describedby="post-upload-info">
-				</div>
+				<button type="button" class="browser button button-hero" aria-labelledby="post-upload-info"><?php _e( 'Select Files' ); ?></button>
 			</div>
 
 			<div class="upload-inline-status"></div>