Index: src/wp-admin/upload.php
===================================================================
--- src/wp-admin/upload.php	(revision 37896)
+++ src/wp-admin/upload.php	(working copy)
@@ -73,20 +73,16 @@
 	require_once( ABSPATH . 'wp-admin/admin-header.php' );
 	?>
 	<div class="wrap" id="wp-media-grid" data-search="<?php _admin_search_query() ?>">
-		<h1>
-		<?php
-		echo esc_html( $title );
-		if ( current_user_can( 'upload_files' ) ) { ?>
-			<a href="<?php echo admin_url( 'media-new.php' ); ?>" class="page-title-action"><?php echo esc_html_x( 'Add New', 'file' ); ?></a><?php
-		}
-		?>
-		</h1>
+		<h2>
+			<?php
+			echo esc_html( $title );
+			if ( current_user_can( 'upload_files' ) ) { ?>
+				<a href="media-new.php" class="upload-view-toggle page-title-action aria-button-if-js" aria-expanded="false"><?php echo esc_html_x( 'Add New', 'file' ); ?></a><?php
+			}
+			?>
+		</h2>
 		<div class="error hide-if-js">
-			<p><?php printf(
-				/* translators: %s: list view URL */
-				__( 'The grid view for the Media Library requires JavaScript. <a href="%s">Switch to the list view</a>.' ),
-				'upload.php?mode=list'
-			); ?></p>
+			<p><?php _e( 'The grid view for the Media Library requires JavaScript. <a href="upload.php?mode=list">Switch to the list view</a>.' ); ?></p>
 		</div>
 	</div>
 	<?php