Index: src/wp-includes/css/media-views.css
===================================================================
--- src/wp-includes/css/media-views.css	(revision 31049)
+++ src/wp-includes/css/media-views.css	(working copy)
@@ -230,14 +230,18 @@
 
 .media-toolbar-primary {
 	float: right;
-	height: 100%;
 	max-width: 33%;
 }
 
 .media-toolbar-secondary {
+    -webkit-box-sizing: border-box;
+    -moz-box-sizing: border-box;
+    box-sizing: border-box;
 	float: left;
-	height: 100%;
 	max-width: 66%;
+	/* reserve room for the spinner */
+	padding-right: 20px;
+	position: relative;
 }
 
 .media-toolbar-primary > .media-button,
@@ -736,10 +740,17 @@
  */
 .media-frame select.attachment-filters {
 	margin-top: 11px;
-	margin-right: 2%;
-	max-width: 47%;
+	margin-right: 10px;
+	margin-left: 0;
 }
 
+@media only screen and (max-width: 1120px) {
+	.media-frame select.attachment-filters {
+		margin-right: 2%;
+		max-width: 48%;
+	}
+}
+
 /**
  * Search
  */
@@ -752,6 +763,10 @@
 	-webkit-appearance: none;
 }
 
+.media-modal .media-frame .search {
+	height: 28px;
+}
+
 .media-toolbar-primary .search {
 	max-width: 100%;
 }
@@ -1491,21 +1506,21 @@
  * Spinner
  */
 .media-frame .spinner {
-	background: url(../images/spinner.gif) no-repeat;
-	-webkit-background-size: 20px 20px;
-	background-size: 20px 20px;
-	display: none;
-	opacity: 0.7;
-	filter: alpha(opacity=70);
-	width: 20px;
-	height: 20px;
+	float: none;
+	position: absolute;
+	right: 0;
+	top: 1px;
 	margin: 0;
 }
 
-.media-toolbar .spinner {
-	margin-top: 14px;
+.media-modal .spinner {
+	top: 15px;
 }
 
+.media-modal .settings-save-status .spinner {
+	top: -1px;
+}
+
 /**
  * Attachment Details
  */
@@ -1766,7 +1781,6 @@
 }
 
 .media-frame .embed-url .spinner {
-	position: absolute;
 	top: 32px;
 	right: 26px;
 }
@@ -2356,10 +2370,6 @@
 		height: auto;
 	}
 
-	.media-modal .attachments-browser .media-toolbar .spinner {
-		margin: 14px 8px 0;
-	}
-
 	/* Text inputs need to be 16px, or they force zooming on iOS */
 	.media-frame input[type="text"],
 	.media-frame input[type="password"],