From e59592f87e062c74857a741ef0aa08e409b1abda Mon Sep 17 00:00:00 2001
From: Konstantin Obenland <obenland@git.wordpress.org>
Date: Sat, 27 Jun 2015 15:40:27 +0000
Subject: [PATCH] Proper heading for admin screens.

First step towards restoring a good heading structure in wp-admin.
The previous `<h1>` contained the site title and a link to the front page and was removed with the toolbar refactoring in 3.2.

Props joedolson, afercia.
Fixes #31650.



git-svn-id: https://develop.svn.wordpress.org/trunk@32974 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-admin/comment.php                          |  2 +-
 src/wp-admin/css/common.css                       |  3 +++
 src/wp-admin/custom-background.php                |  2 +-
 src/wp-admin/custom-header.php                    |  4 ++--
 src/wp-admin/edit-comments.php                    |  4 ++--
 src/wp-admin/edit-form-advanced.php               |  4 ++--
 src/wp-admin/edit-form-comment.php                |  2 +-
 src/wp-admin/edit-link-form.php                   |  2 +-
 src/wp-admin/edit-tag-form.php                    |  2 +-
 src/wp-admin/edit-tags.php                        |  4 ++--
 src/wp-admin/edit.php                             |  4 ++--
 src/wp-admin/export.php                           |  2 +-
 src/wp-admin/import.php                           |  2 +-
 src/wp-admin/includes/class-wp-upgrader-skins.php |  2 +-
 src/wp-admin/index.php                            |  2 +-
 src/wp-admin/js/common.js                         |  8 +++++++-
 src/wp-admin/js/theme.js                          |  2 +-
 src/wp-admin/link-manager.php                     |  4 ++--
 src/wp-admin/media-new.php                        |  2 +-
 src/wp-admin/media.php                            |  4 ++--
 src/wp-admin/ms-delete-site.php                   |  2 +-
 src/wp-admin/my-sites.php                         |  2 +-
 src/wp-admin/nav-menus.php                        |  4 ++--
 src/wp-admin/network.php                          |  2 +-
 src/wp-admin/network/index.php                    |  2 +-
 src/wp-admin/network/settings.php                 |  2 +-
 src/wp-admin/network/site-info.php                |  2 +-
 src/wp-admin/network/site-new.php                 |  2 +-
 src/wp-admin/network/site-settings.php            |  2 +-
 src/wp-admin/network/site-themes.php              |  2 +-
 src/wp-admin/network/site-users.php               |  2 +-
 src/wp-admin/network/sites.php                    |  6 +++---
 src/wp-admin/network/themes.php                   | 10 +++++-----
 src/wp-admin/network/upgrade.php                  |  2 +-
 src/wp-admin/network/user-new.php                 |  2 +-
 src/wp-admin/network/users.php                    |  6 +++---
 src/wp-admin/options-discussion.php               |  2 +-
 src/wp-admin/options-general.php                  |  2 +-
 src/wp-admin/options-media.php                    |  2 +-
 src/wp-admin/options-permalink.php                |  2 +-
 src/wp-admin/options-reading.php                  |  2 +-
 src/wp-admin/options-writing.php                  |  2 +-
 src/wp-admin/options.php                          |  2 +-
 src/wp-admin/plugin-editor.php                    |  4 ++--
 src/wp-admin/plugin-install.php                   |  4 ++--
 src/wp-admin/plugins.php                          | 10 +++++-----
 src/wp-admin/revision.php                         |  4 ++--
 src/wp-admin/theme-editor.php                     |  2 +-
 src/wp-admin/theme-install.php                    |  4 ++--
 src/wp-admin/themes.php                           |  4 ++--
 src/wp-admin/tools.php                            |  2 +-
 src/wp-admin/update-core.php                      |  8 ++++----
 src/wp-admin/upload.php                           |  8 ++++----
 src/wp-admin/user-edit.php                        |  4 ++--
 src/wp-admin/user-new.php                         |  4 ++--
 src/wp-admin/users.php                            |  8 ++++----
 src/wp-admin/widgets.php                          |  6 +++---
 57 files changed, 103 insertions(+), 94 deletions(-)

diff --git a/src/wp-admin/comment.php b/src/wp-admin/comment.php
index 0630c07474..4c71f3422f 100644
--- a/src/wp-admin/comment.php
+++ b/src/wp-admin/comment.php
@@ -117,7 +117,7 @@ case 'spam'    :
 ?>
 <div class="wrap">
 
-<h2><?php echo esc_html( $title ); ?></h2>
+<h1><?php echo esc_html( $title ); ?></h1>
 
 <?php
 switch ( $action ) {
diff --git a/src/wp-admin/css/common.css b/src/wp-admin/css/common.css
index 540be3c51e..c260c03dd9 100644
--- a/src/wp-admin/css/common.css
+++ b/src/wp-admin/css/common.css
@@ -328,6 +328,7 @@ h1 {
 	margin: .67em 0;
 }
 
+.wrap > h1,
 h2 {
 	color: #23282d;
 	font-size: 1.5em;
@@ -564,12 +565,14 @@ code {
 	color: #00a0d2;
 }
 
+.wrap h1,
 .wrap h2,
 .subtitle {
 	font-weight: normal;
 	margin: 0;
 }
 
+.wrap h1,
 .wrap h2 {
 	font-size: 23px;
 	font-weight: 400;
diff --git a/src/wp-admin/custom-background.php b/src/wp-admin/custom-background.php
index 61a700af5e..36a5b504fa 100644
--- a/src/wp-admin/custom-background.php
+++ b/src/wp-admin/custom-background.php
@@ -176,7 +176,7 @@ class Custom_Background {
 	public function admin_page() {
 ?>
 <div class="wrap" id="custom-background">
-<h2><?php _e( 'Custom Background' ); ?></h2>
+<h1><?php _e( 'Custom Background' ); ?></h1>
 
 <?php if ( current_user_can( 'customize' ) ) { ?>
 <div class="notice notice-info hide-if-no-customize">
diff --git a/src/wp-admin/custom-header.php b/src/wp-admin/custom-header.php
index 966d356639..4aeb8053c3 100644
--- a/src/wp-admin/custom-header.php
+++ b/src/wp-admin/custom-header.php
@@ -446,7 +446,7 @@ class Custom_Image_Header {
 ?>
 
 <div class="wrap">
-<h2><?php _e( 'Custom Header' ); ?></h2>
+<h1><?php _e( 'Custom Header' ); ?></h1>
 
 <?php if ( current_user_can( 'customize' ) ) { ?>
 <div class="notice notice-info hide-if-no-customize">
@@ -754,7 +754,7 @@ wp_nonce_field( 'custom-header-options', '_wpnonce-custom-header-options' ); ?>
 		?>
 
 <div class="wrap">
-<h2><?php _e( 'Crop Header Image' ); ?></h2>
+<h1><?php _e( 'Crop Header Image' ); ?></h1>
 
 <form method="post" action="<?php echo esc_url(add_query_arg('step', 3)); ?>">
 	<p class="hide-if-no-js"><?php _e('Choose the part of the image you want to use as your header.'); ?></p>
diff --git a/src/wp-admin/edit-comments.php b/src/wp-admin/edit-comments.php
index e7cd83585c..057b0a5d6c 100644
--- a/src/wp-admin/edit-comments.php
+++ b/src/wp-admin/edit-comments.php
@@ -140,7 +140,7 @@ require_once( ABSPATH . 'wp-admin/admin-header.php' );
 ?>
 
 <div class="wrap">
-<h2><?php
+<h1><?php
 if ( $post_id )
 	echo sprintf( __( 'Comments on &#8220;%s&#8221;' ),
 		sprintf( '<a href="%s">%s</a>',
@@ -153,7 +153,7 @@ else
 
 if ( isset($_REQUEST['s']) && $_REQUEST['s'] )
 	echo '<span class="subtitle">' . sprintf( __( 'Search results for &#8220;%s&#8221;' ), wp_html_excerpt( esc_html( wp_unslash( $_REQUEST['s'] ) ), 50, '&hellip;' ) ) . '</span>'; ?>
-</h2>
+</h1>
 
 <?php
 if ( isset( $_REQUEST['error'] ) ) {
diff --git a/src/wp-admin/edit-form-advanced.php b/src/wp-admin/edit-form-advanced.php
index c93112b49a..38b2cc70f5 100644
--- a/src/wp-admin/edit-form-advanced.php
+++ b/src/wp-admin/edit-form-advanced.php
@@ -414,11 +414,11 @@ require_once( ABSPATH . 'wp-admin/admin-header.php' );
 ?>
 
 <div class="wrap">
-<h2><?php
+<h1><?php
 echo esc_html( $title );
 if ( isset( $post_new_file ) && current_user_can( $post_type_object->cap->create_posts ) )
 	echo ' <a href="' . esc_url( admin_url( $post_new_file ) ) . '" class="add-new-h2">' . esc_html( $post_type_object->labels->add_new ) . '</a>';
-?></h2>
+?></h1>
 <?php if ( $notice ) : ?>
 <div id="notice" class="notice notice-warning"><p id="has-newer-autosave"><?php echo $notice ?></p></div>
 <?php endif; ?>
diff --git a/src/wp-admin/edit-form-comment.php b/src/wp-admin/edit-form-comment.php
index 2c91673b66..ce644c12ac 100644
--- a/src/wp-admin/edit-form-comment.php
+++ b/src/wp-admin/edit-form-comment.php
@@ -13,7 +13,7 @@ if ( !defined('ABSPATH') )
 <form name="post" action="comment.php" method="post" id="post">
 <?php wp_nonce_field('update-comment_' . $comment->comment_ID) ?>
 <div class="wrap">
-<h2><?php _e('Edit Comment'); ?></h2>
+<h1><?php _e( 'Edit Comment' ); ?></h1>
 
 <div id="poststuff">
 <input type="hidden" name="action" value="editedcomment" />
diff --git a/src/wp-admin/edit-link-form.php b/src/wp-admin/edit-link-form.php
index f326689dad..fe0b94d22d 100644
--- a/src/wp-admin/edit-link-form.php
+++ b/src/wp-admin/edit-link-form.php
@@ -70,7 +70,7 @@ require_once( ABSPATH . 'wp-admin/admin-header.php' );
 ?>
 
 <div class="wrap">
-<h2><?php echo esc_html( $title ); ?>  <a href="link-add.php" class="add-new-h2"><?php echo esc_html_x('Add New', 'link'); ?></a></h2>
+<h1><?php echo esc_html( $title ); ?>  <a href="link-add.php" class="add-new-h2"><?php echo esc_html_x('Add New', 'link'); ?></a></h1>
 
 <?php if ( isset( $_GET['added'] ) ) : ?>
 <div id="message" class="updated notice is-dismissible"><p><?php _e('Link added.'); ?></p></div>
diff --git a/src/wp-admin/edit-tag-form.php b/src/wp-admin/edit-tag-form.php
index 7e2d937785..ac5aafbf8f 100644
--- a/src/wp-admin/edit-tag-form.php
+++ b/src/wp-admin/edit-tag-form.php
@@ -62,7 +62,7 @@ if ( 'category' == $taxonomy ) {
 do_action( "{$taxonomy}_pre_edit_form", $tag, $taxonomy ); ?>
 
 <div class="wrap">
-<h2><?php echo $tax->labels->edit_item; ?></h2>
+<h1><?php echo $tax->labels->edit_item; ?></h1>
 <div id="ajax-response"></div>
 <form name="edittag" id="edittag" method="post" action="edit-tags.php" class="validate"
 <?php
diff --git a/src/wp-admin/edit-tags.php b/src/wp-admin/edit-tags.php
index 327493f475..db8319cdd4 100644
--- a/src/wp-admin/edit-tags.php
+++ b/src/wp-admin/edit-tags.php
@@ -312,10 +312,10 @@ if ( is_plugin_active( 'wpcat2tag-importer/wpcat2tag-importer.php' ) ) {
 ?>
 
 <div class="wrap nosubsub">
-<h2><?php echo esc_html( $title );
+<h1><?php echo esc_html( $title );
 if ( !empty($_REQUEST['s']) )
 	printf( '<span class="subtitle">' . __('Search results for &#8220;%s&#8221;') . '</span>', esc_html( wp_unslash($_REQUEST['s']) ) ); ?>
-</h2>
+</h1>
 
 <?php if ( $message ) : ?>
 <div id="message" class="<?php echo $class; ?> notice is-dismissible"><p><?php echo $message; ?></p></div>
diff --git a/src/wp-admin/edit.php b/src/wp-admin/edit.php
index cc3c8dc32c..e1dda8418c 100644
--- a/src/wp-admin/edit.php
+++ b/src/wp-admin/edit.php
@@ -283,13 +283,13 @@ $bulk_counts = array_filter( $bulk_counts );
 require_once( ABSPATH . 'wp-admin/admin-header.php' );
 ?>
 <div class="wrap">
-<h2><?php
+<h1><?php
 echo esc_html( $post_type_object->labels->name );
 if ( current_user_can( $post_type_object->cap->create_posts ) )
 	echo ' <a href="' . esc_url( admin_url( $post_new_file ) ) . '" class="add-new-h2">' . esc_html( $post_type_object->labels->add_new ) . '</a>';
 if ( ! empty( $_REQUEST['s'] ) )
 	printf( ' <span class="subtitle">' . __('Search results for &#8220;%s&#8221;') . '</span>', get_search_query() );
-?></h2>
+?></h1>
 
 <?php
 // If we have a bulk message to issue:
diff --git a/src/wp-admin/export.php b/src/wp-admin/export.php
index daba6e360e..ce5081baa9 100644
--- a/src/wp-admin/export.php
+++ b/src/wp-admin/export.php
@@ -143,7 +143,7 @@ function export_date_options( $post_type = 'post' ) {
 ?>
 
 <div class="wrap">
-<h2><?php echo esc_html( $title ); ?></h2>
+<h1><?php echo esc_html( $title ); ?></h1>
 
 <p><?php _e('When you click the button below WordPress will create an XML file for you to save to your computer.'); ?></p>
 <p><?php _e('This format, which we call WordPress eXtended RSS or WXR, will contain your posts, pages, comments, custom fields, categories, and tags.'); ?></p>
diff --git a/src/wp-admin/import.php b/src/wp-admin/import.php
index 0f427760b4..e7dce2df13 100644
--- a/src/wp-admin/import.php
+++ b/src/wp-admin/import.php
@@ -52,7 +52,7 @@ $parent_file = 'tools.php';
 ?>
 
 <div class="wrap">
-<h2><?php echo esc_html( $title ); ?></h2>
+<h1><?php echo esc_html( $title ); ?></h1>
 <?php if ( ! empty( $_GET['invalid'] ) ) : ?>
 	<div class="error"><p><strong><?php _e('ERROR:')?></strong> <?php printf( __('The <strong>%s</strong> importer is invalid or is not installed.'), esc_html( $_GET['invalid'] ) ); ?></p></div>
 <?php endif; ?>
diff --git a/src/wp-admin/includes/class-wp-upgrader-skins.php b/src/wp-admin/includes/class-wp-upgrader-skins.php
index bb7325e420..b0cd3c15ad 100644
--- a/src/wp-admin/includes/class-wp-upgrader-skins.php
+++ b/src/wp-admin/includes/class-wp-upgrader-skins.php
@@ -84,7 +84,7 @@ class WP_Upgrader_Skin {
 		}
 		$this->done_header = true;
 		echo '<div class="wrap">';
-		echo '<h2>' . $this->options['title'] . '</h2>';
+		echo '<h1>' . $this->options['title'] . '</h1>';
 	}
 
 	/**
diff --git a/src/wp-admin/index.php b/src/wp-admin/index.php
index 40c7c7f2a1..9143928984 100644
--- a/src/wp-admin/index.php
+++ b/src/wp-admin/index.php
@@ -93,7 +93,7 @@ include( ABSPATH . 'wp-admin/admin-header.php' );
 ?>
 
 <div class="wrap">
-	<h2><?php echo esc_html( $title ); ?></h2>
+	<h1><?php echo esc_html( $title ); ?></h1>
 
 <?php if ( has_action( 'welcome_panel' ) && current_user_can( 'edit_theme_options' ) ) :
 	$classes = 'welcome-panel';
diff --git a/src/wp-admin/js/common.js b/src/wp-admin/js/common.js
index f6d18da10a..6366fdc8d3 100644
--- a/src/wp-admin/js/common.js
+++ b/src/wp-admin/js/common.js
@@ -370,7 +370,13 @@ $(document).ready( function() {
 	}
 
 	// Move .notice, .updated and .error alert boxes. Don't move boxes designed to be inline.
-	$firstHeading = $( 'div.wrap h2:first' );
+	$firstHeading = $( '.wrap > h1:first' );
+
+	// Back compatibility: if there is no H1, apply to first H2.
+	if ( ! $firstHeading.length ) {
+		$firstHeading = $( '.wrap h2:first' );
+	}
+
 	$firstHeading.nextAll( 'div.updated, div.error, div.notice' ).addClass( 'below-h2' );
 	$( 'div.updated, div.error, div.notice' ).not( '.below-h2, .inline' ).insertAfter( $firstHeading );
 
diff --git a/src/wp-admin/js/theme.js b/src/wp-admin/js/theme.js
index 2cf5f770ad..c307636a37 100644
--- a/src/wp-admin/js/theme.js
+++ b/src/wp-admin/js/theme.js
@@ -84,7 +84,7 @@ themes.view.Appearance = wp.Backbone.View.extend({
 	},
 
 	// Defines search element container
-	searchContainer: $( '#wpbody h2:first' ),
+	searchContainer: $( '#wpbody h1:first' ),
 
 	// Search input and view
 	// for current theme collection
diff --git a/src/wp-admin/link-manager.php b/src/wp-admin/link-manager.php
index 9313f37508..7c26d5357d 100644
--- a/src/wp-admin/link-manager.php
+++ b/src/wp-admin/link-manager.php
@@ -69,10 +69,10 @@ if ( ! current_user_can('manage_links') )
 ?>
 
 <div class="wrap nosubsub">
-<h2><?php echo esc_html( $title ); ?> <a href="link-add.php" class="add-new-h2"><?php echo esc_html_x('Add New', 'link'); ?></a> <?php
+<h1><?php echo esc_html( $title ); ?> <a href="link-add.php" class="add-new-h2"><?php echo esc_html_x('Add New', 'link'); ?></a> <?php
 if ( !empty($_REQUEST['s']) )
 	printf( '<span class="subtitle">' . __('Search results for &#8220;%s&#8221;') . '</span>', esc_html( wp_unslash($_REQUEST['s']) ) ); ?>
-</h2>
+</h1>
 
 <?php
 if ( isset($_REQUEST['deleted']) ) {
diff --git a/src/wp-admin/media-new.php b/src/wp-admin/media-new.php
index f68a4eef2d..c8263d8ac9 100644
--- a/src/wp-admin/media-new.php
+++ b/src/wp-admin/media-new.php
@@ -65,7 +65,7 @@ if ( get_user_setting('uploader') || isset( $_GET['browser-uploader'] ) )
 	$form_class .= ' html-uploader';
 ?>
 <div class="wrap">
-	<h2><?php echo esc_html( $title ); ?></h2>
+	<h1><?php echo esc_html( $title ); ?></h1>
 
 	<form enctype="multipart/form-data" method="post" action="<?php echo admin_url('media-new.php'); ?>" class="<?php echo esc_attr( $form_class ); ?>" id="file-form">
 
diff --git a/src/wp-admin/media.php b/src/wp-admin/media.php
index 62b2401be4..76587cafdb 100644
--- a/src/wp-admin/media.php
+++ b/src/wp-admin/media.php
@@ -103,13 +103,13 @@ case 'edit' :
 ?>
 
 <div class="wrap">
-<h2>
+<h1>
 <?php
 echo esc_html( $title );
 if ( current_user_can( 'upload_files' ) ) { ?>
 	<a href="media-new.php" class="add-new-h2"><?php echo esc_html_x('Add New', 'file'); ?></a>
 <?php } ?>
-</h2>
+</h1>
 
 <form method="post" class="media-upload-form" id="media-single-form">
 <p class="submit" style="padding-bottom: 0;">
diff --git a/src/wp-admin/ms-delete-site.php b/src/wp-admin/ms-delete-site.php
index 07d87e2066..71ad38ffc4 100644
--- a/src/wp-admin/ms-delete-site.php
+++ b/src/wp-admin/ms-delete-site.php
@@ -32,7 +32,7 @@ $parent_file = 'tools.php';
 require_once( ABSPATH . 'wp-admin/admin-header.php' );
 
 echo '<div class="wrap">';
-echo '<h2>' . esc_html( $title ) . '</h2>';
+echo '<h1>' . esc_html( $title ) . '</h1>';
 
 if ( isset( $_POST['action'] ) && $_POST['action'] == 'deleteblog' && isset( $_POST['confirmdelete'] ) && $_POST['confirmdelete'] == '1' ) {
 	check_admin_referer( 'delete-blog' );
diff --git a/src/wp-admin/my-sites.php b/src/wp-admin/my-sites.php
index 269b081166..011634fa7b 100644
--- a/src/wp-admin/my-sites.php
+++ b/src/wp-admin/my-sites.php
@@ -56,7 +56,7 @@ if ( $updated ) { ?>
 <?php } ?>
 
 <div class="wrap">
-<h2><?php echo esc_html( $title ); ?></h2>
+<h1><?php echo esc_html( $title ); ?></h1>
 <?php
 if ( empty( $blogs ) ) :
 	echo '<p>';
diff --git a/src/wp-admin/nav-menus.php b/src/wp-admin/nav-menus.php
index bc2d374a27..8a3511b359 100644
--- a/src/wp-admin/nav-menus.php
+++ b/src/wp-admin/nav-menus.php
@@ -558,12 +558,12 @@ get_current_screen()->set_help_sidebar(
 require_once( ABSPATH . 'wp-admin/admin-header.php' );
 ?>
 <div class="wrap">
-	<h2 class="nav-tab-wrapper">
+	<h1 class="nav-tab-wrapper">
 		<a href="<?php echo admin_url( 'nav-menus.php' ); ?>" class="nav-tab<?php if ( ! isset( $_GET['action'] ) || isset( $_GET['action'] ) && 'locations' != $_GET['action'] ) echo ' nav-tab-active'; ?>"><?php esc_html_e( 'Edit Menus' ); ?></a>
 		<?php if ( $num_locations && $menu_count ) : ?>
 			<a href="<?php echo esc_url( add_query_arg( array( 'action' => 'locations' ), admin_url( 'nav-menus.php' ) ) ); ?>" class="nav-tab<?php if ( $locations_screen ) echo ' nav-tab-active'; ?>"><?php esc_html_e( 'Manage Locations' ); ?></a>
 		<?php endif; ?>
-	</h2>
+	</h1>
 	<?php
 	foreach( $messages as $message ) :
 		echo $message . "\n";
diff --git a/src/wp-admin/network.php b/src/wp-admin/network.php
index 0017815969..ae3515105a 100644
--- a/src/wp-admin/network.php
+++ b/src/wp-admin/network.php
@@ -145,7 +145,7 @@ get_current_screen()->set_help_sidebar(
 include( ABSPATH . 'wp-admin/admin-header.php' );
 ?>
 <div class="wrap">
-<h2><?php echo esc_html( $title ); ?></h2>
+<h1><?php echo esc_html( $title ); ?></h1>
 
 <?php
 /**
diff --git a/src/wp-admin/network/index.php b/src/wp-admin/network/index.php
index 70f6bbf5fb..5c2bfe887d 100644
--- a/src/wp-admin/network/index.php
+++ b/src/wp-admin/network/index.php
@@ -65,7 +65,7 @@ require_once( ABSPATH . 'wp-admin/admin-header.php' );
 ?>
 
 <div class="wrap">
-<h2><?php echo esc_html( $title ); ?></h2>
+<h1><?php echo esc_html( $title ); ?></h1>
 
 <div id="dashboard-widgets-wrap">
 
diff --git a/src/wp-admin/network/settings.php b/src/wp-admin/network/settings.php
index f3ef480056..1872eb81c0 100644
--- a/src/wp-admin/network/settings.php
+++ b/src/wp-admin/network/settings.php
@@ -119,7 +119,7 @@ if ( isset( $_GET['updated'] ) ) {
 ?>
 
 <div class="wrap">
-	<h2><?php echo esc_html( $title ); ?></h2>
+	<h1><?php echo esc_html( $title ); ?></h1>
 	<form method="post" action="settings.php" novalidate="novalidate">
 		<?php wp_nonce_field( 'siteoptions' ); ?>
 		<h3><?php _e( 'Operational Settings' ); ?></h3>
diff --git a/src/wp-admin/network/site-info.php b/src/wp-admin/network/site-info.php
index 446db733e4..61fea29850 100644
--- a/src/wp-admin/network/site-info.php
+++ b/src/wp-admin/network/site-info.php
@@ -137,7 +137,7 @@ require( ABSPATH . 'wp-admin/admin-header.php' );
 ?>
 
 <div class="wrap">
-<h2 id="edit-site"><?php echo $title_site_url_linked ?></h2>
+<h1 id="edit-site"><?php echo $title_site_url_linked; ?></h1>
 <h3 class="nav-tab-wrapper">
 <?php
 $tabs = array(
diff --git a/src/wp-admin/network/site-new.php b/src/wp-admin/network/site-new.php
index 00ca3c9fc8..6032cd8a5b 100644
--- a/src/wp-admin/network/site-new.php
+++ b/src/wp-admin/network/site-new.php
@@ -130,7 +130,7 @@ require( ABSPATH . 'wp-admin/admin-header.php' );
 ?>
 
 <div class="wrap">
-<h2 id="add-new-site"><?php _e('Add New Site') ?></h2>
+<h1 id="add-new-site"><?php _e( 'Add New Site' ); ?></h1>
 <?php
 if ( ! empty( $messages ) ) {
 	foreach ( $messages as $msg )
diff --git a/src/wp-admin/network/site-settings.php b/src/wp-admin/network/site-settings.php
index ecf8a12a22..31980eebf8 100644
--- a/src/wp-admin/network/site-settings.php
+++ b/src/wp-admin/network/site-settings.php
@@ -87,7 +87,7 @@ require( ABSPATH . 'wp-admin/admin-header.php' );
 ?>
 
 <div class="wrap">
-<h2 id="edit-site"><?php echo $title_site_url_linked ?></h2>
+<h1 id="edit-site"><?php echo $title_site_url_linked; ?></h1>
 <h3 class="nav-tab-wrapper">
 <?php
 $tabs = array(
diff --git a/src/wp-admin/network/site-themes.php b/src/wp-admin/network/site-themes.php
index 384f58c64e..0042601bdc 100644
--- a/src/wp-admin/network/site-themes.php
+++ b/src/wp-admin/network/site-themes.php
@@ -139,7 +139,7 @@ $submenu_file = 'sites.php';
 require( ABSPATH . 'wp-admin/admin-header.php' ); ?>
 
 <div class="wrap">
-<h2 id="edit-site"><?php echo $title_site_url_linked ?></h2>
+<h1 id="edit-site"><?php echo $title_site_url_linked; ?></h1>
 <h3 class="nav-tab-wrapper">
 <?php
 $tabs = array(
diff --git a/src/wp-admin/network/site-users.php b/src/wp-admin/network/site-users.php
index 595ca45a5c..f29056509f 100644
--- a/src/wp-admin/network/site-users.php
+++ b/src/wp-admin/network/site-users.php
@@ -182,7 +182,7 @@ var current_site_id = <?php echo $id; ?>;
 
 
 <div class="wrap">
-<h2 id="edit-site"><?php echo $title_site_url_linked ?></h2>
+<h1 id="edit-site"><?php echo $title_site_url_linked; ?></h1>
 <h3 class="nav-tab-wrapper">
 <?php
 $tabs = array(
diff --git a/src/wp-admin/network/sites.php b/src/wp-admin/network/sites.php
index 922ce76532..1e05c16466 100644
--- a/src/wp-admin/network/sites.php
+++ b/src/wp-admin/network/sites.php
@@ -67,7 +67,7 @@ if ( isset( $_GET['action'] ) ) {
 		require_once( ABSPATH . 'wp-admin/admin-header.php' );
 		?>
 			<div class="wrap">
-				<h2><?php _e( 'Confirm your action' ); ?></h2>
+				<h1><?php _e( 'Confirm your action' ); ?></h1>
 				<form action="sites.php?action=<?php echo esc_attr( $_GET['action2'] ) ?>" method="post">
 					<input type="hidden" name="action" value="<?php echo esc_attr( $_GET['action2'] ) ?>" />
 					<input type="hidden" name="id" value="<?php echo esc_attr( $id ); ?>" />
@@ -248,7 +248,7 @@ require_once( ABSPATH . 'wp-admin/admin-header.php' );
 ?>
 
 <div class="wrap">
-<h2><?php _e( 'Sites' ) ?>
+<h1><?php _e( 'Sites' ); ?>
 
 <?php if ( current_user_can( 'create_sites') ) : ?>
 	<a href="<?php echo network_admin_url('site-new.php'); ?>" class="add-new-h2"><?php echo esc_html_x( 'Add New', 'site' ); ?></a>
@@ -257,7 +257,7 @@ require_once( ABSPATH . 'wp-admin/admin-header.php' );
 <?php if ( isset( $_REQUEST['s'] ) && $_REQUEST['s'] ) {
 	printf( '<span class="subtitle">' . __( 'Search results for &#8220;%s&#8221;' ) . '</span>', esc_html( $s ) );
 } ?>
-</h2>
+</h1>
 
 <?php echo $msg; ?>
 
diff --git a/src/wp-admin/network/themes.php b/src/wp-admin/network/themes.php
index 2b77f188fb..3597bb8d6b 100644
--- a/src/wp-admin/network/themes.php
+++ b/src/wp-admin/network/themes.php
@@ -86,7 +86,7 @@ if ( $action ) {
 			require_once(ABSPATH . 'wp-admin/admin-header.php');
 
 			echo '<div class="wrap">';
-			echo '<h2>' . esc_html( $title ) . '</h2>';
+			echo '<h1>' . esc_html( $title ) . '</h1>';
 
 			$url = self_admin_url('update.php?action=update-selected-themes&amp;themes=' . urlencode( join(',', $themes) ));
 			$url = wp_nonce_url($url, 'bulk-update-themes');
@@ -150,11 +150,11 @@ if ( $action ) {
 				?>
 			<div class="wrap">
 				<?php if ( 1 == $themes_to_delete ) : ?>
-					<h2><?php _e( 'Delete Theme' ); ?></h2>
+					<h1><?php _e( 'Delete Theme' ); ?></h1>
 					<div class="error"><p><strong><?php _e( 'Caution:' ); ?></strong> <?php _e( 'This theme may be active on other sites in the network.' ); ?></p></div>
 					<p><?php _e( 'You are about to remove the following theme:' ); ?></p>
 				<?php else : ?>
-					<h2><?php _e( 'Delete Themes' ); ?></h2>
+					<h1><?php _e( 'Delete Themes' ); ?></h1>
 					<div class="error"><p><strong><?php _e( 'Caution:' ); ?></strong> <?php _e( 'These themes may be active on other sites in the network.' ); ?></p></div>
 					<p><?php _e( 'You are about to remove the following themes:' ); ?></p>
 				<?php endif; ?>
@@ -261,10 +261,10 @@ require_once(ABSPATH . 'wp-admin/admin-header.php');
 ?>
 
 <div class="wrap">
-<h2><?php echo esc_html( $title ); if ( current_user_can('install_themes') ) { ?> <a href="theme-install.php" class="add-new-h2"><?php echo esc_html_x('Add New', 'theme'); ?></a><?php }
+<h1><?php echo esc_html( $title ); if ( current_user_can('install_themes') ) { ?> <a href="theme-install.php" class="add-new-h2"><?php echo esc_html_x('Add New', 'theme'); ?></a><?php }
 if ( $s )
 	printf( '<span class="subtitle">' . __('Search results for &#8220;%s&#8221;') . '</span>', esc_html( $s ) ); ?>
-</h2>
+</h1>
 
 <?php
 if ( isset( $_GET['enabled'] ) ) {
diff --git a/src/wp-admin/network/upgrade.php b/src/wp-admin/network/upgrade.php
index bdef9b6892..60d8d8951e 100644
--- a/src/wp-admin/network/upgrade.php
+++ b/src/wp-admin/network/upgrade.php
@@ -39,7 +39,7 @@ if ( ! current_user_can( 'manage_network' ) )
 	wp_die( __( 'You do not have permission to access this page.' ), 403 );
 
 echo '<div class="wrap">';
-echo '<h2>' . __( 'Upgrade Network' ) . '</h2>';
+echo '<h1>' . __( 'Upgrade Network' ) . '</h1>';
 
 $action = isset($_GET['action']) ? $_GET['action'] : 'show';
 
diff --git a/src/wp-admin/network/user-new.php b/src/wp-admin/network/user-new.php
index 3a63686fc2..93b27a677e 100644
--- a/src/wp-admin/network/user-new.php
+++ b/src/wp-admin/network/user-new.php
@@ -70,7 +70,7 @@ $parent_file = 'users.php';
 require( ABSPATH . 'wp-admin/admin-header.php' ); ?>
 
 <div class="wrap">
-<h2 id="add-new-user"><?php _e('Add New User') ?></h2>
+<h1 id="add-new-user"><?php _e( 'Add New User' ); ?></h1>
 <?php
 if ( ! empty( $messages ) ) {
 	foreach ( $messages as $msg )
diff --git a/src/wp-admin/network/users.php b/src/wp-admin/network/users.php
index b42eaefef7..edc1eba39d 100644
--- a/src/wp-admin/network/users.php
+++ b/src/wp-admin/network/users.php
@@ -26,7 +26,7 @@ function confirm_delete_users( $users ) {
 		return false;
 	}
 	?>
-	<h2><?php esc_html_e( 'Users' ); ?></h2>
+	<h1><?php esc_html_e( 'Users' ); ?></h1>
 
 	<?php if ( 1 == count( $users ) ) : ?>
 		<p><?php _e( 'You have chosen to delete the user from all networks and sites.' ); ?></p>
@@ -309,7 +309,7 @@ if ( isset( $_REQUEST['updated'] ) && $_REQUEST['updated'] == 'true' && ! empty(
 }
 	?>
 <div class="wrap">
-	<h2><?php esc_html_e( 'Users' );
+	<h1><?php esc_html_e( 'Users' );
 	if ( current_user_can( 'create_users') ) : ?>
 		<a href="<?php echo network_admin_url('user-new.php'); ?>" class="add-new-h2"><?php echo esc_html_x( 'Add New', 'user' ); ?></a><?php
 	endif;
@@ -317,7 +317,7 @@ if ( isset( $_REQUEST['updated'] ) && $_REQUEST['updated'] == 'true' && ! empty(
 	if ( !empty( $usersearch ) )
 	printf( '<span class="subtitle">' . __( 'Search results for &#8220;%s&#8221;' ) . '</span>', esc_html( $usersearch ) );
 	?>
-	</h2>
+	</h1>
 
 	<?php $wp_list_table->views(); ?>
 
diff --git a/src/wp-admin/options-discussion.php b/src/wp-admin/options-discussion.php
index 5b5f2f5572..759d58c86d 100644
--- a/src/wp-admin/options-discussion.php
+++ b/src/wp-admin/options-discussion.php
@@ -51,7 +51,7 @@ include( ABSPATH . 'wp-admin/admin-header.php' );
 ?>
 
 <div class="wrap">
-<h2><?php echo esc_html( $title ); ?></h2>
+<h1><?php echo esc_html( $title ); ?></h1>
 
 <form method="post" action="options.php">
 <?php settings_fields('discussion'); ?>
diff --git a/src/wp-admin/options-general.php b/src/wp-admin/options-general.php
index 103e34b3f1..7f2a14ea4f 100644
--- a/src/wp-admin/options-general.php
+++ b/src/wp-admin/options-general.php
@@ -109,7 +109,7 @@ include( ABSPATH . 'wp-admin/admin-header.php' );
 ?>
 
 <div class="wrap">
-<h2><?php echo esc_html( $title ); ?></h2>
+<h1><?php echo esc_html( $title ); ?></h1>
 
 <form method="post" action="options.php" novalidate="novalidate">
 <?php settings_fields('general'); ?>
diff --git a/src/wp-admin/options-media.php b/src/wp-admin/options-media.php
index 21db693f78..21b96eddbc 100644
--- a/src/wp-admin/options-media.php
+++ b/src/wp-admin/options-media.php
@@ -40,7 +40,7 @@ include( ABSPATH . 'wp-admin/admin-header.php' );
 ?>
 
 <div class="wrap">
-<h2><?php echo esc_html( $title ); ?></h2>
+<h1><?php echo esc_html( $title ); ?></h1>
 
 <form action="options.php" method="post">
 <?php settings_fields('media'); ?>
diff --git a/src/wp-admin/options-permalink.php b/src/wp-admin/options-permalink.php
index 0d241ae84e..b1f84cc4ac 100644
--- a/src/wp-admin/options-permalink.php
+++ b/src/wp-admin/options-permalink.php
@@ -175,7 +175,7 @@ if ( ! is_multisite() ) {
 <?php endif; ?>
 
 <div class="wrap">
-<h2><?php echo esc_html( $title ); ?></h2>
+<h1><?php echo esc_html( $title ); ?></h1>
 
 <form name="form" action="options-permalink.php" method="post">
 <?php wp_nonce_field('update-permalink') ?>
diff --git a/src/wp-admin/options-reading.php b/src/wp-admin/options-reading.php
index 7d28208d6d..9341e7fcf4 100644
--- a/src/wp-admin/options-reading.php
+++ b/src/wp-admin/options-reading.php
@@ -74,7 +74,7 @@ include( ABSPATH . 'wp-admin/admin-header.php' );
 ?>
 
 <div class="wrap">
-<h2><?php echo esc_html( $title ); ?></h2>
+<h1><?php echo esc_html( $title ); ?></h1>
 
 <form method="post" action="options.php">
 <?php
diff --git a/src/wp-admin/options-writing.php b/src/wp-admin/options-writing.php
index 0e14ff32dc..ba7eeca78d 100644
--- a/src/wp-admin/options-writing.php
+++ b/src/wp-admin/options-writing.php
@@ -50,7 +50,7 @@ include( ABSPATH . 'wp-admin/admin-header.php' );
 ?>
 
 <div class="wrap">
-<h2><?php echo esc_html( $title ); ?></h2>
+<h1><?php echo esc_html( $title ); ?></h1>
 
 <form method="post" action="options.php">
 <?php settings_fields('writing'); ?>
diff --git a/src/wp-admin/options.php b/src/wp-admin/options.php
index 5dacc41c44..752d7b46ff 100644
--- a/src/wp-admin/options.php
+++ b/src/wp-admin/options.php
@@ -226,7 +226,7 @@ if ( 'update' == $action ) {
 include( ABSPATH . 'wp-admin/admin-header.php' ); ?>
 
 <div class="wrap">
-  <h2><?php esc_html_e('All Settings'); ?></h2>
+  <h1><?php esc_html_e( 'All Settings' ); ?></h1>
   <form name="form" action="options.php" method="post" id="all-options">
   <?php wp_nonce_field('options-options') ?>
   <input type="hidden" name="action" value="update" />
diff --git a/src/wp-admin/plugin-editor.php b/src/wp-admin/plugin-editor.php
index f6033e9a59..6ffadf69c1 100644
--- a/src/wp-admin/plugin-editor.php
+++ b/src/wp-admin/plugin-editor.php
@@ -28,7 +28,7 @@ if ( empty( $plugins ) ) {
 	include( ABSPATH . 'wp-admin/admin-header.php' );
 	?>
 	<div class="wrap">
-		<h2><?php echo esc_html( $title ); ?></h2>
+		<h1><?php echo esc_html( $title ); ?></h1>
 		<div id="message" class="error"><p><?php _e( 'You do not appear to have any plugins available at this time.' ); ?></p></div>
 	</div>
 	<?php
@@ -174,7 +174,7 @@ default:
 </div>
 <?php endif; ?>
 <div class="wrap">
-<h2><?php echo esc_html( $title ); ?></h2>
+<h1><?php echo esc_html( $title ); ?></h1>
 
 <div class="fileedit-sub">
 <div class="alignleft">
diff --git a/src/wp-admin/plugin-install.php b/src/wp-admin/plugin-install.php
index be8e80f658..cf0d1d4955 100644
--- a/src/wp-admin/plugin-install.php
+++ b/src/wp-admin/plugin-install.php
@@ -94,7 +94,7 @@ get_current_screen()->set_help_sidebar(
 include(ABSPATH . 'wp-admin/admin-header.php');
 ?>
 <div class="wrap">
-<h2>
+<h1>
 	<?php
 	echo esc_html( $title );
 	if ( ! empty( $tabs['upload'] ) && current_user_can( 'upload_plugins' ) ) {
@@ -108,7 +108,7 @@ include(ABSPATH . 'wp-admin/admin-header.php');
 		echo ' <a href="' . $href . '" class="upload add-new-h2">' . $text . '</a>';
 	}
 	?>
-</h2>
+</h1>
 
 <?php
 if ( $tab !== 'upload' ) {
diff --git a/src/wp-admin/plugins.php b/src/wp-admin/plugins.php
index 0f26891e50..b9615b3c33 100644
--- a/src/wp-admin/plugins.php
+++ b/src/wp-admin/plugins.php
@@ -122,7 +122,7 @@ if ( $action ) {
 			require_once(ABSPATH . 'wp-admin/admin-header.php');
 
 			echo '<div class="wrap">';
-			echo '<h2>' . esc_html( $title ) . '</h2>';
+			echo '<h1>' . esc_html( $title ) . '</h1>';
 
 			$url = self_admin_url('update.php?action=update-selected&amp;plugins=' . urlencode( join(',', $plugins) ));
 			$url = wp_nonce_url($url, 'bulk-update-plugins');
@@ -288,13 +288,13 @@ if ( $action ) {
 					$plugins_to_delete = count( $plugin_info );
 				?>
 				<?php if ( 1 == $plugins_to_delete ) : ?>
-					<h2><?php _e( 'Delete Plugin' ); ?></h2>
+					<h1><?php _e( 'Delete Plugin' ); ?></h1>
 					<?php if ( $have_non_network_plugins && is_network_admin() ) : ?>
 						<div class="error"><p><strong><?php _e( 'Caution:' ); ?></strong> <?php _e( 'This plugin may be active on other sites in the network.' ); ?></p></div>
 					<?php endif; ?>
 					<p><?php _e( 'You are about to remove the following plugin:' ); ?></p>
 				<?php else: ?>
-					<h2><?php _e( 'Delete Plugins' ); ?></h2>
+					<h1><?php _e( 'Delete Plugins' ); ?></h1>
 					<?php if ( $have_non_network_plugins && is_network_admin() ) : ?>
 						<div class="error"><p><strong><?php _e( 'Caution:' ); ?></strong> <?php _e( 'These plugins may be active on other sites in the network.' ); ?></p></div>
 					<?php endif; ?>
@@ -446,13 +446,13 @@ if ( !empty($invalid) )
 <?php endif; ?>
 
 <div class="wrap">
-<h2><?php echo esc_html( $title );
+<h1><?php echo esc_html( $title );
 if ( ( ! is_multisite() || is_network_admin() ) && current_user_can('install_plugins') ) { ?>
  <a href="<?php echo self_admin_url( 'plugin-install.php' ); ?>" class="add-new-h2"><?php echo esc_html_x('Add New', 'plugin'); ?></a>
 <?php }
 if ( $s )
 	printf( '<span class="subtitle">' . __('Search results for &#8220;%s&#8221;') . '</span>', esc_html( $s ) ); ?>
-</h2>
+</h1>
 
 <?php
 /**
diff --git a/src/wp-admin/revision.php b/src/wp-admin/revision.php
index 0f48ef9a27..40328599d4 100644
--- a/src/wp-admin/revision.php
+++ b/src/wp-admin/revision.php
@@ -74,7 +74,7 @@ default :
 
 	$post_edit_link = get_edit_post_link();
 	$post_title     = '<a href="' . $post_edit_link . '">' . _draft_or_post_title() . '</a>';
-	$h2             = sprintf( __( 'Compare Revisions of &#8220;%1$s&#8221;' ), $post_title );
+	$h1             = sprintf( __( 'Compare Revisions of &#8220;%1$s&#8221;' ), $post_title );
 	$return_to_post = '<a href="' . $post_edit_link . '">' . __( '&larr; Return to post editor' ) . '</a>';
 	$title          = __( 'Revisions' );
 
@@ -126,7 +126,7 @@ require_once( ABSPATH . 'wp-admin/admin-header.php' );
 ?>
 
 <div class="wrap">
-	<h2 class="long-header"><?php echo $h2; ?></h2>
+	<h1 class="long-header"><?php echo $h1; ?></h1>
 	<?php echo $return_to_post; ?>
 </div>
 <?php
diff --git a/src/wp-admin/theme-editor.php b/src/wp-admin/theme-editor.php
index e0ca475bd0..c858c0bbcf 100644
--- a/src/wp-admin/theme-editor.php
+++ b/src/wp-admin/theme-editor.php
@@ -131,7 +131,7 @@ if ( $description != $file_show )
 	$description .= ' <span>(' . $file_show . ')</span>';
 ?>
 <div class="wrap">
-<h2><?php echo esc_html( $title ); ?></h2>
+<h1><?php echo esc_html( $title ); ?></h1>
 
 <div class="fileedit-sub">
 <div class="alignleft">
diff --git a/src/wp-admin/theme-install.php b/src/wp-admin/theme-install.php
index 56c20b5859..133820bc63 100644
--- a/src/wp-admin/theme-install.php
+++ b/src/wp-admin/theme-install.php
@@ -102,7 +102,7 @@ include(ABSPATH . 'wp-admin/admin-header.php');
 
 ?>
 <div class="wrap">
-	<h2><?php
+	<h1><?php
 	echo esc_html( $title );
 
 	/**
@@ -120,7 +120,7 @@ include(ABSPATH . 'wp-admin/admin-header.php');
 		echo ' <a href="#" class="upload add-new-h2">' . __( 'Upload Theme' ) . '</a>';
 		echo ' <a href="#" class="browse-themes add-new-h2">' . _x( 'Browse', 'themes' ) . '</a>';
 	}
-	?></h2>
+	?></h1>
 
 	<div class="upload-theme">
 	<?php install_themes_upload(); ?>
diff --git a/src/wp-admin/themes.php b/src/wp-admin/themes.php
index 81e0d7512d..56711232da 100644
--- a/src/wp-admin/themes.php
+++ b/src/wp-admin/themes.php
@@ -124,12 +124,12 @@ require_once( ABSPATH . 'wp-admin/admin-header.php' );
 ?>
 
 <div class="wrap">
-	<h2><?php esc_html_e( 'Themes' ); ?>
+	<h1><?php esc_html_e( 'Themes' ); ?>
 		<span class="title-count theme-count"><?php echo count( $themes ); ?></span>
 	<?php if ( ! is_multisite() && current_user_can( 'install_themes' ) ) : ?>
 		<a href="<?php echo admin_url( 'theme-install.php' ); ?>" class="hide-if-no-js add-new-h2"><?php echo esc_html_x( 'Add New', 'Add new theme' ); ?></a>
 	<?php endif; ?>
-	</h2>
+	</h1>
 <?php
 if ( ! validate_current_theme() || isset( $_GET['broken'] ) ) : ?>
 <div id="message1" class="updated notice is-dismissible"><p><?php _e('The active theme is broken. Reverting to the default theme.'); ?></p></div>
diff --git a/src/wp-admin/tools.php b/src/wp-admin/tools.php
index 692fe9273b..726c55b52a 100644
--- a/src/wp-admin/tools.php
+++ b/src/wp-admin/tools.php
@@ -33,7 +33,7 @@ require_once( ABSPATH . 'wp-admin/admin-header.php' );
 
 ?>
 <div class="wrap">
-<h2><?php echo esc_html( $title ); ?></h2>
+<h1><?php echo esc_html( $title ); ?></h1>
 
 <?php if ( current_user_can('edit_posts') ) : ?>
 <div class="card pressthis">
diff --git a/src/wp-admin/update-core.php b/src/wp-admin/update-core.php
index c4da56a4b3..8a0b1d84fe 100644
--- a/src/wp-admin/update-core.php
+++ b/src/wp-admin/update-core.php
@@ -415,7 +415,7 @@ function do_core_upgrade( $reinstall = false ) {
 
 ?>
 	<div class="wrap">
-	<h2><?php _e('Update WordPress'); ?></h2>
+	<h1><?php _e( 'Update WordPress' ); ?></h1>
 <?php
 
 	if ( false === ( $credentials = request_filesystem_credentials( $url, '', false, ABSPATH, array( 'version', 'locale' ), $allow_relaxed_file_ownership ) ) ) {
@@ -542,7 +542,7 @@ if ( 'upgrade-core' == $action ) {
 	require_once(ABSPATH . 'wp-admin/admin-header.php');
 	?>
 	<div class="wrap">
-	<h2><?php _e('WordPress Updates'); ?></h2>
+	<h1><?php _e( 'WordPress Updates' ); ?></h1>
 	<?php
 	if ( $upgrade_error ) {
 		echo '<div class="error"><p>';
@@ -624,7 +624,7 @@ if ( 'upgrade-core' == $action ) {
 
 	require_once(ABSPATH . 'wp-admin/admin-header.php');
 	echo '<div class="wrap">';
-	echo '<h2>' . esc_html__('Update Plugins') . '</h2>';
+	echo '<h1>' . __( 'Update Plugins' ) . '</h1>';
 	echo '<iframe src="', $url, '" style="width: 100%; height: 100%; min-height: 750px;" frameborder="0"></iframe>';
 	echo '</div>';
 	include(ABSPATH . 'wp-admin/admin-footer.php');
@@ -653,7 +653,7 @@ if ( 'upgrade-core' == $action ) {
 	require_once(ABSPATH . 'wp-admin/admin-header.php');
 	?>
 	<div class="wrap">
-		<h2><?php echo esc_html__('Update Themes') ?></h2>
+		<h1><?php _e( 'Update Themes' ); ?></h1>
 		<iframe src="<?php echo $url ?>" style="width: 100%; height: 100%; min-height: 750px;" frameborder="0"></iframe>
 	</div>
 	<?php
diff --git a/src/wp-admin/upload.php b/src/wp-admin/upload.php
index 39fa165fb2..6e8f90d0e0 100644
--- a/src/wp-admin/upload.php
+++ b/src/wp-admin/upload.php
@@ -71,14 +71,14 @@ if ( 'grid' === $mode ) {
 	require_once( ABSPATH . 'wp-admin/admin-header.php' );
 	?>
 	<div class="wrap" id="wp-media-grid" data-search="<?php _admin_search_query() ?>">
-		<h2>
+		<h1>
 		<?php
 		echo esc_html( $title );
 		if ( current_user_can( 'upload_files' ) ) { ?>
 			<a href="media-new.php" class="add-new-h2"><?php echo esc_html_x( 'Add New', 'file' ); ?></a><?php
 		}
 		?>
-		</h2>
+		</h1>
 		<div class="error hide-if-js">
 			<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>
@@ -206,7 +206,7 @@ require_once( ABSPATH . 'wp-admin/admin-header.php' );
 ?>
 
 <div class="wrap">
-<h2>
+<h1>
 <?php
 echo esc_html( $title );
 if ( current_user_can( 'upload_files' ) ) { ?>
@@ -214,7 +214,7 @@ if ( current_user_can( 'upload_files' ) ) { ?>
 }
 if ( ! empty( $_REQUEST['s'] ) )
 	printf( '<span class="subtitle">' . __('Search results for &#8220;%s&#8221;') . '</span>', get_search_query() ); ?>
-</h2>
+</h1>
 
 <?php
 $message = '';
diff --git a/src/wp-admin/user-edit.php b/src/wp-admin/user-edit.php
index f5b71990cb..061f190067 100644
--- a/src/wp-admin/user-edit.php
+++ b/src/wp-admin/user-edit.php
@@ -202,7 +202,7 @@ include(ABSPATH . 'wp-admin/admin-header.php');
 <?php endif; ?>
 
 <div class="wrap" id="profile-page">
-<h2>
+<h1>
 <?php
 echo esc_html( $title );
 if ( ! IS_PROFILE_PAGE ) {
@@ -212,7 +212,7 @@ if ( ! IS_PROFILE_PAGE ) {
 		<a href="user-new.php" class="add-new-h2"><?php echo esc_html_x( 'Add Existing', 'user' ); ?></a>
 	<?php }
 } ?>
-</h2>
+</h1>
 <form id="your-profile" action="<?php echo esc_url( self_admin_url( IS_PROFILE_PAGE ? 'profile.php' : 'user-edit.php' ) ); ?>" method="post" novalidate="novalidate"<?php
 	/**
 	 * Fires inside the your-profile form tag on the user editing screen.
diff --git a/src/wp-admin/user-new.php b/src/wp-admin/user-new.php
index af019b0988..5b8a2847a0 100644
--- a/src/wp-admin/user-new.php
+++ b/src/wp-admin/user-new.php
@@ -237,13 +237,13 @@ if ( isset($_GET['update']) ) {
 }
 ?>
 <div class="wrap">
-<h2 id="add-new-user"> <?php
+<h1 id="add-new-user"><?php
 if ( current_user_can( 'create_users' ) ) {
 	echo _x( 'Add New User', 'user' );
 } elseif ( current_user_can( 'promote_users' ) ) {
 	echo _x( 'Add Existing User', 'user' );
 } ?>
-</h2>
+</h1>
 
 <?php if ( isset($errors) && is_wp_error( $errors ) ) : ?>
 	<div class="error">
diff --git a/src/wp-admin/users.php b/src/wp-admin/users.php
index 27e264ca59..5bc5d10c07 100644
--- a/src/wp-admin/users.php
+++ b/src/wp-admin/users.php
@@ -214,7 +214,7 @@ case 'delete':
 <?php echo $referer; ?>
 
 <div class="wrap">
-<h2><?php _e('Delete Users'); ?></h2>
+<h1><?php _e( 'Delete Users' ); ?></h1>
 <?php if ( isset( $_REQUEST['error'] ) ) : ?>
 	<div class="error">
 		<p><strong><?php _e( 'ERROR:' ); ?></strong> <?php _e( 'Please select an option.' ); ?></p>
@@ -336,7 +336,7 @@ case 'remove':
 <?php echo $referer; ?>
 
 <div class="wrap">
-<h2><?php _e('Remove Users from Site'); ?></h2>
+<h1><?php _e( 'Remove Users from Site' ); ?></h1>
 <p><?php _e('You have specified these users for removal:'); ?></p>
 <ul>
 <?php
@@ -443,7 +443,7 @@ if ( ! empty($messages) ) {
 } ?>
 
 <div class="wrap">
-<h2>
+<h1>
 <?php
 echo esc_html( $title );
 if ( current_user_can( 'create_users' ) ) { ?>
@@ -454,7 +454,7 @@ if ( current_user_can( 'create_users' ) ) { ?>
 
 if ( $usersearch )
 	printf( '<span class="subtitle">' . __('Search results for &#8220;%s&#8221;') . '</span>', esc_html( $usersearch ) ); ?>
-</h2>
+</h1>
 
 <?php $wp_list_table->views(); ?>
 
diff --git a/src/wp-admin/widgets.php b/src/wp-admin/widgets.php
index 57f00a94be..5550cae5f5 100644
--- a/src/wp-admin/widgets.php
+++ b/src/wp-admin/widgets.php
@@ -235,7 +235,7 @@ if ( isset($_GET['editwidget']) && $_GET['editwidget'] ) {
 
 	require_once( ABSPATH . 'wp-admin/admin-header.php' ); ?>
 	<div class="wrap">
-	<h2><?php echo esc_html( $title ); ?></h2>
+	<h1><?php echo esc_html( $title ); ?></h1>
 	<div class="editwidget"<?php echo $width; ?>>
 	<h3><?php printf( __( 'Widget %s' ), $name ); ?></h3>
 
@@ -315,7 +315,7 @@ $errors = array(
 require_once( ABSPATH . 'wp-admin/admin-header.php' ); ?>
 
 <div class="wrap">
-<h2>
+<h1>
 <?php
 	echo esc_html( $title );
 	if ( current_user_can( 'customize' ) ) {
@@ -332,7 +332,7 @@ require_once( ABSPATH . 'wp-admin/admin-header.php' ); ?>
 		);
 	}
 ?>
-</h2>
+</h1>
 
 <?php if ( isset($_GET['message']) && isset($messages[$_GET['message']]) ) { ?>
 <div id="message" class="updated notice is-dismissible"><p><?php echo $messages[$_GET['message']]; ?></p></div>