Index: wp-admin/css/common.css
===================================================================
--- wp-admin/css/common.css	(revision 31879)
+++ wp-admin/css/common.css	(working copy)
@@ -416,7 +416,7 @@
 
 .subsubsub {
 	list-style: none;
-	margin: 8px 0 0;
+	margin: 0;
 	padding: 0;
 	font-size: 13px;
 	float: left;
@@ -555,7 +555,7 @@
 }
 
 .wrap {
-	margin: 10px 20px 0 2px;
+	margin: 20px 20px 0 2px;
 }
 
 .attention {
@@ -568,12 +568,25 @@
 	margin: 0;
 }
 
+.wrap header {
+	margin-bottom: 15px;
+}
+
 .wrap h2 {
 	font-size: 23px;
 	font-weight: 400;
-	padding: 9px 15px 4px 0;
-	line-height: 29px;
+	padding-right: 10px;
+	line-height: 1.2;
+	display: inline;
 }
+.post-php .wrap h2 {
+	float: left;
+}
+.index-php .wrap h2,
+.nav-menus-php .wrap h2 {
+	display: block;
+	margin-bottom: 10px;
+}
 
 .subtitle {
 	color: #777;
@@ -583,10 +596,7 @@
 
 .wrap .add-new-h2,
 .wrap .add-new-h2:active {
-	margin-left: 4px;
 	padding: 4px 8px;
-	position: relative;
-	top: -3px;
 	text-decoration: none;
 	border: none;
 	-webkit-border-radius: 2px;
@@ -595,6 +605,8 @@
 	text-shadow: none;
 	font-weight: 600;
 	font-size: 13px;
+	display: inline-block;
+	margin-right: 20px;
 }
 
 .wrap .add-new-h2:hover {
@@ -964,13 +976,20 @@
 }
 
 /* not a part of filter bar, but derived from it, so here for now */
-.title-count {
+.theme-count {
 	display: inline;
-	top: -3px;
-	margin-left: 5px;
-	margin-right: 20px;
+	margin-right: 25px;
 }
 
+.helper-content {
+	display: inline;
+	position: relative;
+}
+
+.theme-install-php .helper-content {
+	bottom: -10px;
+}
+
 .filter-items {
 	float: left;
 }
Index: wp-admin/css/themes.css
===================================================================
--- wp-admin/css/themes.css	(revision 31879)
+++ wp-admin/css/themes.css	(working copy)
@@ -27,9 +27,6 @@
 
 /* Search form */
 .themes-php .wp-filter-search {
-	position: relative;
-	top: -2px;
-	left: 20px;
 	margin: 0;
 	width: 280px;
 	font-size: 16px;
Index: wp-admin/edit-comments.php
===================================================================
--- wp-admin/edit-comments.php	(revision 31879)
+++ wp-admin/edit-comments.php	(working copy)
@@ -140,21 +140,13 @@
 ?>
 
 <div class="wrap">
-<h2><?php
-if ( $post_id )
-	echo sprintf( __( 'Comments on &#8220;%s&#8221;' ),
-		sprintf( '<a href="%s">%s</a>',
-			get_edit_post_link( $post_id ),
-			wp_html_excerpt( _draft_or_post_title( $post_id ), 50, '&hellip;' )
-		)
-	);
-else
-	echo __('Comments');
+	<header>
+		<h2><?php if ( $post_id ) echo sprintf( __( 'Comments on &#8220;%s&#8221;' ), sprintf( '<a href="%s">%s</a>', get_edit_post_link( $post_id ), wp_html_excerpt( _draft_or_post_title( $post_id ), 50, '&hellip;' ) ) );
+			else  _e( 'Comments' );?></h2>
+		<?php
+		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>'; ?>
+	</header>
 
-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>
-
 <?php
 if ( isset( $_REQUEST['error'] ) ) {
 	$error = (int) $_REQUEST['error'];
Index: wp-admin/edit-form-advanced.php
===================================================================
--- wp-admin/edit-form-advanced.php	(revision 31879)
+++ wp-admin/edit-form-advanced.php	(working copy)
@@ -401,22 +401,25 @@
 ?>
 
 <div class="wrap">
-<h2><?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>
-<?php if ( $notice ) : ?>
-<div id="notice" class="notice notice-warning"><p id="has-newer-autosave"><?php echo $notice ?></p></div>
-<?php endif; ?>
-<?php if ( $message ) : ?>
-<div id="message" class="updated"><p><?php echo $message; ?></p></div>
-<?php endif; ?>
-<div id="lost-connection-notice" class="error hidden">
-	<p><span class="spinner"></span> <?php _e( '<strong>Connection lost.</strong> Saving has been disabled until you&#8217;re reconnected.' ); ?>
-	<span class="hide-if-no-sessionstorage"><?php _e( 'We&#8217;re backing up this post in your browser, just in case.' ); ?></span>
-	</p>
-</div>
+	<header>
+		<h2><?php echo esc_html( $title );?></h2>
+			<?php 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>';?>
+			<?php if ( $notice ) : ?>
+				<div id="notice" class="notice notice-warning"><p id="has-newer-autosave"><?php echo $notice ?></p></div>
+			<?php endif; ?>
+			<?php if ( $message ) : ?>
+				<div id="message" class="updated">
+					<p><?php echo $message; ?></p>
+				</div>
+			<?php endif; ?>
+			<div id="lost-connection-notice" class="error hidden">
+				<p><span class="spinner"></span> <?php _e( '<strong>Connection lost.</strong> Saving has been disabled until you&#8217;re reconnected.' ); ?>
+					<span class="hide-if-no-sessionstorage"><?php _e( 'We&#8217;re backing up this post in your browser, just in case.' ); ?></span>
+				</p>
+			</div>
+	</header>
+
 <form name="post" action="post.php" method="post" id="post"<?php
 /**
  * Fires inside the post editor form tag.
Index: wp-admin/edit.php
===================================================================
--- wp-admin/edit.php	(revision 31879)
+++ wp-admin/edit.php	(working copy)
@@ -277,13 +277,15 @@
 require_once( ABSPATH . 'wp-admin/admin-header.php' );
 ?>
 <div class="wrap">
-<h2><?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>
+	<header>
+		<h2><?php echo esc_html( $post_type_object->labels->name );?></h2>
+		<?php
+		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() );
+		?>
+	</header>
 
 <?php
 // If we have a bulk message to issue:
Index: wp-admin/js/theme.js
===================================================================
--- wp-admin/js/theme.js	(revision 31879)
+++ wp-admin/js/theme.js	(working copy)
@@ -85,7 +85,7 @@
 	},
 
 	// Defines search element container
-	searchContainer: $( '#wpbody h2:first' ),
+	searchContainer: $( '#wpbody .helper-content' ),
 
 	// Search input and view
 	// for current theme collection
Index: wp-admin/plugin-install.php
===================================================================
--- wp-admin/plugin-install.php	(revision 31879)
+++ wp-admin/plugin-install.php	(working copy)
@@ -94,21 +94,19 @@
 include(ABSPATH . 'wp-admin/admin-header.php');
 ?>
 <div class="wrap">
-<h2>
-	<?php
-	echo esc_html( $title );
-	if ( ! empty( $tabs['upload'] ) && current_user_can( 'upload_plugins' ) ) {
-		if ( $tab === 'upload' ) {
-			$href = self_admin_url( 'plugin-install.php' );
-			$text = _x( 'Browse', 'plugins' );
-		} else {
-			$href = self_admin_url( 'plugin-install.php?tab=upload' );
-			$text = __( 'Upload Plugin' );
-		}
-		echo ' <a href="' . $href . '" class="upload add-new-h2">' . $text . '</a>';
-	}
-	?>
-</h2>
+	<header>
+		<h2><?php echo esc_html( $title );?></h2>
+		<?php if ( ! empty( $tabs['upload'] ) && current_user_can( 'upload_plugins' ) ) {
+			if ( $tab === 'upload' ) {
+				$href = self_admin_url( 'plugin-install.php' );
+				$text = _x( 'Browse', 'plugins' );
+			} else {
+				$href = self_admin_url( 'plugin-install.php?tab=upload' );
+				$text = __( 'Upload Plugin' );
+			}
+			echo ' <a href="' . $href . '" class="upload add-new-h2">' . $text . '</a>';
+		}?>
+	</header>
 
 <?php
 if ( $tab !== 'upload' ) {
Index: wp-admin/plugins.php
===================================================================
--- wp-admin/plugins.php	(revision 31879)
+++ wp-admin/plugins.php	(working copy)
@@ -435,13 +435,14 @@
 <?php endif; ?>
 
 <div class="wrap">
-<h2><?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>
+	<header>
+		<h2><?php echo esc_html( $title );?></h2>
+		<?php 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>
+	</header>
 <?php }
 if ( $s )
 	printf( '<span class="subtitle">' . __('Search results for &#8220;%s&#8221;') . '</span>', esc_html( $s ) ); ?>
-</h2>
 
 <?php
 /**
Index: wp-admin/theme-install.php
===================================================================
--- wp-admin/theme-install.php	(revision 31879)
+++ wp-admin/theme-install.php	(working copy)
@@ -99,8 +99,9 @@
 
 ?>
 <div class="wrap">
-	<h2><?php
-	echo esc_html( $title );
+	<header>
+		<h2><?php echo esc_html( $title );?></h2>
+		<?php
 
 	/**
 	 * Filter the tabs shown on the Add Themes screen.
@@ -117,7 +118,8 @@
 		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>
+	?>
+	</header>
 
 	<div class="upload-theme">
 	<?php install_themes_upload(); ?>
Index: wp-admin/themes.php
===================================================================
--- wp-admin/themes.php	(revision 31879)
+++ wp-admin/themes.php	(working copy)
@@ -121,12 +121,15 @@
 ?>
 
 <div class="wrap">
-	<h2><?php esc_html_e( 'Themes' ); ?>
+	<header>
+		<h2><?php esc_html_e( 'Themes' ); ?></h2>
 		<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>
+		<div class="add-new-theme">
+			<?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; ?>
+		</div>
+	</header>
 <?php
 if ( ! validate_current_theme() || isset( $_GET['broken'] ) ) : ?>
 <div id="message1" class="updated"><p><?php _e('The active theme is broken. Reverting to the default theme.'); ?></p></div>
Index: wp-admin/upload.php
===================================================================
--- wp-admin/upload.php	(revision 31879)
+++ wp-admin/upload.php	(working copy)
@@ -71,14 +71,13 @@
 	require_once( ABSPATH . 'wp-admin/admin-header.php' );
 	?>
 	<div class="wrap" id="wp-media-grid" data-search="<?php _admin_search_query() ?>">
-		<h2>
-		<?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>
+		<header>
+			<h2><?php echo esc_html( $title );?></h2>
+			<?php 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 }
+			?>
+		</header>
 		<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,15 +205,19 @@
 ?>
 
 <div class="wrap">
-<h2>
+	<header>
+		<h2><?php echo esc_html( $title );?></h2>
+		<?php
+		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
+		}?>
+	</header>
+
+
 <?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
-}
 if ( ! empty( $_REQUEST['s'] ) )
 	printf( '<span class="subtitle">' . __('Search results for &#8220;%s&#8221;') . '</span>', get_search_query() ); ?>
-</h2>
 
 <?php
 $message = '';
Index: wp-admin/users.php
===================================================================
--- wp-admin/users.php	(revision 31879)
+++ wp-admin/users.php	(working copy)
@@ -428,18 +428,18 @@
 } ?>
 
 <div class="wrap">
-<h2>
-<?php
-echo esc_html( $title );
-if ( current_user_can( 'create_users' ) ) { ?>
-	<a href="user-new.php" class="add-new-h2"><?php echo esc_html_x( 'Add New', 'user' ); ?></a>
-<?php } elseif ( is_multisite() && current_user_can( 'promote_users' ) ) { ?>
-	<a href="user-new.php" class="add-new-h2"><?php echo esc_html_x( 'Add Existing', 'user' ); ?></a>
-<?php }
+	<header>
+		<h2><?php echo esc_html( $title );?></h2>
+		<?php
+		if ( current_user_can( 'create_users' ) ) { ?>
+			<a href="user-new.php" class="add-new-h2"><?php echo esc_html_x( 'Add New', 'user' ); ?></a>
+		<?php } elseif ( is_multisite() && current_user_can( 'promote_users' ) ) { ?>
+			<a href="user-new.php" class="add-new-h2"><?php echo esc_html_x( 'Add Existing', 'user' ); ?></a>
+		<?php }
+		if ( $usersearch )
+			printf( '<span class="subtitle">' . __('Search results for &#8220;%s&#8221;') . '</span>', esc_html( $usersearch ) ); ?>
+	</header>
 
-if ( $usersearch )
-	printf( '<span class="subtitle">' . __('Search results for &#8220;%s&#8221;') . '</span>', esc_html( $usersearch ) ); ?>
-</h2>
 
 <?php $wp_list_table->views(); ?>
 
Index: wp-admin/widgets.php
===================================================================
--- wp-admin/widgets.php	(revision 31879)
+++ wp-admin/widgets.php	(working copy)
@@ -310,24 +310,24 @@
 require_once( ABSPATH . 'wp-admin/admin-header.php' ); ?>
 
 <div class="wrap">
-<h2>
-<?php
-	echo esc_html( $title );
-	if ( current_user_can( 'customize' ) ) {
-		printf(
-			' <a class="add-new-h2 hide-if-no-customize" href="%1$s">%2$s</a>',
-			esc_url( add_query_arg(
-				array(
-					array( 'autofocus' => array( 'panel' => 'widgets' ) ),
-					'return' => urlencode( wp_unslash( $_SERVER['REQUEST_URI'] ) )
-				),
-				admin_url( 'customize.php' )
-			) ),
-			__( 'Manage in Customizer' )
-		);
-	}
-?>
-</h2>
+	<header>
+		<h2><?php echo esc_html( $title );?></h2>
+		<?php
+		if ( current_user_can( 'customize' ) ) {
+			printf(
+				' <a class="add-new-h2 hide-if-no-customize" href="%1$s">%2$s</a>',
+				esc_url( add_query_arg(
+					array(
+						array( 'autofocus' => array( 'panel' => 'widgets' ) ),
+						'return' => urlencode( wp_unslash( $_SERVER['REQUEST_URI'] ) )
+					),
+					admin_url( 'customize.php' )
+				) ),
+				__( 'Manage in Customizer' )
+			);
+		}
+		?>
+	</header>
 
 <?php if ( isset($_GET['message']) && isset($messages[$_GET['message']]) ) { ?>
 <div id="message" class="updated"><p><?php echo $messages[$_GET['message']]; ?></p></div>