Tag 5.2.15

Built from https://develop.svn.wordpress.org/tags/5.2.15@52904 git-svn-id: http://core.svn.wordpress.org/tags/5.2.15@52493 1a063a9b-81f0-0310-95a4-ce76da25c4cd
WordPress 5.2.15.
2022-03-11 00:29:07 +00:00 · 2022-03-10 22:03:45 +00:00 · 2022-03-10 21:19:47 +00:00 · 2022-01-06 18:51:31 +00:00 · 2022-01-06 18:13:36 +00:00 · 2021-11-10 17:11:42 +00:00
1419 changed files with 266812 additions and 171445 deletions
--- a/index.php
+++ b/index.php
@@ -11,7 +11,7 @@
 *
 * @var bool
 */
-define('WP_USE_THEMES', true);
+define( 'WP_USE_THEMES', true );

 /** Loads the WordPress Environment and Template */
 require( dirname( __FILE__ ) . '/wp-blog-header.php' );
--- a/readme.html
+++ b/readme.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html>
+<html lang="en">
 <head>
 	<meta name="viewport" content="width=device-width" />
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
@@ -26,7 +26,7 @@
 			<li>Open <span class="file"><a href="wp-admin/install.php">wp-admin/install.php</a></span> in your browser.</li>
 		</ol>
 	</li>
-	<li>Once the configuration file is set up, the installer will set up the tables needed for your blog. If there is an error, double check your <code>wp-config.php</code> file, and try again. If it fails again, please go to the <a href="https://wordpress.org/support/" title="WordPress support">support forums</a> with as much data as you can gather.</li>
+	<li>Once the configuration file is set up, the installer will set up the tables needed for your site. If there is an error, double check your <code>wp-config.php</code> file, and try again. If it fails again, please go to the <a href="https://wordpress.org/support/forums/" title="WordPress support">support forums</a> with as much data as you can gather.</li>
 	<li><strong>If you did not enter a password, note the password given to you.</strong> If you did not provide a username, it will be <code>admin</code>.</li>
 	<li>The installer should then send you to the <a href="wp-login.php">login page</a>. Sign in with the username and password you chose during the installation. If a password was generated for you, you can then click on &#8220;Profile&#8221; to change the password.</li>
 </ol>
@@ -52,13 +52,13 @@

 <h2>System Requirements</h2>
 <ul>
-	<li><a href="https://secure.php.net/">PHP</a> version <strong>5.2.4</strong> or higher.</li>
+	<li><a href="https://secure.php.net/">PHP</a> version <strong>5.6.20</strong> or higher.</li>
 	<li><a href="https://www.mysql.com/">MySQL</a> version <strong>5.0</strong> or higher.</li>
 </ul>

 <h3>Recommendations</h3>
 <ul>
-	<li><a href="https://secure.php.net/">PHP</a> version <strong>7.2</strong> or higher.</li>
+	<li><a href="https://secure.php.net/">PHP</a> version <strong>7.3</strong> or higher.</li>
 	<li><a href="https://www.mysql.com/">MySQL</a> version <strong>5.6</strong> or higher.</li>
 	<li>The <a href="https://httpd.apache.org/docs/2.2/mod/mod_rewrite.html">mod_rewrite</a> Apache module.</li>
 	<li><a href="https://wordpress.org/news/2016/12/moving-toward-ssl/">HTTPS</a> support.</li>
@@ -74,7 +74,7 @@
 		<dd>This is where you&#8217;ll find the latest updates and news related to WordPress. Recent WordPress news appears in your administrative dashboard by default.</dd>
 	<dt><a href="https://planet.wordpress.org/">WordPress Planet</a></dt>
 		<dd>The WordPress Planet is a news aggregator that brings together posts from WordPress blogs around the web.</dd>
-	<dt><a href="https://wordpress.org/support/">WordPress Support Forums</a></dt>
+	<dt><a href="https://wordpress.org/support/forums/">WordPress Support Forums</a></dt>
 		<dd>If you&#8217;ve looked everywhere and still can&#8217;t find an answer, the support forums are very active and have a large community ready to help. To help them help you be sure to use a descriptive thread title and describe your question in as much detail as possible.</dd>
 	<dt><a href="https://codex.wordpress.org/IRC">WordPress <abbr title="Internet Relay Chat">IRC</abbr> Channel</a></dt>
 		<dd>There is an online chat channel that is used for discussion among people who use WordPress and occasionally support topics. The above wiki page should point you in the right direction. (<a href="irc://irc.freenode.net/wordpress">irc.freenode.net #wordpress</a>)</dd>
@@ -82,7 +82,7 @@

 <h2>Final Notes</h2>
 <ul>
-	<li>If you have any suggestions, ideas, or comments, or if you (gasp!) found a bug, join us in the <a href="https://wordpress.org/support/">Support Forums</a>.</li>
+	<li>If you have any suggestions, ideas, or comments, or if you (gasp!) found a bug, join us in the <a href="https://wordpress.org/support/forums/">Support Forums</a>.</li>
 	<li>WordPress has a robust plugin <abbr title="application programming interface">API</abbr> that makes extending the code easy. If you are a developer interested in utilizing this, see the <a href="https://developer.wordpress.org/plugins/">Plugin Developer Handbook</a>. You shouldn&#8217;t modify any of the core code.</li>
 </ul>

--- a/wp-activate.php
+++ b/wp-activate.php
@@ -9,11 +9,11 @@
 define( 'WP_INSTALLING', true );

 /** Sets up the WordPress Environment. */
-require( dirname(__FILE__) . '/wp-load.php' );
+require( dirname( __FILE__ ) . '/wp-load.php' );

 require( dirname( __FILE__ ) . '/wp-blog-header.php' );

-if ( !is_multisite() ) {
+if ( ! is_multisite() ) {
 	wp_redirect( wp_registration_url() );
 	die();
 }
@@ -21,7 +21,7 @@ if ( !is_multisite() ) {
 $valid_error_codes = array( 'already_active', 'blog_taken' );

 list( $activate_path ) = explode( '?', wp_unslash( $_SERVER['REQUEST_URI'] ) );
-$activate_cookie = 'wp-activate-' . COOKIEHASH;
+$activate_cookie       = 'wp-activate-' . COOKIEHASH;

 $key    = '';
 $result = null;
@@ -64,8 +64,9 @@ if ( $result === null || ( is_wp_error( $result ) && 'invalid_key' === $result->

 nocache_headers();

-if ( is_object( $wp_object_cache ) )
+if ( is_object( $wp_object_cache ) ) {
 	$wp_object_cache->cache_enabled = false;
+}

 // Fix for page title
 $wp_query->is_404 = false;
@@ -89,10 +90,10 @@ function do_activate_header() {
 	 * Fires before the Site Activation page is loaded.
 	 *
 	 * Fires on the {@see 'wp_head'} action.
-     *
-     * @since 3.0.0
-     */
-    do_action( 'activate_wp_head' );
+	 *
+	 * @since 3.0.0
+	 */
+	do_action( 'activate_wp_head' );
 }
 add_action( 'wp_head', 'do_activate_header' );

@@ -108,7 +109,7 @@ function wpmu_activate_stylesheet() {
 		#submit, #key { width: 90%; font-size: 24px; }
 		#language { margin-top: .5em; }
 		.error { background: #f66; }
-		span.h3 { padding: 0 8px; font-size: 1.3em; font-weight: bold; }
+		span.h3 { padding: 0 8px; font-size: 1.3em; font-weight: 600; }
 	</style>
 	<?php
 }
@@ -122,18 +123,19 @@ get_header( 'wp-activate' );
 	<div class="wp-activate-container">
 	<?php if ( ! $key ) { ?>

-		<h2><?php _e('Activation Key Required') ?></h2>
-		<form name="activateform" id="activateform" method="post" action="<?php echo network_site_url('wp-activate.php'); ?>">
+		<h2><?php _e( 'Activation Key Required' ); ?></h2>
+		<form name="activateform" id="activateform" method="post" action="<?php echo network_site_url( 'wp-activate.php' ); ?>">
 			<p>
-			    <label for="key"><?php _e('Activation Key:') ?></label>
-			    <br /><input type="text" name="key" id="key" value="" size="50" />
+				<label for="key"><?php _e( 'Activation Key:' ); ?></label>
+				<br /><input type="text" name="key" id="key" value="" size="50" />
 			</p>
 			<p class="submit">
-			    <input id="submit" type="submit" name="Submit" class="submit" value="<?php esc_attr_e('Activate') ?>" />
+				<input id="submit" type="submit" name="Submit" class="submit" value="<?php esc_attr_e( 'Activate' ); ?>" />
 			</p>
 		</form>

-	<?php } else {
+		<?php
+	} else {
 		if ( is_wp_error( $result ) && in_array( $result->get_error_code(), $valid_error_codes ) ) {
 			$signup = $result->get_error_data();
 			?>
@@ -142,7 +144,7 @@ get_header( 'wp-activate' );
 			echo '<p class="lead-in">';
 			if ( $signup->domain . $signup->path == '' ) {
 				printf(
-				/* translators: 1: login URL, 2: username, 3: user email, 4: lost password URL */
+					/* translators: 1: login URL, 2: username, 3: user email, 4: lost password URL */
 					__( 'Your account has been activated. You may now <a href="%1$s">log in</a> to the site using your chosen username of &#8220;%2$s&#8221;. Please check your email inbox at %3$s for your password and login instructions. If you do not receive an email, please check your junk or spam folder. If you still do not receive an email within an hour, you can <a href="%4$s">reset your password</a>.' ),
 					network_site_url( 'wp-login.php', 'login' ),
 					$signup->user_login,
@@ -151,7 +153,7 @@ get_header( 'wp-activate' );
 				);
 			} else {
 				printf(
-				/* translators: 1: site URL, 2: username, 3: user email, 4: lost password URL */
+					/* translators: 1: site URL, 2: username, 3: user email, 4: lost password URL */
 					__( 'Your site at %1$s is active. You may now log in to your site using your chosen username of &#8220;%2$s&#8221;. Please check your email inbox at %3$s for your password and login instructions. If you do not receive an email, please check your junk or spam folder. If you still do not receive an email within an hour, you can <a href="%4$s">reset your password</a>.' ),
 					sprintf( '<a href="http://%1$s">%1$s</a>', $signup->domain ),
 					$signup->user_login,
@@ -168,31 +170,37 @@ get_header( 'wp-activate' );
 			<?php endif; ?>
 			<?php
 		} else {
-			$url = isset( $result['blog_id'] ) ? get_home_url( (int) $result['blog_id'] ) : '';
+			$url  = isset( $result['blog_id'] ) ? get_home_url( (int) $result['blog_id'] ) : '';
 			$user = get_userdata( (int) $result['user_id'] );
 			?>
-			<h2><?php _e('Your account is now active!'); ?></h2>
+			<h2><?php _e( 'Your account is now active!' ); ?></h2>

 			<div id="signup-welcome">
-				<p><span class="h3"><?php _e('Username:'); ?></span> <?php echo $user->user_login ?></p>
-				<p><span class="h3"><?php _e('Password:'); ?></span> <?php echo $result['password']; ?></p>
+			<p><span class="h3"><?php _e( 'Username:' ); ?></span> <?php echo $user->user_login; ?></p>
+			<p><span class="h3"><?php _e( 'Password:' ); ?></span> <?php echo $result['password']; ?></p>
 			</div>

-			<?php if ( $url && $url != network_home_url( '', 'http' ) ) :
+			<?php
+			if ( $url && $url != network_home_url( '', 'http' ) ) :
 				switch_to_blog( (int) $result['blog_id'] );
 				$login_url = wp_login_url();
 				restore_current_blog();
 				?>
-				<p class="view"><?php
+				<p class="view">
+				<?php
 					/* translators: 1: site URL, 2: login URL */
 					printf( __( 'Your account is now activated. <a href="%1$s">View your site</a> or <a href="%2$s">Log in</a>' ), $url, esc_url( $login_url ) );
-				?></p>
-			<?php else: ?>
-				<p class="view"><?php
+				?>
+				</p>
+			<?php else : ?>
+				<p class="view">
+				<?php
 					/* translators: 1: login URL, 2: network home URL */
 					printf( __( 'Your account is now activated. <a href="%1$s">Log in</a> or go back to the <a href="%2$s">homepage</a>.' ), network_site_url( 'wp-login.php', 'login' ), network_home_url() );
-				?></p>
-			<?php endif;
+				?>
+				</p>
+				<?php
+				endif;
 		}
 	}
 	?>
@@ -202,4 +210,5 @@ get_header( 'wp-activate' );
 	var key_input = document.getElementById('key');
 	key_input && key_input.focus();
 </script>
-<?php get_footer( 'wp-activate' );
+<?php
+get_footer( 'wp-activate' );
--- a/wp-admin/about.php
+++ b/wp-admin/about.php
--- a/wp-admin/admin-ajax.php
+++ b/wp-admin/admin-ajax.php
@@ -25,8 +25,9 @@ require_once( dirname( dirname( __FILE__ ) ) . '/wp-load.php' );
 send_origin_headers();

 // Require an action parameter
-if ( empty( $_REQUEST['action'] ) )
+if ( empty( $_REQUEST['action'] ) ) {
 	wp_die( '0', 400 );
+}

 /** Load WordPress Administration APIs */
 require_once( ABSPATH . 'wp-admin/includes/admin.php' );
@@ -44,74 +45,147 @@ nocache_headers();
 do_action( 'admin_init' );

 $core_actions_get = array(
-	'fetch-list', 'ajax-tag-search', 'wp-compression-test', 'imgedit-preview', 'oembed-cache',
-	'autocomplete-user', 'dashboard-widgets', 'logged-in',
+	'fetch-list',
+	'ajax-tag-search',
+	'wp-compression-test',
+	'imgedit-preview',
+	'oembed-cache',
+	'autocomplete-user',
+	'dashboard-widgets',
+	'logged-in',
 );

 $core_actions_post = array(
-	'oembed-cache', 'image-editor', 'delete-comment', 'delete-tag', 'delete-link',
-	'delete-meta', 'delete-post', 'trash-post', 'untrash-post', 'delete-page', 'dim-comment',
-	'add-link-category', 'add-tag', 'get-tagcloud', 'get-comments', 'replyto-comment',
-	'edit-comment', 'add-menu-item', 'add-meta', 'add-user', 'closed-postboxes',
-	'hidden-columns', 'update-welcome-panel', 'menu-get-metabox', 'wp-link-ajax',
-	'menu-locations-save', 'menu-quick-search', 'meta-box-order', 'get-permalink',
-	'sample-permalink', 'inline-save', 'inline-save-tax', 'find_posts', 'widgets-order',
-	'save-widget', 'delete-inactive-widgets', 'set-post-thumbnail', 'date_format', 'time_format',
-	'wp-remove-post-lock', 'dismiss-wp-pointer', 'upload-attachment', 'get-attachment',
-	'query-attachments', 'save-attachment', 'save-attachment-compat', 'send-link-to-editor',
-	'send-attachment-to-editor', 'save-attachment-order', 'heartbeat', 'get-revision-diffs',
-	'save-user-color-scheme', 'update-widget', 'query-themes', 'parse-embed', 'set-attachment-thumbnail',
-	'parse-media-shortcode', 'destroy-sessions', 'install-plugin', 'update-plugin', 'crop-image',
-	'generate-password', 'save-wporg-username', 'delete-plugin', 'search-plugins',
-	'search-install-plugins', 'activate-plugin', 'update-theme', 'delete-theme', 'install-theme',
-	'get-post-thumbnail-html', 'get-community-events', 'edit-theme-plugin-file',
+	'oembed-cache',
+	'image-editor',
+	'delete-comment',
+	'delete-tag',
+	'delete-link',
+	'delete-meta',
+	'delete-post',
+	'trash-post',
+	'untrash-post',
+	'delete-page',
+	'dim-comment',
+	'add-link-category',
+	'add-tag',
+	'get-tagcloud',
+	'get-comments',
+	'replyto-comment',
+	'edit-comment',
+	'add-menu-item',
+	'add-meta',
+	'add-user',
+	'closed-postboxes',
+	'hidden-columns',
+	'update-welcome-panel',
+	'menu-get-metabox',
+	'wp-link-ajax',
+	'menu-locations-save',
+	'menu-quick-search',
+	'meta-box-order',
+	'get-permalink',
+	'sample-permalink',
+	'inline-save',
+	'inline-save-tax',
+	'find_posts',
+	'widgets-order',
+	'save-widget',
+	'delete-inactive-widgets',
+	'set-post-thumbnail',
+	'date_format',
+	'time_format',
+	'wp-remove-post-lock',
+	'dismiss-wp-pointer',
+	'upload-attachment',
+	'get-attachment',
+	'query-attachments',
+	'save-attachment',
+	'save-attachment-compat',
+	'send-link-to-editor',
+	'send-attachment-to-editor',
+	'save-attachment-order',
+	'heartbeat',
+	'get-revision-diffs',
+	'save-user-color-scheme',
+	'update-widget',
+	'query-themes',
+	'parse-embed',
+	'set-attachment-thumbnail',
+	'parse-media-shortcode',
+	'destroy-sessions',
+	'install-plugin',
+	'update-plugin',
+	'crop-image',
+	'generate-password',
+	'save-wporg-username',
+	'delete-plugin',
+	'search-plugins',
+	'search-install-plugins',
+	'activate-plugin',
+	'update-theme',
+	'delete-theme',
+	'install-theme',
+	'get-post-thumbnail-html',
+	'get-community-events',
+	'edit-theme-plugin-file',
 	'wp-privacy-export-personal-data',
 	'wp-privacy-erase-personal-data',
+	'health-check-site-status-result',
+	'health-check-dotorg-communication',
+	'health-check-is-in-debug-mode',
+	'health-check-background-updates',
+	'health-check-loopback-requests',
+	'health-check-get-sizes',
 );

 // Deprecated
 $core_actions_post_deprecated = array( 'wp-fullscreen-save-post', 'press-this-save-post', 'press-this-add-category' );
-$core_actions_post = array_merge( $core_actions_post, $core_actions_post_deprecated );
+$core_actions_post            = array_merge( $core_actions_post, $core_actions_post_deprecated );

 // Register core Ajax calls.
-if ( ! empty( $_GET['action'] ) && in_array( $_GET['action'], $core_actions_get ) )
+if ( ! empty( $_GET['action'] ) && in_array( $_GET['action'], $core_actions_get ) ) {
 	add_action( 'wp_ajax_' . $_GET['action'], 'wp_ajax_' . str_replace( '-', '_', $_GET['action'] ), 1 );
+}

-if ( ! empty( $_POST['action'] ) && in_array( $_POST['action'], $core_actions_post ) )
+if ( ! empty( $_POST['action'] ) && in_array( $_POST['action'], $core_actions_post ) ) {
 	add_action( 'wp_ajax_' . $_POST['action'], 'wp_ajax_' . str_replace( '-', '_', $_POST['action'] ), 1 );
+}

 add_action( 'wp_ajax_nopriv_heartbeat', 'wp_ajax_nopriv_heartbeat', 1 );

+$action = ( isset( $_REQUEST['action'] ) ) ? $_REQUEST['action'] : '';
+
 if ( is_user_logged_in() ) {
 	// If no action is registered, return a Bad Request response.
-	if ( ! has_action( 'wp_ajax_' . $_REQUEST['action'] ) ) {
+	if ( ! has_action( "wp_ajax_{$action}" ) ) {
 		wp_die( '0', 400 );
 	}

 	/**
 	 * Fires authenticated Ajax actions for logged-in users.
 	 *
-	 * The dynamic portion of the hook name, `$_REQUEST['action']`,
-	 * refers to the name of the Ajax action callback being fired.
+	 * The dynamic portion of the hook name, `$action`, refers
+	 * to the name of the Ajax action callback being fired.
 	 *
 	 * @since 2.1.0
 	 */
-	do_action( 'wp_ajax_' . $_REQUEST['action'] );
+	do_action( "wp_ajax_{$action}" );
 } else {
 	// If no action is registered, return a Bad Request response.
-	if ( ! has_action( 'wp_ajax_nopriv_' . $_REQUEST['action'] ) ) {
+	if ( ! has_action( "wp_ajax_nopriv_{$action}" ) ) {
 		wp_die( '0', 400 );
 	}

 	/**
 	 * Fires non-authenticated Ajax actions for logged-out users.
 	 *
-	 * The dynamic portion of the hook name, `$_REQUEST['action']`,
-	 * refers to the name of the Ajax action callback being fired.
+	 * The dynamic portion of the hook name, `$action`, refers
+	 * to the name of the Ajax action callback being fired.
 	 *
 	 * @since 2.8.0
 	 */
-	do_action( 'wp_ajax_nopriv_' . $_REQUEST['action'] );
+	do_action( "wp_ajax_nopriv_{$action}" );
 }
 // Default status
 wp_die( '0' );
--- a/wp-admin/admin-footer.php
+++ b/wp-admin/admin-footer.php
@@ -7,8 +7,9 @@
 */

 // don't load directly
-if ( !defined('ABSPATH') )
-	die('-1');
+if ( ! defined( 'ABSPATH' ) ) {
+	die( '-1' );
+}

 /**
 * @global string $hook_suffix
@@ -99,9 +100,10 @@ do_action( 'admin_print_footer_scripts' );
 do_action( "admin_footer-{$hook_suffix}" );

 // get_site_option() won't exist when auto upgrading from <= 2.7
-if ( function_exists('get_site_option') ) {
-	if ( false === get_site_option('can_compress_scripts') )
+if ( function_exists( 'get_site_option' ) ) {
+	if ( false === get_site_option( 'can_compress_scripts' ) ) {
 		compression_test();
+	}
 }

 ?>
--- a/wp-admin/admin-functions.php
+++ b/wp-admin/admin-functions.php
@@ -9,7 +9,7 @@
 * @subpackage Administration
 */

-_deprecated_file( basename(__FILE__), '2.5.0', 'wp-admin/includes/admin.php' );
+_deprecated_file( basename( __FILE__ ), '2.5.0', 'wp-admin/includes/admin.php' );

 /** WordPress Administration API: Includes all Administration functions. */
-require_once(ABSPATH . 'wp-admin/includes/admin.php');
+require_once( ABSPATH . 'wp-admin/includes/admin.php' );
--- a/wp-admin/admin-header.php
+++ b/wp-admin/admin-header.php
@@ -6,9 +6,10 @@
 * @subpackage Administration
 */

-@header('Content-Type: ' . get_option('html_type') . '; charset=' . get_option('blog_charset'));
-if ( ! defined( 'WP_ADMIN' ) )
+@header( 'Content-Type: ' . get_option( 'html_type' ) . '; charset=' . get_option( 'blog_charset' ) );
+if ( ! defined( 'WP_ADMIN' ) ) {
 	require_once( dirname( __FILE__ ) . '/admin.php' );
+}

 /**
 * In case admin-header.php is included in a function.
@@ -26,30 +27,36 @@ global $title, $hook_suffix, $current_screen, $wp_locale, $pagenow,
 	$update_title, $total_update_count, $parent_file;

 // Catch plugins that include admin-header.php before admin.php completes.
-if ( empty( $current_screen ) )
+if ( empty( $current_screen ) ) {
 	set_current_screen();
+}

 get_admin_page_title();
 $title = esc_html( strip_tags( $title ) );

 if ( is_network_admin() ) {
-	/* translators: Network admin screen title. 1: Network name */
+	/* translators: Network admin screen title. %s: Network name */
 	$admin_title = sprintf( __( 'Network Admin: %s' ), esc_html( get_network()->site_name ) );
 } elseif ( is_user_admin() ) {
-	/* translators: User dashboard screen title. 1: Network name */
+	/* translators: User dashboard screen title. %s: Network name */
 	$admin_title = sprintf( __( 'User Dashboard: %s' ), esc_html( get_network()->site_name ) );
 } else {
 	$admin_title = get_bloginfo( 'name' );
 }

 if ( $admin_title == $title ) {
-	/* translators: Admin screen title. 1: Admin screen name */
-	$admin_title = sprintf( __( '%1$s &#8212; WordPress' ), $title );
+	/* translators: Admin screen title. %s: Admin screen name */
+	$admin_title = sprintf( __( '%s &#8212; WordPress' ), $title );
 } else {
 	/* translators: Admin screen title. 1: Admin screen name, 2: Network or site name */
 	$admin_title = sprintf( __( '%1$s &lsaquo; %2$s &#8212; WordPress' ), $title, $admin_title );
 }

+if ( wp_is_recovery_mode() ) {
+	/* translators: %s: Admin screen title. */
+	$admin_title = sprintf( __( 'Recovery Mode &#8212; %s' ), $admin_title );
+}
+
 /**
 * Filters the title tag content for an admin page.
 *
@@ -69,19 +76,19 @@ _wp_admin_html_begin();

 wp_enqueue_style( 'colors' );
 wp_enqueue_style( 'ie' );
-wp_enqueue_script('utils');
+wp_enqueue_script( 'utils' );
 wp_enqueue_script( 'svg-painter' );

-$admin_body_class = preg_replace('/[^a-z0-9_-]+/i', '-', $hook_suffix);
+$admin_body_class = preg_replace( '/[^a-z0-9_-]+/i', '-', $hook_suffix );
 ?>
 <script type="text/javascript">
-addLoadEvent = function(func){if(typeof jQuery!="undefined")jQuery(document).ready(func);else if(typeof wpOnload!='function'){wpOnload=func;}else{var oldonload=wpOnload;wpOnload=function(){oldonload();func();}}};
-var ajaxurl = '<?php echo admin_url( 'admin-ajax.php', 'relative' ); ?>',
-	pagenow = '<?php echo $current_screen->id; ?>',
-	typenow = '<?php echo $current_screen->post_type; ?>',
-	adminpage = '<?php echo $admin_body_class; ?>',
-	thousandsSeparator = '<?php echo addslashes( $wp_locale->number_format['thousands_sep'] ); ?>',
-	decimalPoint = '<?php echo addslashes( $wp_locale->number_format['decimal_point'] ); ?>',
+addLoadEvent = function(func){if(typeof jQuery!=='undefined')jQuery(document).ready(func);else if(typeof wpOnload!=='function'){wpOnload=func;}else{var oldonload=wpOnload;wpOnload=function(){oldonload();func();}}};
+var ajaxurl = '<?php echo esc_js( admin_url( 'admin-ajax.php', 'relative' ) ); ?>',
+	pagenow = '<?php echo esc_js( $current_screen->id ); ?>',
+	typenow = '<?php echo esc_js( $current_screen->post_type ); ?>',
+	adminpage = '<?php echo esc_js( $admin_body_class ); ?>',
+	thousandsSeparator = '<?php echo esc_js( $wp_locale->number_format['thousands_sep'] ); ?>',
+	decimalPoint = '<?php echo esc_js( $wp_locale->number_format['decimal_point'] ); ?>',
 	isRtl = <?php echo (int) is_rtl(); ?>;
 </script>
 <meta name="viewport" content="width=device-width,initial-scale=1.0">
@@ -141,37 +148,46 @@ do_action( "admin_head-{$hook_suffix}" );
 */
 do_action( 'admin_head' );

-if ( get_user_setting('mfold') == 'f' )
+if ( get_user_setting( 'mfold' ) == 'f' ) {
 	$admin_body_class .= ' folded';
+}

-if ( !get_user_setting('unfold') )
+if ( ! get_user_setting( 'unfold' ) ) {
 	$admin_body_class .= ' auto-fold';
+}

-if ( is_admin_bar_showing() )
+if ( is_admin_bar_showing() ) {
 	$admin_body_class .= ' admin-bar';
+}

-if ( is_rtl() )
+if ( is_rtl() ) {
 	$admin_body_class .= ' rtl';
+}

-if ( $current_screen->post_type )
+if ( $current_screen->post_type ) {
 	$admin_body_class .= ' post-type-' . $current_screen->post_type;
+}

-if ( $current_screen->taxonomy )
+if ( $current_screen->taxonomy ) {
 	$admin_body_class .= ' taxonomy-' . $current_screen->taxonomy;
+}

 $admin_body_class .= ' branch-' . str_replace( array( '.', ',' ), '-', floatval( get_bloginfo( 'version' ) ) );
 $admin_body_class .= ' version-' . str_replace( '.', '-', preg_replace( '/^([.0-9]+).*/', '$1', get_bloginfo( 'version' ) ) );
 $admin_body_class .= ' admin-color-' . sanitize_html_class( get_user_option( 'admin_color' ), 'fresh' );
 $admin_body_class .= ' locale-' . sanitize_html_class( strtolower( str_replace( '_', '-', get_user_locale() ) ) );

-if ( wp_is_mobile() )
+if ( wp_is_mobile() ) {
 	$admin_body_class .= ' mobile';
+}

-if ( is_multisite() )
+if ( is_multisite() ) {
 	$admin_body_class .= ' multisite';
+}

-if ( is_network_admin() )
+if ( is_network_admin() ) {
 	$admin_body_class .= ' network-admin';
+}

 $admin_body_class .= ' no-customize-support no-svg';

@@ -202,8 +218,9 @@ if ( $current_screen->is_block_editor() ) {
 * @param string $classes Space-separated list of CSS classes.
 */
 $admin_body_classes = apply_filters( 'admin_body_class', '' );
+$admin_body_classes = ltrim( $admin_body_classes . ' ' . $admin_body_class );
 ?>
-<body class="wp-admin wp-core-ui no-js <?php echo $admin_body_classes . ' ' . $admin_body_class; ?>">
+<body class="wp-admin wp-core-ui no-js <?php echo $admin_body_classes; ?>">
 <script type="text/javascript">
 	document.body.className = document.body.className.replace('no-js','js');
 </script>
@@ -216,7 +233,7 @@ if ( current_user_can( 'customize' ) ) {
 ?>

 <div id="wpwrap">
-<?php require(ABSPATH . 'wp-admin/menu-header.php'); ?>
+<?php require( ABSPATH . 'wp-admin/menu-header.php' ); ?>
 <div id="wpcontent">

 <?php
@@ -230,13 +247,13 @@ do_action( 'in_admin_header' );

 <div id="wpbody" role="main">
 <?php
-unset($title_class, $blog_name, $total_update_count, $update_title);
+unset( $blog_name, $total_update_count, $update_title );

 $current_screen->set_parentage( $parent_file );

 ?>

-<div id="wpbody-content" aria-label="<?php esc_attr_e('Main content'); ?>" tabindex="0">
+<div id="wpbody-content">
 <?php

 $current_screen->render_screen_meta();
@@ -271,5 +288,6 @@ if ( is_network_admin() ) {
 */
 do_action( 'all_admin_notices' );

-if ( $parent_file == 'options-general.php' )
-	require(ABSPATH . 'wp-admin/options-head.php');
+if ( $parent_file == 'options-general.php' ) {
+	require( ABSPATH . 'wp-admin/options-head.php' );
+}
--- a/wp-admin/admin-post.php
+++ b/wp-admin/admin-post.php
@@ -13,15 +13,16 @@ if ( ! defined( 'WP_ADMIN' ) ) {
 	define( 'WP_ADMIN', true );
 }

-if ( defined('ABSPATH') )
-	require_once(ABSPATH . 'wp-load.php');
-else
+if ( defined( 'ABSPATH' ) ) {
+	require_once( ABSPATH . 'wp-load.php' );
+} else {
 	require_once( dirname( dirname( __FILE__ ) ) . '/wp-load.php' );
+}

 /** Allow for cross-domain requests (from the front end). */
 send_origin_headers();

-require_once(ABSPATH . 'wp-admin/includes/admin.php');
+require_once( ABSPATH . 'wp-admin/includes/admin.php' );

 nocache_headers();

@@ -30,10 +31,10 @@ do_action( 'admin_init' );

 $action = empty( $_REQUEST['action'] ) ? '' : $_REQUEST['action'];

-if ( ! wp_validate_auth_cookie() ) {
+if ( ! is_user_logged_in() ) {
 	if ( empty( $action ) ) {
 		/**
-		 * Fires on a non-authenticated admin post request where no action was supplied.
+		 * Fires on a non-authenticated admin post request where no action is supplied.
 		 *
 		 * @since 2.6.0
 		 */
@@ -52,7 +53,7 @@ if ( ! wp_validate_auth_cookie() ) {
 } else {
 	if ( empty( $action ) ) {
 		/**
-		 * Fires on an authenticated admin post request where no action was supplied.
+		 * Fires on an authenticated admin post request where no action is supplied.
 		 *
 		 * @since 2.6.0
 		 */
--- a/wp-admin/admin.php
+++ b/wp-admin/admin.php
@@ -15,26 +15,29 @@ if ( ! defined( 'WP_ADMIN' ) ) {
 	define( 'WP_ADMIN', true );
 }

-if ( ! defined('WP_NETWORK_ADMIN') )
-	define('WP_NETWORK_ADMIN', false);
-
-if ( ! defined('WP_USER_ADMIN') )
-	define('WP_USER_ADMIN', false);
-
-if ( ! WP_NETWORK_ADMIN && ! WP_USER_ADMIN ) {
-	define('WP_BLOG_ADMIN', true);
+if ( ! defined( 'WP_NETWORK_ADMIN' ) ) {
+	define( 'WP_NETWORK_ADMIN', false );
 }

-if ( isset($_GET['import']) && !defined('WP_LOAD_IMPORTERS') )
-	define('WP_LOAD_IMPORTERS', true);
+if ( ! defined( 'WP_USER_ADMIN' ) ) {
+	define( 'WP_USER_ADMIN', false );
+}

-require_once(dirname(dirname(__FILE__)) . '/wp-load.php');
+if ( ! WP_NETWORK_ADMIN && ! WP_USER_ADMIN ) {
+	define( 'WP_BLOG_ADMIN', true );
+}
+
+if ( isset( $_GET['import'] ) && ! defined( 'WP_LOAD_IMPORTERS' ) ) {
+	define( 'WP_LOAD_IMPORTERS', true );
+}
+
+require_once( dirname( dirname( __FILE__ ) ) . '/wp-load.php' );

 nocache_headers();

-if ( get_option('db_upgraded') ) {
+if ( get_option( 'db_upgraded' ) ) {
 	flush_rewrite_rules();
-	update_option( 'db_upgraded',  false );
+	update_option( 'db_upgraded', false );

 	/**
 	 * Fires on the next page load after a successful DB upgrade.
@@ -42,25 +45,25 @@ if ( get_option('db_upgraded') ) {
 	 * @since 2.8.0
 	 */
 	do_action( 'after_db_upgrade' );
-} elseif ( get_option('db_version') != $wp_db_version && empty($_POST) ) {
-	if ( !is_multisite() ) {
+} elseif ( get_option( 'db_version' ) != $wp_db_version && empty( $_POST ) ) {
+	if ( ! is_multisite() ) {
 		wp_redirect( admin_url( 'upgrade.php?_wp_http_referer=' . urlencode( wp_unslash( $_SERVER['REQUEST_URI'] ) ) ) );
 		exit;

-	/**
-	 * Filters whether to attempt to perform the multisite DB upgrade routine.
-	 *
-	 * In single site, the user would be redirected to wp-admin/upgrade.php.
-	 * In multisite, the DB upgrade routine is automatically fired, but only
-	 * when this filter returns true.
-	 *
-	 * If the network is 50 sites or less, it will run every time. Otherwise,
-	 * it will throttle itself to reduce load.
-	 *
-	 * @since 3.0.0
-	 *
-	 * @param bool $do_mu_upgrade Whether to perform the Multisite upgrade routine. Default true.
-	 */
+		/**
+		 * Filters whether to attempt to perform the multisite DB upgrade routine.
+		 *
+		 * In single site, the user would be redirected to wp-admin/upgrade.php.
+		 * In multisite, the DB upgrade routine is automatically fired, but only
+		 * when this filter returns true.
+		 *
+		 * If the network is 50 sites or less, it will run every time. Otherwise,
+		 * it will throttle itself to reduce load.
+		 *
+		 * @since 3.0.0
+		 *
+		 * @param bool $do_mu_upgrade Whether to perform the Multisite upgrade routine. Default true.
+		 */
 	} elseif ( apply_filters( 'do_mu_upgrade', true ) ) {
 		$c = get_blog_count();

@@ -68,24 +71,31 @@ if ( get_option('db_upgraded') ) {
 		 * If there are 50 or fewer sites, run every time. Otherwise, throttle to reduce load:
 		 * attempt to do no more than threshold value, with some +/- allowed.
 		 */
-		if ( $c <= 50 || ( $c > 50 && mt_rand( 0, (int)( $c / 50 ) ) == 1 ) ) {
+		if ( $c <= 50 || ( $c > 50 && mt_rand( 0, (int) ( $c / 50 ) ) == 1 ) ) {
 			require_once( ABSPATH . WPINC . '/http.php' );
-			$response = wp_remote_get( admin_url( 'upgrade.php?step=1' ), array( 'timeout' => 120, 'httpversion' => '1.1' ) );
+			$response = wp_remote_get(
+				admin_url( 'upgrade.php?step=1' ),
+				array(
+					'timeout'     => 120,
+					'httpversion' => '1.1',
+				)
+			);
 			/** This action is documented in wp-admin/network/upgrade.php */
 			do_action( 'after_mu_upgrade', $response );
-			unset($response);
+			unset( $response );
 		}
-		unset($c);
+		unset( $c );
 	}
 }

-require_once(ABSPATH . 'wp-admin/includes/admin.php');
+require_once( ABSPATH . 'wp-admin/includes/admin.php' );

 auth_redirect();

 // Schedule trash collection
-if ( ! wp_next_scheduled( 'wp_scheduled_delete' ) && ! wp_installing() )
-	wp_schedule_event(time(), 'daily', 'wp_scheduled_delete');
+if ( ! wp_next_scheduled( 'wp_scheduled_delete' ) && ! wp_installing() ) {
+	wp_schedule_event( time(), 'daily', 'wp_scheduled_delete' );
+}

 // Schedule Transient cleanup.
 if ( ! wp_next_scheduled( 'delete_expired_transients' ) && ! wp_installing() ) {
@@ -117,27 +127,30 @@ $page_hook = null;

 $editing = false;

-if ( isset($_GET['page']) ) {
+if ( isset( $_GET['page'] ) ) {
 	$plugin_page = wp_unslash( $_GET['page'] );
-	$plugin_page = plugin_basename($plugin_page);
+	$plugin_page = plugin_basename( $plugin_page );
 }

-if ( isset( $_REQUEST['post_type'] ) && post_type_exists( $_REQUEST['post_type'] ) )
+if ( isset( $_REQUEST['post_type'] ) && post_type_exists( $_REQUEST['post_type'] ) ) {
 	$typenow = $_REQUEST['post_type'];
-else
+} else {
 	$typenow = '';
+}

-if ( isset( $_REQUEST['taxonomy'] ) && taxonomy_exists( $_REQUEST['taxonomy'] ) )
+if ( isset( $_REQUEST['taxonomy'] ) && taxonomy_exists( $_REQUEST['taxonomy'] ) ) {
 	$taxnow = $_REQUEST['taxonomy'];
-else
+} else {
 	$taxnow = '';
+}

-if ( WP_NETWORK_ADMIN )
-	require(ABSPATH . 'wp-admin/network/menu.php');
-elseif ( WP_USER_ADMIN )
-	require(ABSPATH . 'wp-admin/user/menu.php');
-else
-	require(ABSPATH . 'wp-admin/menu.php');
+if ( WP_NETWORK_ADMIN ) {
+	require( ABSPATH . 'wp-admin/network/menu.php' );
+} elseif ( WP_USER_ADMIN ) {
+	require( ABSPATH . 'wp-admin/user/menu.php' );
+} else {
+	require( ABSPATH . 'wp-admin/menu.php' );
+}

 if ( current_user_can( 'manage_options' ) ) {
 	wp_raise_memory_limit( 'admin' );
@@ -155,26 +168,30 @@ if ( current_user_can( 'manage_options' ) ) {
 */
 do_action( 'admin_init' );

-if ( isset($plugin_page) ) {
-	if ( !empty($typenow) )
+if ( isset( $plugin_page ) ) {
+	if ( ! empty( $typenow ) ) {
 		$the_parent = $pagenow . '?post_type=' . $typenow;
-	else
+	} else {
 		$the_parent = $pagenow;
-	if ( ! $page_hook = get_plugin_page_hook($plugin_page, $the_parent) ) {
-		$page_hook = get_plugin_page_hook($plugin_page, $plugin_page);
+	}
+
+	$page_hook = get_plugin_page_hook( $plugin_page, $the_parent );
+	if ( ! $page_hook ) {
+		$page_hook = get_plugin_page_hook( $plugin_page, $plugin_page );

 		// Back-compat for plugins using add_management_page().
-		if ( empty( $page_hook ) && 'edit.php' == $pagenow && '' != get_plugin_page_hook($plugin_page, 'tools.php') ) {
+		if ( empty( $page_hook ) && 'edit.php' == $pagenow && '' != get_plugin_page_hook( $plugin_page, 'tools.php' ) ) {
 			// There could be plugin specific params on the URL, so we need the whole query string
-			if ( !empty($_SERVER[ 'QUERY_STRING' ]) )
-				$query_string = $_SERVER[ 'QUERY_STRING' ];
-			else
+			if ( ! empty( $_SERVER['QUERY_STRING'] ) ) {
+				$query_string = $_SERVER['QUERY_STRING'];
+			} else {
 				$query_string = 'page=' . $plugin_page;
-			wp_redirect( admin_url('tools.php?' . $query_string) );
+			}
+			wp_redirect( admin_url( 'tools.php?' . $query_string ) );
 			exit;
 		}
 	}
-	unset($the_parent);
+	unset( $the_parent );
 }

 $hook_suffix = '';
@@ -189,7 +206,7 @@ if ( isset( $page_hook ) ) {
 set_current_screen();

 // Handle plugin admin pages.
-if ( isset($plugin_page) ) {
+if ( isset( $plugin_page ) ) {
 	if ( $page_hook ) {
 		/**
 		 * Fires before a particular screen is loaded.
@@ -212,13 +229,25 @@ if ( isset($plugin_page) ) {
 		 * @since 2.1.0
 		 */
 		do_action( "load-{$page_hook}" );
-		if (! isset($_GET['noheader']))
-			require_once(ABSPATH . 'wp-admin/admin-header.php');
+		if ( ! isset( $_GET['noheader'] ) ) {
+			require_once( ABSPATH . 'wp-admin/admin-header.php' );
+		}

 		/**
 		 * Used to call the registered callback for a plugin screen.
 		 *
-		 * @ignore
+		 * This hook uses a dynamic hook name, `$page_hook`, which refers to a mixture of plugin
+		 * page information including:
+		 * 1. The page type. If the plugin page is registered as a submenu page, such as for
+		 *    Settings, the page type would be 'settings'. Otherwise the type is 'toplevel'.
+		 * 2. A separator of '_page_'.
+		 * 3. The plugin basename minus the file extension.
+		 *
+		 * Together, the three parts form the `$page_hook`. Citing the example above,
+		 * the hook name used would be 'settings_page_pluginbasename'.
+		 *
+		 * @see get_plugin_page_hook()
+		 *
 		 * @since 1.5.0
 		 */
 		do_action( $page_hook );
@@ -227,8 +256,9 @@ if ( isset($plugin_page) ) {
 			wp_die( __( 'Invalid plugin page.' ) );
 		}

-		if ( !( file_exists(WP_PLUGIN_DIR . "/$plugin_page") && is_file(WP_PLUGIN_DIR . "/$plugin_page") ) && !( file_exists(WPMU_PLUGIN_DIR . "/$plugin_page") && is_file(WPMU_PLUGIN_DIR . "/$plugin_page") ) )
-			wp_die(sprintf(__('Cannot load %s.'), htmlentities($plugin_page)));
+		if ( ! ( file_exists( WP_PLUGIN_DIR . "/$plugin_page" ) && is_file( WP_PLUGIN_DIR . "/$plugin_page" ) ) && ! ( file_exists( WPMU_PLUGIN_DIR . "/$plugin_page" ) && is_file( WPMU_PLUGIN_DIR . "/$plugin_page" ) ) ) {
+			wp_die( sprintf( __( 'Cannot load %s.' ), htmlentities( $plugin_page ) ) );
+		}

 		/**
 		 * Fires before a particular screen is loaded.
@@ -244,16 +274,18 @@ if ( isset($plugin_page) ) {
 		 */
 		do_action( "load-{$plugin_page}" );

-		if ( !isset($_GET['noheader']))
-			require_once(ABSPATH . 'wp-admin/admin-header.php');
+		if ( ! isset( $_GET['noheader'] ) ) {
+			require_once( ABSPATH . 'wp-admin/admin-header.php' );
+		}

-		if ( file_exists(WPMU_PLUGIN_DIR . "/$plugin_page") )
-			include(WPMU_PLUGIN_DIR . "/$plugin_page");
-		else
-			include(WP_PLUGIN_DIR . "/$plugin_page");
+		if ( file_exists( WPMU_PLUGIN_DIR . "/$plugin_page" ) ) {
+			include( WPMU_PLUGIN_DIR . "/$plugin_page" );
+		} else {
+			include( WP_PLUGIN_DIR . "/$plugin_page" );
+		}
 	}

-	include(ABSPATH . 'wp-admin/admin-footer.php');
+	include( ABSPATH . 'wp-admin/admin-footer.php' );

 	exit();
 } elseif ( isset( $_GET['import'] ) ) {
@@ -264,12 +296,12 @@ if ( isset($plugin_page) ) {
 		wp_die( __( 'Sorry, you are not allowed to import content.' ) );
 	}

-	if ( validate_file($importer) ) {
+	if ( validate_file( $importer ) ) {
 		wp_redirect( admin_url( 'import.php?invalid=' . $importer ) );
 		exit;
 	}

-	if ( ! isset($wp_importers[$importer]) || ! is_callable($wp_importers[$importer][2]) ) {
+	if ( ! isset( $wp_importers[ $importer ] ) || ! is_callable( $wp_importers[ $importer ][2] ) ) {
 		wp_redirect( admin_url( 'import.php?invalid=' . $importer ) );
 		exit;
 	}
@@ -283,16 +315,17 @@ if ( isset($plugin_page) ) {
 	 */
 	do_action( "load-importer-{$importer}" );

-	$parent_file = 'tools.php';
+	$parent_file  = 'tools.php';
 	$submenu_file = 'import.php';
-	$title = __('Import');
+	$title        = __( 'Import' );

-	if (! isset($_GET['noheader']))
-		require_once(ABSPATH . 'wp-admin/admin-header.php');
+	if ( ! isset( $_GET['noheader'] ) ) {
+		require_once( ABSPATH . 'wp-admin/admin-header.php' );
+	}

-	require_once(ABSPATH . 'wp-admin/includes/upgrade.php');
+	require_once( ABSPATH . 'wp-admin/includes/upgrade.php' );

-	define('WP_IMPORTING', true);
+	define( 'WP_IMPORTING', true );

 	/**
 	 * Whether to filter imported data through kses on import.
@@ -308,12 +341,12 @@ if ( isset($plugin_page) ) {
 		kses_init_filters();  // Always filter imported data with kses on multisite.
 	}

-	call_user_func($wp_importers[$importer][2]);
+	call_user_func( $wp_importers[ $importer ][2] );

-	include(ABSPATH . 'wp-admin/admin-footer.php');
+	include( ABSPATH . 'wp-admin/admin-footer.php' );

 	// Make sure rules are flushed
-	flush_rewrite_rules(false);
+	flush_rewrite_rules( false );

 	exit();
 } else {
@@ -336,28 +369,32 @@ if ( isset($plugin_page) ) {
 	 * In all other cases, 'load-' . $pagenow should be used instead.
 	 */
 	if ( $typenow == 'page' ) {
-		if ( $pagenow == 'post-new.php' )
+		if ( $pagenow == 'post-new.php' ) {
 			do_action( 'load-page-new.php' );
-		elseif ( $pagenow == 'post.php' )
+		} elseif ( $pagenow == 'post.php' ) {
 			do_action( 'load-page.php' );
-	}  elseif ( $pagenow == 'edit-tags.php' ) {
-		if ( $taxnow == 'category' )
+		}
+	} elseif ( $pagenow == 'edit-tags.php' ) {
+		if ( $taxnow == 'category' ) {
 			do_action( 'load-categories.php' );
-		elseif ( $taxnow == 'link_category' )
+		} elseif ( $taxnow == 'link_category' ) {
 			do_action( 'load-edit-link-categories.php' );
-	} elseif( 'term.php' === $pagenow ) {
+		}
+	} elseif ( 'term.php' === $pagenow ) {
 		do_action( 'load-edit-tags.php' );
 	}
 }

 if ( ! empty( $_REQUEST['action'] ) ) {
+	$action = $_REQUEST['action'];
+
 	/**
 	 * Fires when an 'action' request variable is sent.
 	 *
-	 * The dynamic portion of the hook name, `$_REQUEST['action']`,
-	 * refers to the action derived from the `GET` or `POST` request.
+	 * The dynamic portion of the hook name, `$action`, refers to
+	 * the action derived from the `GET` or `POST` request.
 	 *
 	 * @since 2.6.0
 	 */
-	do_action( 'admin_action_' . $_REQUEST['action'] );
+	do_action( "admin_action_{$action}" );
 }
--- a/wp-admin/async-upload.php
+++ b/wp-admin/async-upload.php
@@ -39,51 +39,61 @@ if ( ! current_user_can( 'upload_files' ) ) {
 }

 // just fetch the detail form for that attachment
-if ( isset($_REQUEST['attachment_id']) && ($id = intval($_REQUEST['attachment_id'])) && $_REQUEST['fetch'] ) {
+if ( isset( $_REQUEST['attachment_id'] ) && ( $id = intval( $_REQUEST['attachment_id'] ) ) && $_REQUEST['fetch'] ) {
 	$post = get_post( $id );
-	if ( 'attachment' != $post->post_type )
+	if ( 'attachment' != $post->post_type ) {
 		wp_die( __( 'Invalid post type.' ) );
-	if ( ! current_user_can( 'edit_post', $id ) )
+	}
+	if ( ! current_user_can( 'edit_post', $id ) ) {
 		wp_die( __( 'Sorry, you are not allowed to edit this item.' ) );
+	}

 	switch ( $_REQUEST['fetch'] ) {
-		case 3 :
-			if ( $thumb_url = wp_get_attachment_image_src( $id, 'thumbnail', true ) )
+		case 3:
+			if ( $thumb_url = wp_get_attachment_image_src( $id, 'thumbnail', true ) ) {
 				echo '<img class="pinkynail" src="' . esc_url( $thumb_url[0] ) . '" alt="" />';
+			}
 			echo '<a class="edit-attachment" href="' . esc_url( get_edit_post_link( $id ) ) . '" target="_blank">' . _x( 'Edit', 'media item' ) . '</a>';

 			// Title shouldn't ever be empty, but use filename just in case.
-			$file = get_attached_file( $post->ID );
+			$file  = get_attached_file( $post->ID );
 			$title = $post->post_title ? $post->post_title : wp_basename( $file );
 			echo '<div class="filename new"><span class="title">' . esc_html( wp_html_excerpt( $title, 60, '&hellip;' ) ) . '</span></div>';
 			break;
-		case 2 :
-			add_filter('attachment_fields_to_edit', 'media_single_attachment_fields_to_edit', 10, 2);
-			echo get_media_item($id, array( 'send' => false, 'delete' => true ));
+		case 2:
+			add_filter( 'attachment_fields_to_edit', 'media_single_attachment_fields_to_edit', 10, 2 );
+			echo get_media_item(
+				$id,
+				array(
+					'send'   => false,
+					'delete' => true,
+				)
+			);
 			break;
 		default:
-			add_filter('attachment_fields_to_edit', 'media_post_single_attachment_fields_to_edit', 10, 2);
-			echo get_media_item($id);
+			add_filter( 'attachment_fields_to_edit', 'media_post_single_attachment_fields_to_edit', 10, 2 );
+			echo get_media_item( $id );
 			break;
 	}
 	exit;
 }

-check_admin_referer('media-form');
+check_admin_referer( 'media-form' );

 $post_id = 0;
 if ( isset( $_REQUEST['post_id'] ) ) {
 	$post_id = absint( $_REQUEST['post_id'] );
-	if ( ! get_post( $post_id ) || ! current_user_can( 'edit_post', $post_id ) )
+	if ( ! get_post( $post_id ) || ! current_user_can( 'edit_post', $post_id ) ) {
 		$post_id = 0;
+	}
 }

 $id = media_handle_upload( 'async-upload', $post_id );
-if ( is_wp_error($id) ) {
+if ( is_wp_error( $id ) ) {
 	echo '<div class="error-div error">
-	<a class="dismiss" href="#" onclick="jQuery(this).parents(\'div.media-item\').slideUp(200, function(){jQuery(this).remove();});">' . __('Dismiss') . '</a>
-	<strong>' . sprintf(__('&#8220;%s&#8221; has failed to upload.'), esc_html($_FILES['async-upload']['name']) ) . '</strong><br />' .
-	esc_html($id->get_error_message()) . '</div>';
+	<button type="button" class="dismiss button-link" onclick="jQuery(this).parents(\'div.media-item\').slideUp(200, function(){jQuery(this).remove();});">' . __( 'Dismiss' ) . '</button>
+	<strong>' . sprintf( __( '&#8220;%s&#8221; has failed to upload.' ), esc_html( $_FILES['async-upload']['name'] ) ) . '</strong><br />' .
+	esc_html( $id->get_error_message() ) . '</div>';
 	exit;
 }

@@ -91,7 +101,7 @@ if ( $_REQUEST['short'] ) {
 	// Short form response - attachment ID only.
 	echo $id;
 } else {
-	// Long form response - big chunk o html.
+	// Long form response - big chunk of html.
 	$type = $_REQUEST['type'];

 	/**
--- a/wp-admin/comment.php
+++ b/wp-admin/comment.php
@@ -9,169 +9,176 @@
 /** Load WordPress Bootstrap */
 require_once( dirname( __FILE__ ) . '/admin.php' );

-$parent_file = 'edit-comments.php';
+$parent_file  = 'edit-comments.php';
 $submenu_file = 'edit-comments.php';

 /**
 * @global string $action
 */
 global $action;
-wp_reset_vars( array('action') );
+wp_reset_vars( array( 'action' ) );

-if ( isset( $_POST['deletecomment'] ) )
+if ( isset( $_POST['deletecomment'] ) ) {
 	$action = 'deletecomment';
+}

-if ( 'cdc' == $action )
+if ( 'cdc' == $action ) {
 	$action = 'delete';
-elseif ( 'mac' == $action )
+} elseif ( 'mac' == $action ) {
 	$action = 'approve';
+}

 if ( isset( $_GET['dt'] ) ) {
-	if ( 'spam' == $_GET['dt'] )
+	if ( 'spam' == $_GET['dt'] ) {
 		$action = 'spam';
-	elseif ( 'trash' == $_GET['dt'] )
+	} elseif ( 'trash' == $_GET['dt'] ) {
 		$action = 'trash';
+	}
 }

-switch( $action ) {
-
-case 'editcomment' :
-	$title = __('Edit Comment');
-
-	get_current_screen()->add_help_tab( array(
-		'id'      => 'overview',
-		'title'   => __('Overview'),
-		'content' =>
-			'<p>' . __( 'You can edit the information left in a comment if needed. This is often useful when you notice that a commenter has made a typographical error.' ) . '</p>' .
-			'<p>' . __( 'You can also moderate the comment from this screen using the Status box, where you can also change the timestamp of the comment.' ) . '</p>'
-	) );
-
-	get_current_screen()->set_help_sidebar(
-	'<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
-	'<p>' . __( '<a href="https://codex.wordpress.org/Administration_Screens#Comments">Documentation on Comments</a>' ) . '</p>' .
-	'<p>' . __( '<a href="https://wordpress.org/support/">Support Forums</a>' ) . '</p>'
-	);
-
-	wp_enqueue_script('comment');
-	require_once( ABSPATH . 'wp-admin/admin-header.php' );
-
-	$comment_id = absint( $_GET['c'] );
-
-	if ( !$comment = get_comment( $comment_id ) )
-		comment_footer_die( __( 'Invalid comment ID.' ) . sprintf(' <a href="%s">' . __('Go back') . '</a>.', 'javascript:history.go(-1)') );
-
-	if ( !current_user_can( 'edit_comment', $comment_id ) )
-		comment_footer_die( __('Sorry, you are not allowed to edit this comment.') );
-
-	if ( 'trash' == $comment->comment_approved )
-		comment_footer_die( __('This comment is in the Trash. Please move it out of the Trash if you want to edit it.') );
-
-	$comment = get_comment_to_edit( $comment_id );
-
-	include( ABSPATH . 'wp-admin/edit-form-comment.php' );
-
-	break;
-
-case 'delete'  :
-case 'approve' :
-case 'trash'   :
-case 'spam'    :
-
-	$title = __('Moderate Comment');
-
-	$comment_id = absint( $_GET['c'] );
-
-	if ( ! $comment = get_comment( $comment_id ) ) {
-		wp_redirect( admin_url('edit-comments.php?error=1') );
-		die();
-	}
-
-	if ( !current_user_can( 'edit_comment', $comment->comment_ID ) ) {
-		wp_redirect( admin_url('edit-comments.php?error=2') );
-		die();
-	}
-
-	// No need to re-approve/re-trash/re-spam a comment.
-	if ( $action == str_replace( '1', 'approve', $comment->comment_approved ) ) {
-		wp_redirect( admin_url( 'edit-comments.php?same=' . $comment_id ) );
-		die();
- 	}
-
-	require_once( ABSPATH . 'wp-admin/admin-header.php' );
-
-	$formaction    = $action . 'comment';
-	$nonce_action  = 'approve' == $action ? 'approve-comment_' : 'delete-comment_';
-	$nonce_action .= $comment_id;
-
-?>
-<div class="wrap">
-
-<h1><?php echo esc_html( $title ); ?></h1>
-
-<?php
 switch ( $action ) {
-	case 'spam' :
-		$caution_msg = __('You are about to mark the following comment as spam:');
-		$button      = _x( 'Mark as Spam', 'comment' );
-		break;
-	case 'trash' :
-		$caution_msg = __('You are about to move the following comment to the Trash:');
-		$button      = __('Move to Trash');
-		break;
-	case 'delete' :
-		$caution_msg = __('You are about to delete the following comment:');
-		$button      = __('Permanently Delete Comment');
-		break;
-	default :
-		$caution_msg = __('You are about to approve the following comment:');
-		$button      = __('Approve Comment');
-		break;
-}

-if ( $comment->comment_approved != '0' ) { // if not unapproved
-	$message = '';
-	switch ( $comment->comment_approved ) {
-		case '1' :
-			$message = __('This comment is currently approved.');
-			break;
-		case 'spam' :
-			$message  = __('This comment is currently marked as spam.');
-			break;
-		case 'trash' :
-			$message  = __('This comment is currently in the Trash.');
-			break;
-	}
-	if ( $message ) {
-		echo '<div id="message" class="notice notice-info"><p>' . $message . '</p></div>';
-	}
-}
-?>
+	case 'editcomment':
+		$title = __( 'Edit Comment' );
+
+		get_current_screen()->add_help_tab(
+			array(
+				'id'      => 'overview',
+				'title'   => __( 'Overview' ),
+				'content' =>
+					  '<p>' . __( 'You can edit the information left in a comment if needed. This is often useful when you notice that a commenter has made a typographical error.' ) . '</p>' .
+					  '<p>' . __( 'You can also moderate the comment from this screen using the Status box, where you can also change the timestamp of the comment.' ) . '</p>',
+			)
+		);
+
+		get_current_screen()->set_help_sidebar(
+			'<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
+			'<p>' . __( '<a href="https://codex.wordpress.org/Administration_Screens#Comments">Documentation on Comments</a>' ) . '</p>' .
+			'<p>' . __( '<a href="https://wordpress.org/support/">Support</a>' ) . '</p>'
+		);
+
+		wp_enqueue_script( 'comment' );
+		require_once( ABSPATH . 'wp-admin/admin-header.php' );
+
+		$comment_id = absint( $_GET['c'] );
+
+		if ( ! $comment = get_comment( $comment_id ) ) {
+			comment_footer_die( __( 'Invalid comment ID.' ) . sprintf( ' <a href="%s">' . __( 'Go back' ) . '</a>.', 'javascript:history.go(-1)' ) );
+		}
+
+		if ( ! current_user_can( 'edit_comment', $comment_id ) ) {
+			comment_footer_die( __( 'Sorry, you are not allowed to edit this comment.' ) );
+		}
+
+		if ( 'trash' == $comment->comment_approved ) {
+			comment_footer_die( __( 'This comment is in the Trash. Please move it out of the Trash if you want to edit it.' ) );
+		}
+
+		$comment = get_comment_to_edit( $comment_id );
+
+		include( ABSPATH . 'wp-admin/edit-form-comment.php' );
+
+		break;
+
+	case 'delete':
+	case 'approve':
+	case 'trash':
+	case 'spam':
+		$title = __( 'Moderate Comment' );
+
+		$comment_id = absint( $_GET['c'] );
+
+		if ( ! $comment = get_comment( $comment_id ) ) {
+			wp_redirect( admin_url( 'edit-comments.php?error=1' ) );
+			die();
+		}
+
+		if ( ! current_user_can( 'edit_comment', $comment->comment_ID ) ) {
+			wp_redirect( admin_url( 'edit-comments.php?error=2' ) );
+			die();
+		}
+
+		// No need to re-approve/re-trash/re-spam a comment.
+		if ( $action == str_replace( '1', 'approve', $comment->comment_approved ) ) {
+			wp_redirect( admin_url( 'edit-comments.php?same=' . $comment_id ) );
+			die();
+		}
+
+		require_once( ABSPATH . 'wp-admin/admin-header.php' );
+
+		$formaction    = $action . 'comment';
+		$nonce_action  = 'approve' == $action ? 'approve-comment_' : 'delete-comment_';
+		$nonce_action .= $comment_id;
+
+		?>
+	<div class="wrap">
+
+	<h1><?php echo esc_html( $title ); ?></h1>
+
+		<?php
+		switch ( $action ) {
+			case 'spam':
+				$caution_msg = __( 'You are about to mark the following comment as spam:' );
+				$button      = _x( 'Mark as Spam', 'comment' );
+				break;
+			case 'trash':
+				$caution_msg = __( 'You are about to move the following comment to the Trash:' );
+				$button      = __( 'Move to Trash' );
+				break;
+			case 'delete':
+				$caution_msg = __( 'You are about to delete the following comment:' );
+				$button      = __( 'Permanently Delete Comment' );
+				break;
+			default:
+				$caution_msg = __( 'You are about to approve the following comment:' );
+				$button      = __( 'Approve Comment' );
+				break;
+		}
+
+		if ( $comment->comment_approved != '0' ) { // if not unapproved
+			$message = '';
+			switch ( $comment->comment_approved ) {
+				case '1':
+					$message = __( 'This comment is currently approved.' );
+					break;
+				case 'spam':
+					$message = __( 'This comment is currently marked as spam.' );
+					break;
+				case 'trash':
+					$message = __( 'This comment is currently in the Trash.' );
+					break;
+			}
+			if ( $message ) {
+				echo '<div id="message" class="notice notice-info"><p>' . $message . '</p></div>';
+			}
+		}
+		?>
 <div id="message" class="notice notice-warning"><p><strong><?php _e( 'Caution:' ); ?></strong> <?php echo $caution_msg; ?></p></div>

 <table class="form-table comment-ays">
 <tr>
-<th scope="row"><?php _e('Author'); ?></th>
+<th scope="row"><?php _e( 'Author' ); ?></th>
 <td><?php comment_author( $comment ); ?></td>
 </tr>
-<?php if ( get_comment_author_email( $comment ) ) { ?>
+		<?php if ( get_comment_author_email( $comment ) ) { ?>
 <tr>
-<th scope="row"><?php _e('Email'); ?></th>
+<th scope="row"><?php _e( 'Email' ); ?></th>
 <td><?php comment_author_email( $comment ); ?></td>
 </tr>
 <?php } ?>
-<?php if ( get_comment_author_url( $comment ) ) { ?>
+		<?php if ( get_comment_author_url( $comment ) ) { ?>
 <tr>
-<th scope="row"><?php _e('URL'); ?></th>
+<th scope="row"><?php _e( 'URL' ); ?></th>
 <td><a href="<?php comment_author_url( $comment ); ?>"><?php comment_author_url( $comment ); ?></a></td>
 </tr>
 <?php } ?>
 <tr>
 	<th scope="row"><?php /* translators: column name or table row header */ _e( 'In Response To' ); ?></th>
 	<td>
-	<?php
+		<?php
 		$post_id = $comment->comment_post_ID;
 		if ( current_user_can( 'edit_post', $post_id ) ) {
-			$post_link = "<a href='" . esc_url( get_edit_post_link( $post_id ) ) . "'>";
+			$post_link  = "<a href='" . esc_url( get_edit_post_link( $post_id ) ) . "'>";
 			$post_link .= esc_html( get_the_title( $post_id ) ) . '</a>';
 		} else {
 			$post_link = esc_html( get_the_title( $post_id ) );
@@ -188,145 +195,161 @@ if ( $comment->comment_approved != '0' ) { // if not unapproved
 				'<a href="' . $parent_link . '">' . $name . '</a>'
 			);
 		}
-	?>
+		?>
 	</td>
-</tr>
-<tr>
+	</tr>
+	<tr>
 	<th scope="row"><?php _e( 'Submitted on' ); ?></th>
 	<td>
-	<?php
+		<?php
 		/* translators: 1: comment date, 2: comment time */
-		$submitted = sprintf( __( '%1$s at %2$s' ),
+		$submitted = sprintf(
+			__( '%1$s at %2$s' ),
 			/* translators: comment date format. See https://secure.php.net/date */
 			get_comment_date( __( 'Y/m/d' ), $comment ),
 			get_comment_date( __( 'g:i a' ), $comment )
 		);
-		if ( 'approved' === wp_get_comment_status( $comment ) && ! empty ( $comment->comment_post_ID ) ) {
+		if ( 'approved' === wp_get_comment_status( $comment ) && ! empty( $comment->comment_post_ID ) ) {
 			echo '<a href="' . esc_url( get_comment_link( $comment ) ) . '">' . $submitted . '</a>';
 		} else {
 			echo $submitted;
 		}
-	?>
-	</td>
-</tr>
-<tr>
-<th scope="row"><?php /* translators: field name in comment form */ _ex('Comment', 'noun'); ?></th>
-<td class="comment-content">
-	<?php comment_text( $comment ); ?>
+		?>
+		</td>
+	</tr>
+	<tr>
+	<th scope="row"><?php /* translators: field name in comment form */ _ex( 'Comment', 'noun' ); ?></th>
+	<td class="comment-content">
+		<?php comment_text( $comment ); ?>
 	<p class="edit-comment"><a href="<?php echo admin_url( "comment.php?action=editcomment&amp;c={$comment->comment_ID}" ); ?>"><?php esc_html_e( 'Edit' ); ?></a></p>
-</td>
-</tr>
-</table>
+	</td>
+	</tr>
+	</table>

-<form action="comment.php" method="get" class="comment-ays-submit">
+	<form action="comment.php" method="get" class="comment-ays-submit">

-<p>
-	<?php submit_button( $button, 'primary', 'submit', false ); ?>
-	<a href="<?php echo admin_url('edit-comments.php'); ?>" class="button-cancel"><?php esc_html_e( 'Cancel' ); ?></a>
-</p>
+	<p>
+		<?php submit_button( $button, 'primary', 'submit', false ); ?>
+	<a href="<?php echo admin_url( 'edit-comments.php' ); ?>" class="button-cancel"><?php esc_html_e( 'Cancel' ); ?></a>
+	</p>

-<?php wp_nonce_field( $nonce_action ); ?>
-<input type="hidden" name="action" value="<?php echo esc_attr($formaction); ?>" />
-<input type="hidden" name="c" value="<?php echo esc_attr($comment->comment_ID); ?>" />
-<input type="hidden" name="noredir" value="1" />
-</form>
+		<?php wp_nonce_field( $nonce_action ); ?>
+	<input type="hidden" name="action" value="<?php echo esc_attr( $formaction ); ?>" />
+	<input type="hidden" name="c" value="<?php echo esc_attr( $comment->comment_ID ); ?>" />
+	<input type="hidden" name="noredir" value="1" />
+	</form>

-</div>
-<?php
-	break;
+	</div>
+		<?php
+		break;

-case 'deletecomment'    :
-case 'trashcomment'     :
-case 'untrashcomment'   :
-case 'spamcomment'      :
-case 'unspamcomment'    :
-case 'approvecomment'   :
-case 'unapprovecomment' :
-	$comment_id = absint( $_REQUEST['c'] );
+	case 'deletecomment':
+	case 'trashcomment':
+	case 'untrashcomment':
+	case 'spamcomment':
+	case 'unspamcomment':
+	case 'approvecomment':
+	case 'unapprovecomment':
+		$comment_id = absint( $_REQUEST['c'] );

-	if ( in_array( $action, array( 'approvecomment', 'unapprovecomment' ) ) )
-		check_admin_referer( 'approve-comment_' . $comment_id );
-	else
-		check_admin_referer( 'delete-comment_' . $comment_id );
+		if ( in_array( $action, array( 'approvecomment', 'unapprovecomment' ) ) ) {
+			check_admin_referer( 'approve-comment_' . $comment_id );
+		} else {
+			check_admin_referer( 'delete-comment_' . $comment_id );
+		}

-	$noredir = isset($_REQUEST['noredir']);
+		$noredir = isset( $_REQUEST['noredir'] );

-	if ( !$comment = get_comment($comment_id) )
-		comment_footer_die( __( 'Invalid comment ID.' ) . sprintf(' <a href="%s">' . __('Go back') . '</a>.', 'edit-comments.php') );
-	if ( !current_user_can( 'edit_comment', $comment->comment_ID ) )
-		comment_footer_die( __('Sorry, you are not allowed to edit comments on this post.') );
+		if ( ! $comment = get_comment( $comment_id ) ) {
+			comment_footer_die( __( 'Invalid comment ID.' ) . sprintf( ' <a href="%s">' . __( 'Go back' ) . '</a>.', 'edit-comments.php' ) );
+		}
+		if ( ! current_user_can( 'edit_comment', $comment->comment_ID ) ) {
+			comment_footer_die( __( 'Sorry, you are not allowed to edit comments on this post.' ) );
+		}

-	if ( '' != wp_get_referer() && ! $noredir && false === strpos(wp_get_referer(), 'comment.php') )
-		$redir = wp_get_referer();
-	elseif ( '' != wp_get_original_referer() && ! $noredir )
-		$redir = wp_get_original_referer();
-	elseif ( in_array( $action, array( 'approvecomment', 'unapprovecomment' ) ) )
-		$redir = admin_url('edit-comments.php?p=' . absint( $comment->comment_post_ID ) );
-	else
-		$redir = admin_url('edit-comments.php');
+		if ( '' != wp_get_referer() && ! $noredir && false === strpos( wp_get_referer(), 'comment.php' ) ) {
+			$redir = wp_get_referer();
+		} elseif ( '' != wp_get_original_referer() && ! $noredir ) {
+			$redir = wp_get_original_referer();
+		} elseif ( in_array( $action, array( 'approvecomment', 'unapprovecomment' ) ) ) {
+			$redir = admin_url( 'edit-comments.php?p=' . absint( $comment->comment_post_ID ) );
+		} else {
+			$redir = admin_url( 'edit-comments.php' );
+		}

-	$redir = remove_query_arg( array('spammed', 'unspammed', 'trashed', 'untrashed', 'deleted', 'ids', 'approved', 'unapproved'), $redir );
+		$redir = remove_query_arg( array( 'spammed', 'unspammed', 'trashed', 'untrashed', 'deleted', 'ids', 'approved', 'unapproved' ), $redir );

-	switch ( $action ) {
-		case 'deletecomment' :
-			wp_delete_comment( $comment );
-			$redir = add_query_arg( array('deleted' => '1'), $redir );
-			break;
-		case 'trashcomment' :
-			wp_trash_comment( $comment );
-			$redir = add_query_arg( array('trashed' => '1', 'ids' => $comment_id), $redir );
-			break;
-		case 'untrashcomment' :
-			wp_untrash_comment( $comment );
-			$redir = add_query_arg( array('untrashed' => '1'), $redir );
-			break;
-		case 'spamcomment' :
-			wp_spam_comment( $comment );
-			$redir = add_query_arg( array('spammed' => '1', 'ids' => $comment_id), $redir );
-			break;
-		case 'unspamcomment' :
-			wp_unspam_comment( $comment );
-			$redir = add_query_arg( array('unspammed' => '1'), $redir );
-			break;
-		case 'approvecomment' :
-			wp_set_comment_status( $comment, 'approve' );
-			$redir = add_query_arg( array( 'approved' => 1 ), $redir );
-			break;
-		case 'unapprovecomment' :
-			wp_set_comment_status( $comment, 'hold' );
-			$redir = add_query_arg( array( 'unapproved' => 1 ), $redir );
-			break;
-	}
+		switch ( $action ) {
+			case 'deletecomment':
+				wp_delete_comment( $comment );
+				$redir = add_query_arg( array( 'deleted' => '1' ), $redir );
+				break;
+			case 'trashcomment':
+				wp_trash_comment( $comment );
+				$redir = add_query_arg(
+					array(
+						'trashed' => '1',
+						'ids'     => $comment_id,
+					),
+					$redir
+				);
+				break;
+			case 'untrashcomment':
+				wp_untrash_comment( $comment );
+				$redir = add_query_arg( array( 'untrashed' => '1' ), $redir );
+				break;
+			case 'spamcomment':
+				wp_spam_comment( $comment );
+				$redir = add_query_arg(
+					array(
+						'spammed' => '1',
+						'ids'     => $comment_id,
+					),
+					$redir
+				);
+				break;
+			case 'unspamcomment':
+				wp_unspam_comment( $comment );
+				$redir = add_query_arg( array( 'unspammed' => '1' ), $redir );
+				break;
+			case 'approvecomment':
+				wp_set_comment_status( $comment, 'approve' );
+				$redir = add_query_arg( array( 'approved' => 1 ), $redir );
+				break;
+			case 'unapprovecomment':
+				wp_set_comment_status( $comment, 'hold' );
+				$redir = add_query_arg( array( 'unapproved' => 1 ), $redir );
+				break;
+		}

-	wp_redirect( $redir );
-	die;
+		wp_redirect( $redir );
+		die;

-case 'editedcomment' :
+	case 'editedcomment':
+		$comment_id      = absint( $_POST['comment_ID'] );
+		$comment_post_id = absint( $_POST['comment_post_ID'] );

-	$comment_id = absint( $_POST['comment_ID'] );
-	$comment_post_id = absint( $_POST['comment_post_ID'] );
+		check_admin_referer( 'update-comment_' . $comment_id );

-	check_admin_referer( 'update-comment_' . $comment_id );
+		edit_comment();

-	edit_comment();
+		$location = ( empty( $_POST['referredby'] ) ? "edit-comments.php?p=$comment_post_id" : $_POST['referredby'] ) . '#comment-' . $comment_id;

-	$location = ( empty( $_POST['referredby'] ) ? "edit-comments.php?p=$comment_post_id" : $_POST['referredby'] ) . '#comment-' . $comment_id;
+		/**
+		 * Filters the URI the user is redirected to after editing a comment in the admin.
+		 *
+		 * @since 2.1.0
+		 *
+		 * @param string $location The URI the user will be redirected to.
+		 * @param int $comment_id The ID of the comment being edited.
+		 */
+		$location = apply_filters( 'comment_edit_redirect', $location, $comment_id );
+		wp_redirect( $location );

-	/**
-	 * Filters the URI the user is redirected to after editing a comment in the admin.
-	 *
-	 * @since 2.1.0
-	 *
-	 * @param string $location The URI the user will be redirected to.
-	 * @param int $comment_id The ID of the comment being edited.
-	 */
-	$location = apply_filters( 'comment_edit_redirect', $location, $comment_id );
-	wp_redirect( $location );
+		exit();

-	exit();
-
-default:
-	wp_die( __('Unknown action.') );
+	default:
+		wp_die( __( 'Unknown action.' ) );

 } // end switch

--- a/wp-admin/credits.php
+++ b/wp-admin/credits.php
@@ -18,18 +18,36 @@ include( ABSPATH . 'wp-admin/admin-header.php' );
 ?>
 <div class="wrap about-wrap full-width-layout">

-<h1><?php printf( __( 'Welcome to WordPress %s' ), $display_version ); ?></h1>
+<h1>
+	<?php
+	/* translators: %s: The current WordPress version number */
+	printf( __( 'Welcome to WordPress&nbsp;%s' ), $display_version );
+	?>
+</h1>

-<p class="about-text"><?php printf( __( 'Thank you for updating to the latest version! WordPress %s introduces a robust new content creation experience.' ), $display_version ); ?></p>
+<p class="about-text">
+	<?php
+	printf(
+		/* translators: %s: The current WordPress version number */
+		__( 'Congratulations on updating to WordPress %s! This update makes it easier than ever to fix your site if something goes wrong.' ),
+		$display_version
+	);
+	?>
+</p>

-<div class="wp-badge"><?php printf( __( 'Version %s' ), $display_version ); ?></div>
+<div class="wp-badge">
+	<?php
+	/* translators: %s: The current WordPress version number */
+	printf( __( 'Version %s' ), $display_version );
+	?>
+</div>

-<h2 class="nav-tab-wrapper wp-clearfix">
+<nav class="nav-tab-wrapper wp-clearfix" aria-label="<?php esc_attr_e( 'Secondary menu' ); ?>">
 	<a href="about.php" class="nav-tab"><?php _e( 'What&#8217;s New' ); ?></a>
-	<a href="credits.php" class="nav-tab nav-tab-active"><?php _e( 'Credits' ); ?></a>
+	<a href="credits.php" class="nav-tab nav-tab-active" aria-current="page"><?php _e( 'Credits' ); ?></a>
 	<a href="freedoms.php" class="nav-tab"><?php _e( 'Freedoms' ); ?></a>
 	<a href="freedoms.php?privacy-notice" class="nav-tab"><?php _e( 'Privacy' ); ?></a>
-</h2>
+</nav>

 <div class="about-wrap-content">
 <?php
@@ -38,8 +56,9 @@ $credits = wp_credits();

 if ( ! $credits ) {
 	echo '<p class="about-description">';
-	/* translators: 1: https://wordpress.org/about/, 2: https://make.wordpress.org/ */
-	printf( __( 'WordPress is created by a <a href="%1$s">worldwide team</a> of passionate individuals. <a href="%2$s">Get involved in WordPress</a>.' ),
+	printf(
+		/* translators: 1: https://wordpress.org/about/, 2: https://make.wordpress.org/ */
+		__( 'WordPress is created by a <a href="%1$s">worldwide team</a> of passionate individuals. <a href="%2$s">Get involved in WordPress</a>.' ),
 		'https://wordpress.org/about/',
 		__( 'https://make.wordpress.org/' )
 	);
@@ -64,23 +83,26 @@ foreach ( $credits['groups'] as $group_slug => $group_data ) {
 			// Considered a special slug in the API response. (Also, will never be returned for en_US.)
 			$title = _x( 'Translators', 'Translate this to be the equivalent of English Translators in your language for the credits page Translators section' );
 		} elseif ( isset( $group_data['placeholders'] ) ) {
+			// phpcs:ignore WordPress.WP.I18n.LowLevelTranslationFunction,WordPress.WP.I18n.NonSingularStringLiteralText
 			$title = vsprintf( translate( $group_data['name'] ), $group_data['placeholders'] );
 		} else {
+			// phpcs:ignore WordPress.WP.I18n.LowLevelTranslationFunction,WordPress.WP.I18n.NonSingularStringLiteralText
 			$title = translate( $group_data['name'] );
 		}

-		echo '<h3 class="wp-people-group">' . esc_html( $title ) . "</h3>\n";
+		echo '<h2 class="wp-people-group">' . esc_html( $title ) . "</h2>\n";
 	}

-	if ( ! empty( $group_data['shuffle'] ) )
+	if ( ! empty( $group_data['shuffle'] ) ) {
 		shuffle( $group_data['data'] ); // We were going to sort by ability to pronounce "hierarchical," but that wouldn't be fair to Matt.
+	}

 	switch ( $group_data['type'] ) {
-		case 'list' :
+		case 'list':
 			array_walk( $group_data['data'], '_wp_credits_add_profile_link', $credits['data']['profiles'] );
 			echo '<p class="wp-credits-list">' . wp_sprintf( '%l.', $group_data['data'] ) . "</p>\n\n";
 			break;
-		case 'libraries' :
+		case 'libraries':
 			array_walk( $group_data['data'], '_wp_credits_build_object_link' );
 			echo '<p class="wp-credits-list">' . wp_sprintf( '%l.', $group_data['data'] ) . "</p>\n\n";
 			break;
@@ -91,18 +113,20 @@ foreach ( $credits['groups'] as $group_slug => $group_data ) {
 			foreach ( $group_data['data'] as $person_data ) {
 				echo '<li class="wp-person" id="wp-person-' . esc_attr( $person_data[2] ) . '">' . "\n\t";
 				echo '<a href="' . esc_url( sprintf( $credits['data']['profiles'], $person_data[2] ) ) . '" class="web">';
-				$size = 'compact' == $group_data['type'] ? 30 : 60;
-				$data = get_avatar_data( $person_data[1] . '@md5.gravatar.com', array( 'size' => $size ) );
-				$size *= 2;
+				$size   = 'compact' == $group_data['type'] ? 30 : 60;
+				$data   = get_avatar_data( $person_data[1] . '@md5.gravatar.com', array( 'size' => $size ) );
+				$size  *= 2;
 				$data2x = get_avatar_data( $person_data[1] . '@md5.gravatar.com', array( 'size' => $size ) );
 				echo '<img src="' . esc_url( $data['url'] ) . '" srcset="' . esc_url( $data2x['url'] ) . ' 2x" class="gravatar" alt="" />' . "\n";
 				echo esc_html( $person_data[0] ) . "</a>\n\t";
-				if ( ! $compact )
+				if ( ! $compact ) {
+					// phpcs:ignore WordPress.WP.I18n.LowLevelTranslationFunction,WordPress.WP.I18n.NonSingularStringLiteralText
 					echo '<span class="title">' . translate( $person_data[3] ) . "</span>\n";
+				}
 				echo "</li>\n";
 			}
 			echo "</ul>\n";
-		break;
+			break;
 	}
 }

@@ -117,6 +141,7 @@ return;

 // These are strings returned by the API that we want to be translatable
 __( 'Project Leaders' );
+/* translators: %s: The current WordPress version number */
 __( 'Core Contributors to WordPress %s' );
 __( 'Noteworthy Contributors' );
 __( 'Cofounder, Project Lead' );
--- a/wp-admin/css/about-rtl.css
+++ b/wp-admin/css/about-rtl.css
@@ -8,7 +8,6 @@
   2.0 About Page
    2.1 Typography
    2.2 Structure
-    2.3 Floating Header Layout
   3.0 Credits & Freedoms Pages
 ------------------------------------------------------------------------------*/

@@ -51,29 +50,14 @@
 	vertical-align: middle;
 }

-.about-wrap figure {
-	position: relative;
-	margin: 0;
+.about-wrap .inline-svg img {
+	max-width: 100%;
+	width: auto;
+	height: auto;
 }

-.about-wrap .feature-section figure img {
-	margin-bottom: 0;
-}
-
-.about-wrap figcaption {
-	position: absolute;
-	bottom: 0;
-	width: 100%;
-    padding: 40px 10px 15px;
-    overflow: auto;
-    box-sizing: border-box;
-    background: linear-gradient(0deg,rgba(0,0,0,.7),rgba(0,0,0,.3) 60%,transparent);
-    font-weight: 600;
-    text-shadow: 0px 0px 5px rgba(0,0,0,.75);
-}
-
-.about-wrap .jetpack-video-wrapper {
-	margin-bottom: 0;
+.about-wrap video {
+	margin: 1.5em auto;
 }

 /* WordPress Version Badge */
@@ -92,7 +76,7 @@
 	display: inline-block;
 	width: 140px;
 	text-rendering: optimizeLegibility;
-	box-shadow: 0 1px 3px rgba(0,0,0,0.2);
+	box-shadow: 0 1px 3px rgba(0, 0, 0, 0.2);
 }

 .svg .wp-badge {
@@ -111,26 +95,16 @@
 	padding-left: 15px;
 	padding-right: 15px;
 	font-size: 18px;
+	line-height: 1.33333333;
 }

 /* 1.1 - Typography */

-.about-wrap p {
-	line-height: 1.5;
-	font-size: 14px;
-}
-
-.about-wrap .feature-section p {
-	max-width: 55em;
-	margin-right: auto;
-	margin-left: auto;
-}
-
 .about-wrap h1 {
 	margin: 0.2em 0 0 200px;
 	padding: 0;
 	color: #32373c;
-	line-height: 1.2em;
+	line-height: 1.2;
 	font-size: 2.8em;
 	font-weight: 400;
 }
@@ -150,9 +124,15 @@
 }

 .about-wrap h4 {
+	font-size: 16px;
 	color: #23282d;
 }

+.about-wrap p {
+	line-height: 1.5;
+	font-size: 16px;
+}
+
 .about-wrap code,
 .about-wrap ol li p {
 	font-size: 14px;
@@ -160,8 +140,8 @@
 }

 .about-wrap figcaption {
-    font-size: 13px;
-    text-align: center;
+	font-size: 13px;
+	text-align: center;
 	color: white;
 	text-overflow: ellipsis;
 }
@@ -170,7 +150,7 @@
 .about-wrap .about-text {
 	margin-top: 1.4em;
 	font-weight: 400;
-	line-height: 1.6em;
+	line-height: 1.6;
 	font-size: 19px;
 }

@@ -181,87 +161,135 @@

 /* 1.2 - Structure */

-.about-wrap [class$="-col"] {
-	display: flex;
-	justify-content: space-between;
-	flex-wrap: wrap;
+.about-wrap .has-1-columns,
+.about-wrap .has-2-columns,
+.about-wrap .has-3-columns,
+.about-wrap .has-4-columns {
+	display: -ms-grid;
+	display: grid;
+	max-width: 800px;
+	margin-top: 40px;
+	margin-right: auto;
+	margin-left: auto;
 }

-.about-wrap .feature-section.one-col {
-	margin: 0 auto;
-	max-width: 680px;
+.about-wrap .column {
+	margin-left: 20px;
+	margin-right: 20px;
 }

-.about-wrap .inline-svg img {
+.about-wrap .is-wide {
+	max-width: 760px;
+}
+
+.about-wrap .is-fullwidth {
 	max-width: 100%;
-	width: 100%;
-	height: auto;
 }

-.about-wrap .inline-svg.full-width {
-	margin-bottom: 120px;
+.about-wrap .has-1-columns {
+	display: block;
+	max-width: 680px;
+	margin: 0 auto 40px;
 }

-.about-wrap [class$="-col"] .col {
-	flex: 1;
+.about-wrap .has-2-columns {
+	-ms-grid-columns: 1fr 1fr;
+	grid-template-columns: 1fr 1fr;
 }

-.about-wrap .two-col .col {
-	min-width: 47%;
-	max-width: 47%;
+.about-wrap .has-2-columns .column:nth-of-type(2n+1) {
+	-ms-grid-column: 1;
+	grid-column-start: 1;
 }

-.about-wrap .three-col,
-.about-wrap .four-col {
-	margin: auto;
-	max-width: 1020px;
+.about-wrap .has-2-columns .column:nth-of-type(2n) {
+	-ms-grid-column: 2;
+	grid-column-start: 2;
 }

-.about-wrap .three-col .col {
-	align-self: flex-start;
-	min-width: 31%;
-	max-width: 31%;
+.about-wrap .has-2-columns.is-wider-right {
+	-ms-grid-columns: 1fr 2fr;
+	grid-template-columns: 1fr 2fr;
 }

-.about-wrap .four-col .col {
-	align-self: flex-start;
-	min-width: 23%;
-	max-width: 23%;
+.about-wrap .has-2-columns.is-wider-left {
+	-ms-grid-columns: 2fr 1fr;
+	grid-template-columns: 2fr 1fr;
 }

-.about-wrap .feature-section.eight-col .col {
-	align-self: flex-start;
-	margin-top: 6px;
-	min-width: 12%;
-	max-width: 12%;
+.about-wrap .has-3-columns {
+	-ms-grid-columns: (1fr)[3];
+	grid-template-columns: repeat(3, 1fr);
 }

-.about-wrap .one-col img {
-	margin: 1em 0 2em;
+.about-wrap .has-3-columns .column:nth-of-type(3n+1) {
+	-ms-grid-column: 1;
+	grid-column-start: 1;
 }

-.about-wrap .two-col img {
-	margin-bottom: 1.5em;
+.about-wrap .has-3-columns .column:nth-of-type(3n+2) {
+	-ms-grid-column: 2;
+	grid-column-start: 2;
 }

-.about-wrap .feature-video .mejs-controls {
-	display: none !important;
+.about-wrap .has-3-columns .column:nth-of-type(3n) {
+	-ms-grid-column: 3;
+	grid-column-start: 3;
 }

-.about-wrap .feature-video .mejs-overlay-loading span {
-	background: transparent; /* Hide loading.gif */
+.about-wrap .has-4-columns {
+	-ms-grid-columns: (1fr)[4];
+	grid-template-columns: repeat(4, 1fr);
 }

-.about-wrap video {
-	margin: 1.5em auto;
+.about-wrap .has-4-columns .column:nth-of-type(4n+1) {
+	-ms-grid-column: 1;
+	grid-column-start: 1;
 }

-.about-wrap .cta {
+.about-wrap .has-4-columns .column:nth-of-type(4n+2) {
+	-ms-grid-column: 2;
+	grid-column-start: 2;
+}
+
+.about-wrap .has-4-columns .column:nth-of-type(4n+3) {
+	-ms-grid-column: 3;
+	grid-column-start: 3;
+}
+
+.about-wrap .has-4-columns .column:nth-of-type(4n) {
+	-ms-grid-column: 4;
+	grid-column-start: 4;
+}
+
+.about-wrap .column :first-child {
+	margin-top: 0;
+}
+
+.about-wrap .aligncenter {
 	text-align: center;
 }
-.about-wrap .cta .button {
-	margin: 0 auto 5px;
-	font-weight: 600;
+
+.about-wrap .alignleft {
+	float: right;
+	margin-left: 40px;
+}
+
+.about-wrap .alignright {
+	float: left;
+	margin-right: 40px;
+}
+
+.about-wrap .is-vertically-aligned-top {
+	align-self: start;
+}
+
+.about-wrap .is-vertically-aligned-center {
+	align-self: center;
+}
+
+.about-wrap .is-vertically-aligned-bottom {
+	align-self: end;
 }

 /* 1.3 - Point Releases */
@@ -271,6 +299,10 @@
 	border-bottom: 1px solid #ddd;
 }

+.about-wrap .changelog {
+	margin-bottom: 40px;
+}
+
 .about-wrap .changelog.point-releases h3 {
 	padding-top: 35px;
 }
@@ -279,106 +311,39 @@
 	padding-top: 7px;
 }

+.about-wrap .changelog.feature-section .col {
+	margin-top: 40px;
+}
+
 /*------------------------------------------------------------------------------
  2.0 - About Page
 ------------------------------------------------------------------------------*/

 /* 2.1 - Typography */

-.about-wrap .feature-section.two-col h3 {
-	margin-top: 0;
-}
-
-.about-wrap .feature-section h4 {
-	margin: 1.4em 0 0.6em 0;
-	font-size: 1em;
+.about-wrap .lead-description {
+	font-size: 1.5em;
+	text-align: center;
 }

 .about-wrap .feature-section p {
 	margin-top: 0.6em;
 }

-.about-wrap .lead-description {
-	font-size: 1.5em;
-	text-align: center;
-}
-
-.about-wrap .two-col-text {
-	column-count: 2;
-	column-gap: 40px;
-}
-
-.about-wrap .two-col-text p:first-of-type {
-	margin-top: 0;
-}
-
-.about-wrap .streamlined-updates p,
-.about-wrap .native-fonts p {
-	margin-bottom: 3em;
-}
-
-.about-wrap .under-the-hood img + h3 {
-	margin-top: 1.25em;
-}
-
 /* 2.2 - Structure */

-.about-wrap .headline-feature.feature-video {
-	position: relative;
-	margin: 40px 0;
-	padding-bottom: 56.25%;
+.about-wrap .headline-feature {
+	margin: 0 auto 40px;
+	max-width: 680px;
+}
+
+.about-wrap .headline-feature h2 {
+	margin: 50px 0 0;
+}
+
+.about-wrap .headline-feature img {
+	max-width: 600px;
 	width: 100%;
-	max-width: 100%;
-	height: 0;
-	text-align: center;
-}
-
-.about-wrap .feature-video embed {
-	position: absolute;
-	top: 0;
-	right: 0;
-	width: 100%;
-	height: 100%;
-}
-
-.about-wrap .featured-image {
-	text-align: center;
-}
-
-.about-wrap .feature-section {
-	overflow: hidden;
-}
-
-.about-wrap .feature-section.no-heading {
-	padding-top: 35px;
-}
-
-.about-wrap .feature-section .media-container {
-	overflow: hidden;
-}
-
-.about-wrap .embed-container {
-	text-align: center;
-}
-
-.about-wrap .embed-container iframe {
-	max-width: 100%;
-}
-
-.about-wrap .wp-embedded-content {
-	max-width: 100%;
-}
-
-.about-wrap .feature-section .col {
-	margin-top: 40px;
-}
-
-.about-wrap .changelog {
-	margin-bottom: 40px;
-}
-
-.about-wrap .changelog.feature-section .col {
-	margin-top: 40px;
 }

 /* Return to Dashboard Home link */
@@ -400,11 +365,13 @@

 /* Credits */

-.about-wrap h3.wp-people-group {
+.about-wrap h2.wp-people-group {
 	margin: 2.6em 0 1.33em;
 	padding: 0;
 	font-size: 16px;
 	line-height: inherit;
+	font-weight: 600;
+	text-align: right;
 }

 .about-wrap .wp-people-group {
@@ -449,7 +416,7 @@
 	margin: 6px 0 2px;
 	font-size: 16px;
 	font-weight: 400;
-	line-height: 2em;
+	line-height: 2;
 	text-decoration: none;
 }

@@ -481,18 +448,25 @@
 	margin: 0.6em 0;
 }

-.freedoms-php .about-wrap .col .freedoms-image {
+.freedoms-php .has-4-columns {
+	margin-bottom: 40px;
+}
+
+.freedoms-php .column .freedoms-image {
 	background-image: url('https://s.w.org/wp-content/themes/pub/wporg-main/images/freedoms-2x.png');
 	background-size: 100%;
 	padding-top: 100%;
 }
-.freedoms-php .about-wrap .col:nth-of-type(2) .freedoms-image {
+
+.freedoms-php .column:nth-of-type(2) .freedoms-image {
 	background-position: 100% 34%;
 }
-.freedoms-php .about-wrap .col:nth-of-type(3) .freedoms-image {
+
+.freedoms-php .column:nth-of-type(3) .freedoms-image {
 	background-position: 100% 66%;
 }
-.freedoms-php .about-wrap .col:nth-of-type(4) .freedoms-image {
+
+.freedoms-php .column:nth-of-type(4) .freedoms-image {
 	background-position: 100% 100%;
 }

@@ -500,67 +474,61 @@
  4.0 - Media Queries
 ------------------------------------------------------------------------------*/

-@media screen and (max-width: 1250px) {
-	.about-wrap .floating-header-section.has-long-title .section-item:nth-child(1),
-	.about-wrap .floating-header-section.has-long-title .section-item:nth-child(2) {
-		margin: 0 0 60px;
+@media screen and (max-width: 782px) {
+	.about-wrap .has-3-columns,
+	.about-wrap .has-4-columns {
+		-ms-grid-columns: 1fr 1fr;
+		grid-template-columns: 1fr 1fr;
 	}

-	.about-wrap .floating-header-section.has-long-title .section-item:nth-child(3),
-	.about-wrap .floating-header-section.has-long-title .section-item:nth-child(4) {
-		margin: 0;
+	.about-wrap .has-3-columns .column:nth-of-type(3n+1),
+	.about-wrap .has-4-columns .column:nth-of-type(4n+1) {
+		-ms-grid-column: 1;
+		grid-column-start: 1;
+		-ms-grid-row: 1;
+		grid-row-start: 1;
 	}

-	.about-wrap .floating-header-section.has-long-title .section-item:nth-child(2),
-	.about-wrap .floating-header-section.has-long-title .section-item:nth-child(4) {
-		margin-right: 60px;
+	.about-wrap .has-3-columns .column:nth-of-type(3n+2),
+	.about-wrap .has-4-columns .column:nth-of-type(4n+2) {
+		-ms-grid-column: 2;
+		grid-column-start: 2;
+		-ms-grid-row: 1;
+		grid-row-start: 1;
+	}
+
+	.about-wrap .has-3-columns .column:nth-of-type(3n),
+	.about-wrap .has-4-columns .column:nth-of-type(4n+3) {
+		-ms-grid-column: 1;
+		grid-column-start: 1;
+		-ms-grid-row: 2;
+		grid-row-start: 2;
+	}
+
+	.about-wrap .has-4-columns .column:nth-of-type(4n) {
+		-ms-grid-column: 2;
+		grid-column-start: 2;
+		-ms-grid-row: 2;
+		grid-row-start: 2;
 	}
 }

-@media screen and (max-width: 782px) {
-	.about-wrap .two-col-text {
-		column-count: 1;
-	}
-
-	.about-wrap .two-col .col,
-	.about-wrap .three-col .col,
-	.about-wrap .four-col .col {
-		min-width: 48% !important;
-	}
-
-	.about-wrap .eight-col .col {
-		min-width: 24% !important;
-	}
-
-	.about-wrap .three-col img,
-	.about-wrap .four-col img,
-	.about-wrap .eight-col img {
-		display: block;
-		margin: 0 auto;
-	}
-
-	.about-wrap figcaption {
-		position: relative;
-		margin-top: 10px;
-		margin-bottom: 15px;
-		padding: 0;
-		background: none;
-		color: #40464D;
-		text-shadow: none;
-	}
-
-	.about-wrap .floating-header-section {
+@media screen and (max-width: 600px) {
+	.about-wrap .has-2-columns,
+	.about-wrap .has-3-columns,
+	.about-wrap .has-4-columns {
 		display: block;
 	}

-	.about-wrap .floating-header-section .section-header,
-	.about-wrap .floating-header-section .section-content {
-		max-width: 100%;
+	.about-wrap :not(.is-wider-right):not(.is-wider-left) .column {
+		margin-left: 0;
+		margin-right: 0;
 	}

-	.about-wrap .floating-header-section h2 {
-		position: static;
-		margin-bottom: 60px;
+	.about-wrap .has-2-columns.is-wider-right,
+	.about-wrap .has-2-columns.is-wider-left {
+		display: -ms-grid;
+		display: grid;
 	}
 }

@@ -584,56 +552,21 @@
 		margin-bottom: 1.5em;
 		width: 100%;
 	}
+}

-	.about-wrap .feature-section .col {
-		margin-top: 1em;
+@media only screen and (max-width: 480px) {
+	.about-wrap .has-2-columns.is-wider-right,
+	.about-wrap .has-2-columns.is-wider-left {
+		display: block;
 	}

-	.about-wrap .two-col .col,
-	.about-wrap .three-col .col,
-	.about-wrap .three-col .col {
-		min-width: 100% !important;
+	.about-wrap .column {
+		margin-left: 0;
+		margin-right: 0;
 	}

-	.about-wrap .eight-col .col {
-		min-width: 48% !important;
-	}
-
-	.about-wrap .under-the-hood.four-col .col,
-	.about-wrap .under-the-hood.three-col .col,
-	.about-wrap .under-the-hood.two-col .col,
-	.about-wrap .under-the-hood.one-col .col {
-		margin-bottom: 2em;
-		padding-bottom: 0;
-	}
-
-	.about-wrap .under-the-hood:nth-of-type(2n),
-	.about-wrap .under-the-hood:nth-of-type(3n) {
-		margin-top: 0;
-	}
-
-	.about-wrap .under-the-hood img + h3 {
-		margin-top: 1.25em;
-	}
-
-	.about-wrap .floating-header-section {
-		margin-bottom: 60px;
-		grid-gap: 30px 0;
-	}
-
-	.about-wrap .inline-svg.full-width {
-		margin-bottom: 60px;
-	}
-
-	.about-wrap .floating-header-section h2 {
-		word-break: break-all;
-		-webkit-hyphens: auto;
-		-ms-hyphens: auto;
-		hyphens: auto;
-	}
-
-	.about-wrap .floating-header-section .section-content .section-item {
-		max-width: 100%;
-		margin: 0 0 60px;
+	.about-wrap .has-2-columns.is-wider-right img,
+	.about-wrap .has-2-columns.is-wider-left img {
+		max-width: 160px;
 	}
 }
--- a/wp-admin/css/about-rtl.min.css
+++ b/wp-admin/css/about-rtl.min.css
--- a/wp-admin/css/about.css
+++ b/wp-admin/css/about.css
@@ -8,7 +8,6 @@
   2.0 About Page
    2.1 Typography
    2.2 Structure
-    2.3 Floating Header Layout
   3.0 Credits & Freedoms Pages
 ------------------------------------------------------------------------------*/

@@ -51,29 +50,14 @@
 	vertical-align: middle;
 }

-.about-wrap figure {
-	position: relative;
-	margin: 0;
+.about-wrap .inline-svg img {
+	max-width: 100%;
+	width: auto;
+	height: auto;
 }

-.about-wrap .feature-section figure img {
-	margin-bottom: 0;
-}
-
-.about-wrap figcaption {
-	position: absolute;
-	bottom: 0;
-	width: 100%;
-    padding: 40px 10px 15px;
-    overflow: auto;
-    box-sizing: border-box;
-    background: linear-gradient(0deg,rgba(0,0,0,.7),rgba(0,0,0,.3) 60%,transparent);
-    font-weight: 600;
-    text-shadow: 0px 0px 5px rgba(0,0,0,.75);
-}
-
-.about-wrap .jetpack-video-wrapper {
-	margin-bottom: 0;
+.about-wrap video {
+	margin: 1.5em auto;
 }

 /* WordPress Version Badge */
@@ -92,7 +76,7 @@
 	display: inline-block;
 	width: 140px;
 	text-rendering: optimizeLegibility;
-	box-shadow: 0 1px 3px rgba(0,0,0,0.2);
+	box-shadow: 0 1px 3px rgba(0, 0, 0, 0.2);
 }

 .svg .wp-badge {
@@ -111,26 +95,16 @@
 	padding-right: 15px;
 	padding-left: 15px;
 	font-size: 18px;
+	line-height: 1.33333333;
 }

 /* 1.1 - Typography */

-.about-wrap p {
-	line-height: 1.5;
-	font-size: 14px;
-}
-
-.about-wrap .feature-section p {
-	max-width: 55em;
-	margin-left: auto;
-	margin-right: auto;
-}
-
 .about-wrap h1 {
 	margin: 0.2em 200px 0 0;
 	padding: 0;
 	color: #32373c;
-	line-height: 1.2em;
+	line-height: 1.2;
 	font-size: 2.8em;
 	font-weight: 400;
 }
@@ -150,9 +124,15 @@
 }

 .about-wrap h4 {
+	font-size: 16px;
 	color: #23282d;
 }

+.about-wrap p {
+	line-height: 1.5;
+	font-size: 16px;
+}
+
 .about-wrap code,
 .about-wrap ol li p {
 	font-size: 14px;
@@ -160,8 +140,8 @@
 }

 .about-wrap figcaption {
-    font-size: 13px;
-    text-align: center;
+	font-size: 13px;
+	text-align: center;
 	color: white;
 	text-overflow: ellipsis;
 }
@@ -170,7 +150,7 @@
 .about-wrap .about-text {
 	margin-top: 1.4em;
 	font-weight: 400;
-	line-height: 1.6em;
+	line-height: 1.6;
 	font-size: 19px;
 }

@@ -181,87 +161,135 @@

 /* 1.2 - Structure */

-.about-wrap [class$="-col"] {
-	display: flex;
-	justify-content: space-between;
-	flex-wrap: wrap;
+.about-wrap .has-1-columns,
+.about-wrap .has-2-columns,
+.about-wrap .has-3-columns,
+.about-wrap .has-4-columns {
+	display: -ms-grid;
+	display: grid;
+	max-width: 800px;
+	margin-top: 40px;
+	margin-left: auto;
+	margin-right: auto;
 }

-.about-wrap .feature-section.one-col {
-	margin: 0 auto;
-	max-width: 680px;
+.about-wrap .column {
+	margin-right: 20px;
+	margin-left: 20px;
 }

-.about-wrap .inline-svg img {
+.about-wrap .is-wide {
+	max-width: 760px;
+}
+
+.about-wrap .is-fullwidth {
 	max-width: 100%;
-	width: 100%;
-	height: auto;
 }

-.about-wrap .inline-svg.full-width {
-	margin-bottom: 120px;
+.about-wrap .has-1-columns {
+	display: block;
+	max-width: 680px;
+	margin: 0 auto 40px;
 }

-.about-wrap [class$="-col"] .col {
-	flex: 1;
+.about-wrap .has-2-columns {
+	-ms-grid-columns: 1fr 1fr;
+	grid-template-columns: 1fr 1fr;
 }

-.about-wrap .two-col .col {
-	min-width: 47%;
-	max-width: 47%;
+.about-wrap .has-2-columns .column:nth-of-type(2n+1) {
+	-ms-grid-column: 1;
+	grid-column-start: 1;
 }

-.about-wrap .three-col,
-.about-wrap .four-col {
-	margin: auto;
-	max-width: 1020px;
+.about-wrap .has-2-columns .column:nth-of-type(2n) {
+	-ms-grid-column: 2;
+	grid-column-start: 2;
 }

-.about-wrap .three-col .col {
-	align-self: flex-start;
-	min-width: 31%;
-	max-width: 31%;
+.about-wrap .has-2-columns.is-wider-right {
+	-ms-grid-columns: 1fr 2fr;
+	grid-template-columns: 1fr 2fr;
 }

-.about-wrap .four-col .col {
-	align-self: flex-start;
-	min-width: 23%;
-	max-width: 23%;
+.about-wrap .has-2-columns.is-wider-left {
+	-ms-grid-columns: 2fr 1fr;
+	grid-template-columns: 2fr 1fr;
 }

-.about-wrap .feature-section.eight-col .col {
-	align-self: flex-start;
-	margin-top: 6px;
-	min-width: 12%;
-	max-width: 12%;
+.about-wrap .has-3-columns {
+	-ms-grid-columns: (1fr)[3];
+	grid-template-columns: repeat(3, 1fr);
 }

-.about-wrap .one-col img {
-	margin: 1em 0 2em;
+.about-wrap .has-3-columns .column:nth-of-type(3n+1) {
+	-ms-grid-column: 1;
+	grid-column-start: 1;
 }

-.about-wrap .two-col img {
-	margin-bottom: 1.5em;
+.about-wrap .has-3-columns .column:nth-of-type(3n+2) {
+	-ms-grid-column: 2;
+	grid-column-start: 2;
 }

-.about-wrap .feature-video .mejs-controls {
-	display: none !important;
+.about-wrap .has-3-columns .column:nth-of-type(3n) {
+	-ms-grid-column: 3;
+	grid-column-start: 3;
 }

-.about-wrap .feature-video .mejs-overlay-loading span {
-	background: transparent; /* Hide loading.gif */
+.about-wrap .has-4-columns {
+	-ms-grid-columns: (1fr)[4];
+	grid-template-columns: repeat(4, 1fr);
 }

-.about-wrap video {
-	margin: 1.5em auto;
+.about-wrap .has-4-columns .column:nth-of-type(4n+1) {
+	-ms-grid-column: 1;
+	grid-column-start: 1;
 }

-.about-wrap .cta {
+.about-wrap .has-4-columns .column:nth-of-type(4n+2) {
+	-ms-grid-column: 2;
+	grid-column-start: 2;
+}
+
+.about-wrap .has-4-columns .column:nth-of-type(4n+3) {
+	-ms-grid-column: 3;
+	grid-column-start: 3;
+}
+
+.about-wrap .has-4-columns .column:nth-of-type(4n) {
+	-ms-grid-column: 4;
+	grid-column-start: 4;
+}
+
+.about-wrap .column :first-child {
+	margin-top: 0;
+}
+
+.about-wrap .aligncenter {
 	text-align: center;
 }
-.about-wrap .cta .button {
-	margin: 0 auto 5px;
-	font-weight: 600;
+
+.about-wrap .alignleft {
+	float: left;
+	margin-right: 40px;
+}
+
+.about-wrap .alignright {
+	float: right;
+	margin-left: 40px;
+}
+
+.about-wrap .is-vertically-aligned-top {
+	align-self: start;
+}
+
+.about-wrap .is-vertically-aligned-center {
+	align-self: center;
+}
+
+.about-wrap .is-vertically-aligned-bottom {
+	align-self: end;
 }

 /* 1.3 - Point Releases */
@@ -271,6 +299,10 @@
 	border-bottom: 1px solid #ddd;
 }

+.about-wrap .changelog {
+	margin-bottom: 40px;
+}
+
 .about-wrap .changelog.point-releases h3 {
 	padding-top: 35px;
 }
@@ -279,106 +311,39 @@
 	padding-top: 7px;
 }

+.about-wrap .changelog.feature-section .col {
+	margin-top: 40px;
+}
+
 /*------------------------------------------------------------------------------
  2.0 - About Page
 ------------------------------------------------------------------------------*/

 /* 2.1 - Typography */

-.about-wrap .feature-section.two-col h3 {
-	margin-top: 0;
-}
-
-.about-wrap .feature-section h4 {
-	margin: 1.4em 0 0.6em 0;
-	font-size: 1em;
+.about-wrap .lead-description {
+	font-size: 1.5em;
+	text-align: center;
 }

 .about-wrap .feature-section p {
 	margin-top: 0.6em;
 }

-.about-wrap .lead-description {
-	font-size: 1.5em;
-	text-align: center;
-}
-
-.about-wrap .two-col-text {
-	column-count: 2;
-	column-gap: 40px;
-}
-
-.about-wrap .two-col-text p:first-of-type {
-	margin-top: 0;
-}
-
-.about-wrap .streamlined-updates p,
-.about-wrap .native-fonts p {
-	margin-bottom: 3em;
-}
-
-.about-wrap .under-the-hood img + h3 {
-	margin-top: 1.25em;
-}
-
 /* 2.2 - Structure */

-.about-wrap .headline-feature.feature-video {
-	position: relative;
-	margin: 40px 0;
-	padding-bottom: 56.25%;
+.about-wrap .headline-feature {
+	margin: 0 auto 40px;
+	max-width: 680px;
+}
+
+.about-wrap .headline-feature h2 {
+	margin: 50px 0 0;
+}
+
+.about-wrap .headline-feature img {
+	max-width: 600px;
 	width: 100%;
-	max-width: 100%;
-	height: 0;
-	text-align: center;
-}
-
-.about-wrap .feature-video embed {
-	position: absolute;
-	top: 0;
-	left: 0;
-	width: 100%;
-	height: 100%;
-}
-
-.about-wrap .featured-image {
-	text-align: center;
-}
-
-.about-wrap .feature-section {
-	overflow: hidden;
-}
-
-.about-wrap .feature-section.no-heading {
-	padding-top: 35px;
-}
-
-.about-wrap .feature-section .media-container {
-	overflow: hidden;
-}
-
-.about-wrap .embed-container {
-	text-align: center;
-}
-
-.about-wrap .embed-container iframe {
-	max-width: 100%;
-}
-
-.about-wrap .wp-embedded-content {
-	max-width: 100%;
-}
-
-.about-wrap .feature-section .col {
-	margin-top: 40px;
-}
-
-.about-wrap .changelog {
-	margin-bottom: 40px;
-}
-
-.about-wrap .changelog.feature-section .col {
-	margin-top: 40px;
 }

 /* Return to Dashboard Home link */
@@ -400,11 +365,13 @@

 /* Credits */

-.about-wrap h3.wp-people-group {
+.about-wrap h2.wp-people-group {
 	margin: 2.6em 0 1.33em;
 	padding: 0;
 	font-size: 16px;
 	line-height: inherit;
+	font-weight: 600;
+	text-align: left;
 }

 .about-wrap .wp-people-group {
@@ -449,7 +416,7 @@
 	margin: 6px 0 2px;
 	font-size: 16px;
 	font-weight: 400;
-	line-height: 2em;
+	line-height: 2;
 	text-decoration: none;
 }

@@ -481,18 +448,25 @@
 	margin: 0.6em 0;
 }

-.freedoms-php .about-wrap .col .freedoms-image {
+.freedoms-php .has-4-columns {
+	margin-bottom: 40px;
+}
+
+.freedoms-php .column .freedoms-image {
 	background-image: url('https://s.w.org/wp-content/themes/pub/wporg-main/images/freedoms-2x.png');
 	background-size: 100%;
 	padding-top: 100%;
 }
-.freedoms-php .about-wrap .col:nth-of-type(2) .freedoms-image {
+
+.freedoms-php .column:nth-of-type(2) .freedoms-image {
 	background-position: 0 34%;
 }
-.freedoms-php .about-wrap .col:nth-of-type(3) .freedoms-image {
+
+.freedoms-php .column:nth-of-type(3) .freedoms-image {
 	background-position: 0 66%;
 }
-.freedoms-php .about-wrap .col:nth-of-type(4) .freedoms-image {
+
+.freedoms-php .column:nth-of-type(4) .freedoms-image {
 	background-position: 0 100%;
 }

@@ -500,67 +474,61 @@
  4.0 - Media Queries
 ------------------------------------------------------------------------------*/

-@media screen and (max-width: 1250px) {
-	.about-wrap .floating-header-section.has-long-title .section-item:nth-child(1),
-	.about-wrap .floating-header-section.has-long-title .section-item:nth-child(2) {
-		margin: 0 0 60px;
+@media screen and (max-width: 782px) {
+	.about-wrap .has-3-columns,
+	.about-wrap .has-4-columns {
+		-ms-grid-columns: 1fr 1fr;
+		grid-template-columns: 1fr 1fr;
 	}

-	.about-wrap .floating-header-section.has-long-title .section-item:nth-child(3),
-	.about-wrap .floating-header-section.has-long-title .section-item:nth-child(4) {
-		margin: 0;
+	.about-wrap .has-3-columns .column:nth-of-type(3n+1),
+	.about-wrap .has-4-columns .column:nth-of-type(4n+1) {
+		-ms-grid-column: 1;
+		grid-column-start: 1;
+		-ms-grid-row: 1;
+		grid-row-start: 1;
 	}

-	.about-wrap .floating-header-section.has-long-title .section-item:nth-child(2),
-	.about-wrap .floating-header-section.has-long-title .section-item:nth-child(4) {
-		margin-left: 60px;
+	.about-wrap .has-3-columns .column:nth-of-type(3n+2),
+	.about-wrap .has-4-columns .column:nth-of-type(4n+2) {
+		-ms-grid-column: 2;
+		grid-column-start: 2;
+		-ms-grid-row: 1;
+		grid-row-start: 1;
+	}
+
+	.about-wrap .has-3-columns .column:nth-of-type(3n),
+	.about-wrap .has-4-columns .column:nth-of-type(4n+3) {
+		-ms-grid-column: 1;
+		grid-column-start: 1;
+		-ms-grid-row: 2;
+		grid-row-start: 2;
+	}
+
+	.about-wrap .has-4-columns .column:nth-of-type(4n) {
+		-ms-grid-column: 2;
+		grid-column-start: 2;
+		-ms-grid-row: 2;
+		grid-row-start: 2;
 	}
 }

-@media screen and (max-width: 782px) {
-	.about-wrap .two-col-text {
-		column-count: 1;
-	}
-
-	.about-wrap .two-col .col,
-	.about-wrap .three-col .col,
-	.about-wrap .four-col .col {
-		min-width: 48% !important;
-	}
-
-	.about-wrap .eight-col .col {
-		min-width: 24% !important;
-	}
-
-	.about-wrap .three-col img,
-	.about-wrap .four-col img,
-	.about-wrap .eight-col img {
-		display: block;
-		margin: 0 auto;
-	}
-
-	.about-wrap figcaption {
-		position: relative;
-		margin-top: 10px;
-		margin-bottom: 15px;
-		padding: 0;
-		background: none;
-		color: #40464D;
-		text-shadow: none;
-	}
-
-	.about-wrap .floating-header-section {
+@media screen and (max-width: 600px) {
+	.about-wrap .has-2-columns,
+	.about-wrap .has-3-columns,
+	.about-wrap .has-4-columns {
 		display: block;
 	}

-	.about-wrap .floating-header-section .section-header,
-	.about-wrap .floating-header-section .section-content {
-		max-width: 100%;
+	.about-wrap :not(.is-wider-right):not(.is-wider-left) .column {
+		margin-right: 0;
+		margin-left: 0;
 	}

-	.about-wrap .floating-header-section h2 {
-		position: static;
-		margin-bottom: 60px;
+	.about-wrap .has-2-columns.is-wider-right,
+	.about-wrap .has-2-columns.is-wider-left {
+		display: -ms-grid;
+		display: grid;
 	}
 }

@@ -584,56 +552,21 @@
 		margin-bottom: 1.5em;
 		width: 100%;
 	}
+}

-	.about-wrap .feature-section .col {
-		margin-top: 1em;
+@media only screen and (max-width: 480px) {
+	.about-wrap .has-2-columns.is-wider-right,
+	.about-wrap .has-2-columns.is-wider-left {
+		display: block;
 	}

-	.about-wrap .two-col .col,
-	.about-wrap .three-col .col,
-	.about-wrap .three-col .col {
-		min-width: 100% !important;
+	.about-wrap .column {
+		margin-right: 0;
+		margin-left: 0;
 	}

-	.about-wrap .eight-col .col {
-		min-width: 48% !important;
-	}
-
-	.about-wrap .under-the-hood.four-col .col,
-	.about-wrap .under-the-hood.three-col .col,
-	.about-wrap .under-the-hood.two-col .col,
-	.about-wrap .under-the-hood.one-col .col {
-		margin-bottom: 2em;
-		padding-bottom: 0;
-	}
-
-	.about-wrap .under-the-hood:nth-of-type(2n),
-	.about-wrap .under-the-hood:nth-of-type(3n) {
-		margin-top: 0;
-	}
-
-	.about-wrap .under-the-hood img + h3 {
-		margin-top: 1.25em;
-	}
-
-	.about-wrap .floating-header-section {
-		margin-bottom: 60px;
-		grid-gap: 30px 0;
-	}
-
-	.about-wrap .inline-svg.full-width {
-		margin-bottom: 60px;
-	}
-
-	.about-wrap .floating-header-section h2 {
-		word-break: break-all;
-		-webkit-hyphens: auto;
-		-ms-hyphens: auto;
-		hyphens: auto;
-	}
-
-	.about-wrap .floating-header-section .section-content .section-item {
-		max-width: 100%;
-		margin: 0 0 60px;
+	.about-wrap .has-2-columns.is-wider-right img,
+	.about-wrap .has-2-columns.is-wider-left img {
+		max-width: 160px;
 	}
 }
--- a/wp-admin/css/about.min.css
+++ b/wp-admin/css/about.min.css
--- a/wp-admin/css/admin-menu-rtl.css
+++ b/wp-admin/css/admin-menu-rtl.css
@@ -159,14 +159,14 @@

 #adminmenu a {
 	display: block;
-	line-height: 18px;
+	line-height: 1.3;
 	padding: 2px 5px;
 	color: #eee;
 }

 #adminmenu .wp-submenu a {
 	color: #b4b9be;
-	color: rgba(240,245,250,0.7);
+	color: rgba(240, 245, 250, 0.7);
 }

 #adminmenu .wp-submenu a:hover,
@@ -202,7 +202,7 @@
 	padding: 7px 0 8px;
 	z-index: 9999;
 	background-color: #32373c;
-	box-shadow: 0 3px 5px rgba(0,0,0,0.2);
+	box-shadow: 0 3px 5px rgba(0, 0, 0, 0.2);
 }

 .js #adminmenu .sub-open,
@@ -280,7 +280,7 @@

 #adminmenu .wp-submenu a {
 	font-size: 13px;
-	line-height: 18px;
+	line-height: 1.4;
 	margin: 0;
 	padding: 5px 0;
 }
@@ -298,7 +298,8 @@
 .folded #adminmenu .wp-has-current-submenu li > a {
 	padding-left: 16px;
 	padding-right: 14px;
-	transition: all .1s ease-in-out;
+	/* Exclude from the transition the outline for Windows High Contrast mode */
+	transition: all .1s ease-in-out, outline 0s;
 }

 #adminmenu .wp-has-current-submenu ul > li > a,
@@ -310,7 +311,7 @@
 #adminmenu .wp-submenu-head {
 	font-size: 14px;
 	font-weight: 400;
-	line-height: 18px;
+	line-height: 1.3;
 	padding: 0;
 }

@@ -330,7 +331,6 @@
 #adminmenu .wp-submenu li {
 	padding: 0;
 	margin: 0;
-	overflow: hidden;
 }

 #adminmenu .wp-menu-image img {
@@ -359,14 +359,14 @@

 div.wp-menu-image:before {
 	color: #a0a5aa;
-	color: rgba(240,245,250,0.6);
+	color: rgba(240, 245, 250, 0.6);
 	padding: 7px 0;
 	transition: all .1s ease-in-out;
 }

 #adminmenu div.wp-menu-image:before {
 	color: #a0a5aa;
-	color: rgba(240,245,250,0.6);
+	color: rgba(240, 245, 250, 0.6);
 }

 #adminmenu li.wp-has-current-submenu:hover div.wp-menu-image:before,
@@ -515,22 +515,23 @@ ul#adminmenu > li.current > a.current:after {
 #adminmenu .update-plugins {
 	display: inline-block;
 	vertical-align: top;
-	margin: 1px 2px 0 0;
+	box-sizing: border-box;
+	margin: 1px 2px -1px 0;
 	padding: 0 5px;
-	min-width: 7px;
-	height: 17px;
-	border-radius: 11px;
+	min-width: 18px;
+	height: 18px;
+	border-radius: 9px;
 	background-color: #ca4a1f;
 	color: #fff;
-	font-size: 9px;
-	line-height: 17px;
+	font-size: 11px;
+	line-height: 1.6;
 	text-align: center;
 	z-index: 26;
 }

 #adminmenu li.current a .awaiting-mod,
 #adminmenu li a.wp-has-current-submenu .update-plugins {
-	background-color: #00b9eb;
+	background-color: #ca4a1f;
 	color: #fff;
 }

@@ -547,16 +548,20 @@ ul#adminmenu > li.current > a.current:after {
 	padding: 0;
 	position: relative;
 	overflow: visible;
-	line-height: 34px;
 	background: none;
 	color: #aaa;
 	cursor: pointer;
-	outline: 0;
 }

-#collapse-button:hover,
+#collapse-button:hover {
+	color: #00b9eb;
+}
+
 #collapse-button:focus {
 	color: #00b9eb;
+	/* Only visible in Windows High Contrast mode */
+	outline: 1px solid transparent;
+	outline-offset: -1px;
 }

 #collapse-button .collapse-button-icon,
@@ -566,7 +571,10 @@ ul#adminmenu > li.current > a.current:after {
 	position: absolute;
 	top: 0;
 	right: 0;
-	line-height: 34px;
+}
+
+#collapse-button .collapse-button-label {
+	top: 8px;
 }

 #collapse-button .collapse-button-icon {
@@ -735,7 +743,7 @@ li#wp-admin-bar-menu-toggle {

 }

-@media screen and ( max-width: 782px ) {
+@media screen and (max-width: 782px) {
 	.auto-fold #wpcontent {
 		position: relative;
 		margin-right: 0;
--- a/wp-admin/css/admin-menu-rtl.min.css
+++ b/wp-admin/css/admin-menu-rtl.min.css
--- a/wp-admin/css/admin-menu.css
+++ b/wp-admin/css/admin-menu.css
@@ -159,14 +159,14 @@

 #adminmenu a {
 	display: block;
-	line-height: 18px;
+	line-height: 1.3;
 	padding: 2px 5px;
 	color: #eee;
 }

 #adminmenu .wp-submenu a {
 	color: #b4b9be;
-	color: rgba(240,245,250,0.7);
+	color: rgba(240, 245, 250, 0.7);
 }

 #adminmenu .wp-submenu a:hover,
@@ -202,7 +202,7 @@
 	padding: 7px 0 8px;
 	z-index: 9999;
 	background-color: #32373c;
-	box-shadow: 0 3px 5px rgba(0,0,0,0.2);
+	box-shadow: 0 3px 5px rgba(0, 0, 0, 0.2);
 }

 .js #adminmenu .sub-open,
@@ -280,7 +280,7 @@

 #adminmenu .wp-submenu a {
 	font-size: 13px;
-	line-height: 18px;
+	line-height: 1.4;
 	margin: 0;
 	padding: 5px 0;
 }
@@ -298,7 +298,8 @@
 .folded #adminmenu .wp-has-current-submenu li > a {
 	padding-right: 16px;
 	padding-left: 14px;
-	transition: all .1s ease-in-out;
+	/* Exclude from the transition the outline for Windows High Contrast mode */
+	transition: all .1s ease-in-out, outline 0s;
 }

 #adminmenu .wp-has-current-submenu ul > li > a,
@@ -310,7 +311,7 @@
 #adminmenu .wp-submenu-head {
 	font-size: 14px;
 	font-weight: 400;
-	line-height: 18px;
+	line-height: 1.3;
 	padding: 0;
 }

@@ -330,7 +331,6 @@
 #adminmenu .wp-submenu li {
 	padding: 0;
 	margin: 0;
-	overflow: hidden;
 }

 #adminmenu .wp-menu-image img {
@@ -359,14 +359,14 @@

 div.wp-menu-image:before {
 	color: #a0a5aa;
-	color: rgba(240,245,250,0.6);
+	color: rgba(240, 245, 250, 0.6);
 	padding: 7px 0;
 	transition: all .1s ease-in-out;
 }

 #adminmenu div.wp-menu-image:before {
 	color: #a0a5aa;
-	color: rgba(240,245,250,0.6);
+	color: rgba(240, 245, 250, 0.6);
 }

 #adminmenu li.wp-has-current-submenu:hover div.wp-menu-image:before,
@@ -515,22 +515,23 @@ ul#adminmenu > li.current > a.current:after {
 #adminmenu .update-plugins {
 	display: inline-block;
 	vertical-align: top;
-	margin: 1px 0 0 2px;
+	box-sizing: border-box;
+	margin: 1px 0 -1px 2px;
 	padding: 0 5px;
-	min-width: 7px;
-	height: 17px;
-	border-radius: 11px;
+	min-width: 18px;
+	height: 18px;
+	border-radius: 9px;
 	background-color: #ca4a1f;
 	color: #fff;
-	font-size: 9px;
-	line-height: 17px;
+	font-size: 11px;
+	line-height: 1.6;
 	text-align: center;
 	z-index: 26;
 }

 #adminmenu li.current a .awaiting-mod,
 #adminmenu li a.wp-has-current-submenu .update-plugins {
-	background-color: #00b9eb;
+	background-color: #ca4a1f;
 	color: #fff;
 }

@@ -547,16 +548,20 @@ ul#adminmenu > li.current > a.current:after {
 	padding: 0;
 	position: relative;
 	overflow: visible;
-	line-height: 34px;
 	background: none;
 	color: #aaa;
 	cursor: pointer;
-	outline: 0;
 }

-#collapse-button:hover,
+#collapse-button:hover {
+	color: #00b9eb;
+}
+
 #collapse-button:focus {
 	color: #00b9eb;
+	/* Only visible in Windows High Contrast mode */
+	outline: 1px solid transparent;
+	outline-offset: -1px;
 }

 #collapse-button .collapse-button-icon,
@@ -566,7 +571,10 @@ ul#adminmenu > li.current > a.current:after {
 	position: absolute;
 	top: 0;
 	left: 0;
-	line-height: 34px;
+}
+
+#collapse-button .collapse-button-label {
+	top: 8px;
 }

 #collapse-button .collapse-button-icon {
@@ -735,7 +743,7 @@ li#wp-admin-bar-menu-toggle {

 }

-@media screen and ( max-width: 782px ) {
+@media screen and (max-width: 782px) {
 	.auto-fold #wpcontent {
 		position: relative;
 		margin-left: 0;
--- a/wp-admin/css/admin-menu.min.css
+++ b/wp-admin/css/admin-menu.min.css
--- a/wp-admin/css/code-editor-rtl.css
+++ b/wp-admin/css/code-editor-rtl.css
@@ -28,7 +28,7 @@

 .wp-core-ui .CodeMirror-lint-message-error,
 .wp-core-ui .CodeMirror-lint-message-warning {
-	box-shadow: 0 1px 1px 0 rgba( 0, 0, 0, 0.1 );
+	box-shadow: 0 1px 1px 0 rgba(0, 0, 0, 0.1);
 	margin: 5px 0 2px;
 	padding: 3px 28px 3px 12px;
 }
@@ -63,7 +63,7 @@
 }

 .wrap .CodeMirror .CodeMirror-matchingbracket {
-	background: rgba(255, 150, 0, .3);
+	background: rgba(255, 150, 0, 0.3);
 	color: inherit;
 }

@@ -71,6 +71,6 @@
 	text-align: right;
 }

-.wrap .CodeMirror .CodeMirror-linenumber { 
-    color: #666; 
+.wrap .CodeMirror .CodeMirror-linenumber {
+	color: #666;
 }
--- a/wp-admin/css/code-editor.css
+++ b/wp-admin/css/code-editor.css
@@ -28,7 +28,7 @@

 .wp-core-ui .CodeMirror-lint-message-error,
 .wp-core-ui .CodeMirror-lint-message-warning {
-	box-shadow: 0 1px 1px 0 rgba( 0, 0, 0, 0.1 );
+	box-shadow: 0 1px 1px 0 rgba(0, 0, 0, 0.1);
 	margin: 5px 0 2px;
 	padding: 3px 12px 3px 28px;
 }
@@ -63,7 +63,7 @@
 }

 .wrap .CodeMirror .CodeMirror-matchingbracket {
-	background: rgba(255, 150, 0, .3);
+	background: rgba(255, 150, 0, 0.3);
 	color: inherit;
 }

@@ -71,6 +71,6 @@
 	text-align: left;
 }

-.wrap .CodeMirror .CodeMirror-linenumber { 
-    color: #666; 
+.wrap .CodeMirror .CodeMirror-linenumber {
+	color: #666;
 }
--- a/wp-admin/css/color-picker-rtl.css
+++ b/wp-admin/css/color-picker-rtl.css
@@ -1,5 +1,7 @@
+/* rtl:ignore */
 .wp-color-picker {
 	width: 80px;
+	direction: ltr;
 }

 .wp-picker-container .hidden {
@@ -20,7 +22,7 @@
 	border-right: 1px solid #ccc;
 	color: #555;
 	display: block;
-	line-height: 22px;
+	line-height: 2;
 	padding: 0 6px;
 	text-align: center;
 }
@@ -39,13 +41,13 @@
 	border-right: 1px solid #999;
 }

-.wp-picker-containers {
+.wp-picker-container {
 	display: inline-block;
 }

 .wp-color-result:focus {
 	border-color: #5b9dd9;
-	box-shadow: 0 0 3px rgba( 0, 115, 170, .8 );
+	box-shadow: 0 0 3px rgba(0, 115, 170, 0.8);
 }

 .wp-color-result:active {
@@ -70,7 +72,7 @@

 .wp-picker-input-wrap .button,
 .wp-customizer .wp-picker-input-wrap .button {
- 	margin-right: 6px;
+	margin-right: 6px;
 }

 .wp-picker-container .iris-square-slider .ui-slider-handle:focus {
@@ -87,7 +89,7 @@
 	width: 65px;
 	font-size: 12px;
 	font-family: monospace;
-	line-height: 16px;
+	line-height: 1.4;
 	margin: 0;
 	vertical-align: top;
 }
@@ -115,22 +117,22 @@
 .iris-picker .iris-strip .ui-slider-handle:focus {
 	box-shadow:
 		0 0 0 1px #5b9dd9,
-		0 0 2px 1px rgba(30, 140, 190, .8);
+		0 0 2px 1px rgba(30, 140, 190, 0.8);
 }

 .iris-picker .iris-palette:focus {
 	box-shadow:
-		inset 0 0 5px rgba(0,0,0,.4),
+		inset 0 0 5px rgba(0, 0, 0, 0.4),
 		0 0 0 1px #5b9dd9,
-		0 0 2px 1px rgba(30, 140, 190, .8);
+		0 0 2px 1px rgba(30, 140, 190, 0.8);
 }

-@media screen and ( max-width: 782px ) {
+@media screen and (max-width: 782px) {
 	.wp-picker-container input[type="text"].wp-color-picker {
 		width: 80px;
 		padding: 6px 5px 5px;
 		font-size: 16px;
-		line-height: 18px;
+		line-height: 1.15;
 	}

 	.wp-customizer .wp-picker-container input[type="text"].wp-color-picker {
@@ -141,12 +143,12 @@
 		height: auto;
 		padding: 0 40px 0 0;
 		font-size: 14px;
-		line-height: 29px;
+		line-height: 2.1;
 	}

 	.wp-customizer .wp-picker-container .wp-color-result.button {
 		font-size: 13px;
-		line-height: 26px;
+		line-height: 2;
 	}

 	.wp-picker-container .wp-color-result-text {
@@ -160,10 +162,10 @@
 	}
 }

-@media screen and ( max-width: 640px ) {
+@media screen and (max-width: 640px) {
 	.wp-customizer .wp-picker-container .wp-color-result.button {
 		font-size: 14px;
-		line-height: 29px;
+		line-height: 2.1;
 	}

 	.wp-customizer .wp-picker-container input[type="text"].wp-color-picker {
--- a/wp-admin/css/color-picker-rtl.min.css
+++ b/wp-admin/css/color-picker-rtl.min.css
@@ -1,2 +1,2 @@
 /*! This file is auto-generated */
-.wp-color-picker{width:80px}.wp-picker-container .hidden{display:none}.wp-picker-container .wp-color-result.button{height:24px;margin:0 0 6px 6px;padding:0 30px 0 0;font-size:11px}.wp-color-result-text{background:#f7f7f7;border-radius:2px 0 0 2px;border-right:1px solid #ccc;color:#555;display:block;line-height:22px;padding:0 6px;text-align:center}.wp-color-result:focus,.wp-color-result:hover{background:#fafafa;border-color:#999;color:#23282d}.wp-color-result:focus:after,.wp-color-result:hover:after{color:#23282d;border-color:#a0a5aa;border-right:1px solid #999}.wp-picker-containers{display:inline-block}.wp-color-result:focus{border-color:#5b9dd9;box-shadow:0 0 3px rgba(0,115,170,.8)}.wp-color-result:active{transform:none!important}.wp-picker-open+.wp-picker-input-wrap{display:inline-block;vertical-align:top}.wp-picker-input-wrap label{display:inline-block;vertical-align:top}.form-table .wp-picker-input-wrap label{margin:0!important}.wp-customizer .wp-picker-input-wrap .button,.wp-picker-input-wrap .button{margin-right:6px}.wp-picker-container .iris-square-slider .ui-slider-handle:focus{background-color:#555}.wp-picker-container .iris-picker{border-radius:0;border-color:#ddd;margin-top:6px}.wp-picker-container input[type=text].wp-color-picker{width:65px;font-size:12px;font-family:monospace;line-height:16px;margin:0;vertical-align:top}.wp-color-picker::-webkit-input-placeholder{color:#72777c}.wp-color-picker::-moz-placeholder{color:#72777c;opacity:1}.wp-color-picker:-ms-input-placeholder{color:#72777c}.wp-picker-container input[type=text].iris-error{background-color:#ffebe8;border-color:#c00;color:#000}.iris-picker .iris-strip .ui-slider-handle:focus,.iris-picker .ui-square-handle:focus{box-shadow:0 0 0 1px #5b9dd9,0 0 2px 1px rgba(30,140,190,.8)}.iris-picker .iris-palette:focus{box-shadow:inset 0 0 5px rgba(0,0,0,.4),0 0 0 1px #5b9dd9,0 0 2px 1px rgba(30,140,190,.8)}@media screen and (max-width:782px){.wp-picker-container input[type=text].wp-color-picker{width:80px;padding:6px 5px 5px;font-size:16px;line-height:18px}.wp-customizer .wp-picker-container input[type=text].wp-color-picker{padding:5px 5px 4px}.wp-picker-container .wp-color-result.button{height:auto;padding:0 40px 0 0;font-size:14px;line-height:29px}.wp-customizer .wp-picker-container .wp-color-result.button{font-size:13px;line-height:26px}.wp-picker-container .wp-color-result-text{padding:0 14px;font-size:inherit;line-height:inherit}.wp-customizer .wp-picker-container .wp-color-result-text{padding:0 10px}}@media screen and (max-width:640px){.wp-customizer .wp-picker-container .wp-color-result.button{font-size:14px;line-height:29px}.wp-customizer .wp-picker-container input[type=text].wp-color-picker{padding:6px 5px}}
+.wp-color-picker{width:80px;direction:ltr}.wp-picker-container .hidden{display:none}.wp-picker-container .wp-color-result.button{height:24px;margin:0 0 6px 6px;padding:0 30px 0 0;font-size:11px}.wp-color-result-text{background:#f7f7f7;border-radius:2px 0 0 2px;border-right:1px solid #ccc;color:#555;display:block;line-height:2;padding:0 6px;text-align:center}.wp-color-result:focus,.wp-color-result:hover{background:#fafafa;border-color:#999;color:#23282d}.wp-color-result:focus:after,.wp-color-result:hover:after{color:#23282d;border-color:#a0a5aa;border-right:1px solid #999}.wp-picker-container{display:inline-block}.wp-color-result:focus{border-color:#5b9dd9;box-shadow:0 0 3px rgba(0,115,170,.8)}.wp-color-result:active{transform:none!important}.wp-picker-open+.wp-picker-input-wrap{display:inline-block;vertical-align:top}.wp-picker-input-wrap label{display:inline-block;vertical-align:top}.form-table .wp-picker-input-wrap label{margin:0!important}.wp-customizer .wp-picker-input-wrap .button,.wp-picker-input-wrap .button{margin-right:6px}.wp-picker-container .iris-square-slider .ui-slider-handle:focus{background-color:#555}.wp-picker-container .iris-picker{border-radius:0;border-color:#ddd;margin-top:6px}.wp-picker-container input[type=text].wp-color-picker{width:65px;font-size:12px;font-family:monospace;line-height:1.4;margin:0;vertical-align:top}.wp-color-picker::-webkit-input-placeholder{color:#72777c}.wp-color-picker::-moz-placeholder{color:#72777c;opacity:1}.wp-color-picker:-ms-input-placeholder{color:#72777c}.wp-picker-container input[type=text].iris-error{background-color:#ffebe8;border-color:#c00;color:#000}.iris-picker .iris-strip .ui-slider-handle:focus,.iris-picker .ui-square-handle:focus{box-shadow:0 0 0 1px #5b9dd9,0 0 2px 1px rgba(30,140,190,.8)}.iris-picker .iris-palette:focus{box-shadow:inset 0 0 5px rgba(0,0,0,.4),0 0 0 1px #5b9dd9,0 0 2px 1px rgba(30,140,190,.8)}@media screen and (max-width:782px){.wp-picker-container input[type=text].wp-color-picker{width:80px;padding:6px 5px 5px;font-size:16px;line-height:1.15}.wp-customizer .wp-picker-container input[type=text].wp-color-picker{padding:5px 5px 4px}.wp-picker-container .wp-color-result.button{height:auto;padding:0 40px 0 0;font-size:14px;line-height:2.1}.wp-customizer .wp-picker-container .wp-color-result.button{font-size:13px;line-height:2}.wp-picker-container .wp-color-result-text{padding:0 14px;font-size:inherit;line-height:inherit}.wp-customizer .wp-picker-container .wp-color-result-text{padding:0 10px}}@media screen and (max-width:640px){.wp-customizer .wp-picker-container .wp-color-result.button{font-size:14px;line-height:2.1}.wp-customizer .wp-picker-container input[type=text].wp-color-picker{padding:6px 5px}}
--- a/wp-admin/css/color-picker.css
+++ b/wp-admin/css/color-picker.css
@@ -1,5 +1,7 @@
+/* rtl:ignore */
 .wp-color-picker {
 	width: 80px;
+	direction: ltr;
 }

 .wp-picker-container .hidden {
@@ -20,7 +22,7 @@
 	border-left: 1px solid #ccc;
 	color: #555;
 	display: block;
-	line-height: 22px;
+	line-height: 2;
 	padding: 0 6px;
 	text-align: center;
 }
@@ -39,13 +41,13 @@
 	border-left: 1px solid #999;
 }

-.wp-picker-containers {
+.wp-picker-container {
 	display: inline-block;
 }

 .wp-color-result:focus {
 	border-color: #5b9dd9;
-	box-shadow: 0 0 3px rgba( 0, 115, 170, .8 );
+	box-shadow: 0 0 3px rgba(0, 115, 170, 0.8);
 }

 .wp-color-result:active {
@@ -70,7 +72,7 @@

 .wp-picker-input-wrap .button,
 .wp-customizer .wp-picker-input-wrap .button {
- 	margin-left: 6px;
+	margin-left: 6px;
 }

 .wp-picker-container .iris-square-slider .ui-slider-handle:focus {
@@ -87,7 +89,7 @@
 	width: 65px;
 	font-size: 12px;
 	font-family: monospace;
-	line-height: 16px;
+	line-height: 1.4;
 	margin: 0;
 	vertical-align: top;
 }
@@ -115,22 +117,22 @@
 .iris-picker .iris-strip .ui-slider-handle:focus {
 	box-shadow:
 		0 0 0 1px #5b9dd9,
-		0 0 2px 1px rgba(30, 140, 190, .8);
+		0 0 2px 1px rgba(30, 140, 190, 0.8);
 }

 .iris-picker .iris-palette:focus {
 	box-shadow:
-		inset 0 0 5px rgba(0,0,0,.4),
+		inset 0 0 5px rgba(0, 0, 0, 0.4),
 		0 0 0 1px #5b9dd9,
-		0 0 2px 1px rgba(30, 140, 190, .8);
+		0 0 2px 1px rgba(30, 140, 190, 0.8);
 }

-@media screen and ( max-width: 782px ) {
+@media screen and (max-width: 782px) {
 	.wp-picker-container input[type="text"].wp-color-picker {
 		width: 80px;
 		padding: 6px 5px 5px;
 		font-size: 16px;
-		line-height: 18px;
+		line-height: 1.15;
 	}

 	.wp-customizer .wp-picker-container input[type="text"].wp-color-picker {
@@ -141,12 +143,12 @@
 		height: auto;
 		padding: 0 0 0 40px;
 		font-size: 14px;
-		line-height: 29px;
+		line-height: 2.1;
 	}

 	.wp-customizer .wp-picker-container .wp-color-result.button {
 		font-size: 13px;
-		line-height: 26px;
+		line-height: 2;
 	}

 	.wp-picker-container .wp-color-result-text {
@@ -160,10 +162,10 @@
 	}
 }

-@media screen and ( max-width: 640px ) {
+@media screen and (max-width: 640px) {
 	.wp-customizer .wp-picker-container .wp-color-result.button {
 		font-size: 14px;
-		line-height: 29px;
+		line-height: 2.1;
 	}

 	.wp-customizer .wp-picker-container input[type="text"].wp-color-picker {
--- a/wp-admin/css/color-picker.min.css
+++ b/wp-admin/css/color-picker.min.css
@@ -1,2 +1,2 @@
 /*! This file is auto-generated */
-.wp-color-picker{width:80px}.wp-picker-container .hidden{display:none}.wp-picker-container .wp-color-result.button{height:24px;margin:0 6px 6px 0;padding:0 0 0 30px;font-size:11px}.wp-color-result-text{background:#f7f7f7;border-radius:0 2px 2px 0;border-left:1px solid #ccc;color:#555;display:block;line-height:22px;padding:0 6px;text-align:center}.wp-color-result:focus,.wp-color-result:hover{background:#fafafa;border-color:#999;color:#23282d}.wp-color-result:focus:after,.wp-color-result:hover:after{color:#23282d;border-color:#a0a5aa;border-left:1px solid #999}.wp-picker-containers{display:inline-block}.wp-color-result:focus{border-color:#5b9dd9;box-shadow:0 0 3px rgba(0,115,170,.8)}.wp-color-result:active{transform:none!important}.wp-picker-open+.wp-picker-input-wrap{display:inline-block;vertical-align:top}.wp-picker-input-wrap label{display:inline-block;vertical-align:top}.form-table .wp-picker-input-wrap label{margin:0!important}.wp-customizer .wp-picker-input-wrap .button,.wp-picker-input-wrap .button{margin-left:6px}.wp-picker-container .iris-square-slider .ui-slider-handle:focus{background-color:#555}.wp-picker-container .iris-picker{border-radius:0;border-color:#ddd;margin-top:6px}.wp-picker-container input[type=text].wp-color-picker{width:65px;font-size:12px;font-family:monospace;line-height:16px;margin:0;vertical-align:top}.wp-color-picker::-webkit-input-placeholder{color:#72777c}.wp-color-picker::-moz-placeholder{color:#72777c;opacity:1}.wp-color-picker:-ms-input-placeholder{color:#72777c}.wp-picker-container input[type=text].iris-error{background-color:#ffebe8;border-color:#c00;color:#000}.iris-picker .iris-strip .ui-slider-handle:focus,.iris-picker .ui-square-handle:focus{box-shadow:0 0 0 1px #5b9dd9,0 0 2px 1px rgba(30,140,190,.8)}.iris-picker .iris-palette:focus{box-shadow:inset 0 0 5px rgba(0,0,0,.4),0 0 0 1px #5b9dd9,0 0 2px 1px rgba(30,140,190,.8)}@media screen and (max-width:782px){.wp-picker-container input[type=text].wp-color-picker{width:80px;padding:6px 5px 5px;font-size:16px;line-height:18px}.wp-customizer .wp-picker-container input[type=text].wp-color-picker{padding:5px 5px 4px}.wp-picker-container .wp-color-result.button{height:auto;padding:0 0 0 40px;font-size:14px;line-height:29px}.wp-customizer .wp-picker-container .wp-color-result.button{font-size:13px;line-height:26px}.wp-picker-container .wp-color-result-text{padding:0 14px;font-size:inherit;line-height:inherit}.wp-customizer .wp-picker-container .wp-color-result-text{padding:0 10px}}@media screen and (max-width:640px){.wp-customizer .wp-picker-container .wp-color-result.button{font-size:14px;line-height:29px}.wp-customizer .wp-picker-container input[type=text].wp-color-picker{padding:6px 5px}}
+.wp-color-picker{width:80px;direction:ltr}.wp-picker-container .hidden{display:none}.wp-picker-container .wp-color-result.button{height:24px;margin:0 6px 6px 0;padding:0 0 0 30px;font-size:11px}.wp-color-result-text{background:#f7f7f7;border-radius:0 2px 2px 0;border-left:1px solid #ccc;color:#555;display:block;line-height:2;padding:0 6px;text-align:center}.wp-color-result:focus,.wp-color-result:hover{background:#fafafa;border-color:#999;color:#23282d}.wp-color-result:focus:after,.wp-color-result:hover:after{color:#23282d;border-color:#a0a5aa;border-left:1px solid #999}.wp-picker-container{display:inline-block}.wp-color-result:focus{border-color:#5b9dd9;box-shadow:0 0 3px rgba(0,115,170,.8)}.wp-color-result:active{transform:none!important}.wp-picker-open+.wp-picker-input-wrap{display:inline-block;vertical-align:top}.wp-picker-input-wrap label{display:inline-block;vertical-align:top}.form-table .wp-picker-input-wrap label{margin:0!important}.wp-customizer .wp-picker-input-wrap .button,.wp-picker-input-wrap .button{margin-left:6px}.wp-picker-container .iris-square-slider .ui-slider-handle:focus{background-color:#555}.wp-picker-container .iris-picker{border-radius:0;border-color:#ddd;margin-top:6px}.wp-picker-container input[type=text].wp-color-picker{width:65px;font-size:12px;font-family:monospace;line-height:1.4;margin:0;vertical-align:top}.wp-color-picker::-webkit-input-placeholder{color:#72777c}.wp-color-picker::-moz-placeholder{color:#72777c;opacity:1}.wp-color-picker:-ms-input-placeholder{color:#72777c}.wp-picker-container input[type=text].iris-error{background-color:#ffebe8;border-color:#c00;color:#000}.iris-picker .iris-strip .ui-slider-handle:focus,.iris-picker .ui-square-handle:focus{box-shadow:0 0 0 1px #5b9dd9,0 0 2px 1px rgba(30,140,190,.8)}.iris-picker .iris-palette:focus{box-shadow:inset 0 0 5px rgba(0,0,0,.4),0 0 0 1px #5b9dd9,0 0 2px 1px rgba(30,140,190,.8)}@media screen and (max-width:782px){.wp-picker-container input[type=text].wp-color-picker{width:80px;padding:6px 5px 5px;font-size:16px;line-height:1.15}.wp-customizer .wp-picker-container input[type=text].wp-color-picker{padding:5px 5px 4px}.wp-picker-container .wp-color-result.button{height:auto;padding:0 0 0 40px;font-size:14px;line-height:2.1}.wp-customizer .wp-picker-container .wp-color-result.button{font-size:13px;line-height:2}.wp-picker-container .wp-color-result-text{padding:0 14px;font-size:inherit;line-height:inherit}.wp-customizer .wp-picker-container .wp-color-result-text{padding:0 10px}}@media screen and (max-width:640px){.wp-customizer .wp-picker-container .wp-color-result.button{font-size:14px;line-height:2.1}.wp-customizer .wp-picker-container input[type=text].wp-color-picker{padding:6px 5px}}
--- a/wp-admin/css/colors/_admin.scss
+++ b/wp-admin/css/colors/_admin.scss
@@ -84,9 +84,7 @@ input[type=radio]:checked:before {
 /* List tables */

 .wrap .add-new-h2:hover, /* deprecated */
-.wrap .page-title-action:hover,
-.tablenav .tablenav-pages a:hover,
-.tablenav .tablenav-pages a:focus {
+.wrap .page-title-action:hover {
 	color: $menu-text;
 	background-color: $menu-background;
 }
@@ -132,7 +130,7 @@ input[type=radio]:checked:before {

 /* Active tabs use a bottom border color that matches the page background color. */

-.about-wrap h2 .nav-tab-active,
+.about-wrap .nav-tab-active,
 .nav-tab-active,
 .nav-tab-active:hover {
 	background-color: $body-background;
@@ -350,6 +348,26 @@ ul#adminmenu > li.current > a.current:after {
 	background: $adminbar-input-background;
 }

+/* Admin Bar: recovery mode */
+
+#wpadminbar #wp-admin-bar-recovery-mode {
+	color: $adminbar-recovery-exit-text;
+	background-color: $adminbar-recovery-exit-background;
+}
+
+#wpadminbar #wp-admin-bar-recovery-mode .ab-item,
+#wpadminbar #wp-admin-bar-recovery-mode a.ab-item {
+	color: $adminbar-recovery-exit-text;
+}
+
+#wpadminbar .ab-top-menu > #wp-admin-bar-recovery-mode.hover >.ab-item,
+#wpadminbar.nojq .quicklinks .ab-top-menu > #wp-admin-bar-recovery-mode > .ab-item:focus,
+#wpadminbar:not(.mobile) .ab-top-menu > #wp-admin-bar-recovery-mode:hover > .ab-item,
+#wpadminbar:not(.mobile) .ab-top-menu > #wp-admin-bar-recovery-mode > .ab-item:focus {
+	color: $adminbar-recovery-exit-text;
+	background-color: $adminbar-recovery-exit-background-alt;
+}
+
 /* Admin Bar: my account */

 #wpadminbar .quicklinks li#wp-admin-bar-my-account.with-avatar > a img {
--- a/wp-admin/css/colors/_variables.scss
+++ b/wp-admin/css/colors/_variables.scss
@@ -55,4 +55,8 @@ $menu-collapse-focus-icon: $menu-highlight-icon !default;
 $adminbar-avatar-frame: lighten( $menu-background, 7% ) !default;
 $adminbar-input-background: lighten( $menu-background, 7% ) !default;

+$adminbar-recovery-exit-text: $menu-bubble-text !default;
+$adminbar-recovery-exit-background: $menu-bubble-background !default;
+$adminbar-recovery-exit-background-alt: mix(black, $adminbar-recovery-exit-background, 10%) !default;
+
 $menu-customizer-text: mix( $base-color, $text-color, 40% ) !default;
--- a/wp-admin/css/colors/blue/colors-rtl.css
+++ b/wp-admin/css/colors/blue/colors-rtl.css
@@ -11,7 +11,6 @@ body {
 a {
  color: #0073aa;
 }
-
 a:hover, a:active, a:focus {
  color: #0096dd;
 }
@@ -32,8 +31,8 @@ input[type=radio]:checked:before {
  background: #096484;
 }

-.wp-core-ui input[type="reset"]:hover,
-.wp-core-ui input[type="reset"]:active {
+.wp-core-ui input[type=reset]:hover,
+.wp-core-ui input[type=reset]:active {
  color: #0096dd;
 }

@@ -45,75 +44,60 @@ input[type=radio]:checked:before {
  box-shadow: 0 1px 0 #bd831f;
  text-shadow: 0 -1px 1px #bd831f, -1px 0 1px #bd831f, 0 1px 1px #bd831f, 1px 0 1px #bd831f;
 }
-
 .wp-core-ui .button-primary:hover, .wp-core-ui .button-primary:focus {
  background: #e3af55;
  border-color: #bd831f;
  color: #fff;
  box-shadow: 0 1px 0 #bd831f;
 }
-
 .wp-core-ui .button-primary:focus {
  box-shadow: inset 0 1px 0 #d39323, 0 0 2px 1px #33b3db;
 }
-
 .wp-core-ui .button-primary:active, .wp-core-ui .button-primary.active, .wp-core-ui .button-primary.active:focus, .wp-core-ui .button-primary.active:hover {
  background: #d39323;
  border-color: #bd831f;
  box-shadow: inset 0 2px 0 #bd831f;
 }
-
 .wp-core-ui .button-primary[disabled], .wp-core-ui .button-primary:disabled, .wp-core-ui .button-primary.button-primary-disabled, .wp-core-ui .button-primary.disabled {
  color: #d1cdc7 !important;
  background: #db9925 !important;
  border-color: #bd831f !important;
  text-shadow: none !important;
 }
-
 .wp-core-ui .button-primary.button-hero {
  box-shadow: 0 2px 0 #bd831f !important;
 }
-
 .wp-core-ui .button-primary.button-hero:active {
  box-shadow: inset 0 3px 0 #bd831f !important;
 }
-
 .wp-core-ui .wp-ui-primary {
  color: #fff;
  background-color: #52accc;
 }
-
 .wp-core-ui .wp-ui-text-primary {
  color: #52accc;
 }
-
 .wp-core-ui .wp-ui-highlight {
  color: #fff;
  background-color: #096484;
 }
-
 .wp-core-ui .wp-ui-text-highlight {
  color: #096484;
 }
-
 .wp-core-ui .wp-ui-notification {
  color: #fff;
  background-color: #e1a948;
 }
-
 .wp-core-ui .wp-ui-text-notification {
  color: #e1a948;
 }
-
 .wp-core-ui .wp-ui-text-icon {
  color: #e5f8ff;
 }

 /* List tables */
 .wrap .add-new-h2:hover,
-.wrap .page-title-action:hover,
-.tablenav .tablenav-pages a:hover,
-.tablenav .tablenav-pages a:focus {
+.wrap .page-title-action:hover {
  color: #fff;
  background-color: #52accc;
 }
@@ -155,7 +139,7 @@ input[type=radio]:checked:before {
 }

 /* Active tabs use a bottom border color that matches the page background color. */
-.about-wrap h2 .nav-tab-active,
+.about-wrap .nav-tab-active,
 .nav-tab-active,
 .nav-tab-active:hover {
  background-color: #f1f1f1;
@@ -186,7 +170,6 @@ input[type=radio]:checked:before {
 #adminmenu .wp-has-current-submenu.opensub .wp-submenu a {
  color: #e2ecf1;
 }
-
 #adminmenu .wp-submenu a:focus, #adminmenu .wp-submenu a:hover,
 #adminmenu .wp-has-current-submenu .wp-submenu a:focus,
 #adminmenu .wp-has-current-submenu .wp-submenu a:hover,
@@ -205,7 +188,6 @@ input[type=radio]:checked:before {
 #adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a {
  color: #fff;
 }
-
 #adminmenu .wp-submenu li.current a:hover, #adminmenu .wp-submenu li.current a:focus,
 #adminmenu a.wp-has-current-submenu:focus + .wp-submenu li.current a:hover,
 #adminmenu a.wp-has-current-submenu:focus + .wp-submenu li.current a:focus,
@@ -372,6 +354,25 @@ ul#adminmenu > li.current > a.current:after {
  background: #6eb9d4;
 }

+/* Admin Bar: recovery mode */
+#wpadminbar #wp-admin-bar-recovery-mode {
+  color: #fff;
+  background-color: #e1a948;
+}
+
+#wpadminbar #wp-admin-bar-recovery-mode .ab-item,
+#wpadminbar #wp-admin-bar-recovery-mode a.ab-item {
+  color: #fff;
+}
+
+#wpadminbar .ab-top-menu > #wp-admin-bar-recovery-mode.hover > .ab-item,
+#wpadminbar.nojq .quicklinks .ab-top-menu > #wp-admin-bar-recovery-mode > .ab-item:focus,
+#wpadminbar:not(.mobile) .ab-top-menu > #wp-admin-bar-recovery-mode:hover > .ab-item,
+#wpadminbar:not(.mobile) .ab-top-menu > #wp-admin-bar-recovery-mode > .ab-item:focus {
+  color: #fff;
+  background-color: #cb9841;
+}
+
 /* Admin Bar: my account */
 #wpadminbar .quicklinks li#wp-admin-bar-my-account.with-avatar > a img {
  border-color: #6eb9d4;
@@ -499,4 +500,4 @@ div#wp-responsive-toggle a:before {
 .mce-container.mce-menu .mce-menu-item-normal.mce-active,
 .mce-container.mce-menu .mce-menu-item-preview.mce-active {
  background: #096484;
-}
+}
--- a/wp-admin/css/colors/blue/colors-rtl.min.css
+++ b/wp-admin/css/colors/blue/colors-rtl.min.css
--- a/wp-admin/css/colors/blue/colors.css
+++ b/wp-admin/css/colors/blue/colors.css
@@ -11,7 +11,6 @@ body {
 a {
  color: #0073aa;
 }
-
 a:hover, a:active, a:focus {
  color: #0096dd;
 }
@@ -32,8 +31,8 @@ input[type=radio]:checked:before {
  background: #096484;
 }

-.wp-core-ui input[type="reset"]:hover,
-.wp-core-ui input[type="reset"]:active {
+.wp-core-ui input[type=reset]:hover,
+.wp-core-ui input[type=reset]:active {
  color: #0096dd;
 }

@@ -45,75 +44,60 @@ input[type=radio]:checked:before {
  box-shadow: 0 1px 0 #bd831f;
  text-shadow: 0 -1px 1px #bd831f, 1px 0 1px #bd831f, 0 1px 1px #bd831f, -1px 0 1px #bd831f;
 }
-
 .wp-core-ui .button-primary:hover, .wp-core-ui .button-primary:focus {
  background: #e3af55;
  border-color: #bd831f;
  color: #fff;
  box-shadow: 0 1px 0 #bd831f;
 }
-
 .wp-core-ui .button-primary:focus {
  box-shadow: inset 0 1px 0 #d39323, 0 0 2px 1px #33b3db;
 }
-
 .wp-core-ui .button-primary:active, .wp-core-ui .button-primary.active, .wp-core-ui .button-primary.active:focus, .wp-core-ui .button-primary.active:hover {
  background: #d39323;
  border-color: #bd831f;
  box-shadow: inset 0 2px 0 #bd831f;
 }
-
 .wp-core-ui .button-primary[disabled], .wp-core-ui .button-primary:disabled, .wp-core-ui .button-primary.button-primary-disabled, .wp-core-ui .button-primary.disabled {
  color: #d1cdc7 !important;
  background: #db9925 !important;
  border-color: #bd831f !important;
  text-shadow: none !important;
 }
-
 .wp-core-ui .button-primary.button-hero {
  box-shadow: 0 2px 0 #bd831f !important;
 }
-
 .wp-core-ui .button-primary.button-hero:active {
  box-shadow: inset 0 3px 0 #bd831f !important;
 }
-
 .wp-core-ui .wp-ui-primary {
  color: #fff;
  background-color: #52accc;
 }
-
 .wp-core-ui .wp-ui-text-primary {
  color: #52accc;
 }
-
 .wp-core-ui .wp-ui-highlight {
  color: #fff;
  background-color: #096484;
 }
-
 .wp-core-ui .wp-ui-text-highlight {
  color: #096484;
 }
-
 .wp-core-ui .wp-ui-notification {
  color: #fff;
  background-color: #e1a948;
 }
-
 .wp-core-ui .wp-ui-text-notification {
  color: #e1a948;
 }
-
 .wp-core-ui .wp-ui-text-icon {
  color: #e5f8ff;
 }

 /* List tables */
 .wrap .add-new-h2:hover,
-.wrap .page-title-action:hover,
-.tablenav .tablenav-pages a:hover,
-.tablenav .tablenav-pages a:focus {
+.wrap .page-title-action:hover {
  color: #fff;
  background-color: #52accc;
 }
@@ -155,7 +139,7 @@ input[type=radio]:checked:before {
 }

 /* Active tabs use a bottom border color that matches the page background color. */
-.about-wrap h2 .nav-tab-active,
+.about-wrap .nav-tab-active,
 .nav-tab-active,
 .nav-tab-active:hover {
  background-color: #f1f1f1;
@@ -186,7 +170,6 @@ input[type=radio]:checked:before {
 #adminmenu .wp-has-current-submenu.opensub .wp-submenu a {
  color: #e2ecf1;
 }
-
 #adminmenu .wp-submenu a:focus, #adminmenu .wp-submenu a:hover,
 #adminmenu .wp-has-current-submenu .wp-submenu a:focus,
 #adminmenu .wp-has-current-submenu .wp-submenu a:hover,
@@ -205,7 +188,6 @@ input[type=radio]:checked:before {
 #adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a {
  color: #fff;
 }
-
 #adminmenu .wp-submenu li.current a:hover, #adminmenu .wp-submenu li.current a:focus,
 #adminmenu a.wp-has-current-submenu:focus + .wp-submenu li.current a:hover,
 #adminmenu a.wp-has-current-submenu:focus + .wp-submenu li.current a:focus,
@@ -372,6 +354,25 @@ ul#adminmenu > li.current > a.current:after {
  background: #6eb9d4;
 }

+/* Admin Bar: recovery mode */
+#wpadminbar #wp-admin-bar-recovery-mode {
+  color: #fff;
+  background-color: #e1a948;
+}
+
+#wpadminbar #wp-admin-bar-recovery-mode .ab-item,
+#wpadminbar #wp-admin-bar-recovery-mode a.ab-item {
+  color: #fff;
+}
+
+#wpadminbar .ab-top-menu > #wp-admin-bar-recovery-mode.hover > .ab-item,
+#wpadminbar.nojq .quicklinks .ab-top-menu > #wp-admin-bar-recovery-mode > .ab-item:focus,
+#wpadminbar:not(.mobile) .ab-top-menu > #wp-admin-bar-recovery-mode:hover > .ab-item,
+#wpadminbar:not(.mobile) .ab-top-menu > #wp-admin-bar-recovery-mode > .ab-item:focus {
+  color: #fff;
+  background-color: #cb9841;
+}
+
 /* Admin Bar: my account */
 #wpadminbar .quicklinks li#wp-admin-bar-my-account.with-avatar > a img {
  border-color: #6eb9d4;
@@ -499,4 +500,4 @@ div#wp-responsive-toggle a:before {
 .mce-container.mce-menu .mce-menu-item-normal.mce-active,
 .mce-container.mce-menu .mce-menu-item-preview.mce-active {
  background: #096484;
-}
+}
--- a/wp-admin/css/colors/blue/colors.min.css
+++ b/wp-admin/css/colors/blue/colors.min.css
--- a/wp-admin/css/colors/coffee/colors-rtl.css
+++ b/wp-admin/css/colors/coffee/colors-rtl.css
@@ -11,7 +11,6 @@ body {
 a {
  color: #0073aa;
 }
-
 a:hover, a:active, a:focus {
  color: #0096dd;
 }
@@ -32,8 +31,8 @@ input[type=radio]:checked:before {
  background: #59524c;
 }

-.wp-core-ui input[type="reset"]:hover,
-.wp-core-ui input[type="reset"]:active {
+.wp-core-ui input[type=reset]:hover,
+.wp-core-ui input[type=reset]:active {
  color: #0096dd;
 }

@@ -45,75 +44,60 @@ input[type=radio]:checked:before {
  box-shadow: 0 1px 0 #ae7d55;
  text-shadow: 0 -1px 1px #ae7d55, -1px 0 1px #ae7d55, 0 1px 1px #ae7d55, 1px 0 1px #ae7d55;
 }
-
 .wp-core-ui .button-primary:hover, .wp-core-ui .button-primary:focus {
  background: #ccad93;
  border-color: #ae7d55;
  color: #fff;
  box-shadow: 0 1px 0 #ae7d55;
 }
-
 .wp-core-ui .button-primary:focus {
  box-shadow: inset 0 1px 0 #b78b66, 0 0 2px 1px #33b3db;
 }
-
 .wp-core-ui .button-primary:active, .wp-core-ui .button-primary.active, .wp-core-ui .button-primary.active:focus, .wp-core-ui .button-primary.active:hover {
  background: #b78b66;
  border-color: #ae7d55;
  box-shadow: inset 0 2px 0 #ae7d55;
 }
-
 .wp-core-ui .button-primary[disabled], .wp-core-ui .button-primary:disabled, .wp-core-ui .button-primary.button-primary-disabled, .wp-core-ui .button-primary.disabled {
  color: #d1ccc7 !important;
  background: #ba906d !important;
  border-color: #ae7d55 !important;
  text-shadow: none !important;
 }
-
 .wp-core-ui .button-primary.button-hero {
  box-shadow: 0 2px 0 #ae7d55 !important;
 }
-
 .wp-core-ui .button-primary.button-hero:active {
  box-shadow: inset 0 3px 0 #ae7d55 !important;
 }
-
 .wp-core-ui .wp-ui-primary {
  color: #fff;
  background-color: #59524c;
 }
-
 .wp-core-ui .wp-ui-text-primary {
  color: #59524c;
 }
-
 .wp-core-ui .wp-ui-highlight {
  color: #fff;
  background-color: #c7a589;
 }
-
 .wp-core-ui .wp-ui-text-highlight {
  color: #c7a589;
 }
-
 .wp-core-ui .wp-ui-notification {
  color: #fff;
  background-color: #9ea476;
 }
-
 .wp-core-ui .wp-ui-text-notification {
  color: #9ea476;
 }
-
 .wp-core-ui .wp-ui-text-icon {
  color: #f3f2f1;
 }

 /* List tables */
 .wrap .add-new-h2:hover,
-.wrap .page-title-action:hover,
-.tablenav .tablenav-pages a:hover,
-.tablenav .tablenav-pages a:focus {
+.wrap .page-title-action:hover {
  color: #fff;
  background-color: #59524c;
 }
@@ -155,7 +139,7 @@ input[type=radio]:checked:before {
 }

 /* Active tabs use a bottom border color that matches the page background color. */
-.about-wrap h2 .nav-tab-active,
+.about-wrap .nav-tab-active,
 .nav-tab-active,
 .nav-tab-active:hover {
  background-color: #f1f1f1;
@@ -186,7 +170,6 @@ input[type=radio]:checked:before {
 #adminmenu .wp-has-current-submenu.opensub .wp-submenu a {
  color: #cdcbc9;
 }
-
 #adminmenu .wp-submenu a:focus, #adminmenu .wp-submenu a:hover,
 #adminmenu .wp-has-current-submenu .wp-submenu a:focus,
 #adminmenu .wp-has-current-submenu .wp-submenu a:hover,
@@ -205,7 +188,6 @@ input[type=radio]:checked:before {
 #adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a {
  color: #fff;
 }
-
 #adminmenu .wp-submenu li.current a:hover, #adminmenu .wp-submenu li.current a:focus,
 #adminmenu a.wp-has-current-submenu:focus + .wp-submenu li.current a:hover,
 #adminmenu a.wp-has-current-submenu:focus + .wp-submenu li.current a:focus,
@@ -372,6 +354,25 @@ ul#adminmenu > li.current > a.current:after {
  background: #6c645c;
 }

+/* Admin Bar: recovery mode */
+#wpadminbar #wp-admin-bar-recovery-mode {
+  color: #fff;
+  background-color: #9ea476;
+}
+
+#wpadminbar #wp-admin-bar-recovery-mode .ab-item,
+#wpadminbar #wp-admin-bar-recovery-mode a.ab-item {
+  color: #fff;
+}
+
+#wpadminbar .ab-top-menu > #wp-admin-bar-recovery-mode.hover > .ab-item,
+#wpadminbar.nojq .quicklinks .ab-top-menu > #wp-admin-bar-recovery-mode > .ab-item:focus,
+#wpadminbar:not(.mobile) .ab-top-menu > #wp-admin-bar-recovery-mode:hover > .ab-item,
+#wpadminbar:not(.mobile) .ab-top-menu > #wp-admin-bar-recovery-mode > .ab-item:focus {
+  color: #fff;
+  background-color: #8e946a;
+}
+
 /* Admin Bar: my account */
 #wpadminbar .quicklinks li#wp-admin-bar-my-account.with-avatar > a img {
  border-color: #6c645c;
@@ -499,4 +500,4 @@ div#wp-responsive-toggle a:before {
 .mce-container.mce-menu .mce-menu-item-normal.mce-active,
 .mce-container.mce-menu .mce-menu-item-preview.mce-active {
  background: #c7a589;
-}
+}
--- a/wp-admin/css/colors/coffee/colors-rtl.min.css
+++ b/wp-admin/css/colors/coffee/colors-rtl.min.css
--- a/wp-admin/css/colors/coffee/colors.css
+++ b/wp-admin/css/colors/coffee/colors.css
@@ -11,7 +11,6 @@ body {
 a {
  color: #0073aa;
 }
-
 a:hover, a:active, a:focus {
  color: #0096dd;
 }
@@ -32,8 +31,8 @@ input[type=radio]:checked:before {
  background: #59524c;
 }

-.wp-core-ui input[type="reset"]:hover,
-.wp-core-ui input[type="reset"]:active {
+.wp-core-ui input[type=reset]:hover,
+.wp-core-ui input[type=reset]:active {
  color: #0096dd;
 }

@@ -45,75 +44,60 @@ input[type=radio]:checked:before {
  box-shadow: 0 1px 0 #ae7d55;
  text-shadow: 0 -1px 1px #ae7d55, 1px 0 1px #ae7d55, 0 1px 1px #ae7d55, -1px 0 1px #ae7d55;
 }
-
 .wp-core-ui .button-primary:hover, .wp-core-ui .button-primary:focus {
  background: #ccad93;
  border-color: #ae7d55;
  color: #fff;
  box-shadow: 0 1px 0 #ae7d55;
 }
-
 .wp-core-ui .button-primary:focus {
  box-shadow: inset 0 1px 0 #b78b66, 0 0 2px 1px #33b3db;
 }
-
 .wp-core-ui .button-primary:active, .wp-core-ui .button-primary.active, .wp-core-ui .button-primary.active:focus, .wp-core-ui .button-primary.active:hover {
  background: #b78b66;
  border-color: #ae7d55;
  box-shadow: inset 0 2px 0 #ae7d55;
 }
-
 .wp-core-ui .button-primary[disabled], .wp-core-ui .button-primary:disabled, .wp-core-ui .button-primary.button-primary-disabled, .wp-core-ui .button-primary.disabled {
  color: #d1ccc7 !important;
  background: #ba906d !important;
  border-color: #ae7d55 !important;
  text-shadow: none !important;
 }
-
 .wp-core-ui .button-primary.button-hero {
  box-shadow: 0 2px 0 #ae7d55 !important;
 }
-
 .wp-core-ui .button-primary.button-hero:active {
  box-shadow: inset 0 3px 0 #ae7d55 !important;
 }
-
 .wp-core-ui .wp-ui-primary {
  color: #fff;
  background-color: #59524c;
 }
-
 .wp-core-ui .wp-ui-text-primary {
  color: #59524c;
 }
-
 .wp-core-ui .wp-ui-highlight {
  color: #fff;
  background-color: #c7a589;
 }
-
 .wp-core-ui .wp-ui-text-highlight {
  color: #c7a589;
 }
-
 .wp-core-ui .wp-ui-notification {
  color: #fff;
  background-color: #9ea476;
 }
-
 .wp-core-ui .wp-ui-text-notification {
  color: #9ea476;
 }
-
 .wp-core-ui .wp-ui-text-icon {
  color: #f3f2f1;
 }

 /* List tables */
 .wrap .add-new-h2:hover,
-.wrap .page-title-action:hover,
-.tablenav .tablenav-pages a:hover,
-.tablenav .tablenav-pages a:focus {
+.wrap .page-title-action:hover {
  color: #fff;
  background-color: #59524c;
 }
@@ -155,7 +139,7 @@ input[type=radio]:checked:before {
 }

 /* Active tabs use a bottom border color that matches the page background color. */
-.about-wrap h2 .nav-tab-active,
+.about-wrap .nav-tab-active,
 .nav-tab-active,
 .nav-tab-active:hover {
  background-color: #f1f1f1;
@@ -186,7 +170,6 @@ input[type=radio]:checked:before {
 #adminmenu .wp-has-current-submenu.opensub .wp-submenu a {
  color: #cdcbc9;
 }
-
 #adminmenu .wp-submenu a:focus, #adminmenu .wp-submenu a:hover,
 #adminmenu .wp-has-current-submenu .wp-submenu a:focus,
 #adminmenu .wp-has-current-submenu .wp-submenu a:hover,
@@ -205,7 +188,6 @@ input[type=radio]:checked:before {
 #adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a {
  color: #fff;
 }
-
 #adminmenu .wp-submenu li.current a:hover, #adminmenu .wp-submenu li.current a:focus,
 #adminmenu a.wp-has-current-submenu:focus + .wp-submenu li.current a:hover,
 #adminmenu a.wp-has-current-submenu:focus + .wp-submenu li.current a:focus,
@@ -372,6 +354,25 @@ ul#adminmenu > li.current > a.current:after {
  background: #6c645c;
 }

+/* Admin Bar: recovery mode */
+#wpadminbar #wp-admin-bar-recovery-mode {
+  color: #fff;
+  background-color: #9ea476;
+}
+
+#wpadminbar #wp-admin-bar-recovery-mode .ab-item,
+#wpadminbar #wp-admin-bar-recovery-mode a.ab-item {
+  color: #fff;
+}
+
+#wpadminbar .ab-top-menu > #wp-admin-bar-recovery-mode.hover > .ab-item,
+#wpadminbar.nojq .quicklinks .ab-top-menu > #wp-admin-bar-recovery-mode > .ab-item:focus,
+#wpadminbar:not(.mobile) .ab-top-menu > #wp-admin-bar-recovery-mode:hover > .ab-item,
+#wpadminbar:not(.mobile) .ab-top-menu > #wp-admin-bar-recovery-mode > .ab-item:focus {
+  color: #fff;
+  background-color: #8e946a;
+}
+
 /* Admin Bar: my account */
 #wpadminbar .quicklinks li#wp-admin-bar-my-account.with-avatar > a img {
  border-color: #6c645c;
@@ -499,4 +500,4 @@ div#wp-responsive-toggle a:before {
 .mce-container.mce-menu .mce-menu-item-normal.mce-active,
 .mce-container.mce-menu .mce-menu-item-preview.mce-active {
  background: #c7a589;
-}
+}
--- a/wp-admin/css/colors/coffee/colors.min.css
+++ b/wp-admin/css/colors/coffee/colors.min.css
--- a/wp-admin/css/colors/ectoplasm/colors-rtl.css
+++ b/wp-admin/css/colors/ectoplasm/colors-rtl.css
@@ -11,7 +11,6 @@ body {
 a {
  color: #0073aa;
 }
-
 a:hover, a:active, a:focus {
  color: #0096dd;
 }
@@ -32,8 +31,8 @@ input[type=radio]:checked:before {
  background: #523f6d;
 }

-.wp-core-ui input[type="reset"]:hover,
-.wp-core-ui input[type="reset"]:active {
+.wp-core-ui input[type=reset]:hover,
+.wp-core-ui input[type=reset]:active {
  color: #0096dd;
 }

@@ -45,75 +44,60 @@ input[type=radio]:checked:before {
  box-shadow: 0 1px 0 #727f30;
  text-shadow: 0 -1px 1px #727f30, -1px 0 1px #727f30, 0 1px 1px #727f30, 1px 0 1px #727f30;
 }
-
 .wp-core-ui .button-primary:hover, .wp-core-ui .button-primary:focus {
  background: #a9bd4f;
  border-color: #727f30;
  color: #fff;
  box-shadow: 0 1px 0 #727f30;
 }
-
 .wp-core-ui .button-primary:focus {
  box-shadow: inset 0 1px 0 #829237, 0 0 2px 1px #33b3db;
 }
-
 .wp-core-ui .button-primary:active, .wp-core-ui .button-primary.active, .wp-core-ui .button-primary.active:focus, .wp-core-ui .button-primary.active:hover {
  background: #829237;
  border-color: #727f30;
  box-shadow: inset 0 2px 0 #727f30;
 }
-
 .wp-core-ui .button-primary[disabled], .wp-core-ui .button-primary:disabled, .wp-core-ui .button-primary.button-primary-disabled, .wp-core-ui .button-primary.disabled {
  color: #cfd1c7 !important;
  background: #89993a !important;
  border-color: #727f30 !important;
  text-shadow: none !important;
 }
-
 .wp-core-ui .button-primary.button-hero {
  box-shadow: 0 2px 0 #727f30 !important;
 }
-
 .wp-core-ui .button-primary.button-hero:active {
  box-shadow: inset 0 3px 0 #727f30 !important;
 }
-
 .wp-core-ui .wp-ui-primary {
  color: #fff;
  background-color: #523f6d;
 }
-
 .wp-core-ui .wp-ui-text-primary {
  color: #523f6d;
 }
-
 .wp-core-ui .wp-ui-highlight {
  color: #fff;
  background-color: #a3b745;
 }
-
 .wp-core-ui .wp-ui-text-highlight {
  color: #a3b745;
 }
-
 .wp-core-ui .wp-ui-notification {
  color: #fff;
  background-color: #d46f15;
 }
-
 .wp-core-ui .wp-ui-text-notification {
  color: #d46f15;
 }
-
 .wp-core-ui .wp-ui-text-icon {
  color: #ece6f6;
 }

 /* List tables */
 .wrap .add-new-h2:hover,
-.wrap .page-title-action:hover,
-.tablenav .tablenav-pages a:hover,
-.tablenav .tablenav-pages a:focus {
+.wrap .page-title-action:hover {
  color: #fff;
  background-color: #523f6d;
 }
@@ -155,7 +139,7 @@ input[type=radio]:checked:before {
 }

 /* Active tabs use a bottom border color that matches the page background color. */
-.about-wrap h2 .nav-tab-active,
+.about-wrap .nav-tab-active,
 .nav-tab-active,
 .nav-tab-active:hover {
  background-color: #f1f1f1;
@@ -186,7 +170,6 @@ input[type=radio]:checked:before {
 #adminmenu .wp-has-current-submenu.opensub .wp-submenu a {
  color: #cbc5d3;
 }
-
 #adminmenu .wp-submenu a:focus, #adminmenu .wp-submenu a:hover,
 #adminmenu .wp-has-current-submenu .wp-submenu a:focus,
 #adminmenu .wp-has-current-submenu .wp-submenu a:hover,
@@ -205,7 +188,6 @@ input[type=radio]:checked:before {
 #adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a {
  color: #fff;
 }
-
 #adminmenu .wp-submenu li.current a:hover, #adminmenu .wp-submenu li.current a:focus,
 #adminmenu a.wp-has-current-submenu:focus + .wp-submenu li.current a:hover,
 #adminmenu a.wp-has-current-submenu:focus + .wp-submenu li.current a:focus,
@@ -372,6 +354,25 @@ ul#adminmenu > li.current > a.current:after {
  background: #634c84;
 }

+/* Admin Bar: recovery mode */
+#wpadminbar #wp-admin-bar-recovery-mode {
+  color: #fff;
+  background-color: #d46f15;
+}
+
+#wpadminbar #wp-admin-bar-recovery-mode .ab-item,
+#wpadminbar #wp-admin-bar-recovery-mode a.ab-item {
+  color: #fff;
+}
+
+#wpadminbar .ab-top-menu > #wp-admin-bar-recovery-mode.hover > .ab-item,
+#wpadminbar.nojq .quicklinks .ab-top-menu > #wp-admin-bar-recovery-mode > .ab-item:focus,
+#wpadminbar:not(.mobile) .ab-top-menu > #wp-admin-bar-recovery-mode:hover > .ab-item,
+#wpadminbar:not(.mobile) .ab-top-menu > #wp-admin-bar-recovery-mode > .ab-item:focus {
+  color: #fff;
+  background-color: #bf6413;
+}
+
 /* Admin Bar: my account */
 #wpadminbar .quicklinks li#wp-admin-bar-my-account.with-avatar > a img {
  border-color: #634c84;
@@ -499,4 +500,4 @@ div#wp-responsive-toggle a:before {
 .mce-container.mce-menu .mce-menu-item-normal.mce-active,
 .mce-container.mce-menu .mce-menu-item-preview.mce-active {
  background: #a3b745;
-}
+}
--- a/wp-admin/css/colors/ectoplasm/colors-rtl.min.css
+++ b/wp-admin/css/colors/ectoplasm/colors-rtl.min.css
--- a/wp-admin/css/colors/ectoplasm/colors.css
+++ b/wp-admin/css/colors/ectoplasm/colors.css
@@ -11,7 +11,6 @@ body {
 a {
  color: #0073aa;
 }
-
 a:hover, a:active, a:focus {
  color: #0096dd;
 }
@@ -32,8 +31,8 @@ input[type=radio]:checked:before {
  background: #523f6d;
 }

-.wp-core-ui input[type="reset"]:hover,
-.wp-core-ui input[type="reset"]:active {
+.wp-core-ui input[type=reset]:hover,
+.wp-core-ui input[type=reset]:active {
  color: #0096dd;
 }

@@ -45,75 +44,60 @@ input[type=radio]:checked:before {
  box-shadow: 0 1px 0 #727f30;
  text-shadow: 0 -1px 1px #727f30, 1px 0 1px #727f30, 0 1px 1px #727f30, -1px 0 1px #727f30;
 }
-
 .wp-core-ui .button-primary:hover, .wp-core-ui .button-primary:focus {
  background: #a9bd4f;
  border-color: #727f30;
  color: #fff;
  box-shadow: 0 1px 0 #727f30;
 }
-
 .wp-core-ui .button-primary:focus {
  box-shadow: inset 0 1px 0 #829237, 0 0 2px 1px #33b3db;
 }
-
 .wp-core-ui .button-primary:active, .wp-core-ui .button-primary.active, .wp-core-ui .button-primary.active:focus, .wp-core-ui .button-primary.active:hover {
  background: #829237;
  border-color: #727f30;
  box-shadow: inset 0 2px 0 #727f30;
 }
-
 .wp-core-ui .button-primary[disabled], .wp-core-ui .button-primary:disabled, .wp-core-ui .button-primary.button-primary-disabled, .wp-core-ui .button-primary.disabled {
  color: #cfd1c7 !important;
  background: #89993a !important;
  border-color: #727f30 !important;
  text-shadow: none !important;
 }
-
 .wp-core-ui .button-primary.button-hero {
  box-shadow: 0 2px 0 #727f30 !important;
 }
-
 .wp-core-ui .button-primary.button-hero:active {
  box-shadow: inset 0 3px 0 #727f30 !important;
 }
-
 .wp-core-ui .wp-ui-primary {
  color: #fff;
  background-color: #523f6d;
 }
-
 .wp-core-ui .wp-ui-text-primary {
  color: #523f6d;
 }
-
 .wp-core-ui .wp-ui-highlight {
  color: #fff;
  background-color: #a3b745;
 }
-
 .wp-core-ui .wp-ui-text-highlight {
  color: #a3b745;
 }
-
 .wp-core-ui .wp-ui-notification {
  color: #fff;
  background-color: #d46f15;
 }
-
 .wp-core-ui .wp-ui-text-notification {
  color: #d46f15;
 }
-
 .wp-core-ui .wp-ui-text-icon {
  color: #ece6f6;
 }

 /* List tables */
 .wrap .add-new-h2:hover,
-.wrap .page-title-action:hover,
-.tablenav .tablenav-pages a:hover,
-.tablenav .tablenav-pages a:focus {
+.wrap .page-title-action:hover {
  color: #fff;
  background-color: #523f6d;
 }
@@ -155,7 +139,7 @@ input[type=radio]:checked:before {
 }

 /* Active tabs use a bottom border color that matches the page background color. */
-.about-wrap h2 .nav-tab-active,
+.about-wrap .nav-tab-active,
 .nav-tab-active,
 .nav-tab-active:hover {
  background-color: #f1f1f1;
@@ -186,7 +170,6 @@ input[type=radio]:checked:before {
 #adminmenu .wp-has-current-submenu.opensub .wp-submenu a {
  color: #cbc5d3;
 }
-
 #adminmenu .wp-submenu a:focus, #adminmenu .wp-submenu a:hover,
 #adminmenu .wp-has-current-submenu .wp-submenu a:focus,
 #adminmenu .wp-has-current-submenu .wp-submenu a:hover,
@@ -205,7 +188,6 @@ input[type=radio]:checked:before {
 #adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a {
  color: #fff;
 }
-
 #adminmenu .wp-submenu li.current a:hover, #adminmenu .wp-submenu li.current a:focus,
 #adminmenu a.wp-has-current-submenu:focus + .wp-submenu li.current a:hover,
 #adminmenu a.wp-has-current-submenu:focus + .wp-submenu li.current a:focus,
@@ -372,6 +354,25 @@ ul#adminmenu > li.current > a.current:after {
  background: #634c84;
 }

+/* Admin Bar: recovery mode */
+#wpadminbar #wp-admin-bar-recovery-mode {
+  color: #fff;
+  background-color: #d46f15;
+}
+
+#wpadminbar #wp-admin-bar-recovery-mode .ab-item,
+#wpadminbar #wp-admin-bar-recovery-mode a.ab-item {
+  color: #fff;
+}
+
+#wpadminbar .ab-top-menu > #wp-admin-bar-recovery-mode.hover > .ab-item,
+#wpadminbar.nojq .quicklinks .ab-top-menu > #wp-admin-bar-recovery-mode > .ab-item:focus,
+#wpadminbar:not(.mobile) .ab-top-menu > #wp-admin-bar-recovery-mode:hover > .ab-item,
+#wpadminbar:not(.mobile) .ab-top-menu > #wp-admin-bar-recovery-mode > .ab-item:focus {
+  color: #fff;
+  background-color: #bf6413;
+}
+
 /* Admin Bar: my account */
 #wpadminbar .quicklinks li#wp-admin-bar-my-account.with-avatar > a img {
  border-color: #634c84;
@@ -499,4 +500,4 @@ div#wp-responsive-toggle a:before {
 .mce-container.mce-menu .mce-menu-item-normal.mce-active,
 .mce-container.mce-menu .mce-menu-item-preview.mce-active {
  background: #a3b745;
-}
+}
--- a/wp-admin/css/colors/ectoplasm/colors.min.css
+++ b/wp-admin/css/colors/ectoplasm/colors.min.css
--- a/wp-admin/css/colors/light/colors-rtl.css
+++ b/wp-admin/css/colors/light/colors-rtl.css
@@ -11,7 +11,6 @@ body {
 a {
  color: #0073aa;
 }
-
 a:hover, a:active, a:focus {
  color: #0096dd;
 }
@@ -32,8 +31,8 @@ input[type=radio]:checked:before {
  background: #04a4cc;
 }

-.wp-core-ui input[type="reset"]:hover,
-.wp-core-ui input[type="reset"]:active {
+.wp-core-ui input[type=reset]:hover,
+.wp-core-ui input[type=reset]:active {
  color: #0096dd;
 }

@@ -45,75 +44,60 @@ input[type=radio]:checked:before {
  box-shadow: 0 1px 0 #036881;
  text-shadow: 0 -1px 1px #036881, -1px 0 1px #036881, 0 1px 1px #036881, 1px 0 1px #036881;
 }
-
 .wp-core-ui .button-primary:hover, .wp-core-ui .button-primary:focus {
  background: #04b0db;
  border-color: #036881;
  color: #fff;
  box-shadow: 0 1px 0 #036881;
 }
-
 .wp-core-ui .button-primary:focus {
  box-shadow: inset 0 1px 0 #037c9a, 0 0 2px 1px #33b3db;
 }
-
 .wp-core-ui .button-primary:active, .wp-core-ui .button-primary.active, .wp-core-ui .button-primary.active:focus, .wp-core-ui .button-primary.active:hover {
  background: #037c9a;
  border-color: #036881;
  box-shadow: inset 0 2px 0 #036881;
 }
-
 .wp-core-ui .button-primary[disabled], .wp-core-ui .button-primary:disabled, .wp-core-ui .button-primary.button-primary-disabled, .wp-core-ui .button-primary.disabled {
  color: #c7cfd1 !important;
  background: #0384a4 !important;
  border-color: #036881 !important;
  text-shadow: none !important;
 }
-
 .wp-core-ui .button-primary.button-hero {
  box-shadow: 0 2px 0 #036881 !important;
 }
-
 .wp-core-ui .button-primary.button-hero:active {
  box-shadow: inset 0 3px 0 #036881 !important;
 }
-
 .wp-core-ui .wp-ui-primary {
  color: #333;
  background-color: #e5e5e5;
 }
-
 .wp-core-ui .wp-ui-text-primary {
  color: #e5e5e5;
 }
-
 .wp-core-ui .wp-ui-highlight {
  color: #fff;
  background-color: #888;
 }
-
 .wp-core-ui .wp-ui-text-highlight {
  color: #888;
 }
-
 .wp-core-ui .wp-ui-notification {
  color: #fff;
  background-color: #d64e07;
 }
-
 .wp-core-ui .wp-ui-text-notification {
  color: #d64e07;
 }
-
 .wp-core-ui .wp-ui-text-icon {
  color: #999;
 }

 /* List tables */
 .wrap .add-new-h2:hover,
-.wrap .page-title-action:hover,
-.tablenav .tablenav-pages a:hover,
-.tablenav .tablenav-pages a:focus {
+.wrap .page-title-action:hover {
  color: #333;
  background-color: #e5e5e5;
 }
@@ -155,7 +139,7 @@ input[type=radio]:checked:before {
 }

 /* Active tabs use a bottom border color that matches the page background color. */
-.about-wrap h2 .nav-tab-active,
+.about-wrap .nav-tab-active,
 .nav-tab-active,
 .nav-tab-active:hover {
  background-color: #f5f5f5;
@@ -186,7 +170,6 @@ input[type=radio]:checked:before {
 #adminmenu .wp-has-current-submenu.opensub .wp-submenu a {
  color: #686868;
 }
-
 #adminmenu .wp-submenu a:focus, #adminmenu .wp-submenu a:hover,
 #adminmenu .wp-has-current-submenu .wp-submenu a:focus,
 #adminmenu .wp-has-current-submenu .wp-submenu a:hover,
@@ -205,7 +188,6 @@ input[type=radio]:checked:before {
 #adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a {
  color: #333;
 }
-
 #adminmenu .wp-submenu li.current a:hover, #adminmenu .wp-submenu li.current a:focus,
 #adminmenu a.wp-has-current-submenu:focus + .wp-submenu li.current a:hover,
 #adminmenu a.wp-has-current-submenu:focus + .wp-submenu li.current a:focus,
@@ -372,6 +354,25 @@ ul#adminmenu > li.current > a.current:after {
  background: #f7f7f7;
 }

+/* Admin Bar: recovery mode */
+#wpadminbar #wp-admin-bar-recovery-mode {
+  color: #fff;
+  background-color: #d64e07;
+}
+
+#wpadminbar #wp-admin-bar-recovery-mode .ab-item,
+#wpadminbar #wp-admin-bar-recovery-mode a.ab-item {
+  color: #fff;
+}
+
+#wpadminbar .ab-top-menu > #wp-admin-bar-recovery-mode.hover > .ab-item,
+#wpadminbar.nojq .quicklinks .ab-top-menu > #wp-admin-bar-recovery-mode > .ab-item:focus,
+#wpadminbar:not(.mobile) .ab-top-menu > #wp-admin-bar-recovery-mode:hover > .ab-item,
+#wpadminbar:not(.mobile) .ab-top-menu > #wp-admin-bar-recovery-mode > .ab-item:focus {
+  color: #fff;
+  background-color: #c14606;
+}
+
 /* Admin Bar: my account */
 #wpadminbar .quicklinks li#wp-admin-bar-my-account.with-avatar > a img {
  border-color: #f7f7f7;
@@ -517,4 +518,4 @@ div#wp-responsive-toggle a:before {
 .theme-section.current,
 .theme-filter.current {
  border-bottom-color: #04a4cc;
-}
+}
--- a/wp-admin/css/colors/light/colors-rtl.min.css
+++ b/wp-admin/css/colors/light/colors-rtl.min.css
--- a/wp-admin/css/colors/light/colors.css
+++ b/wp-admin/css/colors/light/colors.css
@@ -11,7 +11,6 @@ body {
 a {
  color: #0073aa;
 }
-
 a:hover, a:active, a:focus {
  color: #0096dd;
 }
@@ -32,8 +31,8 @@ input[type=radio]:checked:before {
  background: #04a4cc;
 }

-.wp-core-ui input[type="reset"]:hover,
-.wp-core-ui input[type="reset"]:active {
+.wp-core-ui input[type=reset]:hover,
+.wp-core-ui input[type=reset]:active {
  color: #0096dd;
 }

@@ -45,75 +44,60 @@ input[type=radio]:checked:before {
  box-shadow: 0 1px 0 #036881;
  text-shadow: 0 -1px 1px #036881, 1px 0 1px #036881, 0 1px 1px #036881, -1px 0 1px #036881;
 }
-
 .wp-core-ui .button-primary:hover, .wp-core-ui .button-primary:focus {
  background: #04b0db;
  border-color: #036881;
  color: #fff;
  box-shadow: 0 1px 0 #036881;
 }
-
 .wp-core-ui .button-primary:focus {
  box-shadow: inset 0 1px 0 #037c9a, 0 0 2px 1px #33b3db;
 }
-
 .wp-core-ui .button-primary:active, .wp-core-ui .button-primary.active, .wp-core-ui .button-primary.active:focus, .wp-core-ui .button-primary.active:hover {
  background: #037c9a;
  border-color: #036881;
  box-shadow: inset 0 2px 0 #036881;
 }
-
 .wp-core-ui .button-primary[disabled], .wp-core-ui .button-primary:disabled, .wp-core-ui .button-primary.button-primary-disabled, .wp-core-ui .button-primary.disabled {
  color: #c7cfd1 !important;
  background: #0384a4 !important;
  border-color: #036881 !important;
  text-shadow: none !important;
 }
-
 .wp-core-ui .button-primary.button-hero {
  box-shadow: 0 2px 0 #036881 !important;
 }
-
 .wp-core-ui .button-primary.button-hero:active {
  box-shadow: inset 0 3px 0 #036881 !important;
 }
-
 .wp-core-ui .wp-ui-primary {
  color: #333;
  background-color: #e5e5e5;
 }
-
 .wp-core-ui .wp-ui-text-primary {
  color: #e5e5e5;
 }
-
 .wp-core-ui .wp-ui-highlight {
  color: #fff;
  background-color: #888;
 }
-
 .wp-core-ui .wp-ui-text-highlight {
  color: #888;
 }
-
 .wp-core-ui .wp-ui-notification {
  color: #fff;
  background-color: #d64e07;
 }
-
 .wp-core-ui .wp-ui-text-notification {
  color: #d64e07;
 }
-
 .wp-core-ui .wp-ui-text-icon {
  color: #999;
 }

 /* List tables */
 .wrap .add-new-h2:hover,
-.wrap .page-title-action:hover,
-.tablenav .tablenav-pages a:hover,
-.tablenav .tablenav-pages a:focus {
+.wrap .page-title-action:hover {
  color: #333;
  background-color: #e5e5e5;
 }
@@ -155,7 +139,7 @@ input[type=radio]:checked:before {
 }

 /* Active tabs use a bottom border color that matches the page background color. */
-.about-wrap h2 .nav-tab-active,
+.about-wrap .nav-tab-active,
 .nav-tab-active,
 .nav-tab-active:hover {
  background-color: #f5f5f5;
@@ -186,7 +170,6 @@ input[type=radio]:checked:before {
 #adminmenu .wp-has-current-submenu.opensub .wp-submenu a {
  color: #686868;
 }
-
 #adminmenu .wp-submenu a:focus, #adminmenu .wp-submenu a:hover,
 #adminmenu .wp-has-current-submenu .wp-submenu a:focus,
 #adminmenu .wp-has-current-submenu .wp-submenu a:hover,
@@ -205,7 +188,6 @@ input[type=radio]:checked:before {
 #adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a {
  color: #333;
 }
-
 #adminmenu .wp-submenu li.current a:hover, #adminmenu .wp-submenu li.current a:focus,
 #adminmenu a.wp-has-current-submenu:focus + .wp-submenu li.current a:hover,
 #adminmenu a.wp-has-current-submenu:focus + .wp-submenu li.current a:focus,
@@ -372,6 +354,25 @@ ul#adminmenu > li.current > a.current:after {
  background: #f7f7f7;
 }

+/* Admin Bar: recovery mode */
+#wpadminbar #wp-admin-bar-recovery-mode {
+  color: #fff;
+  background-color: #d64e07;
+}
+
+#wpadminbar #wp-admin-bar-recovery-mode .ab-item,
+#wpadminbar #wp-admin-bar-recovery-mode a.ab-item {
+  color: #fff;
+}
+
+#wpadminbar .ab-top-menu > #wp-admin-bar-recovery-mode.hover > .ab-item,
+#wpadminbar.nojq .quicklinks .ab-top-menu > #wp-admin-bar-recovery-mode > .ab-item:focus,
+#wpadminbar:not(.mobile) .ab-top-menu > #wp-admin-bar-recovery-mode:hover > .ab-item,
+#wpadminbar:not(.mobile) .ab-top-menu > #wp-admin-bar-recovery-mode > .ab-item:focus {
+  color: #fff;
+  background-color: #c14606;
+}
+
 /* Admin Bar: my account */
 #wpadminbar .quicklinks li#wp-admin-bar-my-account.with-avatar > a img {
  border-color: #f7f7f7;
@@ -517,4 +518,4 @@ div#wp-responsive-toggle a:before {
 .theme-section.current,
 .theme-filter.current {
  border-bottom-color: #04a4cc;
-}
+}
--- a/wp-admin/css/colors/light/colors.min.css
+++ b/wp-admin/css/colors/light/colors.min.css
--- a/wp-admin/css/colors/midnight/colors-rtl.css
+++ b/wp-admin/css/colors/midnight/colors-rtl.css
@@ -11,7 +11,6 @@ body {
 a {
  color: #0073aa;
 }
-
 a:hover, a:active, a:focus {
  color: #0096dd;
 }
@@ -32,8 +31,8 @@ input[type=radio]:checked:before {
  background: #e14d43;
 }

-.wp-core-ui input[type="reset"]:hover,
-.wp-core-ui input[type="reset"]:active {
+.wp-core-ui input[type=reset]:hover,
+.wp-core-ui input[type=reset]:active {
  color: #0096dd;
 }

@@ -45,75 +44,60 @@ input[type=radio]:checked:before {
  box-shadow: 0 1px 0 #ba281e;
  text-shadow: 0 -1px 1px #ba281e, -1px 0 1px #ba281e, 0 1px 1px #ba281e, 1px 0 1px #ba281e;
 }
-
 .wp-core-ui .button-primary:hover, .wp-core-ui .button-primary:focus {
  background: #e35950;
  border-color: #ba281e;
  color: #fff;
  box-shadow: 0 1px 0 #ba281e;
 }
-
 .wp-core-ui .button-primary:focus {
  box-shadow: inset 0 1px 0 #d02c21, 0 0 2px 1px #33b3db;
 }
-
 .wp-core-ui .button-primary:active, .wp-core-ui .button-primary.active, .wp-core-ui .button-primary.active:focus, .wp-core-ui .button-primary.active:hover {
  background: #d02c21;
  border-color: #ba281e;
  box-shadow: inset 0 2px 0 #ba281e;
 }
-
 .wp-core-ui .button-primary[disabled], .wp-core-ui .button-primary:disabled, .wp-core-ui .button-primary.button-primary-disabled, .wp-core-ui .button-primary.disabled {
  color: #d1c8c7 !important;
  background: #d92e23 !important;
  border-color: #ba281e !important;
  text-shadow: none !important;
 }
-
 .wp-core-ui .button-primary.button-hero {
  box-shadow: 0 2px 0 #ba281e !important;
 }
-
 .wp-core-ui .button-primary.button-hero:active {
  box-shadow: inset 0 3px 0 #ba281e !important;
 }
-
 .wp-core-ui .wp-ui-primary {
  color: #fff;
  background-color: #363b3f;
 }
-
 .wp-core-ui .wp-ui-text-primary {
  color: #363b3f;
 }
-
 .wp-core-ui .wp-ui-highlight {
  color: #fff;
  background-color: #e14d43;
 }
-
 .wp-core-ui .wp-ui-text-highlight {
  color: #e14d43;
 }
-
 .wp-core-ui .wp-ui-notification {
  color: #fff;
  background-color: #69a8bb;
 }
-
 .wp-core-ui .wp-ui-text-notification {
  color: #69a8bb;
 }
-
 .wp-core-ui .wp-ui-text-icon {
  color: #f1f2f3;
 }

 /* List tables */
 .wrap .add-new-h2:hover,
-.wrap .page-title-action:hover,
-.tablenav .tablenav-pages a:hover,
-.tablenav .tablenav-pages a:focus {
+.wrap .page-title-action:hover {
  color: #fff;
  background-color: #363b3f;
 }
@@ -155,7 +139,7 @@ input[type=radio]:checked:before {
 }

 /* Active tabs use a bottom border color that matches the page background color. */
-.about-wrap h2 .nav-tab-active,
+.about-wrap .nav-tab-active,
 .nav-tab-active,
 .nav-tab-active:hover {
  background-color: #f1f1f1;
@@ -186,7 +170,6 @@ input[type=radio]:checked:before {
 #adminmenu .wp-has-current-submenu.opensub .wp-submenu a {
  color: #c3c4c5;
 }
-
 #adminmenu .wp-submenu a:focus, #adminmenu .wp-submenu a:hover,
 #adminmenu .wp-has-current-submenu .wp-submenu a:focus,
 #adminmenu .wp-has-current-submenu .wp-submenu a:hover,
@@ -205,7 +188,6 @@ input[type=radio]:checked:before {
 #adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a {
  color: #fff;
 }
-
 #adminmenu .wp-submenu li.current a:hover, #adminmenu .wp-submenu li.current a:focus,
 #adminmenu a.wp-has-current-submenu:focus + .wp-submenu li.current a:hover,
 #adminmenu a.wp-has-current-submenu:focus + .wp-submenu li.current a:focus,
@@ -372,6 +354,25 @@ ul#adminmenu > li.current > a.current:after {
  background: #464d52;
 }

+/* Admin Bar: recovery mode */
+#wpadminbar #wp-admin-bar-recovery-mode {
+  color: #fff;
+  background-color: #69a8bb;
+}
+
+#wpadminbar #wp-admin-bar-recovery-mode .ab-item,
+#wpadminbar #wp-admin-bar-recovery-mode a.ab-item {
+  color: #fff;
+}
+
+#wpadminbar .ab-top-menu > #wp-admin-bar-recovery-mode.hover > .ab-item,
+#wpadminbar.nojq .quicklinks .ab-top-menu > #wp-admin-bar-recovery-mode > .ab-item:focus,
+#wpadminbar:not(.mobile) .ab-top-menu > #wp-admin-bar-recovery-mode:hover > .ab-item,
+#wpadminbar:not(.mobile) .ab-top-menu > #wp-admin-bar-recovery-mode > .ab-item:focus {
+  color: #fff;
+  background-color: #5f97a8;
+}
+
 /* Admin Bar: my account */
 #wpadminbar .quicklinks li#wp-admin-bar-my-account.with-avatar > a img {
  border-color: #464d52;
@@ -499,4 +500,4 @@ div#wp-responsive-toggle a:before {
 .mce-container.mce-menu .mce-menu-item-normal.mce-active,
 .mce-container.mce-menu .mce-menu-item-preview.mce-active {
  background: #e14d43;
-}
+}
--- a/wp-admin/css/colors/midnight/colors-rtl.min.css
+++ b/wp-admin/css/colors/midnight/colors-rtl.min.css
--- a/wp-admin/css/colors/midnight/colors.css
+++ b/wp-admin/css/colors/midnight/colors.css
@@ -11,7 +11,6 @@ body {
 a {
  color: #0073aa;
 }
-
 a:hover, a:active, a:focus {
  color: #0096dd;
 }
@@ -32,8 +31,8 @@ input[type=radio]:checked:before {
  background: #e14d43;
 }

-.wp-core-ui input[type="reset"]:hover,
-.wp-core-ui input[type="reset"]:active {
+.wp-core-ui input[type=reset]:hover,
+.wp-core-ui input[type=reset]:active {
  color: #0096dd;
 }

@@ -45,75 +44,60 @@ input[type=radio]:checked:before {
  box-shadow: 0 1px 0 #ba281e;
  text-shadow: 0 -1px 1px #ba281e, 1px 0 1px #ba281e, 0 1px 1px #ba281e, -1px 0 1px #ba281e;
 }
-
 .wp-core-ui .button-primary:hover, .wp-core-ui .button-primary:focus {
  background: #e35950;
  border-color: #ba281e;
  color: #fff;
  box-shadow: 0 1px 0 #ba281e;
 }
-
 .wp-core-ui .button-primary:focus {
  box-shadow: inset 0 1px 0 #d02c21, 0 0 2px 1px #33b3db;
 }
-
 .wp-core-ui .button-primary:active, .wp-core-ui .button-primary.active, .wp-core-ui .button-primary.active:focus, .wp-core-ui .button-primary.active:hover {
  background: #d02c21;
  border-color: #ba281e;
  box-shadow: inset 0 2px 0 #ba281e;
 }
-
 .wp-core-ui .button-primary[disabled], .wp-core-ui .button-primary:disabled, .wp-core-ui .button-primary.button-primary-disabled, .wp-core-ui .button-primary.disabled {
  color: #d1c8c7 !important;
  background: #d92e23 !important;
  border-color: #ba281e !important;
  text-shadow: none !important;
 }
-
 .wp-core-ui .button-primary.button-hero {
  box-shadow: 0 2px 0 #ba281e !important;
 }
-
 .wp-core-ui .button-primary.button-hero:active {
  box-shadow: inset 0 3px 0 #ba281e !important;
 }
-
 .wp-core-ui .wp-ui-primary {
  color: #fff;
  background-color: #363b3f;
 }
-
 .wp-core-ui .wp-ui-text-primary {
  color: #363b3f;
 }
-
 .wp-core-ui .wp-ui-highlight {
  color: #fff;
  background-color: #e14d43;
 }
-
 .wp-core-ui .wp-ui-text-highlight {
  color: #e14d43;
 }
-
 .wp-core-ui .wp-ui-notification {
  color: #fff;
  background-color: #69a8bb;
 }
-
 .wp-core-ui .wp-ui-text-notification {
  color: #69a8bb;
 }
-
 .wp-core-ui .wp-ui-text-icon {
  color: #f1f2f3;
 }

 /* List tables */
 .wrap .add-new-h2:hover,
-.wrap .page-title-action:hover,
-.tablenav .tablenav-pages a:hover,
-.tablenav .tablenav-pages a:focus {
+.wrap .page-title-action:hover {
  color: #fff;
  background-color: #363b3f;
 }
@@ -155,7 +139,7 @@ input[type=radio]:checked:before {
 }

 /* Active tabs use a bottom border color that matches the page background color. */
-.about-wrap h2 .nav-tab-active,
+.about-wrap .nav-tab-active,
 .nav-tab-active,
 .nav-tab-active:hover {
  background-color: #f1f1f1;
@@ -186,7 +170,6 @@ input[type=radio]:checked:before {
 #adminmenu .wp-has-current-submenu.opensub .wp-submenu a {
  color: #c3c4c5;
 }
-
 #adminmenu .wp-submenu a:focus, #adminmenu .wp-submenu a:hover,
 #adminmenu .wp-has-current-submenu .wp-submenu a:focus,
 #adminmenu .wp-has-current-submenu .wp-submenu a:hover,
@@ -205,7 +188,6 @@ input[type=radio]:checked:before {
 #adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a {
  color: #fff;
 }
-
 #adminmenu .wp-submenu li.current a:hover, #adminmenu .wp-submenu li.current a:focus,
 #adminmenu a.wp-has-current-submenu:focus + .wp-submenu li.current a:hover,
 #adminmenu a.wp-has-current-submenu:focus + .wp-submenu li.current a:focus,
@@ -372,6 +354,25 @@ ul#adminmenu > li.current > a.current:after {
  background: #464d52;
 }

+/* Admin Bar: recovery mode */
+#wpadminbar #wp-admin-bar-recovery-mode {
+  color: #fff;
+  background-color: #69a8bb;
+}
+
+#wpadminbar #wp-admin-bar-recovery-mode .ab-item,
+#wpadminbar #wp-admin-bar-recovery-mode a.ab-item {
+  color: #fff;
+}
+
+#wpadminbar .ab-top-menu > #wp-admin-bar-recovery-mode.hover > .ab-item,
+#wpadminbar.nojq .quicklinks .ab-top-menu > #wp-admin-bar-recovery-mode > .ab-item:focus,
+#wpadminbar:not(.mobile) .ab-top-menu > #wp-admin-bar-recovery-mode:hover > .ab-item,
+#wpadminbar:not(.mobile) .ab-top-menu > #wp-admin-bar-recovery-mode > .ab-item:focus {
+  color: #fff;
+  background-color: #5f97a8;
+}
+
 /* Admin Bar: my account */
 #wpadminbar .quicklinks li#wp-admin-bar-my-account.with-avatar > a img {
  border-color: #464d52;
@@ -499,4 +500,4 @@ div#wp-responsive-toggle a:before {
 .mce-container.mce-menu .mce-menu-item-normal.mce-active,
 .mce-container.mce-menu .mce-menu-item-preview.mce-active {
  background: #e14d43;
-}
+}
--- a/wp-admin/css/colors/midnight/colors.min.css
+++ b/wp-admin/css/colors/midnight/colors.min.css
--- a/wp-admin/css/colors/ocean/colors-rtl.css
+++ b/wp-admin/css/colors/ocean/colors-rtl.css
@@ -11,7 +11,6 @@ body {
 a {
  color: #0073aa;
 }
-
 a:hover, a:active, a:focus {
  color: #0096dd;
 }
@@ -32,8 +31,8 @@ input[type=radio]:checked:before {
  background: #738e96;
 }

-.wp-core-ui input[type="reset"]:hover,
-.wp-core-ui input[type="reset"]:active {
+.wp-core-ui input[type=reset]:hover,
+.wp-core-ui input[type=reset]:active {
  color: #0096dd;
 }

@@ -45,75 +44,60 @@ input[type=radio]:checked:before {
  box-shadow: 0 1px 0 #719a74;
  text-shadow: 0 -1px 1px #719a74, -1px 0 1px #719a74, 0 1px 1px #719a74, 1px 0 1px #719a74;
 }
-
 .wp-core-ui .button-primary:hover, .wp-core-ui .button-primary:focus {
  background: #a7c0a9;
  border-color: #719a74;
  color: #fff;
  box-shadow: 0 1px 0 #719a74;
 }
-
 .wp-core-ui .button-primary:focus {
  box-shadow: inset 0 1px 0 #80a583, 0 0 2px 1px #33b3db;
 }
-
 .wp-core-ui .button-primary:active, .wp-core-ui .button-primary.active, .wp-core-ui .button-primary.active:focus, .wp-core-ui .button-primary.active:hover {
  background: #80a583;
  border-color: #719a74;
  box-shadow: inset 0 2px 0 #719a74;
 }
-
 .wp-core-ui .button-primary[disabled], .wp-core-ui .button-primary:disabled, .wp-core-ui .button-primary.button-primary-disabled, .wp-core-ui .button-primary.disabled {
  color: #c7d1c8 !important;
  background: #86a989 !important;
  border-color: #719a74 !important;
  text-shadow: none !important;
 }
-
 .wp-core-ui .button-primary.button-hero {
  box-shadow: 0 2px 0 #719a74 !important;
 }
-
 .wp-core-ui .button-primary.button-hero:active {
  box-shadow: inset 0 3px 0 #719a74 !important;
 }
-
 .wp-core-ui .wp-ui-primary {
  color: #fff;
  background-color: #738e96;
 }
-
 .wp-core-ui .wp-ui-text-primary {
  color: #738e96;
 }
-
 .wp-core-ui .wp-ui-highlight {
  color: #fff;
  background-color: #9ebaa0;
 }
-
 .wp-core-ui .wp-ui-text-highlight {
  color: #9ebaa0;
 }
-
 .wp-core-ui .wp-ui-notification {
  color: #fff;
  background-color: #aa9d88;
 }
-
 .wp-core-ui .wp-ui-text-notification {
  color: #aa9d88;
 }
-
 .wp-core-ui .wp-ui-text-icon {
  color: #f2fcff;
 }

 /* List tables */
 .wrap .add-new-h2:hover,
-.wrap .page-title-action:hover,
-.tablenav .tablenav-pages a:hover,
-.tablenav .tablenav-pages a:focus {
+.wrap .page-title-action:hover {
  color: #fff;
  background-color: #738e96;
 }
@@ -155,7 +139,7 @@ input[type=radio]:checked:before {
 }

 /* Active tabs use a bottom border color that matches the page background color. */
-.about-wrap h2 .nav-tab-active,
+.about-wrap .nav-tab-active,
 .nav-tab-active,
 .nav-tab-active:hover {
  background-color: #f1f1f1;
@@ -186,7 +170,6 @@ input[type=radio]:checked:before {
 #adminmenu .wp-has-current-submenu.opensub .wp-submenu a {
  color: #d5dde0;
 }
-
 #adminmenu .wp-submenu a:focus, #adminmenu .wp-submenu a:hover,
 #adminmenu .wp-has-current-submenu .wp-submenu a:focus,
 #adminmenu .wp-has-current-submenu .wp-submenu a:hover,
@@ -205,7 +188,6 @@ input[type=radio]:checked:before {
 #adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a {
  color: #fff;
 }
-
 #adminmenu .wp-submenu li.current a:hover, #adminmenu .wp-submenu li.current a:focus,
 #adminmenu a.wp-has-current-submenu:focus + .wp-submenu li.current a:hover,
 #adminmenu a.wp-has-current-submenu:focus + .wp-submenu li.current a:focus,
@@ -372,6 +354,25 @@ ul#adminmenu > li.current > a.current:after {
  background: #879ea5;
 }

+/* Admin Bar: recovery mode */
+#wpadminbar #wp-admin-bar-recovery-mode {
+  color: #fff;
+  background-color: #aa9d88;
+}
+
+#wpadminbar #wp-admin-bar-recovery-mode .ab-item,
+#wpadminbar #wp-admin-bar-recovery-mode a.ab-item {
+  color: #fff;
+}
+
+#wpadminbar .ab-top-menu > #wp-admin-bar-recovery-mode.hover > .ab-item,
+#wpadminbar.nojq .quicklinks .ab-top-menu > #wp-admin-bar-recovery-mode > .ab-item:focus,
+#wpadminbar:not(.mobile) .ab-top-menu > #wp-admin-bar-recovery-mode:hover > .ab-item,
+#wpadminbar:not(.mobile) .ab-top-menu > #wp-admin-bar-recovery-mode > .ab-item:focus {
+  color: #fff;
+  background-color: #998d7a;
+}
+
 /* Admin Bar: my account */
 #wpadminbar .quicklinks li#wp-admin-bar-my-account.with-avatar > a img {
  border-color: #879ea5;
@@ -499,4 +500,4 @@ div#wp-responsive-toggle a:before {
 .mce-container.mce-menu .mce-menu-item-normal.mce-active,
 .mce-container.mce-menu .mce-menu-item-preview.mce-active {
  background: #9ebaa0;
-}
+}
--- a/wp-admin/css/colors/ocean/colors-rtl.min.css
+++ b/wp-admin/css/colors/ocean/colors-rtl.min.css
--- a/wp-admin/css/colors/ocean/colors.css
+++ b/wp-admin/css/colors/ocean/colors.css
@@ -11,7 +11,6 @@ body {
 a {
  color: #0073aa;
 }
-
 a:hover, a:active, a:focus {
  color: #0096dd;
 }
@@ -32,8 +31,8 @@ input[type=radio]:checked:before {
  background: #738e96;
 }

-.wp-core-ui input[type="reset"]:hover,
-.wp-core-ui input[type="reset"]:active {
+.wp-core-ui input[type=reset]:hover,
+.wp-core-ui input[type=reset]:active {
  color: #0096dd;
 }

@@ -45,75 +44,60 @@ input[type=radio]:checked:before {
  box-shadow: 0 1px 0 #719a74;
  text-shadow: 0 -1px 1px #719a74, 1px 0 1px #719a74, 0 1px 1px #719a74, -1px 0 1px #719a74;
 }
-
 .wp-core-ui .button-primary:hover, .wp-core-ui .button-primary:focus {
  background: #a7c0a9;
  border-color: #719a74;
  color: #fff;
  box-shadow: 0 1px 0 #719a74;
 }
-
 .wp-core-ui .button-primary:focus {
  box-shadow: inset 0 1px 0 #80a583, 0 0 2px 1px #33b3db;
 }
-
 .wp-core-ui .button-primary:active, .wp-core-ui .button-primary.active, .wp-core-ui .button-primary.active:focus, .wp-core-ui .button-primary.active:hover {
  background: #80a583;
  border-color: #719a74;
  box-shadow: inset 0 2px 0 #719a74;
 }
-
 .wp-core-ui .button-primary[disabled], .wp-core-ui .button-primary:disabled, .wp-core-ui .button-primary.button-primary-disabled, .wp-core-ui .button-primary.disabled {
  color: #c7d1c8 !important;
  background: #86a989 !important;
  border-color: #719a74 !important;
  text-shadow: none !important;
 }
-
 .wp-core-ui .button-primary.button-hero {
  box-shadow: 0 2px 0 #719a74 !important;
 }
-
 .wp-core-ui .button-primary.button-hero:active {
  box-shadow: inset 0 3px 0 #719a74 !important;
 }
-
 .wp-core-ui .wp-ui-primary {
  color: #fff;
  background-color: #738e96;
 }
-
 .wp-core-ui .wp-ui-text-primary {
  color: #738e96;
 }
-
 .wp-core-ui .wp-ui-highlight {
  color: #fff;
  background-color: #9ebaa0;
 }
-
 .wp-core-ui .wp-ui-text-highlight {
  color: #9ebaa0;
 }
-
 .wp-core-ui .wp-ui-notification {
  color: #fff;
  background-color: #aa9d88;
 }
-
 .wp-core-ui .wp-ui-text-notification {
  color: #aa9d88;
 }
-
 .wp-core-ui .wp-ui-text-icon {
  color: #f2fcff;
 }

 /* List tables */
 .wrap .add-new-h2:hover,
-.wrap .page-title-action:hover,
-.tablenav .tablenav-pages a:hover,
-.tablenav .tablenav-pages a:focus {
+.wrap .page-title-action:hover {
  color: #fff;
  background-color: #738e96;
 }
@@ -155,7 +139,7 @@ input[type=radio]:checked:before {
 }

 /* Active tabs use a bottom border color that matches the page background color. */
-.about-wrap h2 .nav-tab-active,
+.about-wrap .nav-tab-active,
 .nav-tab-active,
 .nav-tab-active:hover {
  background-color: #f1f1f1;
@@ -186,7 +170,6 @@ input[type=radio]:checked:before {
 #adminmenu .wp-has-current-submenu.opensub .wp-submenu a {
  color: #d5dde0;
 }
-
 #adminmenu .wp-submenu a:focus, #adminmenu .wp-submenu a:hover,
 #adminmenu .wp-has-current-submenu .wp-submenu a:focus,
 #adminmenu .wp-has-current-submenu .wp-submenu a:hover,
@@ -205,7 +188,6 @@ input[type=radio]:checked:before {
 #adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a {
  color: #fff;
 }
-
 #adminmenu .wp-submenu li.current a:hover, #adminmenu .wp-submenu li.current a:focus,
 #adminmenu a.wp-has-current-submenu:focus + .wp-submenu li.current a:hover,
 #adminmenu a.wp-has-current-submenu:focus + .wp-submenu li.current a:focus,
@@ -372,6 +354,25 @@ ul#adminmenu > li.current > a.current:after {
  background: #879ea5;
 }

+/* Admin Bar: recovery mode */
+#wpadminbar #wp-admin-bar-recovery-mode {
+  color: #fff;
+  background-color: #aa9d88;
+}
+
+#wpadminbar #wp-admin-bar-recovery-mode .ab-item,
+#wpadminbar #wp-admin-bar-recovery-mode a.ab-item {
+  color: #fff;
+}
+
+#wpadminbar .ab-top-menu > #wp-admin-bar-recovery-mode.hover > .ab-item,
+#wpadminbar.nojq .quicklinks .ab-top-menu > #wp-admin-bar-recovery-mode > .ab-item:focus,
+#wpadminbar:not(.mobile) .ab-top-menu > #wp-admin-bar-recovery-mode:hover > .ab-item,
+#wpadminbar:not(.mobile) .ab-top-menu > #wp-admin-bar-recovery-mode > .ab-item:focus {
+  color: #fff;
+  background-color: #998d7a;
+}
+
 /* Admin Bar: my account */
 #wpadminbar .quicklinks li#wp-admin-bar-my-account.with-avatar > a img {
  border-color: #879ea5;
@@ -499,4 +500,4 @@ div#wp-responsive-toggle a:before {
 .mce-container.mce-menu .mce-menu-item-normal.mce-active,
 .mce-container.mce-menu .mce-menu-item-preview.mce-active {
  background: #9ebaa0;
-}
+}
--- a/wp-admin/css/colors/ocean/colors.min.css
+++ b/wp-admin/css/colors/ocean/colors.min.css
--- a/wp-admin/css/colors/sunrise/colors-rtl.css
+++ b/wp-admin/css/colors/sunrise/colors-rtl.css
@@ -11,7 +11,6 @@ body {
 a {
  color: #0073aa;
 }
-
 a:hover, a:active, a:focus {
  color: #0096dd;
 }
@@ -32,8 +31,8 @@ input[type=radio]:checked:before {
  background: #dd823b;
 }

-.wp-core-ui input[type="reset"]:hover,
-.wp-core-ui input[type="reset"]:active {
+.wp-core-ui input[type=reset]:hover,
+.wp-core-ui input[type=reset]:active {
  color: #0096dd;
 }

@@ -45,75 +44,60 @@ input[type=radio]:checked:before {
  box-shadow: 0 1px 0 #ad5d1e;
  text-shadow: 0 -1px 1px #ad5d1e, -1px 0 1px #ad5d1e, 0 1px 1px #ad5d1e, 1px 0 1px #ad5d1e;
 }
-
 .wp-core-ui .button-primary:hover, .wp-core-ui .button-primary:focus {
  background: #df8a48;
  border-color: #ad5d1e;
  color: #fff;
  box-shadow: 0 1px 0 #ad5d1e;
 }
-
 .wp-core-ui .button-primary:focus {
  box-shadow: inset 0 1px 0 #c36922, 0 0 2px 1px #33b3db;
 }
-
 .wp-core-ui .button-primary:active, .wp-core-ui .button-primary.active, .wp-core-ui .button-primary.active:focus, .wp-core-ui .button-primary.active:hover {
  background: #c36922;
  border-color: #ad5d1e;
  box-shadow: inset 0 2px 0 #ad5d1e;
 }
-
 .wp-core-ui .button-primary[disabled], .wp-core-ui .button-primary:disabled, .wp-core-ui .button-primary.button-primary-disabled, .wp-core-ui .button-primary.disabled {
  color: #d1cbc7 !important;
  background: #cc6d23 !important;
  border-color: #ad5d1e !important;
  text-shadow: none !important;
 }
-
 .wp-core-ui .button-primary.button-hero {
  box-shadow: 0 2px 0 #ad5d1e !important;
 }
-
 .wp-core-ui .button-primary.button-hero:active {
  box-shadow: inset 0 3px 0 #ad5d1e !important;
 }
-
 .wp-core-ui .wp-ui-primary {
  color: #fff;
  background-color: #cf4944;
 }
-
 .wp-core-ui .wp-ui-text-primary {
  color: #cf4944;
 }
-
 .wp-core-ui .wp-ui-highlight {
  color: #fff;
  background-color: #dd823b;
 }
-
 .wp-core-ui .wp-ui-text-highlight {
  color: #dd823b;
 }
-
 .wp-core-ui .wp-ui-notification {
  color: #fff;
  background-color: #ccaf0b;
 }
-
 .wp-core-ui .wp-ui-text-notification {
  color: #ccaf0b;
 }
-
 .wp-core-ui .wp-ui-text-icon {
  color: #f3f1f1;
 }

 /* List tables */
 .wrap .add-new-h2:hover,
-.wrap .page-title-action:hover,
-.tablenav .tablenav-pages a:hover,
-.tablenav .tablenav-pages a:focus {
+.wrap .page-title-action:hover {
  color: #fff;
  background-color: #cf4944;
 }
@@ -155,7 +139,7 @@ input[type=radio]:checked:before {
 }

 /* Active tabs use a bottom border color that matches the page background color. */
-.about-wrap h2 .nav-tab-active,
+.about-wrap .nav-tab-active,
 .nav-tab-active,
 .nav-tab-active:hover {
  background-color: #f1f1f1;
@@ -186,7 +170,6 @@ input[type=radio]:checked:before {
 #adminmenu .wp-has-current-submenu.opensub .wp-submenu a {
  color: #f1c8c7;
 }
-
 #adminmenu .wp-submenu a:focus, #adminmenu .wp-submenu a:hover,
 #adminmenu .wp-has-current-submenu .wp-submenu a:focus,
 #adminmenu .wp-has-current-submenu .wp-submenu a:hover,
@@ -205,7 +188,6 @@ input[type=radio]:checked:before {
 #adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a {
  color: #fff;
 }
-
 #adminmenu .wp-submenu li.current a:hover, #adminmenu .wp-submenu li.current a:focus,
 #adminmenu a.wp-has-current-submenu:focus + .wp-submenu li.current a:hover,
 #adminmenu a.wp-has-current-submenu:focus + .wp-submenu li.current a:focus,
@@ -372,6 +354,25 @@ ul#adminmenu > li.current > a.current:after {
  background: #d66560;
 }

+/* Admin Bar: recovery mode */
+#wpadminbar #wp-admin-bar-recovery-mode {
+  color: #fff;
+  background-color: #ccaf0b;
+}
+
+#wpadminbar #wp-admin-bar-recovery-mode .ab-item,
+#wpadminbar #wp-admin-bar-recovery-mode a.ab-item {
+  color: #fff;
+}
+
+#wpadminbar .ab-top-menu > #wp-admin-bar-recovery-mode.hover > .ab-item,
+#wpadminbar.nojq .quicklinks .ab-top-menu > #wp-admin-bar-recovery-mode > .ab-item:focus,
+#wpadminbar:not(.mobile) .ab-top-menu > #wp-admin-bar-recovery-mode:hover > .ab-item,
+#wpadminbar:not(.mobile) .ab-top-menu > #wp-admin-bar-recovery-mode > .ab-item:focus {
+  color: #fff;
+  background-color: #b89e0a;
+}
+
 /* Admin Bar: my account */
 #wpadminbar .quicklinks li#wp-admin-bar-my-account.with-avatar > a img {
  border-color: #d66560;
@@ -499,4 +500,4 @@ div#wp-responsive-toggle a:before {
 .mce-container.mce-menu .mce-menu-item-normal.mce-active,
 .mce-container.mce-menu .mce-menu-item-preview.mce-active {
  background: #dd823b;
-}
+}
--- a/wp-admin/css/colors/sunrise/colors-rtl.min.css
+++ b/wp-admin/css/colors/sunrise/colors-rtl.min.css
--- a/wp-admin/css/colors/sunrise/colors.css
+++ b/wp-admin/css/colors/sunrise/colors.css
@@ -11,7 +11,6 @@ body {
 a {
  color: #0073aa;
 }
-
 a:hover, a:active, a:focus {
  color: #0096dd;
 }
@@ -32,8 +31,8 @@ input[type=radio]:checked:before {
  background: #dd823b;
 }

-.wp-core-ui input[type="reset"]:hover,
-.wp-core-ui input[type="reset"]:active {
+.wp-core-ui input[type=reset]:hover,
+.wp-core-ui input[type=reset]:active {
  color: #0096dd;
 }

@@ -45,75 +44,60 @@ input[type=radio]:checked:before {
  box-shadow: 0 1px 0 #ad5d1e;
  text-shadow: 0 -1px 1px #ad5d1e, 1px 0 1px #ad5d1e, 0 1px 1px #ad5d1e, -1px 0 1px #ad5d1e;
 }
-
 .wp-core-ui .button-primary:hover, .wp-core-ui .button-primary:focus {
  background: #df8a48;
  border-color: #ad5d1e;
  color: #fff;
  box-shadow: 0 1px 0 #ad5d1e;
 }
-
 .wp-core-ui .button-primary:focus {
  box-shadow: inset 0 1px 0 #c36922, 0 0 2px 1px #33b3db;
 }
-
 .wp-core-ui .button-primary:active, .wp-core-ui .button-primary.active, .wp-core-ui .button-primary.active:focus, .wp-core-ui .button-primary.active:hover {
  background: #c36922;
  border-color: #ad5d1e;
  box-shadow: inset 0 2px 0 #ad5d1e;
 }
-
 .wp-core-ui .button-primary[disabled], .wp-core-ui .button-primary:disabled, .wp-core-ui .button-primary.button-primary-disabled, .wp-core-ui .button-primary.disabled {
  color: #d1cbc7 !important;
  background: #cc6d23 !important;
  border-color: #ad5d1e !important;
  text-shadow: none !important;
 }
-
 .wp-core-ui .button-primary.button-hero {
  box-shadow: 0 2px 0 #ad5d1e !important;
 }
-
 .wp-core-ui .button-primary.button-hero:active {
  box-shadow: inset 0 3px 0 #ad5d1e !important;
 }
-
 .wp-core-ui .wp-ui-primary {
  color: #fff;
  background-color: #cf4944;
 }
-
 .wp-core-ui .wp-ui-text-primary {
  color: #cf4944;
 }
-
 .wp-core-ui .wp-ui-highlight {
  color: #fff;
  background-color: #dd823b;
 }
-
 .wp-core-ui .wp-ui-text-highlight {
  color: #dd823b;
 }
-
 .wp-core-ui .wp-ui-notification {
  color: #fff;
  background-color: #ccaf0b;
 }
-
 .wp-core-ui .wp-ui-text-notification {
  color: #ccaf0b;
 }
-
 .wp-core-ui .wp-ui-text-icon {
  color: #f3f1f1;
 }

 /* List tables */
 .wrap .add-new-h2:hover,
-.wrap .page-title-action:hover,
-.tablenav .tablenav-pages a:hover,
-.tablenav .tablenav-pages a:focus {
+.wrap .page-title-action:hover {
  color: #fff;
  background-color: #cf4944;
 }
@@ -155,7 +139,7 @@ input[type=radio]:checked:before {
 }

 /* Active tabs use a bottom border color that matches the page background color. */
-.about-wrap h2 .nav-tab-active,
+.about-wrap .nav-tab-active,
 .nav-tab-active,
 .nav-tab-active:hover {
  background-color: #f1f1f1;
@@ -186,7 +170,6 @@ input[type=radio]:checked:before {
 #adminmenu .wp-has-current-submenu.opensub .wp-submenu a {
  color: #f1c8c7;
 }
-
 #adminmenu .wp-submenu a:focus, #adminmenu .wp-submenu a:hover,
 #adminmenu .wp-has-current-submenu .wp-submenu a:focus,
 #adminmenu .wp-has-current-submenu .wp-submenu a:hover,
@@ -205,7 +188,6 @@ input[type=radio]:checked:before {
 #adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a {
  color: #fff;
 }
-
 #adminmenu .wp-submenu li.current a:hover, #adminmenu .wp-submenu li.current a:focus,
 #adminmenu a.wp-has-current-submenu:focus + .wp-submenu li.current a:hover,
 #adminmenu a.wp-has-current-submenu:focus + .wp-submenu li.current a:focus,
@@ -372,6 +354,25 @@ ul#adminmenu > li.current > a.current:after {
  background: #d66560;
 }

+/* Admin Bar: recovery mode */
+#wpadminbar #wp-admin-bar-recovery-mode {
+  color: #fff;
+  background-color: #ccaf0b;
+}
+
+#wpadminbar #wp-admin-bar-recovery-mode .ab-item,
+#wpadminbar #wp-admin-bar-recovery-mode a.ab-item {
+  color: #fff;
+}
+
+#wpadminbar .ab-top-menu > #wp-admin-bar-recovery-mode.hover > .ab-item,
+#wpadminbar.nojq .quicklinks .ab-top-menu > #wp-admin-bar-recovery-mode > .ab-item:focus,
+#wpadminbar:not(.mobile) .ab-top-menu > #wp-admin-bar-recovery-mode:hover > .ab-item,
+#wpadminbar:not(.mobile) .ab-top-menu > #wp-admin-bar-recovery-mode > .ab-item:focus {
+  color: #fff;
+  background-color: #b89e0a;
+}
+
 /* Admin Bar: my account */
 #wpadminbar .quicklinks li#wp-admin-bar-my-account.with-avatar > a img {
  border-color: #d66560;
@@ -499,4 +500,4 @@ div#wp-responsive-toggle a:before {
 .mce-container.mce-menu .mce-menu-item-normal.mce-active,
 .mce-container.mce-menu .mce-menu-item-preview.mce-active {
  background: #dd823b;
-}
+}
--- a/wp-admin/css/colors/sunrise/colors.min.css
+++ b/wp-admin/css/colors/sunrise/colors.min.css
--- a/wp-admin/css/common-rtl.css
+++ b/wp-admin/css/common-rtl.css
@@ -134,6 +134,10 @@
 	word-wrap: normal !important; /* many screen reader and browser combinations announce broken words as they would appear visually */
 }

+.button .screen-reader-text {
+	height: auto; /* Fixes a Safari+VoiceOver bug, see ticket #42006 */
+}
+
 .screen-reader-shortcut {
 	position: absolute;
 	top: -1000em;
@@ -152,9 +156,11 @@
 	color: #0073aa;
 	z-index: 100000;
 	line-height: normal;
-	box-shadow: 0 0 2px 2px rgba(0,0,0,.6);
+	box-shadow: 0 0 2px 2px rgba(0, 0, 0, 0.6);
 	text-decoration: none;
-	outline: none;
+	/* Only visible in Windows High Contrast mode */
+	outline: 2px solid transparent;
+	outline-offset: -2px;
 }

 .hidden,
@@ -185,7 +191,7 @@ p.popular-tags,
 .imgedit-group,
 .comment-ays {
 	border: 1px solid #e5e5e5;
-	box-shadow: 0 1px 1px rgba(0,0,0,0.04);
+	box-shadow: 0 1px 1px rgba(0, 0, 0, 0.04);
 }

 table.widefat,
@@ -268,14 +274,22 @@ a:focus .media-icon img,
 	color: #124964;
 	box-shadow:
 		0 0 0 1px #5b9dd9,
-		0 0 2px 1px rgba(30, 140, 190, .8);
+		0 0 2px 1px rgba(30, 140, 190, 0.8);
+	/* Only visible in Windows High Contrast mode */
+	outline: 1px solid transparent;
 }

 .ie8 a:focus {
 	outline: #5b9dd9 solid 1px;
 }

-#adminmenu a:focus,
+#adminmenu a:focus {
+	box-shadow: none;
+	/* Only visible in Windows High Contrast mode */
+	outline: 1px solid transparent;
+	outline-offset: -1px;
+}
+
 .screen-reader-text:focus {
 	box-shadow: none;
 	outline: none;
@@ -409,7 +423,7 @@ code {
 	padding: 3px 5px 2px 5px;
 	margin: 0 1px;
 	background: #eaeaea;
-	background: rgba(0,0,0,0.07);
+	background: rgba(0, 0, 0, 0.07);
 	font-size: 13px;
 }

@@ -572,7 +586,7 @@ code {
 	font-weight: 400;
 	margin: 0;
 	padding: 9px 0 4px 0;
-	line-height: 29px;
+	line-height: 1.3;
 }

 .wrap h1.wp-heading-inline {
@@ -613,7 +627,6 @@ code {
 	line-height: normal; /* IE8-IE11 need this for buttons */
 	color: #0073aa; /* some of these controls are button elements and don't inherit from links */
 	cursor: pointer;
-	outline: 0;
 }

 .wrap .wp-heading-inline + .page-title-action {
@@ -634,7 +647,9 @@ code {

 .wrap .page-title-action:focus {
 	border-color: #5b9dd9;
-	box-shadow: 0 0 2px rgba( 30, 140, 190, 0.8 );
+	box-shadow: 0 0 2px rgba(30, 140, 190, 0.8);
+	/* Only visible in Windows High Contrast mode */
+	outline: 2px solid transparent;
 }

 .wrap h1.long-header {
@@ -651,7 +666,7 @@ code {
 div#widgets-right .widget-top:hover,
 #widgets-left .widget-top:hover {
 	border-color: #999;
-	box-shadow: 0 1px 2px rgba(0,0,0,0.1);
+	box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1);
 }

 .sorthelper {
@@ -816,7 +831,7 @@ img.emoji {
 .tagchecklist .ntdelbutton:focus .remove-tag-icon:before {
 	box-shadow:
 		0 0 0 1px #5b9dd9,
-		0 0 2px 1px rgba(30, 140, 190, .8);
+		0 0 2px 1px rgba(30, 140, 190, 0.8);
 }

 .key-labels label {
@@ -899,11 +914,11 @@ span.required,

 #delete-action {
 	float: right;
-	line-height: 28px;
+	line-height: 2.1;
 }

 #delete-link {
-	line-height: 28px;
+	line-height: 2.1;
 	vertical-align: middle;
 	text-align: right;
 	margin-right: 8px;
@@ -916,7 +931,7 @@ span.required,
 #publishing-action {
 	text-align: left;
 	float: left;
-	line-height: 23px;
+	line-height: 1.9;
 }

 #publishing-action .spinner {
@@ -981,7 +996,7 @@ th.action-links {
 	margin: 12px 0 25px;
 	padding: 0 10px;
 	width: 100%;
-	box-shadow: 0 1px 1px rgba(0,0,0,0.04);
+	box-shadow: 0 1px 1px rgba(0, 0, 0, 0.04);
 	border: 1px solid #e5e5e5;
 	background: #fff;
 	color: #555;
@@ -1170,7 +1185,7 @@ th.action-links {
 	width: 24%;
 	background: #fff;
 	border: 1px solid #e5e5e5;
-	box-shadow: 0 1px 1px rgba(0,0,0,0.04);
+	box-shadow: 0 1px 1px rgba(0, 0, 0, 0.04);
 }

 .filter-group legend {
@@ -1191,7 +1206,7 @@ th.action-links {

 .filter-drawer .filter-group-feature input,
 .filter-drawer .filter-group-feature label {
-	line-height: 16px;
+	line-height: 1.4;
 }

 .filter-drawer .filter-group-feature input {
@@ -1228,7 +1243,7 @@ th.action-links {

 .wp-filter .button-link.edit-filters {
 	padding: 0 5px;
-	line-height: 28px;
+	line-height: 2.2;
 }

 .filtered-by {
@@ -1252,7 +1267,7 @@ th.action-links {
 	margin: 0 5px;
 	padding: 4px 8px;
 	border: 1px solid #e5e5e5;
-	box-shadow: 0 1px 1px rgba(0,0,0,0.04);
+	box-shadow: 0 1px 1px rgba(0, 0, 0, 0.04);
 	background: #fff;
 	font-size: 11px;
 }
@@ -1350,7 +1365,7 @@ div.updated,
 div.error {
 	background: #fff;
 	border-right: 4px solid #fff;
-	box-shadow: 0 1px 1px 0 rgba( 0, 0, 0, 0.1 );
+	box-shadow: 0 1px 1px 0 rgba(0, 0, 0, 0.1);
 	margin: 5px 15px 2px;
 	padding: 1px 12px;
 }
@@ -1415,7 +1430,7 @@ div.error p,

 .notice-dismiss:focus {
 	outline: none;
-	box-shadow: 0 0 0 1px #5b9dd9, 0 0 2px 1px rgba(30, 140, 190, .8);
+	box-shadow: 0 0 0 1px #5b9dd9, 0 0 2px 1px rgba(30, 140, 190, 0.8);
 }

 .ie8 .notice-dismiss:focus {
@@ -1518,13 +1533,13 @@ div.error {
 .installed p:before,
 .button.updated-message:before {
 	color: #79ba49;
-	content: '\f147';
+	content: "\f147";
 }

 /* Error icon. */
 .update-message.notice-error p:before {
-	 color: #dc3232;
-	 content: "\f534";
+	color: #dc3232;
+	content: "\f534";
 }

 .wrap .notice p:before,
@@ -1536,20 +1551,29 @@ div.error {
 #update-nag,
 .update-nag {
 	display: inline-block;
-	line-height: 19px;
+	line-height: 1.4;
 	padding: 11px 15px;
 	font-size: 14px;
 	text-align: right;
 	margin: 25px 2px 0 20px;
 	background-color: #fff;
 	border-right: 4px solid #ffba00;
-	box-shadow: 0 1px 1px 0 rgba(0,0,0,0.1);
+	box-shadow: 0 1px 1px 0 rgba(0, 0, 0, 0.1);
 }

 ul#dismissed-updates {
 	display: none;
 }

+#dismissed-updates li > p {
+	margin-top: 0;
+}
+
+#dismiss,
+#undismiss {
+	margin-right: 0.5em;
+}
+
 form.upgrade {
 	margin-top: 8px;
 }
@@ -1635,6 +1659,7 @@ form.upgrade .hint {
 }

 #screen-meta-links {
+	float: left;
 	margin: 0 0 0 20px;
 }

@@ -1646,18 +1671,13 @@ form.upgrade .hint {
 	background-color: #fff;
 	border: 1px solid #ddd;
 	border-top: none;
-	box-shadow: 0 1px 0 rgba(0,0,0,.025);
+	box-shadow: 0 1px 0 rgba(0, 0, 0, 0.025);
 }

 #screen-options-link-wrap,
 #contextual-help-link-wrap {
-	float: left;
-	height: 28px;
+	float: right;
 	margin: 0 6px 0 0;
-	border: 1px solid #ddd;
-	border-top: none;
-	background: #fff;
-	box-shadow: 0 1px 1px -1px rgba(0,0,0,0.1);
 }

 #screen-meta-links .screen-meta-toggle {
@@ -1666,12 +1686,17 @@ form.upgrade .hint {
 }

 #screen-meta-links .show-settings {
-	border: 0;
-	background: none;
+	border: 1px solid #ddd;
+	border-top: none;
+	border-bottom-color: #ccc;
+	height: auto;
+	margin-bottom: 0;
+	padding: 3px 16px 3px 6px;
+	background: #fff;
 	border-radius: 0;
 	color: #72777c;
 	line-height: 1.7;
-	padding: 3px 16px 3px 6px;
+	box-shadow: none;
 }

 #screen-meta-links .show-settings:hover,
@@ -1680,8 +1705,12 @@ form.upgrade .hint {
 	color: #32373c;
 }

+#screen-meta-links .show-settings:focus {
+	border-color: #5b9dd9;
+	box-shadow: 0 0 3px rgba(0, 115, 170, 0.8);
+}
+
 #screen-meta-links .show-settings:active {
-	box-shadow: none;
 	transform: none;
 }

@@ -1725,7 +1754,7 @@ form.upgrade .hint {
 #contextual-help-wrap h5 {
 	margin: 0;
 	padding: 8px 0;
- 	font-size: 13px;
+	font-size: 13px;
 	font-weight: 600;
 }

@@ -1736,7 +1765,7 @@ form.upgrade .hint {
 .metabox-prefs label {
 	display: inline-block;
 	padding-left: 15px;
-	line-height: 30px;
+	line-height: 2.35;
 }

 #number-of-columns {
@@ -1775,7 +1804,7 @@ form.upgrade .hint {
 }

 .metabox-prefs .screen-options label {
-	line-height: 28px;
+	line-height: 2.2;
 	padding-left: 0;
 }

@@ -1839,7 +1868,7 @@ form.upgrade .hint {
 .contextual-help-tabs a {
 	display: block;
 	padding: 5px 12px 5px 5px;
-	line-height: 18px;
+	line-height: 1.4;
 	text-decoration: none;
 	border: 1px solid transparent;
 	border-left: none;
@@ -1855,7 +1884,7 @@ form.upgrade .hint {
 	margin: 0 0 0 -1px;
 	border-right: 2px solid #00a0d2;
 	background: #f6fbfd;
-	box-shadow: 0 2px 0 rgba(0,0,0,0.02), 0 1px 0 rgba(0,0,0,0.02);
+	box-shadow: 0 2px 0 rgba(0, 0, 0, 0.02), 0 1px 0 rgba(0, 0, 0, 0.02);
 }

 .contextual-help-tabs .active a {
@@ -1871,7 +1900,7 @@ form.upgrade .hint {
 .help-tab-content {
 	display: none;
 	margin: 0 0 12px 22px;
-	line-height: 1.6em;
+	line-height: 1.6;
 }

 .help-tab-content.active {
@@ -1967,7 +1996,7 @@ html.wp-toolbar {
 	width: 200px;
 	text-align: center;
 	color: #ccc;
-	font-size:18px;
+	font-size: 18px;
 	display: none;
 }

@@ -2052,13 +2081,19 @@ html.wp-toolbar {
 	user-select: none;
 }

-.postbox .inside,
-.stuffbox .inside {
+.postbox .inside {
 	padding: 0 12px 12px;
-	line-height: 1.4em;
+	line-height: 1.4;
 	font-size: 13px;
 }

+.stuffbox .inside {
+	padding: 0;
+	line-height: 1.4;
+	font-size: 13px;
+	margin-top: 0;
+}
+
 .postbox .inside {
 	margin: 11px 0;
 	position: relative;
@@ -2123,7 +2158,7 @@ html.wp-toolbar {
 #wpfooter p {
 	font-size: 13px;
 	margin: 0;
-	line-height: 20px;
+	line-height: 1.55;
 }

 #footer-thankyou {
@@ -2141,7 +2176,7 @@ html.wp-toolbar {
 	margin-right: 0.5em; /* half the font size so set the font size properly */
 	padding: 5px 10px;
 	font-size: 14px;
-	line-height: 24px;
+	line-height: 1.71428571;
 	font-weight: 600;
 	background: #e5e5e5;
 	color: #555;
@@ -2153,7 +2188,7 @@ h3 .nav-tab, /* Back-compat for pre-4.4 */
 .nav-tab-small .nav-tab {
 	padding: 5px 14px;
 	font-size: 12px;
-	line-height: 16px;
+	line-height: 1.33;
 }

 .nav-tab:hover,
@@ -2193,10 +2228,10 @@ h1.nav-tab-wrapper, /* Back-compat for pre-4.4 */

 /* Back-compat for plugins. Deprecated. Use .wp-clearfix instead. */
 .nav-tab-wrapper:not(.wp-clearfix):after {
- 	content: "";
- 	display: table;
- 	clear: both;
- }
+	content: "";
+	display: table;
+	clear: both;
+}

 .ie8 .nav-tab-wrapper {
 	/* contain floats establishing a new block formatting context */
@@ -2255,7 +2290,7 @@ h1.nav-tab-wrapper, /* Back-compat for pre-4.4 */
 /* Back-compat for nav-menus screen */
 .nav-menus-php .metabox-holder h3 {
 	padding: 10px 14px 11px 10px;
-	line-height: 21px;
+	line-height: 1.5;
 }

 #templateside ul li a {
@@ -2318,7 +2353,7 @@ body.iframe {

 .importers td {
 	padding-left: 14px;
-	line-height: 1.5em;
+	line-height: 1.4;
 }

 .importers .import-system {
@@ -2343,7 +2378,7 @@ body.iframe {
 }

 .importer-action {
-	line-height: 20px; /* Same as with .updating-message */
+	line-height: 1.55; /* Same as with .updating-message */
 	color: #555;
 	margin-bottom: 1em;
 }
@@ -2354,11 +2389,8 @@ body.iframe {
 }

 .edit-comment-author {
-	font-size: 14px;
-	line-height: 1.4;
-	font-weight: 600;
 	color: #222;
-	margin: 2px 9px 0 0;
+	border-bottom: 1px solid #eee;
 }

 #namediv h3 label, /* Back-compat for pre-4.4 */
@@ -2401,7 +2433,7 @@ body.iframe {

 br.clear {
 	height: 2px;
-	line-height: 2px;
+	line-height: 0.15;
 }

 .checkbox {
@@ -2431,11 +2463,11 @@ div.star-holder {
 	position: relative;
 	height: 17px;
 	width: 100px;
-	background: url(../images/stars.png?ver=20121108) repeat-x bottom left;
+	background: url(../images/stars.png?ver=20121108) repeat-x bottom right;
 }

 div.star-holder .star-rating {
-	background: url(../images/stars.png?ver=20121108) repeat-x top left;
+	background: url(../images/stars.png?ver=20121108) repeat-x top right;
 	height: 17px;
 	float: right;
 }
@@ -2456,7 +2488,7 @@ div.star-holder .star-rating {
 	font-weight: 400;
 	font-style: normal;
 	vertical-align: top;
-	transition: color .1s ease-in 0;
+	transition: color .1s ease-in;
 	text-align: center;
 	color: #ffb900;
 }
@@ -2470,7 +2502,7 @@ div.star-holder .star-rating {
 }

 .rtl .star-rating .star-half {
-	transform: rotateY(180deg);
+	transform: rotateY(-180deg);
 }

 .star-rating .star-empty:before {
@@ -2505,7 +2537,7 @@ div.action-links {
 	background: #f5f5f5;
 	font-size: 22px;
 	font-weight: 600;
-	line-height: 56px;
+	line-height: 2.4;
 	position: relative;
 	height: 56px;
 }
@@ -2531,15 +2563,15 @@ div.action-links {
 	font-family: "Helvetica Neue", sans-serif;
 	display: inline-block;
 	font-size: 30px;
-	line-height: 50px;
+	line-height: 1.68;
 	box-sizing: border-box;
 	max-width: 100%;
 	padding: 0 15px;
 	margin-top: 174px;
 	color: #fff;
-	background: rgba( 30, 30, 30, 0.9 );
-	text-shadow: 0 1px 3px rgba( 0, 0, 0, 0.4 );
-	box-shadow: 0 0 30px rgba( 255, 255, 255, 0.1 );
+	background: rgba(30, 30, 30, 0.9);
+	text-shadow: 0 1px 3px rgba(0, 0, 0, 0.4);
+	box-shadow: 0 0 30px rgba(255, 255, 255, 0.1);
 	border-radius: 8px;
 }

@@ -2555,7 +2587,7 @@ div.action-links {
 	height: 250px;
 	width: 100%;
 	background: transparent;
-	box-shadow: inset 0 0 50px 4px rgba( 0, 0, 0, 0.2 ), inset 0 -1px 0 rgba( 0, 0, 0, 0.1 );
+	box-shadow: inset 0 0 50px 4px rgba(0, 0, 0, 0.2), inset 0 -1px 0 rgba(0, 0, 0, 0.1);
 }

 #plugin-information-tabs {
@@ -2576,7 +2608,7 @@ div.action-links {
 	padding: 9px 10px;
 	margin: 0;
 	height: 18px;
-	line-height: 18px;
+	line-height: 1.3;
 	font-size: 14px;
 	text-decoration: none;
 	transition: none;
@@ -2624,12 +2656,17 @@ div.action-links {
 	left: 250px;
 	bottom: 0;
 	right: 0;
+	margin-top: 10px;
 	margin-left: 250px; /* FYI box */
 	padding: 10px 26px;
 	margin-bottom: -99939px; /* 60px less than the padding below to accommodate footer */
 	padding-bottom: 99999px; /* equal height column trick */
 }

+#section-holder .notice {
+	margin: 5px 0 15px;
+}
+
 #section-holder .updated {
 	margin: 16px 0;
 }
@@ -2768,7 +2805,7 @@ div.action-links {
 	max-width: 100%;
 	width: auto;
 	height: auto;
-	box-shadow: 0 1px 2px rgba( 0, 0, 0, 0.3 );
+	box-shadow: 0 1px 2px rgba(0, 0, 0, 0.3);
 }

 /* rtl:ignore */
@@ -2848,7 +2885,7 @@ div.action-links {
 	margin-left: 1em;
 }

-@media screen and ( max-width: 771px ) {
+@media screen and (max-width: 771px) {
 	#plugin-information-title.with-banner {
 		height: 100px;
 	}
@@ -2856,7 +2893,7 @@ div.action-links {
 	#plugin-information-title.with-banner h2 {
 		margin-top: 30px;
 		font-size: 20px;
-		line-height: 40px;
+		line-height: 2;
 		max-width: 85%;
 	}

@@ -2965,7 +3002,7 @@ div.action-links {
 }

 /* move plugin install close icon to top on narrow screens */
-@media screen and ( max-width: 830px ) {
+@media screen and (max-width: 830px) {
 	.plugin-details-modal #TB_closeWindowButton {
 		left: 0;
 		top: -30px;
@@ -3023,7 +3060,7 @@ img {
 .js .postbox .handlediv:focus .toggle-indicator:before {
 	box-shadow:
 		0 0 0 1px #5b9dd9,
-		0 0 2px 1px rgba(30, 140, 190, .8);
+		0 0 2px 1px rgba(30, 140, 190, 0.8);
 }

 /* @todo: appears to be Press This only and overridden */
@@ -3118,7 +3155,7 @@ img {
 }
 [role="treeitem"] .folder-label.focus {
 	color: #124964;
-	box-shadow: 0 0 0 1px #5b9dd9, 0 0 2px 1px rgba(30, 140, 190, .8);
+	box-shadow: 0 0 0 1px #5b9dd9, 0 0 2px 1px rgba(30, 140, 190, 0.8);
 }
 [role="treeitem"].hover,
 [role="treeitem"] .folder-label.hover {
@@ -3135,7 +3172,7 @@ img {

 /* Styles for folder indicators/depth */
 .tree-folder .tree-folder::after {
-	content: ' ';
+	content: "";
 	display: block;
 	position: absolute;
 	right: 2px;
@@ -3144,7 +3181,7 @@ img {
 	bottom: 10px;
 }
 .tree-folder > li::before {
-	content: ' ';
+	content: "";
 	position: absolute;
 	display: block;
 	border-right: 1px solid #ccc;
@@ -3155,7 +3192,7 @@ img {
 	border-bottom: 1px solid #ccc;
 }
 .tree-folder > li::after {
-	content: ' ';
+	content: "";
 	position: absolute;
 	display: block;
 	border-right: 1px solid #ccc;
@@ -3286,7 +3323,7 @@ img {
 }

 #documentation label {
-	line-height: 22px;
+	line-height: 1.8;
 	vertical-align: baseline;
 	font-weight: 600;
 }
@@ -3347,7 +3384,7 @@ img {
 .widget-top .widget-action:focus .toggle-indicator:before {
 	box-shadow:
 		0 0 0 1px #5b9dd9,
-		0 0 2px 1px rgba(30,140,190,.8);
+		0 0 2px 1px rgba(30, 140, 190, 0.8);
 }

 .control-section .accordion-section-title:after,
@@ -3360,7 +3397,8 @@ img {
 .control-section.open .accordion-section-title:after,
 #customize-info.open .accordion-section-title:after,
 .nav-menus-php .menu-item-edit-active .item-edit:before,
-.widget.open .widget-top .widget-action .toggle-indicator:before {
+.widget.open .widget-top .widget-action .toggle-indicator:before,
+.widget.widget-in-question .widget-top .widget-action .toggle-indicator:before {
 	content: "\f142";
 }

@@ -3444,7 +3482,7 @@ img {
 	border-right: none;
 	border-left: none;
 	padding: 10px 14px 11px 10px;
-	line-height: 21px;
+	line-height: 1.55;
 	background: #fff;
 }

@@ -3626,7 +3664,7 @@ img {
 	/* Back-compat for pre-3.8 */
 	div.star-holder,
 	div.star-holder .star-rating {
-		background: url(../images/stars-2x.png?ver=20121108) repeat-x bottom left;
+		background: url(../images/stars-2x.png?ver=20121108) repeat-x bottom right;
 		background-size: 21px 37px;
 	}

@@ -3653,11 +3691,15 @@ img {
 	width: device-width;
 }

-@media screen and ( max-width: 782px ) {
+@media screen and (max-width: 782px) {
 	html.wp-toolbar {
 		padding-top: 46px;
 	}

+	.screen-reader-shortcut:focus {
+		top: -39px;
+	}
+
 	body {
 		min-width: 240px;
 		overflow-x: hidden;
@@ -3678,6 +3720,7 @@ img {
 	}

 	.wrap {
+		clear: both;
 		margin-left: 12px;
 		margin-right: 0;
 	}
@@ -3695,8 +3738,6 @@ img {
 	}

 	/* Hidden Elements */
-	#screen-meta,
-	#screen-meta-links,
 	#collapse-menu,
 	.post-format-select {
 		display: none !important;
@@ -3895,7 +3936,7 @@ img {

 	.filter-drawer .filter-group-feature input,
 	.filter-drawer .filter-group-feature label {
-		line-height: 25px;
+		line-height: 2.1;
 	}

 	.filter-drawer .filter-group-feature label {
@@ -3904,9 +3945,44 @@ img {

 	.wp-filter .button.drawer-toggle {
 		font-size: 13px;
-		line-height: 26px;
+		line-height: 2;
 		height: 28px;
 	}
+
+	/* Fix help tab columns for smaller screens */
+	#screen-meta #contextual-help-wrap {
+		overflow: visible;
+	}
+
+	#screen-meta #contextual-help-back,
+	#screen-meta .contextual-help-sidebar {
+		display: none;
+	}
+
+	#screen-meta .contextual-help-tabs {
+		clear: both;
+		width: 100%;
+		float: none;
+	}
+
+	#screen-meta .contextual-help-tabs ul {
+		margin: 0 0 1em;
+		padding: 1em 0 0;
+	}
+
+	#screen-meta .contextual-help-tabs .active {
+		margin: 0;
+	}
+
+	#screen-meta .contextual-help-tabs-wrap {
+		clear: both;
+		max-width: 100%;
+		float: none;
+	}
+
+	#screen-meta-links {
+		margin-bottom: 20px; /* Add margins beneath links for better spacing between boxes and elements */
+	}
 }

 /* Smartphone */
@@ -3921,6 +3997,10 @@ img {
 		padding-top: 0;
 	}

+	.screen-reader-shortcut:focus {
+		top: 7px;
+	}
+
 	#wpbody {
 		padding-top: 46px;
 	}
@@ -3938,10 +4018,17 @@ img {

 	h1 .nav-tab,
 	h2 .nav-tab,
-	h3 .nav-tab {
+	h3 .nav-tab,
+	nav .nav-tab {
 		margin: 10px 0 0 10px;
 		border-bottom: 1px solid #ccc;
 	}
+
+	.nav-tab-active:hover,
+	.nav-tab-active:focus,
+	.nav-tab-active:focus:active {
+		border-bottom: 1px solid #ccc;
+	}
 }

@media screen and (max-width: 320px) {
--- a/wp-admin/css/common-rtl.min.css
+++ b/wp-admin/css/common-rtl.min.css
--- a/wp-admin/css/common.css
+++ b/wp-admin/css/common.css
@@ -134,6 +134,10 @@
 	word-wrap: normal !important; /* many screen reader and browser combinations announce broken words as they would appear visually */
 }

+.button .screen-reader-text {
+	height: auto; /* Fixes a Safari+VoiceOver bug, see ticket #42006 */
+}
+
 .screen-reader-shortcut {
 	position: absolute;
 	top: -1000em;
@@ -152,9 +156,11 @@
 	color: #0073aa;
 	z-index: 100000;
 	line-height: normal;
-	box-shadow: 0 0 2px 2px rgba(0,0,0,.6);
+	box-shadow: 0 0 2px 2px rgba(0, 0, 0, 0.6);
 	text-decoration: none;
-	outline: none;
+	/* Only visible in Windows High Contrast mode */
+	outline: 2px solid transparent;
+	outline-offset: -2px;
 }

 .hidden,
@@ -185,7 +191,7 @@ p.popular-tags,
 .imgedit-group,
 .comment-ays {
 	border: 1px solid #e5e5e5;
-	box-shadow: 0 1px 1px rgba(0,0,0,0.04);
+	box-shadow: 0 1px 1px rgba(0, 0, 0, 0.04);
 }

 table.widefat,
@@ -268,14 +274,22 @@ a:focus .media-icon img,
 	color: #124964;
 	box-shadow:
 		0 0 0 1px #5b9dd9,
-		0 0 2px 1px rgba(30, 140, 190, .8);
+		0 0 2px 1px rgba(30, 140, 190, 0.8);
+	/* Only visible in Windows High Contrast mode */
+	outline: 1px solid transparent;
 }

 .ie8 a:focus {
 	outline: #5b9dd9 solid 1px;
 }

-#adminmenu a:focus,
+#adminmenu a:focus {
+	box-shadow: none;
+	/* Only visible in Windows High Contrast mode */
+	outline: 1px solid transparent;
+	outline-offset: -1px;
+}
+
 .screen-reader-text:focus {
 	box-shadow: none;
 	outline: none;
@@ -409,7 +423,7 @@ code {
 	padding: 3px 5px 2px 5px;
 	margin: 0 1px;
 	background: #eaeaea;
-	background: rgba(0,0,0,0.07);
+	background: rgba(0, 0, 0, 0.07);
 	font-size: 13px;
 }

@@ -572,7 +586,7 @@ code {
 	font-weight: 400;
 	margin: 0;
 	padding: 9px 0 4px 0;
-	line-height: 29px;
+	line-height: 1.3;
 }

 .wrap h1.wp-heading-inline {
@@ -613,7 +627,6 @@ code {
 	line-height: normal; /* IE8-IE11 need this for buttons */
 	color: #0073aa; /* some of these controls are button elements and don't inherit from links */
 	cursor: pointer;
-	outline: 0;
 }

 .wrap .wp-heading-inline + .page-title-action {
@@ -634,7 +647,9 @@ code {

 .wrap .page-title-action:focus {
 	border-color: #5b9dd9;
-	box-shadow: 0 0 2px rgba( 30, 140, 190, 0.8 );
+	box-shadow: 0 0 2px rgba(30, 140, 190, 0.8);
+	/* Only visible in Windows High Contrast mode */
+	outline: 2px solid transparent;
 }

 .wrap h1.long-header {
@@ -651,7 +666,7 @@ code {
 div#widgets-right .widget-top:hover,
 #widgets-left .widget-top:hover {
 	border-color: #999;
-	box-shadow: 0 1px 2px rgba(0,0,0,0.1);
+	box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1);
 }

 .sorthelper {
@@ -816,7 +831,7 @@ img.emoji {
 .tagchecklist .ntdelbutton:focus .remove-tag-icon:before {
 	box-shadow:
 		0 0 0 1px #5b9dd9,
-		0 0 2px 1px rgba(30, 140, 190, .8);
+		0 0 2px 1px rgba(30, 140, 190, 0.8);
 }

 .key-labels label {
@@ -899,11 +914,11 @@ span.required,

 #delete-action {
 	float: left;
-	line-height: 28px;
+	line-height: 2.1;
 }

 #delete-link {
-	line-height: 28px;
+	line-height: 2.1;
 	vertical-align: middle;
 	text-align: left;
 	margin-left: 8px;
@@ -916,7 +931,7 @@ span.required,
 #publishing-action {
 	text-align: right;
 	float: right;
-	line-height: 23px;
+	line-height: 1.9;
 }

 #publishing-action .spinner {
@@ -981,7 +996,7 @@ th.action-links {
 	margin: 12px 0 25px;
 	padding: 0 10px;
 	width: 100%;
-	box-shadow: 0 1px 1px rgba(0,0,0,0.04);
+	box-shadow: 0 1px 1px rgba(0, 0, 0, 0.04);
 	border: 1px solid #e5e5e5;
 	background: #fff;
 	color: #555;
@@ -1170,7 +1185,7 @@ th.action-links {
 	width: 24%;
 	background: #fff;
 	border: 1px solid #e5e5e5;
-	box-shadow: 0 1px 1px rgba(0,0,0,0.04);
+	box-shadow: 0 1px 1px rgba(0, 0, 0, 0.04);
 }

 .filter-group legend {
@@ -1191,7 +1206,7 @@ th.action-links {

 .filter-drawer .filter-group-feature input,
 .filter-drawer .filter-group-feature label {
-	line-height: 16px;
+	line-height: 1.4;
 }

 .filter-drawer .filter-group-feature input {
@@ -1228,7 +1243,7 @@ th.action-links {

 .wp-filter .button-link.edit-filters {
 	padding: 0 5px;
-	line-height: 28px;
+	line-height: 2.2;
 }

 .filtered-by {
@@ -1252,7 +1267,7 @@ th.action-links {
 	margin: 0 5px;
 	padding: 4px 8px;
 	border: 1px solid #e5e5e5;
-	box-shadow: 0 1px 1px rgba(0,0,0,0.04);
+	box-shadow: 0 1px 1px rgba(0, 0, 0, 0.04);
 	background: #fff;
 	font-size: 11px;
 }
@@ -1350,7 +1365,7 @@ div.updated,
 div.error {
 	background: #fff;
 	border-left: 4px solid #fff;
-	box-shadow: 0 1px 1px 0 rgba( 0, 0, 0, 0.1 );
+	box-shadow: 0 1px 1px 0 rgba(0, 0, 0, 0.1);
 	margin: 5px 15px 2px;
 	padding: 1px 12px;
 }
@@ -1415,7 +1430,7 @@ div.error p,

 .notice-dismiss:focus {
 	outline: none;
-	box-shadow: 0 0 0 1px #5b9dd9, 0 0 2px 1px rgba(30, 140, 190, .8);
+	box-shadow: 0 0 0 1px #5b9dd9, 0 0 2px 1px rgba(30, 140, 190, 0.8);
 }

 .ie8 .notice-dismiss:focus {
@@ -1518,13 +1533,13 @@ div.error {
 .installed p:before,
 .button.updated-message:before {
 	color: #79ba49;
-	content: '\f147';
+	content: "\f147";
 }

 /* Error icon. */
 .update-message.notice-error p:before {
-	 color: #dc3232;
-	 content: "\f534";
+	color: #dc3232;
+	content: "\f534";
 }

 .wrap .notice p:before,
@@ -1536,20 +1551,29 @@ div.error {
 #update-nag,
 .update-nag {
 	display: inline-block;
-	line-height: 19px;
+	line-height: 1.4;
 	padding: 11px 15px;
 	font-size: 14px;
 	text-align: left;
 	margin: 25px 20px 0 2px;
 	background-color: #fff;
 	border-left: 4px solid #ffba00;
-	box-shadow: 0 1px 1px 0 rgba(0,0,0,0.1);
+	box-shadow: 0 1px 1px 0 rgba(0, 0, 0, 0.1);
 }

 ul#dismissed-updates {
 	display: none;
 }

+#dismissed-updates li > p {
+	margin-top: 0;
+}
+
+#dismiss,
+#undismiss {
+	margin-left: 0.5em;
+}
+
 form.upgrade {
 	margin-top: 8px;
 }
@@ -1635,6 +1659,7 @@ form.upgrade .hint {
 }

 #screen-meta-links {
+	float: right;
 	margin: 0 20px 0 0;
 }

@@ -1646,18 +1671,13 @@ form.upgrade .hint {
 	background-color: #fff;
 	border: 1px solid #ddd;
 	border-top: none;
-	box-shadow: 0 1px 0 rgba(0,0,0,.025);
+	box-shadow: 0 1px 0 rgba(0, 0, 0, 0.025);
 }

 #screen-options-link-wrap,
 #contextual-help-link-wrap {
-	float: right;
-	height: 28px;
+	float: left;
 	margin: 0 0 0 6px;
-	border: 1px solid #ddd;
-	border-top: none;
-	background: #fff;
-	box-shadow: 0 1px 1px -1px rgba(0,0,0,0.1);
 }

 #screen-meta-links .screen-meta-toggle {
@@ -1666,12 +1686,17 @@ form.upgrade .hint {
 }

 #screen-meta-links .show-settings {
-	border: 0;
-	background: none;
+	border: 1px solid #ddd;
+	border-top: none;
+	border-bottom-color: #ccc;
+	height: auto;
+	margin-bottom: 0;
+	padding: 3px 6px 3px 16px;
+	background: #fff;
 	border-radius: 0;
 	color: #72777c;
 	line-height: 1.7;
-	padding: 3px 6px 3px 16px;
+	box-shadow: none;
 }

 #screen-meta-links .show-settings:hover,
@@ -1680,8 +1705,12 @@ form.upgrade .hint {
 	color: #32373c;
 }

+#screen-meta-links .show-settings:focus {
+	border-color: #5b9dd9;
+	box-shadow: 0 0 3px rgba(0, 115, 170, 0.8);
+}
+
 #screen-meta-links .show-settings:active {
-	box-shadow: none;
 	transform: none;
 }

@@ -1725,7 +1754,7 @@ form.upgrade .hint {
 #contextual-help-wrap h5 {
 	margin: 0;
 	padding: 8px 0;
- 	font-size: 13px;
+	font-size: 13px;
 	font-weight: 600;
 }

@@ -1736,7 +1765,7 @@ form.upgrade .hint {
 .metabox-prefs label {
 	display: inline-block;
 	padding-right: 15px;
-	line-height: 30px;
+	line-height: 2.35;
 }

 #number-of-columns {
@@ -1775,7 +1804,7 @@ form.upgrade .hint {
 }

 .metabox-prefs .screen-options label {
-	line-height: 28px;
+	line-height: 2.2;
 	padding-right: 0;
 }

@@ -1839,7 +1868,7 @@ form.upgrade .hint {
 .contextual-help-tabs a {
 	display: block;
 	padding: 5px 5px 5px 12px;
-	line-height: 18px;
+	line-height: 1.4;
 	text-decoration: none;
 	border: 1px solid transparent;
 	border-right: none;
@@ -1855,7 +1884,7 @@ form.upgrade .hint {
 	margin: 0 -1px 0 0;
 	border-left: 2px solid #00a0d2;
 	background: #f6fbfd;
-	box-shadow: 0 2px 0 rgba(0,0,0,0.02), 0 1px 0 rgba(0,0,0,0.02);
+	box-shadow: 0 2px 0 rgba(0, 0, 0, 0.02), 0 1px 0 rgba(0, 0, 0, 0.02);
 }

 .contextual-help-tabs .active a {
@@ -1871,7 +1900,7 @@ form.upgrade .hint {
 .help-tab-content {
 	display: none;
 	margin: 0 22px 12px 0;
-	line-height: 1.6em;
+	line-height: 1.6;
 }

 .help-tab-content.active {
@@ -1967,7 +1996,7 @@ html.wp-toolbar {
 	width: 200px;
 	text-align: center;
 	color: #ccc;
-	font-size:18px;
+	font-size: 18px;
 	display: none;
 }

@@ -2052,13 +2081,19 @@ html.wp-toolbar {
 	user-select: none;
 }

-.postbox .inside,
-.stuffbox .inside {
+.postbox .inside {
 	padding: 0 12px 12px;
-	line-height: 1.4em;
+	line-height: 1.4;
 	font-size: 13px;
 }

+.stuffbox .inside {
+	padding: 0;
+	line-height: 1.4;
+	font-size: 13px;
+	margin-top: 0;
+}
+
 .postbox .inside {
 	margin: 11px 0;
 	position: relative;
@@ -2123,7 +2158,7 @@ html.wp-toolbar {
 #wpfooter p {
 	font-size: 13px;
 	margin: 0;
-	line-height: 20px;
+	line-height: 1.55;
 }

 #footer-thankyou {
@@ -2141,7 +2176,7 @@ html.wp-toolbar {
 	margin-left: 0.5em; /* half the font size so set the font size properly */
 	padding: 5px 10px;
 	font-size: 14px;
-	line-height: 24px;
+	line-height: 1.71428571;
 	font-weight: 600;
 	background: #e5e5e5;
 	color: #555;
@@ -2153,7 +2188,7 @@ h3 .nav-tab, /* Back-compat for pre-4.4 */
 .nav-tab-small .nav-tab {
 	padding: 5px 14px;
 	font-size: 12px;
-	line-height: 16px;
+	line-height: 1.33;
 }

 .nav-tab:hover,
@@ -2193,10 +2228,10 @@ h1.nav-tab-wrapper, /* Back-compat for pre-4.4 */

 /* Back-compat for plugins. Deprecated. Use .wp-clearfix instead. */
 .nav-tab-wrapper:not(.wp-clearfix):after {
- 	content: "";
- 	display: table;
- 	clear: both;
- }
+	content: "";
+	display: table;
+	clear: both;
+}

 .ie8 .nav-tab-wrapper {
 	/* contain floats establishing a new block formatting context */
@@ -2255,7 +2290,7 @@ h1.nav-tab-wrapper, /* Back-compat for pre-4.4 */
 /* Back-compat for nav-menus screen */
 .nav-menus-php .metabox-holder h3 {
 	padding: 10px 10px 11px 14px;
-	line-height: 21px;
+	line-height: 1.5;
 }

 #templateside ul li a {
@@ -2318,7 +2353,7 @@ body.iframe {

 .importers td {
 	padding-right: 14px;
-	line-height: 1.5em;
+	line-height: 1.4;
 }

 .importers .import-system {
@@ -2343,7 +2378,7 @@ body.iframe {
 }

 .importer-action {
-	line-height: 20px; /* Same as with .updating-message */
+	line-height: 1.55; /* Same as with .updating-message */
 	color: #555;
 	margin-bottom: 1em;
 }
@@ -2354,11 +2389,8 @@ body.iframe {
 }

 .edit-comment-author {
-	font-size: 14px;
-	line-height: 1.4;
-	font-weight: 600;
 	color: #222;
-	margin: 2px 0 0 9px;
+	border-bottom: 1px solid #eee;
 }

 #namediv h3 label, /* Back-compat for pre-4.4 */
@@ -2401,7 +2433,7 @@ body.iframe {

 br.clear {
 	height: 2px;
-	line-height: 2px;
+	line-height: 0.15;
 }

 .checkbox {
@@ -2456,7 +2488,7 @@ div.star-holder .star-rating {
 	font-weight: 400;
 	font-style: normal;
 	vertical-align: top;
-	transition: color .1s ease-in 0;
+	transition: color .1s ease-in;
 	text-align: center;
 	color: #ffb900;
 }
@@ -2505,7 +2537,7 @@ div.action-links {
 	background: #f5f5f5;
 	font-size: 22px;
 	font-weight: 600;
-	line-height: 56px;
+	line-height: 2.4;
 	position: relative;
 	height: 56px;
 }
@@ -2531,15 +2563,15 @@ div.action-links {
 	font-family: "Helvetica Neue", sans-serif;
 	display: inline-block;
 	font-size: 30px;
-	line-height: 50px;
+	line-height: 1.68;
 	box-sizing: border-box;
 	max-width: 100%;
 	padding: 0 15px;
 	margin-top: 174px;
 	color: #fff;
-	background: rgba( 30, 30, 30, 0.9 );
-	text-shadow: 0 1px 3px rgba( 0, 0, 0, 0.4 );
-	box-shadow: 0 0 30px rgba( 255, 255, 255, 0.1 );
+	background: rgba(30, 30, 30, 0.9);
+	text-shadow: 0 1px 3px rgba(0, 0, 0, 0.4);
+	box-shadow: 0 0 30px rgba(255, 255, 255, 0.1);
 	border-radius: 8px;
 }

@@ -2555,7 +2587,7 @@ div.action-links {
 	height: 250px;
 	width: 100%;
 	background: transparent;
-	box-shadow: inset 0 0 50px 4px rgba( 0, 0, 0, 0.2 ), inset 0 -1px 0 rgba( 0, 0, 0, 0.1 );
+	box-shadow: inset 0 0 50px 4px rgba(0, 0, 0, 0.2), inset 0 -1px 0 rgba(0, 0, 0, 0.1);
 }

 #plugin-information-tabs {
@@ -2576,7 +2608,7 @@ div.action-links {
 	padding: 9px 10px;
 	margin: 0;
 	height: 18px;
-	line-height: 18px;
+	line-height: 1.3;
 	font-size: 14px;
 	text-decoration: none;
 	transition: none;
@@ -2624,12 +2656,17 @@ div.action-links {
 	right: 250px;
 	bottom: 0;
 	left: 0;
+	margin-top: 10px;
 	margin-right: 250px; /* FYI box */
 	padding: 10px 26px;
 	margin-bottom: -99939px; /* 60px less than the padding below to accommodate footer */
 	padding-bottom: 99999px; /* equal height column trick */
 }

+#section-holder .notice {
+	margin: 5px 0 15px;
+}
+
 #section-holder .updated {
 	margin: 16px 0;
 }
@@ -2768,7 +2805,7 @@ div.action-links {
 	max-width: 100%;
 	width: auto;
 	height: auto;
-	box-shadow: 0 1px 2px rgba( 0, 0, 0, 0.3 );
+	box-shadow: 0 1px 2px rgba(0, 0, 0, 0.3);
 }

 /* rtl:ignore */
@@ -2848,7 +2885,7 @@ div.action-links {
 	margin-right: 1em;
 }

-@media screen and ( max-width: 771px ) {
+@media screen and (max-width: 771px) {
 	#plugin-information-title.with-banner {
 		height: 100px;
 	}
@@ -2856,7 +2893,7 @@ div.action-links {
 	#plugin-information-title.with-banner h2 {
 		margin-top: 30px;
 		font-size: 20px;
-		line-height: 40px;
+		line-height: 2;
 		max-width: 85%;
 	}

@@ -2965,7 +3002,7 @@ div.action-links {
 }

 /* move plugin install close icon to top on narrow screens */
-@media screen and ( max-width: 830px ) {
+@media screen and (max-width: 830px) {
 	.plugin-details-modal #TB_closeWindowButton {
 		right: 0;
 		top: -30px;
@@ -3023,7 +3060,7 @@ img {
 .js .postbox .handlediv:focus .toggle-indicator:before {
 	box-shadow:
 		0 0 0 1px #5b9dd9,
-		0 0 2px 1px rgba(30, 140, 190, .8);
+		0 0 2px 1px rgba(30, 140, 190, 0.8);
 }

 /* @todo: appears to be Press This only and overridden */
@@ -3118,7 +3155,7 @@ img {
 }
 [role="treeitem"] .folder-label.focus {
 	color: #124964;
-	box-shadow: 0 0 0 1px #5b9dd9, 0 0 2px 1px rgba(30, 140, 190, .8);
+	box-shadow: 0 0 0 1px #5b9dd9, 0 0 2px 1px rgba(30, 140, 190, 0.8);
 }
 [role="treeitem"].hover,
 [role="treeitem"] .folder-label.hover {
@@ -3135,7 +3172,7 @@ img {

 /* Styles for folder indicators/depth */
 .tree-folder .tree-folder::after {
-	content: ' ';
+	content: "";
 	display: block;
 	position: absolute;
 	left: 2px;
@@ -3144,7 +3181,7 @@ img {
 	bottom: 10px;
 }
 .tree-folder > li::before {
-	content: ' ';
+	content: "";
 	position: absolute;
 	display: block;
 	border-left: 1px solid #ccc;
@@ -3155,7 +3192,7 @@ img {
 	border-bottom: 1px solid #ccc;
 }
 .tree-folder > li::after {
-	content: ' ';
+	content: "";
 	position: absolute;
 	display: block;
 	border-left: 1px solid #ccc;
@@ -3286,7 +3323,7 @@ img {
 }

 #documentation label {
-	line-height: 22px;
+	line-height: 1.8;
 	vertical-align: baseline;
 	font-weight: 600;
 }
@@ -3347,7 +3384,7 @@ img {
 .widget-top .widget-action:focus .toggle-indicator:before {
 	box-shadow:
 		0 0 0 1px #5b9dd9,
-		0 0 2px 1px rgba(30,140,190,.8);
+		0 0 2px 1px rgba(30, 140, 190, 0.8);
 }

 .control-section .accordion-section-title:after,
@@ -3360,7 +3397,8 @@ img {
 .control-section.open .accordion-section-title:after,
 #customize-info.open .accordion-section-title:after,
 .nav-menus-php .menu-item-edit-active .item-edit:before,
-.widget.open .widget-top .widget-action .toggle-indicator:before {
+.widget.open .widget-top .widget-action .toggle-indicator:before,
+.widget.widget-in-question .widget-top .widget-action .toggle-indicator:before {
 	content: "\f142";
 }

@@ -3444,7 +3482,7 @@ img {
 	border-left: none;
 	border-right: none;
 	padding: 10px 10px 11px 14px;
-	line-height: 21px;
+	line-height: 1.55;
 	background: #fff;
 }

@@ -3653,11 +3691,15 @@ img {
 	width: device-width;
 }

-@media screen and ( max-width: 782px ) {
+@media screen and (max-width: 782px) {
 	html.wp-toolbar {
 		padding-top: 46px;
 	}

+	.screen-reader-shortcut:focus {
+		top: -39px;
+	}
+
 	body {
 		min-width: 240px;
 		overflow-x: hidden;
@@ -3678,6 +3720,7 @@ img {
 	}

 	.wrap {
+		clear: both;
 		margin-right: 12px;
 		margin-left: 0;
 	}
@@ -3695,8 +3738,6 @@ img {
 	}

 	/* Hidden Elements */
-	#screen-meta,
-	#screen-meta-links,
 	#collapse-menu,
 	.post-format-select {
 		display: none !important;
@@ -3895,7 +3936,7 @@ img {

 	.filter-drawer .filter-group-feature input,
 	.filter-drawer .filter-group-feature label {
-		line-height: 25px;
+		line-height: 2.1;
 	}

 	.filter-drawer .filter-group-feature label {
@@ -3904,9 +3945,44 @@ img {

 	.wp-filter .button.drawer-toggle {
 		font-size: 13px;
-		line-height: 26px;
+		line-height: 2;
 		height: 28px;
 	}
+
+	/* Fix help tab columns for smaller screens */
+	#screen-meta #contextual-help-wrap {
+		overflow: visible;
+	}
+
+	#screen-meta #contextual-help-back,
+	#screen-meta .contextual-help-sidebar {
+		display: none;
+	}
+
+	#screen-meta .contextual-help-tabs {
+		clear: both;
+		width: 100%;
+		float: none;
+	}
+
+	#screen-meta .contextual-help-tabs ul {
+		margin: 0 0 1em;
+		padding: 1em 0 0;
+	}
+
+	#screen-meta .contextual-help-tabs .active {
+		margin: 0;
+	}
+
+	#screen-meta .contextual-help-tabs-wrap {
+		clear: both;
+		max-width: 100%;
+		float: none;
+	}
+
+	#screen-meta-links {
+		margin-bottom: 20px; /* Add margins beneath links for better spacing between boxes and elements */
+	}
 }

 /* Smartphone */
@@ -3921,6 +3997,10 @@ img {
 		padding-top: 0;
 	}

+	.screen-reader-shortcut:focus {
+		top: 7px;
+	}
+
 	#wpbody {
 		padding-top: 46px;
 	}
@@ -3938,10 +4018,17 @@ img {

 	h1 .nav-tab,
 	h2 .nav-tab,
-	h3 .nav-tab {
+	h3 .nav-tab,
+	nav .nav-tab {
 		margin: 10px 10px 0 0;
 		border-bottom: 1px solid #ccc;
 	}
+
+	.nav-tab-active:hover,
+	.nav-tab-active:focus,
+	.nav-tab-active:focus:active {
+		border-bottom: 1px solid #ccc;
+	}
 }

@media screen and (max-width: 320px) {
--- a/wp-admin/css/common.min.css
+++ b/wp-admin/css/common.min.css
--- a/wp-admin/css/customize-controls-rtl.css
+++ b/wp-admin/css/customize-controls-rtl.css
@@ -21,7 +21,7 @@ body {
 }

 #customize-controls #customize-notifications-area .notice.notification-overlay.notification-changeset-locked {
-	background-color: rgba( 0, 0, 0, 0.7 );
+	background-color: rgba(0, 0, 0, 0.7);
 	padding: 25px;
 }

@@ -34,7 +34,7 @@ body {
 	padding: 25px 109px 25px 25px;
 	position: relative;
 	background: #fff;
-	box-shadow: 0 3px 6px rgba( 0, 0, 0, 0.3 );
+	box-shadow: 0 3px 6px rgba(0, 0, 0, 0.3);
 	line-height: 1.5;
 	overflow-y: auto;
 	text-align: right;
@@ -392,7 +392,7 @@ body.trashing #publish-settings {
 	position: absolute;
 	z-index: 9;
 	width: 100%;
-	box-shadow: 0 1px 0 rgba(0, 0, 0, .1);
+	box-shadow: 0 1px 0 rgba(0, 0, 0, 0.1);
 }

 #customize-controls .customize-section-title.is-in-view {
@@ -430,7 +430,7 @@ body.trashing #publish-settings {

 #customize-controls .customize-info .preview-notice {
 	font-size: 13px;
-	line-height: 24px;
+	line-height: 1.9;
 }

 #customize-controls .customize-pane-child .customize-section-title h3,
@@ -533,9 +533,10 @@ body.trashing #publish-settings {
 	background-color: #fff;
 	border-bottom: 1px solid #ddd;
 	border-right: 4px solid #fff;
-	transition: .15s color ease-in-out,
-	            .15s background-color ease-in-out,
-	            .15s border-color ease-in-out;
+	transition:
+		.15s color ease-in-out,
+		.15s background-color ease-in-out,
+		.15s border-color ease-in-out;
 }

 #customize-controls #customize-theme-controls .customize-themes-panel .accordion-section-title {
@@ -785,9 +786,10 @@ h3.customize-section-title {
 	color: #444;
 	text-align: right;
 	cursor: pointer;
-	transition: color .15s ease-in-out,
-	            border-color .15s ease-in-out,
-	            background .15s ease-in-out;
+	transition:
+		color .15s ease-in-out,
+		border-color .15s ease-in-out,
+		background .15s ease-in-out;
 	box-sizing: content-box;
 }

@@ -805,9 +807,10 @@ h3.customize-section-title {
 	border-right: 4px solid #fff;
 	box-shadow: none;
 	cursor: pointer;
-	transition: color .15s ease-in-out,
-	            border-color .15s ease-in-out,
-	            background .15s ease-in-out;
+	transition:
+		color .15s ease-in-out,
+		border-color .15s ease-in-out,
+		background .15s ease-in-out;
 }

 .customize-section-back {
@@ -915,7 +918,7 @@ p.customize-section-description {
 .customize-control select,
 .customize-control input[type="radio"],
 .customize-control input[type="checkbox"] {
-	line-height: 28px;
+	line-height: 2;
 }

 .customize-control input[type="text"],
@@ -926,7 +929,7 @@ p.customize-section-description {
 .customize-control input[type="tel"],
 .customize-control input[type="url"] {
 	width: 100%;
-	line-height: 18px;
+	line-height: 1.3;
 	margin: 0;
 }

@@ -942,7 +945,7 @@ p.customize-section-description {
 .customize-control select {
 	width: 100%;
 	height: 28px;
-	line-height: 28px;
+	line-height: 2;
 }

 .customize-control select[multiple] {
@@ -952,7 +955,7 @@ p.customize-section-description {
 .customize-control-title {
 	display: block;
 	font-size: 14px;
-	line-height: 24px;
+	line-height: 1.75;
 	font-weight: 600;
 	margin-bottom: 4px;
 }
@@ -960,7 +963,7 @@ p.customize-section-description {
 .customize-control-description {
 	display: block;
 	font-style: italic;
-	line-height: 18px;
+	line-height: 1.4;
 	margin-top: 0;
 	margin-bottom: 5px;
 }
@@ -981,7 +984,7 @@ p.customize-section-description {
 }

 .customize-control .customize-inside-control-row {
-	line-height: 20px;
+	line-height: 1.6;
 	display: block;
 	margin-right: 24px;
 	padding-top: 6px;
@@ -1001,7 +1004,7 @@ p.customize-section-description {

 .customize-control-radio .customize-control-title {
 	margin-bottom: 0;
-	line-height: 22px;
+	line-height: 1.6;
 }

 .customize-control-radio .customize-control-title + .customize-control-description {
@@ -1095,7 +1098,7 @@ p.customize-section-description {
 .customize-control-dropdown-pages .add-new-toggle {
 	margin-right: 1px;
 	font-weight: 600;
-	line-height: 28px;
+	line-height: 2.2;
 }

 #customize-preview iframe {
@@ -1376,6 +1379,7 @@ p.customize-section-description {
 }

 .customize-control .attachment-media-view .placeholder,
+.customize-control .attachment-media-view .button-add-media,
 .customize-control-header .placeholder {
 	width: 100%;
 	position: relative;
@@ -1384,7 +1388,27 @@ p.customize-section-description {
 	border: 1px dashed #b4b9be;
 	box-sizing: border-box;
 	padding: 9px 0;
-	line-height: 20px;
+	line-height: 1.6;
+}
+
+.customize-control .attachment-media-view .button-add-media {
+	cursor: pointer;
+	background-color: #edeff0;
+	color: #32373c;
+}
+
+.customize-control .attachment-media-view .button-add-media:hover {
+	background-color: #fbfbfc;
+}
+
+.customize-control .attachment-media-view .button-add-media:focus {
+	background-color: #fbfbfc;
+	border-style: solid;
+	border-color: #5b9dd9;
+	box-shadow: 0 0 3px rgba( 0, 115, 170, .8 );
+	/* Only visible in Windows High Contrast mode */
+	outline: 2px solid transparent;
+	outline-offset: -2px;
 }

 .customize-control-header .inner {
@@ -1428,7 +1452,7 @@ p.customize-section-description {
 }

 .customize-control-header .header-view.selected:after {
-	content: '';
+	content: "";
 	position: absolute;
 	height: auto;
 	top: 0;
@@ -1529,7 +1553,7 @@ p.customize-section-description {
 	outline: none;
 	box-shadow:
 		0 0 0 1px #5b9dd9,
-		0 0 3px 1px rgba(30, 140, 190, .8);
+		0 0 3px 1px rgba(30, 140, 190, 0.8);
 }

 .customize-control-header .uploaded div:last-child > .choice {
@@ -1621,10 +1645,10 @@ p.customize-section-description {
 .theme-browser .theme.active .theme-actions,
 .wp-customizer .theme-browser .theme .theme-actions {
 	padding: 10px 15px;
-	box-shadow: inset 0 1px 0 rgba(0,0,0,0.1);
+	box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.1);
 }

-@media screen and ( max-width: 640px ) {
+@media screen and (max-width: 640px) {
 	.customize-section-description-container + #customize-control-custom_css:last-child {
 		margin-left: 0;
 	}
@@ -1772,18 +1796,18 @@ p.customize-section-description {
 }

 .themes-filter-bar .feature-filter-toggle:before {
-    content: "\f111";
-    margin: 0 0 0 5px;
-    font: normal 16px/1 dashicons;
-    vertical-align: text-bottom;
-    -webkit-font-smoothing: antialiased;
-    -moz-osx-font-smoothing: grayscale;
+	content: "\f111";
+	margin: 0 0 0 5px;
+	font: normal 16px/1 dashicons;
+	vertical-align: text-bottom;
+	-webkit-font-smoothing: antialiased;
+	-moz-osx-font-smoothing: grayscale;
 }

 .themes-filter-bar .feature-filter-toggle.open {
 	background: #eee;
 	border-color: #999;
-	box-shadow: inset 0 2px 5px -3px rgba( 0, 0, 0, 0.5 );
+	box-shadow: inset 0 2px 5px -3px rgba(0, 0, 0, 0.5);
 	transform: translateY(1px);
 }

@@ -1835,7 +1859,7 @@ p.customize-section-description {
 .control-panel-themes .filter-themes-count {
 	position: relative;
 	float: left;
-	line-height: 34px;
+	line-height: 2.6;
 }

 .control-panel-themes .filter-themes-count .themes-displayed {
@@ -2064,7 +2088,7 @@ p.customize-section-description {
 }

 .themes-filter-bar .wp-filter-search {
-	line-height: 25px;
+	line-height: 1.8;
 	padding: 6px 30px 6px 10px;
 	max-width: 100%;
 	width: 40%;
@@ -2078,7 +2102,7 @@ p.customize-section-description {

 /* Unstick the filter bar on short windows/screens. This breakpoint is based on the
   current length of .org feature filters assuming translations do not wrap lines. */
-@media screen and (max-height:540px), screen and (max-width:1018px) {
+@media screen and (max-height: 540px), screen and (max-width: 1018px) {
 	.customize-preview-header.themes-filter-bar {
 		position: relative;
 		right: 0;
@@ -2101,13 +2125,13 @@ p.customize-section-description {
 	}
 }

-@media screen and (max-width:1018px) {
+@media screen and (max-width: 1018px) {
 	.filter-drawer .filter-group {
 		width: calc( (100% - 50px) / 2);
 	}
 }

-@media screen and (max-width:900px) {
+@media screen and (max-width: 900px) {
 	.customize-preview-header.themes-filter-bar {
 		height: 86px;
 		padding-top: 46px;
@@ -2128,7 +2152,7 @@ p.customize-section-description {
 	}
 }

-@media screen and (max-width:792px) {
+@media screen and (max-width: 792px) {
 	.filter-drawer .filter-group {
 		width: calc( 100% - 25px);
 	}
@@ -2139,7 +2163,7 @@ p.customize-section-description {
 }

 /* Mobile - toggle between themes and filters */
-@media screen and (max-width:600px) {
+@media screen and (max-width: 600px) {

 	.filter-drawer {
 		top: 132px;
@@ -2192,7 +2216,7 @@ p.customize-section-description {
 		height: 46px;
 		width: 26px;
 		display: block;
-		line-height: 46px;
+		line-height: 2.3;
 		padding: 0 8px 0 8px;
 		border-left: 1px solid #ddd;
 	}
@@ -2242,7 +2266,7 @@ p.customize-section-description {
 }

 .wp-customizer .theme-overlay .theme-backdrop {
-	background: rgba( 238, 238, 238, 0.75 );
+	background: rgba(238, 238, 238, 0.75);
 	position: fixed;
 	z-index: 110;
 }
@@ -2320,7 +2344,7 @@ p.customize-section-description {
 }

 /* Small Screens */
-@media (max-width:850px), (max-height:472px) {
+@media (max-width: 850px), (max-height: 472px) {
 	.wp-customizer .theme-overlay .theme-wrap {
 		right: 0;
 		left: 0;
@@ -2342,7 +2366,7 @@ body.cheatin {
 	padding: 1em 2em;
 	max-width: 700px;
 	min-width: 0;
-	box-shadow: 0 1px 3px rgba(0,0,0,0.13);
+	box-shadow: 0 1px 3px rgba(0, 0, 0, 0.13);
 }

 body.cheatin h1 {
@@ -2588,7 +2612,7 @@ body.adding-widget .add-new-widget:before,
 	right: 16px;
 	width: 30px;
 	height: 30px;
-	line-height: 28px;
+	line-height: 2.1;
 	text-align: center;
 	color: #72777c;
 }
@@ -2640,7 +2664,7 @@ body.adding-widget .add-new-widget:before,
 #available-menu-items-search .clear-results:focus {
 	box-shadow:
 		0 0 0 1px #5b9dd9,
-		0 0 2px 1px rgba(30, 140, 190, .8);
+		0 0 2px 1px rgba(30, 140, 190, 0.8);
 }

 #available-menu-items-search .search-icon:after,
@@ -2692,9 +2716,10 @@ body.adding-widget .add-new-widget:before,
 	background: #fff;
 	border-bottom: 1px solid #ddd;
 	border-right: 4px solid #fff;
-	transition: .15s color ease-in-out,
-	            .15s background-color ease-in-out,
-	            .15s border-color ease-in-out;
+	transition:
+		.15s color ease-in-out,
+		.15s background-color ease-in-out,
+		.15s border-color ease-in-out;
 	cursor: pointer;
 	display: none;
 }
@@ -2738,7 +2763,7 @@ body.adding-widget .add-new-widget:before,

 	.customize-control input[type="radio"] + label + br,
 	.customize-control input[type="checkbox"] + label + br {
-		line-height: 32px; /* For widgets checkboxes */
+		line-height: 2.5; /* For widgets checkboxes */
 	}

 	.customize-control .date-time-fields select {
@@ -2782,7 +2807,7 @@ body.adding-widget .add-new-widget:before,
 	}
 }

-@media screen and ( max-width: 1200px ) {
+@media screen and (max-width: 1200px) {
 	.outer-section-open .wp-full-overlay.expanded.preview-mobile .wp-full-overlay-main,
 	.adding-menu-items .wp-full-overlay.expanded.preview-mobile .wp-full-overlay-main,
 	.adding-widget .wp-full-overlay.expanded.preview-mobile .wp-full-overlay-main {
@@ -2790,7 +2815,7 @@ body.adding-widget .add-new-widget:before,
 	}
 }

-@media screen and ( max-width: 640px ) {
+@media screen and (max-width: 640px) {

 	/* when the sidebar is collapsed and switching to responsive view,
 	   bring it back see ticket #35220 */
@@ -2807,7 +2832,7 @@ body.adding-widget .add-new-widget:before,
 		position: absolute;
 		top: 0;
 		right: 48px;
-		line-height: 45px;
+		line-height: 3.2;
 		font-size: 14px;
 		padding: 0 12px;
 		margin: 0;
@@ -2938,11 +2963,11 @@ body.adding-widget .add-new-widget:before,
 	.theme-browser .theme.active .theme-actions,
 	.wp-customizer .theme-browser .theme .theme-actions {
 		padding: 9px 15px;
-		box-shadow: inset 0 1px 0 rgba(0,0,0,0.1);
+		box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.1);
 	}
 }

-@media screen and ( max-width: 600px ) {
+@media screen and (max-width: 600px) {
 	.theme-browser .theme.active .theme-actions,
 	.wp-customizer .theme-browser .theme .theme-actions {
 		padding: 8px 15px;
--- a/wp-admin/css/customize-controls-rtl.min.css
+++ b/wp-admin/css/customize-controls-rtl.min.css
--- a/wp-admin/css/customize-controls.css
+++ b/wp-admin/css/customize-controls.css
@@ -21,7 +21,7 @@ body {
 }

 #customize-controls #customize-notifications-area .notice.notification-overlay.notification-changeset-locked {
-	background-color: rgba( 0, 0, 0, 0.7 );
+	background-color: rgba(0, 0, 0, 0.7);
 	padding: 25px;
 }

@@ -34,7 +34,7 @@ body {
 	padding: 25px 25px 25px 109px;
 	position: relative;
 	background: #fff;
-	box-shadow: 0 3px 6px rgba( 0, 0, 0, 0.3 );
+	box-shadow: 0 3px 6px rgba(0, 0, 0, 0.3);
 	line-height: 1.5;
 	overflow-y: auto;
 	text-align: left;
@@ -392,7 +392,7 @@ body.trashing #publish-settings {
 	position: absolute;
 	z-index: 9;
 	width: 100%;
-	box-shadow: 0 1px 0 rgba(0, 0, 0, .1);
+	box-shadow: 0 1px 0 rgba(0, 0, 0, 0.1);
 }

 #customize-controls .customize-section-title.is-in-view {
@@ -430,7 +430,7 @@ body.trashing #publish-settings {

 #customize-controls .customize-info .preview-notice {
 	font-size: 13px;
-	line-height: 24px;
+	line-height: 1.9;
 }

 #customize-controls .customize-pane-child .customize-section-title h3,
@@ -533,9 +533,10 @@ body.trashing #publish-settings {
 	background-color: #fff;
 	border-bottom: 1px solid #ddd;
 	border-left: 4px solid #fff;
-	transition: .15s color ease-in-out,
-	            .15s background-color ease-in-out,
-	            .15s border-color ease-in-out;
+	transition:
+		.15s color ease-in-out,
+		.15s background-color ease-in-out,
+		.15s border-color ease-in-out;
 }

 #customize-controls #customize-theme-controls .customize-themes-panel .accordion-section-title {
@@ -785,9 +786,10 @@ h3.customize-section-title {
 	color: #444;
 	text-align: left;
 	cursor: pointer;
-	transition: color .15s ease-in-out,
-	            border-color .15s ease-in-out,
-	            background .15s ease-in-out;
+	transition:
+		color .15s ease-in-out,
+		border-color .15s ease-in-out,
+		background .15s ease-in-out;
 	box-sizing: content-box;
 }

@@ -805,9 +807,10 @@ h3.customize-section-title {
 	border-left: 4px solid #fff;
 	box-shadow: none;
 	cursor: pointer;
-	transition: color .15s ease-in-out,
-	            border-color .15s ease-in-out,
-	            background .15s ease-in-out;
+	transition:
+		color .15s ease-in-out,
+		border-color .15s ease-in-out,
+		background .15s ease-in-out;
 }

 .customize-section-back {
@@ -915,7 +918,7 @@ p.customize-section-description {
 .customize-control select,
 .customize-control input[type="radio"],
 .customize-control input[type="checkbox"] {
-	line-height: 28px;
+	line-height: 2;
 }

 .customize-control input[type="text"],
@@ -926,7 +929,7 @@ p.customize-section-description {
 .customize-control input[type="tel"],
 .customize-control input[type="url"] {
 	width: 100%;
-	line-height: 18px;
+	line-height: 1.3;
 	margin: 0;
 }

@@ -942,7 +945,7 @@ p.customize-section-description {
 .customize-control select {
 	width: 100%;
 	height: 28px;
-	line-height: 28px;
+	line-height: 2;
 }

 .customize-control select[multiple] {
@@ -952,7 +955,7 @@ p.customize-section-description {
 .customize-control-title {
 	display: block;
 	font-size: 14px;
-	line-height: 24px;
+	line-height: 1.75;
 	font-weight: 600;
 	margin-bottom: 4px;
 }
@@ -960,7 +963,7 @@ p.customize-section-description {
 .customize-control-description {
 	display: block;
 	font-style: italic;
-	line-height: 18px;
+	line-height: 1.4;
 	margin-top: 0;
 	margin-bottom: 5px;
 }
@@ -981,7 +984,7 @@ p.customize-section-description {
 }

 .customize-control .customize-inside-control-row {
-	line-height: 20px;
+	line-height: 1.6;
 	display: block;
 	margin-left: 24px;
 	padding-top: 6px;
@@ -1001,7 +1004,7 @@ p.customize-section-description {

 .customize-control-radio .customize-control-title {
 	margin-bottom: 0;
-	line-height: 22px;
+	line-height: 1.6;
 }

 .customize-control-radio .customize-control-title + .customize-control-description {
@@ -1095,7 +1098,7 @@ p.customize-section-description {
 .customize-control-dropdown-pages .add-new-toggle {
 	margin-left: 1px;
 	font-weight: 600;
-	line-height: 28px;
+	line-height: 2.2;
 }

 #customize-preview iframe {
@@ -1376,6 +1379,7 @@ p.customize-section-description {
 }

 .customize-control .attachment-media-view .placeholder,
+.customize-control .attachment-media-view .button-add-media,
 .customize-control-header .placeholder {
 	width: 100%;
 	position: relative;
@@ -1384,7 +1388,27 @@ p.customize-section-description {
 	border: 1px dashed #b4b9be;
 	box-sizing: border-box;
 	padding: 9px 0;
-	line-height: 20px;
+	line-height: 1.6;
+}
+
+.customize-control .attachment-media-view .button-add-media {
+	cursor: pointer;
+	background-color: #edeff0;
+	color: #32373c;
+}
+
+.customize-control .attachment-media-view .button-add-media:hover {
+	background-color: #fbfbfc;
+}
+
+.customize-control .attachment-media-view .button-add-media:focus {
+	background-color: #fbfbfc;
+	border-style: solid;
+	border-color: #5b9dd9;
+	box-shadow: 0 0 3px rgba( 0, 115, 170, .8 );
+	/* Only visible in Windows High Contrast mode */
+	outline: 2px solid transparent;
+	outline-offset: -2px;
 }

 .customize-control-header .inner {
@@ -1428,7 +1452,7 @@ p.customize-section-description {
 }

 .customize-control-header .header-view.selected:after {
-	content: '';
+	content: "";
 	position: absolute;
 	height: auto;
 	top: 0;
@@ -1529,7 +1553,7 @@ p.customize-section-description {
 	outline: none;
 	box-shadow:
 		0 0 0 1px #5b9dd9,
-		0 0 3px 1px rgba(30, 140, 190, .8);
+		0 0 3px 1px rgba(30, 140, 190, 0.8);
 }

 .customize-control-header .uploaded div:last-child > .choice {
@@ -1621,10 +1645,10 @@ p.customize-section-description {
 .theme-browser .theme.active .theme-actions,
 .wp-customizer .theme-browser .theme .theme-actions {
 	padding: 10px 15px;
-	box-shadow: inset 0 1px 0 rgba(0,0,0,0.1);
+	box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.1);
 }

-@media screen and ( max-width: 640px ) {
+@media screen and (max-width: 640px) {
 	.customize-section-description-container + #customize-control-custom_css:last-child {
 		margin-right: 0;
 	}
@@ -1772,18 +1796,18 @@ p.customize-section-description {
 }

 .themes-filter-bar .feature-filter-toggle:before {
-    content: "\f111";
-    margin: 0 5px 0 0;
-    font: normal 16px/1 dashicons;
-    vertical-align: text-bottom;
-    -webkit-font-smoothing: antialiased;
-    -moz-osx-font-smoothing: grayscale;
+	content: "\f111";
+	margin: 0 5px 0 0;
+	font: normal 16px/1 dashicons;
+	vertical-align: text-bottom;
+	-webkit-font-smoothing: antialiased;
+	-moz-osx-font-smoothing: grayscale;
 }

 .themes-filter-bar .feature-filter-toggle.open {
 	background: #eee;
 	border-color: #999;
-	box-shadow: inset 0 2px 5px -3px rgba( 0, 0, 0, 0.5 );
+	box-shadow: inset 0 2px 5px -3px rgba(0, 0, 0, 0.5);
 	transform: translateY(1px);
 }

@@ -1835,7 +1859,7 @@ p.customize-section-description {
 .control-panel-themes .filter-themes-count {
 	position: relative;
 	float: right;
-	line-height: 34px;
+	line-height: 2.6;
 }

 .control-panel-themes .filter-themes-count .themes-displayed {
@@ -2064,7 +2088,7 @@ p.customize-section-description {
 }

 .themes-filter-bar .wp-filter-search {
-	line-height: 25px;
+	line-height: 1.8;
 	padding: 6px 10px 6px 30px;
 	max-width: 100%;
 	width: 40%;
@@ -2078,7 +2102,7 @@ p.customize-section-description {

 /* Unstick the filter bar on short windows/screens. This breakpoint is based on the
   current length of .org feature filters assuming translations do not wrap lines. */
-@media screen and (max-height:540px), screen and (max-width:1018px) {
+@media screen and (max-height: 540px), screen and (max-width: 1018px) {
 	.customize-preview-header.themes-filter-bar {
 		position: relative;
 		left: 0;
@@ -2101,13 +2125,13 @@ p.customize-section-description {
 	}
 }

-@media screen and (max-width:1018px) {
+@media screen and (max-width: 1018px) {
 	.filter-drawer .filter-group {
 		width: calc( (100% - 50px) / 2);
 	}
 }

-@media screen and (max-width:900px) {
+@media screen and (max-width: 900px) {
 	.customize-preview-header.themes-filter-bar {
 		height: 86px;
 		padding-top: 46px;
@@ -2128,7 +2152,7 @@ p.customize-section-description {
 	}
 }

-@media screen and (max-width:792px) {
+@media screen and (max-width: 792px) {
 	.filter-drawer .filter-group {
 		width: calc( 100% - 25px);
 	}
@@ -2139,7 +2163,7 @@ p.customize-section-description {
 }

 /* Mobile - toggle between themes and filters */
-@media screen and (max-width:600px) {
+@media screen and (max-width: 600px) {

 	.filter-drawer {
 		top: 132px;
@@ -2192,7 +2216,7 @@ p.customize-section-description {
 		height: 46px;
 		width: 26px;
 		display: block;
-		line-height: 46px;
+		line-height: 2.3;
 		padding: 0 8px 0 8px;
 		border-right: 1px solid #ddd;
 	}
@@ -2242,7 +2266,7 @@ p.customize-section-description {
 }

 .wp-customizer .theme-overlay .theme-backdrop {
-	background: rgba( 238, 238, 238, 0.75 );
+	background: rgba(238, 238, 238, 0.75);
 	position: fixed;
 	z-index: 110;
 }
@@ -2320,7 +2344,7 @@ p.customize-section-description {
 }

 /* Small Screens */
-@media (max-width:850px), (max-height:472px) {
+@media (max-width: 850px), (max-height: 472px) {
 	.wp-customizer .theme-overlay .theme-wrap {
 		left: 0;
 		right: 0;
@@ -2342,7 +2366,7 @@ body.cheatin {
 	padding: 1em 2em;
 	max-width: 700px;
 	min-width: 0;
-	box-shadow: 0 1px 3px rgba(0,0,0,0.13);
+	box-shadow: 0 1px 3px rgba(0, 0, 0, 0.13);
 }

 body.cheatin h1 {
@@ -2588,7 +2612,7 @@ body.adding-widget .add-new-widget:before,
 	left: 16px;
 	width: 30px;
 	height: 30px;
-	line-height: 28px;
+	line-height: 2.1;
 	text-align: center;
 	color: #72777c;
 }
@@ -2640,7 +2664,7 @@ body.adding-widget .add-new-widget:before,
 #available-menu-items-search .clear-results:focus {
 	box-shadow:
 		0 0 0 1px #5b9dd9,
-		0 0 2px 1px rgba(30, 140, 190, .8);
+		0 0 2px 1px rgba(30, 140, 190, 0.8);
 }

 #available-menu-items-search .search-icon:after,
@@ -2692,9 +2716,10 @@ body.adding-widget .add-new-widget:before,
 	background: #fff;
 	border-bottom: 1px solid #ddd;
 	border-left: 4px solid #fff;
-	transition: .15s color ease-in-out,
-	            .15s background-color ease-in-out,
-	            .15s border-color ease-in-out;
+	transition:
+		.15s color ease-in-out,
+		.15s background-color ease-in-out,
+		.15s border-color ease-in-out;
 	cursor: pointer;
 	display: none;
 }
@@ -2738,7 +2763,7 @@ body.adding-widget .add-new-widget:before,

 	.customize-control input[type="radio"] + label + br,
 	.customize-control input[type="checkbox"] + label + br {
-		line-height: 32px; /* For widgets checkboxes */
+		line-height: 2.5; /* For widgets checkboxes */
 	}

 	.customize-control .date-time-fields select {
@@ -2782,7 +2807,7 @@ body.adding-widget .add-new-widget:before,
 	}
 }

-@media screen and ( max-width: 1200px ) {
+@media screen and (max-width: 1200px) {
 	.outer-section-open .wp-full-overlay.expanded.preview-mobile .wp-full-overlay-main,
 	.adding-menu-items .wp-full-overlay.expanded.preview-mobile .wp-full-overlay-main,
 	.adding-widget .wp-full-overlay.expanded.preview-mobile .wp-full-overlay-main {
@@ -2790,7 +2815,7 @@ body.adding-widget .add-new-widget:before,
 	}
 }

-@media screen and ( max-width: 640px ) {
+@media screen and (max-width: 640px) {

 	/* when the sidebar is collapsed and switching to responsive view,
 	   bring it back see ticket #35220 */
@@ -2807,7 +2832,7 @@ body.adding-widget .add-new-widget:before,
 		position: absolute;
 		top: 0;
 		left: 48px;
-		line-height: 45px;
+		line-height: 3.2;
 		font-size: 14px;
 		padding: 0 12px;
 		margin: 0;
@@ -2938,11 +2963,11 @@ body.adding-widget .add-new-widget:before,
 	.theme-browser .theme.active .theme-actions,
 	.wp-customizer .theme-browser .theme .theme-actions {
 		padding: 9px 15px;
-		box-shadow: inset 0 1px 0 rgba(0,0,0,0.1);
+		box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.1);
 	}
 }

-@media screen and ( max-width: 600px ) {
+@media screen and (max-width: 600px) {
 	.theme-browser .theme.active .theme-actions,
 	.wp-customizer .theme-browser .theme .theme-actions {
 		padding: 8px 15px;
--- a/wp-admin/css/customize-controls.min.css
+++ b/wp-admin/css/customize-controls.min.css
--- a/wp-admin/css/customize-nav-menus-rtl.css
+++ b/wp-admin/css/customize-nav-menus-rtl.css
@@ -37,7 +37,7 @@
 .customize-control-nav_menu_location .create-menu {
 	margin-right: 6px;
 	vertical-align: middle;
-	line-height: 28px;
+	line-height: 2.2;
 }

 #customize-controls .customize-control-nav_menu_name {
@@ -794,7 +794,7 @@ body.adding-menu-items #customize-preview iframe {
 }

 #accordion-section-add_menu .customize-add-menu-button {
-	font-weight: normal;
+	font-weight: 400;
 }

 #create-new-menu-submit {
@@ -870,17 +870,17 @@ li.assigned-to-menu-location .add-new-menu-item {
 #available-menu-items .item-add:focus:before {
 	box-shadow:
 		0 0 0 1px #5b9dd9,
-		0 0 2px 1px rgba(30, 140, 190, .8);
+		0 0 2px 1px rgba(30, 140, 190, 0.8);
 }


-@media screen and ( max-width: 782px ) {
+@media screen and (max-width: 782px) {
 	#available-menu-items #available-menu-items-search .accordion-section-content {
 		top: 63px;
 	}
 }

-@media screen and ( max-width: 640px ) {
+@media screen and (max-width: 640px) {
 	#available-menu-items #available-menu-items-search .accordion-section-content {
 		top: 130px;
 	}
--- a/wp-admin/css/customize-nav-menus-rtl.min.css
+++ b/wp-admin/css/customize-nav-menus-rtl.min.css
--- a/wp-admin/css/customize-nav-menus.css
+++ b/wp-admin/css/customize-nav-menus.css
@@ -37,7 +37,7 @@
 .customize-control-nav_menu_location .create-menu {
 	margin-left: 6px;
 	vertical-align: middle;
-	line-height: 28px;
+	line-height: 2.2;
 }

 #customize-controls .customize-control-nav_menu_name {
@@ -794,7 +794,7 @@ body.adding-menu-items #customize-preview iframe {
 }

 #accordion-section-add_menu .customize-add-menu-button {
-	font-weight: normal;
+	font-weight: 400;
 }

 #create-new-menu-submit {
@@ -870,17 +870,17 @@ li.assigned-to-menu-location .add-new-menu-item {
 #available-menu-items .item-add:focus:before {
 	box-shadow:
 		0 0 0 1px #5b9dd9,
-		0 0 2px 1px rgba(30, 140, 190, .8);
+		0 0 2px 1px rgba(30, 140, 190, 0.8);
 }


-@media screen and ( max-width: 782px ) {
+@media screen and (max-width: 782px) {
 	#available-menu-items #available-menu-items-search .accordion-section-content {
 		top: 63px;
 	}
 }

-@media screen and ( max-width: 640px ) {
+@media screen and (max-width: 640px) {
 	#available-menu-items #available-menu-items-search .accordion-section-content {
 		top: 130px;
 	}
--- a/wp-admin/css/customize-nav-menus.min.css
+++ b/wp-admin/css/customize-nav-menus.min.css
--- a/wp-admin/css/customize-widgets-rtl.css
+++ b/wp-admin/css/customize-widgets-rtl.css
@@ -112,7 +112,7 @@
 .control-section.accordion-section.highlighted > .accordion-section-title,
 .customize-control-widget_form.highlighted {
 	outline: none;
-	box-shadow: 0 0 2px rgba(30,140,190,0.8);
+	box-shadow: 0 0 2px rgba(30, 140, 190, 0.8);
 	position: relative;
 	z-index: 1;
 }
@@ -189,7 +189,7 @@

 #customize-theme-controls .widget-area-select .selected {
 	color: #fff;
-	text-shadow: 0 -1px 0 rgba(0,0,0,.4);
+	text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.4);
 	background: #00a0d2;
 }

@@ -235,6 +235,11 @@
 	width: auto !important;
 }

+/* Keep rule that is no longer necessary on widgets.php. */
+#available-widgets .widget-action {
+	display: none;
+}
+
 .ios #available-widgets {
 	transition: right 0s;
 }
--- a/wp-admin/css/customize-widgets-rtl.min.css
+++ b/wp-admin/css/customize-widgets-rtl.min.css
--- a/wp-admin/css/customize-widgets.css
+++ b/wp-admin/css/customize-widgets.css
@@ -112,7 +112,7 @@
 .control-section.accordion-section.highlighted > .accordion-section-title,
 .customize-control-widget_form.highlighted {
 	outline: none;
-	box-shadow: 0 0 2px rgba(30,140,190,0.8);
+	box-shadow: 0 0 2px rgba(30, 140, 190, 0.8);
 	position: relative;
 	z-index: 1;
 }
@@ -189,7 +189,7 @@

 #customize-theme-controls .widget-area-select .selected {
 	color: #fff;
-	text-shadow: 0 -1px 0 rgba(0,0,0,.4);
+	text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.4);
 	background: #00a0d2;
 }

@@ -235,6 +235,11 @@
 	width: auto !important;
 }

+/* Keep rule that is no longer necessary on widgets.php. */
+#available-widgets .widget-action {
+	display: none;
+}
+
 .ios #available-widgets {
 	transition: left 0s;
 }
--- a/wp-admin/css/customize-widgets.min.css
+++ b/wp-admin/css/customize-widgets.min.css
--- a/wp-admin/css/dashboard-rtl.css
+++ b/wp-admin/css/dashboard-rtl.css
@@ -104,7 +104,7 @@
 	margin: 16px 0;
 	padding: 23px 10px 0;
 	border: 1px solid #e5e5e5;
-	box-shadow: 0 1px 1px rgba(0,0,0,0.04);
+	box-shadow: 0 1px 1px rgba(0, 0, 0, 0.04);
 	background: #fff;
 	font-size: 13px;
 	line-height: 2.1em;
@@ -141,7 +141,6 @@

 .welcome-panel .welcome-panel-close {
 	position: absolute;
-	z-index: 10;
 	top: 10px;
 	left: 10px;
 	padding: 10px 21px 10px 15px;
@@ -166,7 +165,7 @@
 }

 .welcome-panel-content {
-	margin: 0 13px;
+	margin-right: 13px;
 	max-width: 1500px;
 }

@@ -203,7 +202,7 @@
 }

 .welcome-panel .welcome-panel-column ul {
-		margin: 0.8em 0 1em 1em;
+	margin: 0.8em 0 1em 1em;
 }

 .welcome-panel .welcome-panel-column li {
@@ -246,6 +245,11 @@
 	top: -1px;
 }

+.welcome-panel .welcome-setup-home:before {
+	content: "\f102";
+	top: -1px;
+}
+
 .welcome-panel .welcome-view-site:before {
 	content: "\f115";
 	top: -2px;
@@ -390,7 +394,7 @@
 .community-events li {
 	margin: 0;
 	padding: 8px 12px;
-	color: #72777c;
+	color: #32373c;
 }
 .community-events li:first-child {
 	border-top: 1px solid #eee;
@@ -595,23 +599,15 @@ body #dashboard-widgets .postbox form .submit {
 	margin: 12px;
 }

-#dashboard_quick_press .drafts,
-#dashboard_quick_press .easy-blogging {
+#dashboard_quick_press .drafts {
 	padding: 10px 0 0;
 }

 /* Dashboard Quick Draft - Form styling */

-input#save-post {
-	float: right;
-}
-
-form.initial-form.quickpress-open label.prompt {
-	font-style: normal;
-}
-
-form.initial-form.quickpress-open input#title {
-	height: auto;
+#dashboard_quick_press label {
+	display: inline-block;
+	margin-bottom: 4px;
 }

 #dashboard_quick_press input,
@@ -620,10 +616,6 @@ form.initial-form.quickpress-open input#title {
 	margin: 0;
 }

-#dashboard_quick_press textarea {
-	resize: vertical;
-}
-
 #dashboard-widgets .postbox form .submit {
 	margin: -39px 0;
 	float: left;
@@ -633,39 +625,11 @@ form.initial-form.quickpress-open input#title {
 	margin-top: 12px;
 }

-#title-wrap #title-prompt-text,
-.textarea-wrap #content-prompt-text {
-	color: #72777c;
-}
-
-#title-wrap #title-prompt-text {
-	font-size: 1.1em;
-	padding: 7px 8px;
-}
-
-.input-text-wrap,
-.textarea-wrap {
-	position: relative;
-}
-
-.input-text-wrap .prompt,
-.textarea-wrap .prompt {
-	position: absolute;
-}
-
-.textarea-wrap #content-prompt-text {
-	font-size: 1.1em;
-	padding: 7px 8px;
-}
-
-.textarea-wrap textarea#content {
-	margin: 0 0 8px;
-	padding: 6px 7px;
-}
-
 #quick-press textarea#content {
 	min-height: 90px;
 	max-height: 1300px;
+	margin: 0 0 8px;
+	padding: 6px 7px;
 	resize: none;
 }

@@ -996,24 +960,6 @@ form.initial-form.quickpress-open input#title {
 	font-size: 13px;
 }

-/* QuickDraft */
-
-#title-wrap label,
-#description-wrap label {
-	cursor: text;
-}
-
-#title-wrap #title {
-	padding: 2px 6px;
-	font-size: 1.3em;
-	outline: none;
-}
-
-#title-wrap #title-prompt-text {
-	font-size: 1.1em;
-	padding: 5px 8px;
-}
-
 /* Feeds */
 .rss-widget ul {
 	margin: 0;
@@ -1117,6 +1063,28 @@ a.rsswidget {
 	font-size: 16px;
 }

+/* PHP Nag */
+#dashboard_php_nag .dashicons-warning {
+	color: #ffb900;
+	padding-left: 6px;
+}
+
+#dashboard_php_nag.php-insecure .dashicons-warning {
+	color: #df3232;
+}
+
+#dashboard_php_nag p {
+	margin: 12px 0;
+}
+
+#dashboard_php_nag h3 {
+	font-weight: 600;
+}
+
+#dashboard_php_nag .button .dashicons-external {
+	line-height: 25px;
+}
+
 /* =Media Queries
 -------------------------------------------------------------- */

@@ -1224,9 +1192,10 @@ a.rsswidget {
 	.welcome-panel .welcome-panel-column ul {
 		margin: 0.4em 0 0;
 	}
+
 }

-@media screen and ( max-width: 782px ) {
+@media screen and (max-width: 782px) {
 	#dashboard_recent_comments #the-comment-list .comment-item .avatar {
 		height: 30px;
 		width: 30px;
--- a/wp-admin/css/dashboard-rtl.min.css
+++ b/wp-admin/css/dashboard-rtl.min.css
--- a/wp-admin/css/dashboard.css
+++ b/wp-admin/css/dashboard.css
@@ -104,7 +104,7 @@
 	margin: 16px 0;
 	padding: 23px 10px 0;
 	border: 1px solid #e5e5e5;
-	box-shadow: 0 1px 1px rgba(0,0,0,0.04);
+	box-shadow: 0 1px 1px rgba(0, 0, 0, 0.04);
 	background: #fff;
 	font-size: 13px;
 	line-height: 2.1em;
@@ -141,7 +141,6 @@

 .welcome-panel .welcome-panel-close {
 	position: absolute;
-	z-index: 10;
 	top: 10px;
 	right: 10px;
 	padding: 10px 15px 10px 21px;
@@ -166,7 +165,7 @@
 }

 .welcome-panel-content {
-	margin: 0 13px;
+	margin-left: 13px;
 	max-width: 1500px;
 }

@@ -203,7 +202,7 @@
 }

 .welcome-panel .welcome-panel-column ul {
-		margin: 0.8em 1em 1em 0;
+	margin: 0.8em 1em 1em 0;
 }

 .welcome-panel .welcome-panel-column li {
@@ -246,6 +245,11 @@
 	top: -1px;
 }

+.welcome-panel .welcome-setup-home:before {
+	content: "\f102";
+	top: -1px;
+}
+
 .welcome-panel .welcome-view-site:before {
 	content: "\f115";
 	top: -2px;
@@ -390,7 +394,7 @@
 .community-events li {
 	margin: 0;
 	padding: 8px 12px;
-	color: #72777c;
+	color: #32373c;
 }
 .community-events li:first-child {
 	border-top: 1px solid #eee;
@@ -595,23 +599,15 @@ body #dashboard-widgets .postbox form .submit {
 	margin: 12px;
 }

-#dashboard_quick_press .drafts,
-#dashboard_quick_press .easy-blogging {
+#dashboard_quick_press .drafts {
 	padding: 10px 0 0;
 }

 /* Dashboard Quick Draft - Form styling */

-input#save-post {
-	float: left;
-}
-
-form.initial-form.quickpress-open label.prompt {
-	font-style: normal;
-}
-
-form.initial-form.quickpress-open input#title {
-	height: auto;
+#dashboard_quick_press label {
+	display: inline-block;
+	margin-bottom: 4px;
 }

 #dashboard_quick_press input,
@@ -620,10 +616,6 @@ form.initial-form.quickpress-open input#title {
 	margin: 0;
 }

-#dashboard_quick_press textarea {
-	resize: vertical;
-}
-
 #dashboard-widgets .postbox form .submit {
 	margin: -39px 0;
 	float: right;
@@ -633,39 +625,11 @@ form.initial-form.quickpress-open input#title {
 	margin-top: 12px;
 }

-#title-wrap #title-prompt-text,
-.textarea-wrap #content-prompt-text {
-	color: #72777c;
-}
-
-#title-wrap #title-prompt-text {
-	font-size: 1.1em;
-	padding: 7px 8px;
-}
-
-.input-text-wrap,
-.textarea-wrap {
-	position: relative;
-}
-
-.input-text-wrap .prompt,
-.textarea-wrap .prompt {
-	position: absolute;
-}
-
-.textarea-wrap #content-prompt-text {
-	font-size: 1.1em;
-	padding: 7px 8px;
-}
-
-.textarea-wrap textarea#content {
-	margin: 0 0 8px;
-	padding: 6px 7px;
-}
-
 #quick-press textarea#content {
 	min-height: 90px;
 	max-height: 1300px;
+	margin: 0 0 8px;
+	padding: 6px 7px;
 	resize: none;
 }

@@ -996,24 +960,6 @@ form.initial-form.quickpress-open input#title {
 	font-size: 13px;
 }

-/* QuickDraft */
-
-#title-wrap label,
-#description-wrap label {
-	cursor: text;
-}
-
-#title-wrap #title {
-	padding: 2px 6px;
-	font-size: 1.3em;
-	outline: none;
-}
-
-#title-wrap #title-prompt-text {
-	font-size: 1.1em;
-	padding: 5px 8px;
-}
-
 /* Feeds */
 .rss-widget ul {
 	margin: 0;
@@ -1117,6 +1063,28 @@ a.rsswidget {
 	font-size: 16px;
 }

+/* PHP Nag */
+#dashboard_php_nag .dashicons-warning {
+	color: #ffb900;
+	padding-right: 6px;
+}
+
+#dashboard_php_nag.php-insecure .dashicons-warning {
+	color: #df3232;
+}
+
+#dashboard_php_nag p {
+	margin: 12px 0;
+}
+
+#dashboard_php_nag h3 {
+	font-weight: 600;
+}
+
+#dashboard_php_nag .button .dashicons-external {
+	line-height: 25px;
+}
+
 /* =Media Queries
 -------------------------------------------------------------- */

@@ -1224,9 +1192,10 @@ a.rsswidget {
 	.welcome-panel .welcome-panel-column ul {
 		margin: 0.4em 0 0;
 	}
+
 }

-@media screen and ( max-width: 782px ) {
+@media screen and (max-width: 782px) {
 	#dashboard_recent_comments #the-comment-list .comment-item .avatar {
 		height: 30px;
 		width: 30px;
--- a/wp-admin/css/dashboard.min.css
+++ b/wp-admin/css/dashboard.min.css
--- a/wp-admin/css/deprecated-media-rtl.css
+++ b/wp-admin/css/deprecated-media-rtl.css
@@ -107,19 +107,19 @@ th {
 /* specific to the image upload form */

 .image-align-none-label {
-	background: url(../images/align-none.png) no-repeat center left;
+	background: url(../images/align-none.png) no-repeat center right;
 }

 .image-align-left-label {
-	background: url(../images/align-left.png) no-repeat center left;
+	background: url(../images/align-left.png) no-repeat center right;
 }

 .image-align-center-label {
-	background: url(../images/align-center.png) no-repeat center left;
+	background: url(../images/align-center.png) no-repeat center right;
 }

 .image-align-right-label {
-	background: url(../images/align-right.png) no-repeat center left;
+	background: url(../images/align-right.png) no-repeat center right;
 }

 tr.image-size td {
@@ -206,6 +206,22 @@ span.required {
 	margin: 8px 0;
 }

+#media-upload .tablenav-pages a,
+#media-upload .tablenav-pages .current {
+	display: inline-block;
+	padding: 4px 5px 6px;
+	font-size: 16px;
+	line-height: 1;
+	text-align: center;
+	text-decoration: none;
+}
+
+#media-upload .tablenav-pages a {
+	min-width: 17px;
+	border: 1px solid #ccc;
+	background: #f7f7f7;
+}
+
 #filter .tablenav select {
 	border-style: solid;
 	border-width: 1px;
@@ -278,11 +294,11 @@ span.required {
 	border-bottom: 1px solid #ddd;
 }

-h3.media-title  {
+h3.media-title {
 	font-size: 1.6em;
 }

-h4.media-sub-title  {
+h4.media-sub-title {
 	border-bottom: 1px solid #ddd;
 	font-size: 1.3em;
 	margin: 12px;
--- a/wp-admin/css/deprecated-media-rtl.min.css
+++ b/wp-admin/css/deprecated-media-rtl.min.css
--- a/wp-admin/css/deprecated-media.css
+++ b/wp-admin/css/deprecated-media.css
@@ -206,6 +206,22 @@ span.required {
 	margin: 8px 0;
 }

+#media-upload .tablenav-pages a,
+#media-upload .tablenav-pages .current {
+	display: inline-block;
+	padding: 4px 5px 6px;
+	font-size: 16px;
+	line-height: 1;
+	text-align: center;
+	text-decoration: none;
+}
+
+#media-upload .tablenav-pages a {
+	min-width: 17px;
+	border: 1px solid #ccc;
+	background: #f7f7f7;
+}
+
 #filter .tablenav select {
 	border-style: solid;
 	border-width: 1px;
@@ -278,11 +294,11 @@ span.required {
 	border-bottom: 1px solid #ddd;
 }

-h3.media-title  {
+h3.media-title {
 	font-size: 1.6em;
 }

-h4.media-sub-title  {
+h4.media-sub-title {
 	border-bottom: 1px solid #ddd;
 	font-size: 1.3em;
 	margin: 12px;
--- a/wp-admin/css/deprecated-media.min.css
+++ b/wp-admin/css/deprecated-media.min.css
--- a/wp-admin/css/edit-rtl.css
+++ b/wp-admin/css/edit-rtl.css
@@ -154,7 +154,7 @@ body.post-new-php .submitbox .submitdelete {
 	position: relative;
 	min-width: 255px;
 	border: 1px solid #e5e5e5;
-	box-shadow: 0 1px 1px rgba(0,0,0,0.04);
+	box-shadow: 0 1px 1px rgba(0, 0, 0, 0.04);
 	background: #fff;
 }

@@ -167,7 +167,7 @@ body.post-new-php .submitbox .submitdelete {
 	border: 0 none;
 	float: left;
 	padding: 0 12px;
-	margin:0;
+	margin: 0;
 }

 .category-add input[type="text"],
@@ -214,7 +214,7 @@ ul.category-tabs li,

 /* Back-compat for pre-4.4 */
 #category-adder h4 {
-    margin: 0;
+	margin: 0;
 }

 .taxonomy-add-new {
@@ -312,7 +312,7 @@ form#tags-filter {
 	border: 1px solid #e5e5e5;
 	border-top: none;
 	background-color: #f7f7f7;
-	box-shadow: 0 1px 1px rgba(0,0,0,0.04);
+	box-shadow: 0 1px 1px rgba(0, 0, 0, 0.04);
 	z-index: 999;
 }

@@ -496,6 +496,7 @@ span.wp-media-buttons-icon:before {
 #timestampdiv input {
 	border-width: 1px;
 	border-style: solid;
+	text-align: center;
 }

 .notification-dialog {
@@ -506,7 +507,7 @@ span.wp-media-buttons-icon:before {
 	width: 450px;
 	margin-right: -225px;
 	background: #fff;
-	box-shadow: 0 3px 6px rgba( 0, 0, 0, 0.3 );
+	box-shadow: 0 3px 6px rgba(0, 0, 0, 0.3);
 	line-height: 1.5;
 	z-index: 1000005;
 	overflow-y: auto;
@@ -607,10 +608,18 @@ span.wp-media-buttons-icon:before {
 	line-height: 1.4;
 }

+#poststuff .stuffbox h2 {
+	padding: 8px 10px;
+}
+
 #poststuff .inside {
 	margin: 6px 0 0 0;
 }

+#poststuff .stuffbox .inside {
+	margin: 0;
+}
+
 #poststuff .inside #parent_id,
 #poststuff .inside #page_template {
 	max-width: 100%;
@@ -643,7 +652,7 @@ span.wp-media-buttons-icon:before {

 #post-body-content,
 .edit-form-section {
- 	margin-bottom: 20px;
+	margin-bottom: 20px;
 }

 /* Suggested text for privacy policy */
@@ -854,33 +863,20 @@ span.wp-media-buttons-icon:before {
  11.4 - Post formats
 ------------------------------------------------------------------------------*/

-.post-state-format {
-	overflow: hidden;
+.post-format-icon::before {
 	display: inline-block;
 	vertical-align: middle;
 	height: 20px;
 	width: 20px;
-	margin-left: 5px;
 	margin-top: -4px;
-}
-
-.post-state-format:before {
-	display: block;
-	height: 20px;
-	width: 20px;
-	font: normal 20px/1 dashicons !important;
+	margin-left: 7px;
+	color: #ddd;
+	font: normal 20px/1 dashicons;
 	speak: none;
 	-webkit-font-smoothing: antialiased;
 	-moz-osx-font-smoothing: grayscale;
 }

-.post-state-format:before,
-.post-format-icon:before {
-	color: #ddd;
-	transition: all .1s ease-in-out;
-}
-
-a.post-state-format:hover:before,
 a.post-format-icon:hover:before {
 	color: #00a0d2;
 }
@@ -889,7 +885,7 @@ a.post-format-icon:hover:before {
 	line-height: 2em;
 }

-#post-formats-select .post-format-icon:before {
+#post-formats-select .post-format-icon::before {
 	top: 5px;
 }

@@ -898,77 +894,47 @@ input.post-format {
 }

 label.post-format-icon {
-	margin-right: 0px;
-	padding: 2px 0px 2px 0;
+	margin-right: 0;
+	padding: 2px 0;
 }

-.post-format-icon:before {
-	position: relative;
-	display: inline-block;
-	margin-left: 7px;
-	font: normal 20px/1 dashicons;
-	speak: none;
-	-webkit-font-smoothing: antialiased;
-	-moz-osx-font-smoothing: grayscale;
-}
-
-.post-state-format.post-format-standard:before,
-.post-format-icon.post-format-standard:before,
-a.post-state-format.format-standard:before {
+.post-format-icon.post-format-standard::before {
 	content: "\f109";
 }

-.post-state-format.post-format-image:before,
-.post-format-icon.post-format-image:before,
-a.post-state-format.format-image:before {
+.post-format-icon.post-format-image::before {
 	content: "\f128";
 }

-.post-state-format.post-format-gallery:before,
-.post-format-icon.post-format-gallery:before,
-a.post-state-format.format-gallery:before {
+.post-format-icon.post-format-gallery::before {
 	content: "\f161";
 }

-.post-state-format.post-format-audio:before,
-.post-format-icon.post-format-audio:before,
-a.post-state-format.format-audio:before {
+.post-format-icon.post-format-audio::before {
 	content: "\f127";
 }

-.post-state-format.post-format-video:before,
-.post-format-icon.post-format-video:before,
-a.post-state-format.format-video:before {
+.post-format-icon.post-format-video::before {
 	content: "\f126";
 }

-.post-state-format.post-format-chat:before,
-.post-format-icon.post-format-chat:before,
-a.post-state-format.format-chat:before {
+.post-format-icon.post-format-chat::before {
 	content: "\f125";
 }

-.post-state-format.post-format-status:before,
-.post-format-icon.post-format-status:before,
-a.post-state-format.format-status:before {
+.post-format-icon.post-format-status::before {
 	content: "\f130";
 }

-.post-state-format.post-format-aside:before,
-.post-format-icon.post-format-aside:before,
-a.post-state-format.format-aside:before {
+.post-format-icon.post-format-aside::before {
 	content: "\f123";
 }

-.post-state-format.post-format-quote:before,
-.post-format-icon.post-format-quote:before,
-a.post-state-format.format-quote:before {
+.post-format-icon.post-format-quote::before {
 	content: "\f122";
 }

-.post-state-format.post-format-link:before,
-.post-format-icon.post-format-link:before,
-a.post-state-format.format-link:before {
+.post-format-icon.post-format-link::before {
 	content: "\f103";
 }

@@ -1003,11 +969,11 @@ a.post-state-format.format-link:before {
 }

 div.tabs-panel-active {
-	display:block;
+	display: block;
 }

 div.tabs-panel-inactive {
-	display:none;
+	display: none;
 }

 #front-page-warning,
@@ -1094,8 +1060,12 @@ span.description,
  13.0 - Tags
 ------------------------------------------------------------------------------*/

+#poststuff .tagsdiv .ajaxtag {
+	margin-top: 1em;
+}
+
 #poststuff .tagsdiv .howto {
-	margin: 0 0 6px 0;
+	margin: 1em 0 6px 0;
 }

 .ajaxtag .newtag {
@@ -1187,9 +1157,6 @@ p.popular-tags a {

 .edit-tag-actions {
 	margin-top: 20px;
-	overflow: hidden;
-	padding: 10px;
-	margin-left: 10px;
 }

 /* Comments */
@@ -1209,7 +1176,7 @@ p.popular-tags a {
 }

 .comment-ays .comment-content a[href]:after {
-	content: '(' attr( href ) ')';
+	content: "(" attr( href ) ")";
 	display: inline-block;
 	padding: 0 4px;
 	color: #72777C;
@@ -1222,7 +1189,7 @@ p.popular-tags a {
 }

 .comment-ays .comment-content p.edit-comment a[href]:after {
-	content: '';
+	content: "";
 	padding: 0;
 }

@@ -1246,6 +1213,15 @@ p.popular-tags a {

 .stuffbox .editcomment {
 	clear: none;
+	margin-top: 0;
+}
+
+#namediv.stuffbox .editcomment input {
+	width: 100%;
+}
+
+#namediv.stuffbox .editcomment.form-table td {
+	padding: 10px;
 }

 #comment-status-radio p {
@@ -1297,12 +1273,10 @@ table.links-table {
 /* DFW 2
 -------------------------------------------------------------- */

-#wp-content-wrap .mce-wp-dfw,
 #qt_content_dfw {
 	display: none;
 }

-.wp-editor-expand #wp-content-wrap .mce-wp-dfw,
 .wp-editor-expand #qt_content_dfw {
 	display: inline-block;
 }
@@ -1426,7 +1400,7 @@ table.links-table {
 	}
 }

-@media screen and ( max-width: 782px ) {
+@media screen and (max-width: 782px) {
 	.wp-core-ui .edit-tag-actions .button-primary {
 		margin-bottom: 0;
 	}
@@ -1439,12 +1413,20 @@ table.links-table {
 		padding: 10px 10px;
 	}

+	#poststuff .stuffbox .inside {
+		padding: 0 0 4px 2px;
+	}
+
 	#poststuff h3.hndle, /* Back-compat for pre-4.4 */
 	#poststuff .stuffbox > h3, /* Back-compat for pre-4.4 */
 	#poststuff h2 {
 		padding: 12px;
 	}

+	#namediv.stuffbox .editcomment.form-table td {
+		padding: 5px 10px;
+	}
+
 	.post-format-options {
 		padding-left: 0;
 	}
@@ -1651,11 +1633,11 @@ table.links-table {
 	.links-table td {
 		padding: 10px 0;
 	}
-	
+
 	.privacy-text-box {
 		width: auto;
 	}
-	
+
 	.privacy-text-box-toc {
 		float: none;
 		width: auto;
--- a/wp-admin/css/edit-rtl.min.css
+++ b/wp-admin/css/edit-rtl.min.css
--- a/wp-admin/css/edit.css
+++ b/wp-admin/css/edit.css
@@ -154,7 +154,7 @@ body.post-new-php .submitbox .submitdelete {
 	position: relative;
 	min-width: 255px;
 	border: 1px solid #e5e5e5;
-	box-shadow: 0 1px 1px rgba(0,0,0,0.04);
+	box-shadow: 0 1px 1px rgba(0, 0, 0, 0.04);
 	background: #fff;
 }

@@ -167,7 +167,7 @@ body.post-new-php .submitbox .submitdelete {
 	border: 0 none;
 	float: right;
 	padding: 0 12px;
-	margin:0;
+	margin: 0;
 }

 .category-add input[type="text"],
@@ -214,7 +214,7 @@ ul.category-tabs li,

 /* Back-compat for pre-4.4 */
 #category-adder h4 {
-    margin: 0;
+	margin: 0;
 }

 .taxonomy-add-new {
@@ -312,7 +312,7 @@ form#tags-filter {
 	border: 1px solid #e5e5e5;
 	border-top: none;
 	background-color: #f7f7f7;
-	box-shadow: 0 1px 1px rgba(0,0,0,0.04);
+	box-shadow: 0 1px 1px rgba(0, 0, 0, 0.04);
 	z-index: 999;
 }

@@ -496,6 +496,7 @@ span.wp-media-buttons-icon:before {
 #timestampdiv input {
 	border-width: 1px;
 	border-style: solid;
+	text-align: center;
 }

 .notification-dialog {
@@ -506,7 +507,7 @@ span.wp-media-buttons-icon:before {
 	width: 450px;
 	margin-left: -225px;
 	background: #fff;
-	box-shadow: 0 3px 6px rgba( 0, 0, 0, 0.3 );
+	box-shadow: 0 3px 6px rgba(0, 0, 0, 0.3);
 	line-height: 1.5;
 	z-index: 1000005;
 	overflow-y: auto;
@@ -607,10 +608,18 @@ span.wp-media-buttons-icon:before {
 	line-height: 1.4;
 }

+#poststuff .stuffbox h2 {
+	padding: 8px 10px;
+}
+
 #poststuff .inside {
 	margin: 6px 0 0 0;
 }

+#poststuff .stuffbox .inside {
+	margin: 0;
+}
+
 #poststuff .inside #parent_id,
 #poststuff .inside #page_template {
 	max-width: 100%;
@@ -643,7 +652,7 @@ span.wp-media-buttons-icon:before {

 #post-body-content,
 .edit-form-section {
- 	margin-bottom: 20px;
+	margin-bottom: 20px;
 }

 /* Suggested text for privacy policy */
@@ -854,33 +863,20 @@ span.wp-media-buttons-icon:before {
  11.4 - Post formats
 ------------------------------------------------------------------------------*/

-.post-state-format {
-	overflow: hidden;
+.post-format-icon::before {
 	display: inline-block;
 	vertical-align: middle;
 	height: 20px;
 	width: 20px;
-	margin-right: 5px;
 	margin-top: -4px;
-}
-
-.post-state-format:before {
-	display: block;
-	height: 20px;
-	width: 20px;
-	font: normal 20px/1 dashicons !important;
+	margin-right: 7px;
+	color: #ddd;
+	font: normal 20px/1 dashicons;
 	speak: none;
 	-webkit-font-smoothing: antialiased;
 	-moz-osx-font-smoothing: grayscale;
 }

-.post-state-format:before,
-.post-format-icon:before {
-	color: #ddd;
-	transition: all .1s ease-in-out;
-}
-
-a.post-state-format:hover:before,
 a.post-format-icon:hover:before {
 	color: #00a0d2;
 }
@@ -889,7 +885,7 @@ a.post-format-icon:hover:before {
 	line-height: 2em;
 }

-#post-formats-select .post-format-icon:before {
+#post-formats-select .post-format-icon::before {
 	top: 5px;
 }

@@ -898,77 +894,47 @@ input.post-format {
 }

 label.post-format-icon {
-	margin-left: 0px;
-	padding: 2px 0 2px 0px;
+	margin-left: 0;
+	padding: 2px 0;
 }

-.post-format-icon:before {
-	position: relative;
-	display: inline-block;
-	margin-right: 7px;
-	font: normal 20px/1 dashicons;
-	speak: none;
-	-webkit-font-smoothing: antialiased;
-	-moz-osx-font-smoothing: grayscale;
-}
-
-.post-state-format.post-format-standard:before,
-.post-format-icon.post-format-standard:before,
-a.post-state-format.format-standard:before {
+.post-format-icon.post-format-standard::before {
 	content: "\f109";
 }

-.post-state-format.post-format-image:before,
-.post-format-icon.post-format-image:before,
-a.post-state-format.format-image:before {
+.post-format-icon.post-format-image::before {
 	content: "\f128";
 }

-.post-state-format.post-format-gallery:before,
-.post-format-icon.post-format-gallery:before,
-a.post-state-format.format-gallery:before {
+.post-format-icon.post-format-gallery::before {
 	content: "\f161";
 }

-.post-state-format.post-format-audio:before,
-.post-format-icon.post-format-audio:before,
-a.post-state-format.format-audio:before {
+.post-format-icon.post-format-audio::before {
 	content: "\f127";
 }

-.post-state-format.post-format-video:before,
-.post-format-icon.post-format-video:before,
-a.post-state-format.format-video:before {
+.post-format-icon.post-format-video::before {
 	content: "\f126";
 }

-.post-state-format.post-format-chat:before,
-.post-format-icon.post-format-chat:before,
-a.post-state-format.format-chat:before {
+.post-format-icon.post-format-chat::before {
 	content: "\f125";
 }

-.post-state-format.post-format-status:before,
-.post-format-icon.post-format-status:before,
-a.post-state-format.format-status:before {
+.post-format-icon.post-format-status::before {
 	content: "\f130";
 }

-.post-state-format.post-format-aside:before,
-.post-format-icon.post-format-aside:before,
-a.post-state-format.format-aside:before {
+.post-format-icon.post-format-aside::before {
 	content: "\f123";
 }

-.post-state-format.post-format-quote:before,
-.post-format-icon.post-format-quote:before,
-a.post-state-format.format-quote:before {
+.post-format-icon.post-format-quote::before {
 	content: "\f122";
 }

-.post-state-format.post-format-link:before,
-.post-format-icon.post-format-link:before,
-a.post-state-format.format-link:before {
+.post-format-icon.post-format-link::before {
 	content: "\f103";
 }

@@ -1003,11 +969,11 @@ a.post-state-format.format-link:before {
 }

 div.tabs-panel-active {
-	display:block;
+	display: block;
 }

 div.tabs-panel-inactive {
-	display:none;
+	display: none;
 }

 #front-page-warning,
@@ -1094,8 +1060,12 @@ span.description,
  13.0 - Tags
 ------------------------------------------------------------------------------*/

+#poststuff .tagsdiv .ajaxtag {
+	margin-top: 1em;
+}
+
 #poststuff .tagsdiv .howto {
-	margin: 0 0 6px 0;
+	margin: 1em 0 6px 0;
 }

 .ajaxtag .newtag {
@@ -1187,9 +1157,6 @@ p.popular-tags a {

 .edit-tag-actions {
 	margin-top: 20px;
-	overflow: hidden;
-	padding: 10px;
-	margin-right: 10px;
 }

 /* Comments */
@@ -1209,7 +1176,7 @@ p.popular-tags a {
 }

 .comment-ays .comment-content a[href]:after {
-	content: '(' attr( href ) ')';
+	content: "(" attr( href ) ")";
 	display: inline-block;
 	padding: 0 4px;
 	color: #72777C;
@@ -1222,7 +1189,7 @@ p.popular-tags a {
 }

 .comment-ays .comment-content p.edit-comment a[href]:after {
-	content: '';
+	content: "";
 	padding: 0;
 }

@@ -1246,6 +1213,15 @@ p.popular-tags a {

 .stuffbox .editcomment {
 	clear: none;
+	margin-top: 0;
+}
+
+#namediv.stuffbox .editcomment input {
+	width: 100%;
+}
+
+#namediv.stuffbox .editcomment.form-table td {
+	padding: 10px;
 }

 #comment-status-radio p {
@@ -1297,12 +1273,10 @@ table.links-table {
 /* DFW 2
 -------------------------------------------------------------- */

-#wp-content-wrap .mce-wp-dfw,
 #qt_content_dfw {
 	display: none;
 }

-.wp-editor-expand #wp-content-wrap .mce-wp-dfw,
 .wp-editor-expand #qt_content_dfw {
 	display: inline-block;
 }
@@ -1426,7 +1400,7 @@ table.links-table {
 	}
 }

-@media screen and ( max-width: 782px ) {
+@media screen and (max-width: 782px) {
 	.wp-core-ui .edit-tag-actions .button-primary {
 		margin-bottom: 0;
 	}
@@ -1439,12 +1413,20 @@ table.links-table {
 		padding: 10px 10px;
 	}

+	#poststuff .stuffbox .inside {
+		padding: 0 2px 4px 0;
+	}
+
 	#poststuff h3.hndle, /* Back-compat for pre-4.4 */
 	#poststuff .stuffbox > h3, /* Back-compat for pre-4.4 */
 	#poststuff h2 {
 		padding: 12px;
 	}

+	#namediv.stuffbox .editcomment.form-table td {
+		padding: 5px 10px;
+	}
+
 	.post-format-options {
 		padding-right: 0;
 	}
@@ -1651,11 +1633,11 @@ table.links-table {
 	.links-table td {
 		padding: 10px 0;
 	}
-	
+
 	.privacy-text-box {
 		width: auto;
 	}
-	
+
 	.privacy-text-box-toc {
 		float: none;
 		width: auto;
--- a/wp-admin/css/edit.min.css
+++ b/wp-admin/css/edit.min.css
--- a/wp-admin/css/forms-rtl.css
+++ b/wp-admin/css/forms-rtl.css
@@ -24,7 +24,7 @@ input[type="week"],
 select,
 textarea {
 	border: 1px solid #ddd;
-	box-shadow: inset 0 1px 2px rgba( 0, 0, 0, 0.07 );
+	box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.07);
 	background-color: #fff;
 	color: #32373c;
 	outline: none;
@@ -51,7 +51,9 @@ input[type="radio"]:focus,
 select:focus,
 textarea:focus {
 	border-color: #5b9dd9;
-	box-shadow: 0 0 2px rgba( 30, 140, 190, 0.8 );
+	box-shadow: 0 0 2px rgba(30, 140, 190, 0.8);
+	/* Only visible in Windows High Contrast mode */
+	outline: 2px solid transparent;
 }

 /* rtl:ignore */
@@ -84,7 +86,7 @@ input[type="radio"] {
 	width: 16px;
 	min-width: 16px;
 	-webkit-appearance: none;
-	box-shadow: inset 0 1px 2px rgba( 0, 0, 0, 0.1 );
+	box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1);
 	transition: .05s border-color ease-in-out;
 }

@@ -228,18 +230,20 @@ textarea[readonly] {
 }

 ::-moz-placeholder {
-   color: #72777c;
-   opacity: 1;
+	color: #72777c;
+	opacity: 1;
 }

 :-ms-input-placeholder {
 	color: #72777c;
 }

-.form-invalid input, .form-invalid input:focus,
-.form-invalid select, .form-invalid select:focus {
+.form-invalid input,
+.form-invalid input:focus,
+.form-invalid select,
+.form-invalid select:focus {
 	border-color: #dc3232 !important;
- box-shadow: 0 0 2px rgba( 204, 0, 0, 0.8 );
+	box-shadow: 0 0 2px rgba(204, 0, 0, 0.8);
 }

 .form-table .form-required.form-invalid td:after {
@@ -252,11 +256,11 @@ textarea[readonly] {

 /* Adjust error indicator for password layout */
 .form-table .form-required.user-pass1-wrap.form-invalid td:after {
-	content: '';
+	content: "";
 }

 .form-table .form-required.user-pass1-wrap.form-invalid .password-input-wrapper:after {
-	content: '\f534';
+	content: "\f534";
 	font: normal 20px/1 dashicons;
 	color: #dc3232;
 	margin: 0 -29px 0 6px;
@@ -273,10 +277,10 @@ select:disabled,
 select.disabled,
 textarea:disabled,
 textarea.disabled {
-	background: rgba( 255, 255, 255, 0.5 );
-	border-color: rgba( 222, 222, 222, 0.75 );
-	box-shadow: inset 0 1px 2px rgba( 0, 0, 0, 0.04 );
-	color: rgba( 51, 51, 51, 0.5 );
+	background: rgba(255, 255, 255, 0.5);
+	border-color: rgba(222, 222, 222, 0.75);
+	box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.04);
+	color: rgba(51, 51, 51, 0.5);
 }

 input[type="file"]:disabled,
@@ -423,11 +427,16 @@ input[type="number"].tiny-text {
 	margin-right: 1em;
 }

-button.wp-hide-pw > .dashicons {
+.wp-hide-pw > .dashicons,
+.wp-cancel-pw > .dashicons {
 	position: relative;
 	top: 3px;
 }

+.wp-cancel-pw .dashicons-no {
+	display: none;
+}
+
 label,
 #your-profile label + a {
 	vertical-align: middle;
@@ -455,7 +464,7 @@ fieldset label,
 	background-color: #eee;
 	border: 1px solid #ddd;
 	color: #23282d;
-	margin: -2px 1px 5px 5px;
+	margin: -1px 1px 5px;
 	padding: 3px 5px;
 	text-align: center;
 	width: 25em;
@@ -504,25 +513,33 @@ fieldset label,
 }

 .pw-weak {
-	display:none;
+	display: none;
 }

 .indicator-hint {
 	padding-top: 8px;
 }

+.wp-pwd [type="text"],
+.wp-pwd [type="password"] {
+	margin-bottom: 0;
+	/* Same height as the buttons */
+	line-height: 20px;
+	min-height: 28px;
+	max-height: 40px;
+}
+
 #pass1-text,
 .show-password #pass1 {
 	display: none;
 }

-.show-password #pass1-text
-{
-	display: inline-block;
+#pass1-text::-ms-clear {
+	display: none;
 }

-.form-table span.description.important {
-	font-size: 12px;
+.show-password #pass1-text {
+	display: inline-block;
 }

 p.search-box {
@@ -575,7 +592,7 @@ ul#add-to-blog-users {
 	position: absolute;
 	z-index: 10000;
 	border: 1px solid #5b9dd9;
-	box-shadow: 0 1px 2px rgba( 30, 140, 190, 0.8 );
+	box-shadow: 0 1px 2px rgba(30, 140, 190, 0.8);
 	background-color: #fff;
 }

@@ -778,8 +795,9 @@ table.form-table td .updated p {
 	min-width: 255px;
 	max-width: 520px;
 	border: 1px solid #e5e5e5;
-	box-shadow: 0 1px 1px rgba(0,0,0,0.04);
+	box-shadow: 0 1px 1px rgba(0, 0, 0, 0.04);
 	background: #fff;
+	box-sizing: border-box;
 }

 /* Press this styles */
@@ -972,8 +990,8 @@ table.form-table td .updated p {
 }

 #request-filesystem-credentials-title {
-    font-size: 1.3em;
-    margin: 1em 0;
+	font-size: 1.3em;
+	margin: 1em 0;
 }

 .request-filesystem-credentials-form legend {
@@ -1110,7 +1128,7 @@ table.form-table td .updated p {
 .privacy_requests tbody th {
 	border-right: 4px solid #fff;
 	background: #fff;
-	box-shadow: inset 0 -1px 0 rgba(0,0,0,0.1);
+	box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.1);
 }

 .privacy_requests tbody .has-request-results th {
@@ -1123,7 +1141,7 @@ table.form-table td .updated p {

 .privacy_requests tbody td {
 	background: #fff;
-	box-shadow: inset 0 -1px 0 rgba(0,0,0,0.1);
+	box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.1);
 }

 .privacy_requests tbody .has-request-results td {
@@ -1155,18 +1173,18 @@ table.form-table td .updated p {
 }

 .status-label {
-	font-weight: bold;
+	font-weight: 600;
 }

 .status-label.status-request-pending {
-	font-weight: normal;
+	font-weight: 400;
 	font-style: italic;
 	color: #6c7781;
 }

 .status-label.status-request-failed {
 	color: #aa0000;
-	font-weight: bold;
+	font-weight: 600;
 }

 .wp-privacy-request-form {
@@ -1178,7 +1196,7 @@ table.form-table td .updated p {
 }

 .wp-privacy-request-form label {
-	font-weight: bold;
+	font-weight: 600;
 	line-height: 1.5;
 	padding-bottom: .5em;
 	display: block;
@@ -1214,7 +1232,7 @@ table.form-table td .updated p {
 /* =Media Queries
 -------------------------------------------------------------- */

-@media screen and ( max-width: 782px ) {
+@media screen and (max-width: 782px) {
 	/* Input Elements */
 	textarea {
 		-webkit-appearance: none;
@@ -1458,31 +1476,44 @@ table.form-table td .updated p {

 	.wp-pwd [type="text"],
 	.wp-pwd [type="password"] {
-		padding-left: 40px;
+		padding-left: 88px;
 	}

 	.wp-pwd button.button {
 		background: transparent;
-		border: none;
+		border: 1px solid transparent;
 		box-shadow: none;
 		line-height: 2;
 		margin: 0;
-		padding: 5px 10px;
+		padding: 5px 9px;
 		position: absolute;
 		left: 0;
 		top: 0;
 	}

+	.wp-pwd button.wp-hide-pw {
+		left: 40px;
+	}
+
 	.wp-pwd button.button:hover,
-	.wp-pwd button.button:focus,
+	.wp-pwd button.button:focus {
+		background: transparent;
+	}
+
 	.wp-pwd button.button:active {
 		background: transparent;
+		box-shadow: none;
+		transform: none;
 	}

 	.wp-pwd .button .text {
 		display: none;
 	}

+	.wp-cancel-pw .dashicons-no {
+		display: inline-block;
+	}
+
 	.options-general-php input[type="text"].small-text {
 		max-width: 6.25em;
 		margin: 0;
@@ -1490,21 +1521,21 @@ table.form-table td .updated p {

 	/* Privacy Policy settings screen */
 	.tools-privacy-policy-page form.wp-create-privacy-page {
-	    margin-bottom: 1em;
+		margin-bottom: 1em;
 	}

- 	.tools-privacy-policy-page input#set-page,
+	.tools-privacy-policy-page input#set-page,
 	.tools-privacy-policy-page select {
 		margin: 10px 0 0;
 	}

 	.tools-privacy-policy-page .wp-create-privacy-page span {
-	    display: block;
-	    margin-bottom: 1em;
+		display: block;
+		margin-bottom: 1em;
 	}

 	.tools-privacy-policy-page .wp-create-privacy-page .button {
-	    margin-right: 0;
+		margin-right: 0;
 	}

 	.wp-list-table.privacy_requests tr:not(.inline-edit-row):not(.no-items) td.column-primary:not(.check-column) {
@@ -1515,6 +1546,9 @@ table.form-table td .updated p {
 	.wp-list-table.privacy_requests.widefat thead td input {
 		margin-right: 5px;
 	}
+	.regular-text {
+		max-width: 100%;
+	}
 }

@media only screen and (max-width: 768px) {
@@ -1527,18 +1561,12 @@ table.form-table td .updated p {
 	}

 	.form-wrap .form-field {
-		padding:0;
-	}
-
-	/* users */
-	#profile-page .form-table textarea {
-		max-width: 400px;
-		width: auto;
+		padding: 0;
 	}
 }

@media only screen and (max-height: 480px), screen and (max-width: 450px) {
-	/*  Request Credentials / File Editor Warning */
+	/* Request Credentials / File Editor Warning */
 	.request-filesystem-credentials-dialog .notification-dialog,
 	.file-editor-warning .notification-dialog {
 		width: 100%;
--- a/wp-admin/css/forms-rtl.min.css
+++ b/wp-admin/css/forms-rtl.min.css
--- a/wp-admin/css/forms.css
+++ b/wp-admin/css/forms.css
@@ -24,7 +24,7 @@ input[type="week"],
 select,
 textarea {
 	border: 1px solid #ddd;
-	box-shadow: inset 0 1px 2px rgba( 0, 0, 0, 0.07 );
+	box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.07);
 	background-color: #fff;
 	color: #32373c;
 	outline: none;
@@ -51,7 +51,9 @@ input[type="radio"]:focus,
 select:focus,
 textarea:focus {
 	border-color: #5b9dd9;
-	box-shadow: 0 0 2px rgba( 30, 140, 190, 0.8 );
+	box-shadow: 0 0 2px rgba(30, 140, 190, 0.8);
+	/* Only visible in Windows High Contrast mode */
+	outline: 2px solid transparent;
 }

 /* rtl:ignore */
@@ -84,7 +86,7 @@ input[type="radio"] {
 	width: 16px;
 	min-width: 16px;
 	-webkit-appearance: none;
-	box-shadow: inset 0 1px 2px rgba( 0, 0, 0, 0.1 );
+	box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1);
 	transition: .05s border-color ease-in-out;
 }

@@ -228,18 +230,20 @@ textarea[readonly] {
 }

 ::-moz-placeholder {
-   color: #72777c;
-   opacity: 1;
+	color: #72777c;
+	opacity: 1;
 }

 :-ms-input-placeholder {
 	color: #72777c;
 }

-.form-invalid input, .form-invalid input:focus,
-.form-invalid select, .form-invalid select:focus {
+.form-invalid input,
+.form-invalid input:focus,
+.form-invalid select,
+.form-invalid select:focus {
 	border-color: #dc3232 !important;
- box-shadow: 0 0 2px rgba( 204, 0, 0, 0.8 );
+	box-shadow: 0 0 2px rgba(204, 0, 0, 0.8);
 }

 .form-table .form-required.form-invalid td:after {
@@ -252,11 +256,11 @@ textarea[readonly] {

 /* Adjust error indicator for password layout */
 .form-table .form-required.user-pass1-wrap.form-invalid td:after {
-	content: '';
+	content: "";
 }

 .form-table .form-required.user-pass1-wrap.form-invalid .password-input-wrapper:after {
-	content: '\f534';
+	content: "\f534";
 	font: normal 20px/1 dashicons;
 	color: #dc3232;
 	margin: 0 6px 0 -29px;
@@ -273,10 +277,10 @@ select:disabled,
 select.disabled,
 textarea:disabled,
 textarea.disabled {
-	background: rgba( 255, 255, 255, 0.5 );
-	border-color: rgba( 222, 222, 222, 0.75 );
-	box-shadow: inset 0 1px 2px rgba( 0, 0, 0, 0.04 );
-	color: rgba( 51, 51, 51, 0.5 );
+	background: rgba(255, 255, 255, 0.5);
+	border-color: rgba(222, 222, 222, 0.75);
+	box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.04);
+	color: rgba(51, 51, 51, 0.5);
 }

 input[type="file"]:disabled,
@@ -423,11 +427,16 @@ input[type="number"].tiny-text {
 	margin-left: 1em;
 }

-button.wp-hide-pw > .dashicons {
+.wp-hide-pw > .dashicons,
+.wp-cancel-pw > .dashicons {
 	position: relative;
 	top: 3px;
 }

+.wp-cancel-pw .dashicons-no {
+	display: none;
+}
+
 label,
 #your-profile label + a {
 	vertical-align: middle;
@@ -455,7 +464,7 @@ fieldset label,
 	background-color: #eee;
 	border: 1px solid #ddd;
 	color: #23282d;
-	margin: -2px 5px 5px 1px;
+	margin: -1px 1px 5px;
 	padding: 3px 5px;
 	text-align: center;
 	width: 25em;
@@ -504,25 +513,33 @@ fieldset label,
 }

 .pw-weak {
-	display:none;
+	display: none;
 }

 .indicator-hint {
 	padding-top: 8px;
 }

+.wp-pwd [type="text"],
+.wp-pwd [type="password"] {
+	margin-bottom: 0;
+	/* Same height as the buttons */
+	line-height: 20px;
+	min-height: 28px;
+	max-height: 40px;
+}
+
 #pass1-text,
 .show-password #pass1 {
 	display: none;
 }

-.show-password #pass1-text
-{
-	display: inline-block;
+#pass1-text::-ms-clear {
+	display: none;
 }

-.form-table span.description.important {
-	font-size: 12px;
+.show-password #pass1-text {
+	display: inline-block;
 }

 p.search-box {
@@ -575,7 +592,7 @@ ul#add-to-blog-users {
 	position: absolute;
 	z-index: 10000;
 	border: 1px solid #5b9dd9;
-	box-shadow: 0 1px 2px rgba( 30, 140, 190, 0.8 );
+	box-shadow: 0 1px 2px rgba(30, 140, 190, 0.8);
 	background-color: #fff;
 }

@@ -778,8 +795,9 @@ table.form-table td .updated p {
 	min-width: 255px;
 	max-width: 520px;
 	border: 1px solid #e5e5e5;
-	box-shadow: 0 1px 1px rgba(0,0,0,0.04);
+	box-shadow: 0 1px 1px rgba(0, 0, 0, 0.04);
 	background: #fff;
+	box-sizing: border-box;
 }

 /* Press this styles */
@@ -972,8 +990,8 @@ table.form-table td .updated p {
 }

 #request-filesystem-credentials-title {
-    font-size: 1.3em;
-    margin: 1em 0;
+	font-size: 1.3em;
+	margin: 1em 0;
 }

 .request-filesystem-credentials-form legend {
@@ -1110,7 +1128,7 @@ table.form-table td .updated p {
 .privacy_requests tbody th {
 	border-left: 4px solid #fff;
 	background: #fff;
-	box-shadow: inset 0 -1px 0 rgba(0,0,0,0.1);
+	box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.1);
 }

 .privacy_requests tbody .has-request-results th {
@@ -1123,7 +1141,7 @@ table.form-table td .updated p {

 .privacy_requests tbody td {
 	background: #fff;
-	box-shadow: inset 0 -1px 0 rgba(0,0,0,0.1);
+	box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.1);
 }

 .privacy_requests tbody .has-request-results td {
@@ -1155,18 +1173,18 @@ table.form-table td .updated p {
 }

 .status-label {
-	font-weight: bold;
+	font-weight: 600;
 }

 .status-label.status-request-pending {
-	font-weight: normal;
+	font-weight: 400;
 	font-style: italic;
 	color: #6c7781;
 }

 .status-label.status-request-failed {
 	color: #aa0000;
-	font-weight: bold;
+	font-weight: 600;
 }

 .wp-privacy-request-form {
@@ -1178,7 +1196,7 @@ table.form-table td .updated p {
 }

 .wp-privacy-request-form label {
-	font-weight: bold;
+	font-weight: 600;
 	line-height: 1.5;
 	padding-bottom: .5em;
 	display: block;
@@ -1214,7 +1232,7 @@ table.form-table td .updated p {
 /* =Media Queries
 -------------------------------------------------------------- */

-@media screen and ( max-width: 782px ) {
+@media screen and (max-width: 782px) {
 	/* Input Elements */
 	textarea {
 		-webkit-appearance: none;
@@ -1458,31 +1476,44 @@ table.form-table td .updated p {

 	.wp-pwd [type="text"],
 	.wp-pwd [type="password"] {
-		padding-right: 40px;
+		padding-right: 88px;
 	}

 	.wp-pwd button.button {
 		background: transparent;
-		border: none;
+		border: 1px solid transparent;
 		box-shadow: none;
 		line-height: 2;
 		margin: 0;
-		padding: 5px 10px;
+		padding: 5px 9px;
 		position: absolute;
 		right: 0;
 		top: 0;
 	}

+	.wp-pwd button.wp-hide-pw {
+		right: 40px;
+	}
+
 	.wp-pwd button.button:hover,
-	.wp-pwd button.button:focus,
+	.wp-pwd button.button:focus {
+		background: transparent;
+	}
+
 	.wp-pwd button.button:active {
 		background: transparent;
+		box-shadow: none;
+		transform: none;
 	}

 	.wp-pwd .button .text {
 		display: none;
 	}

+	.wp-cancel-pw .dashicons-no {
+		display: inline-block;
+	}
+
 	.options-general-php input[type="text"].small-text {
 		max-width: 6.25em;
 		margin: 0;
@@ -1490,21 +1521,21 @@ table.form-table td .updated p {

 	/* Privacy Policy settings screen */
 	.tools-privacy-policy-page form.wp-create-privacy-page {
-	    margin-bottom: 1em;
+		margin-bottom: 1em;
 	}

- 	.tools-privacy-policy-page input#set-page,
+	.tools-privacy-policy-page input#set-page,
 	.tools-privacy-policy-page select {
 		margin: 10px 0 0;
 	}

 	.tools-privacy-policy-page .wp-create-privacy-page span {
-	    display: block;
-	    margin-bottom: 1em;
+		display: block;
+		margin-bottom: 1em;
 	}

 	.tools-privacy-policy-page .wp-create-privacy-page .button {
-	    margin-left: 0;
+		margin-left: 0;
 	}

 	.wp-list-table.privacy_requests tr:not(.inline-edit-row):not(.no-items) td.column-primary:not(.check-column) {
@@ -1515,6 +1546,9 @@ table.form-table td .updated p {
 	.wp-list-table.privacy_requests.widefat thead td input {
 		margin-left: 5px;
 	}
+	.regular-text {
+		max-width: 100%;
+	}
 }

@media only screen and (max-width: 768px) {
@@ -1527,18 +1561,12 @@ table.form-table td .updated p {
 	}

 	.form-wrap .form-field {
-		padding:0;
-	}
-
-	/* users */
-	#profile-page .form-table textarea {
-		max-width: 400px;
-		width: auto;
+		padding: 0;
 	}
 }

@media only screen and (max-height: 480px), screen and (max-width: 450px) {
-	/*  Request Credentials / File Editor Warning */
+	/* Request Credentials / File Editor Warning */
 	.request-filesystem-credentials-dialog .notification-dialog,
 	.file-editor-warning .notification-dialog {
 		width: 100%;
--- a/wp-admin/css/forms.min.css
+++ b/wp-admin/css/forms.min.css
--- a/wp-admin/css/ie-rtl.css
+++ b/wp-admin/css/ie-rtl.css
@@ -471,12 +471,6 @@ div#dashboard-widgets {
 	display: inline;
 }

-a.post-state-format {
-	text-indent: 0;
-	line-height: 0;
-	font-size: 0;
-}
-
 table.ie-fixed {
 	table-layout: fixed;
 }
@@ -558,7 +552,7 @@ table.ie-fixed {
 }

 #update-nav-menu #post-body {
-	overflow:hidden;
+	overflow: hidden;
 }

 .menu li {
@@ -639,7 +633,7 @@ input[type="password"],
 .mce-btn i.mce-i-wp_page,
 .mce-btn i.mce-i-hr,
 .mce-close {
-	font-family: 'tinymce', Arial;
+	font-family: tinymce, Arial;
 	font-style: normal;
 	font-weight: 400;
 	font-variant: normal;
@@ -650,12 +644,12 @@ input[type="password"],

 .mce-btn i.mce-i-wp_fullscreen,
 .qt-fullscreen {
-	-ie7-icon: '\e023';
+	-ie7-icon: "\e023";
 }

 .mce-btn i.mce-i-wp_more,
 .mce-btn i.mce-i-wp_page {
-	-ie7-icon: '\e027';
+	-ie7-icon: "\e027";
 }

 .mce-btn i.mce-i-wp_adv {
@@ -664,7 +658,7 @@ input[type="password"],

 .mce-btn i.mce-i-help,
 .mce-btn i.mce-i-wp_help {
-	-ie7-icon: '\e016';
+	-ie7-icon: "\e016";
 }


--- a/wp-admin/css/ie-rtl.min.css
+++ b/wp-admin/css/ie-rtl.min.css
--- a/wp-admin/css/ie.css
+++ b/wp-admin/css/ie.css
@@ -471,12 +471,6 @@ div#dashboard-widgets {
 	display: inline;
 }

-a.post-state-format {
-	text-indent: 0;
-	line-height: 0;
-	font-size: 0;
-}
-
 table.ie-fixed {
 	table-layout: fixed;
 }
@@ -558,7 +552,7 @@ table.ie-fixed {
 }

 #update-nav-menu #post-body {
-	overflow:hidden;
+	overflow: hidden;
 }

 .menu li {
@@ -639,7 +633,7 @@ input[type="password"],
 .mce-btn i.mce-i-wp_page,
 .mce-btn i.mce-i-hr,
 .mce-close {
-	font-family: 'tinymce', Arial;
+	font-family: tinymce, Arial;
 	font-style: normal;
 	font-weight: 400;
 	font-variant: normal;
@@ -650,12 +644,12 @@ input[type="password"],

 .mce-btn i.mce-i-wp_fullscreen,
 .qt-fullscreen {
-	-ie7-icon: '\e023';
+	-ie7-icon: "\e023";
 }

 .mce-btn i.mce-i-wp_more,
 .mce-btn i.mce-i-wp_page {
-	-ie7-icon: '\e027';
+	-ie7-icon: "\e027";
 }

 .mce-btn i.mce-i-wp_adv {
@@ -664,7 +658,7 @@ input[type="password"],

 .mce-btn i.mce-i-help,
 .mce-btn i.mce-i-wp_help {
-	-ie7-icon: '\e016';
+	-ie7-icon: "\e016";
 }


--- a/wp-admin/css/ie.min.css
+++ b/wp-admin/css/ie.min.css
--- a/wp-admin/css/install-rtl.css
+++ b/wp-admin/css/install-rtl.css
@@ -11,7 +11,7 @@ body {
 	padding: 20px 20px 10px 20px;
 	max-width: 700px;
 	-webkit-font-smoothing: subpixel-antialiased;
-	box-shadow: 0 1px 3px rgba(0,0,0,0.13);
+	box-shadow: 0 1px 3px rgba(0, 0, 0, 0.13);
 }

 a {
@@ -27,7 +27,7 @@ a:focus {
 	color: #124964;
 	box-shadow:
 		0 0 0 1px #5b9dd9,
-		0 0 2px 1px rgba(30, 140, 190, .8);
+		0 0 2px 1px rgba(30, 140, 190, 0.8);
 }

 .ie8 a:focus {
@@ -63,7 +63,7 @@ ul, ol, dl {
 }

 a img {
-	border:0
+	border: 0
 }
 abbr {
 	border: 0;
@@ -84,7 +84,7 @@ label {
 	margin: 6px 0 14px 0;
 	padding: 0 0 7px 0;
 	border-bottom: none;
-	text-align:center
+	text-align: center
 }
 #logo a {
 	background-image: url(../images/w-logo-blue.png?ver=20131202);
@@ -107,10 +107,6 @@ label {
 	display: block;
 }

-#logo a:focus {
-	box-shadow: none;
-}
-
 .step {
 	margin: 20px 0 15px;
 }
@@ -167,7 +163,7 @@ textarea {
 	font-size: 15px;
 	padding: 3px 5px;
 	border: 1px solid #ddd;
-	box-shadow: inset 0 1px 2px rgba(0,0,0,0.07);
+	box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.07);
 }

 input,
@@ -178,8 +174,9 @@ submit {
 .form-table input[type=text],
 .form-table input[type=email],
 .form-table input[type=url],
-.form-table input[type=password] {
-	width: 206px;
+.form-table input[type=password],
+#pass-strength-result {
+	width: 218px;
 }

 .form-table th p {
@@ -216,66 +213,6 @@ submit {
 	font-family: Consolas, Monaco, monospace;
 }

-.wp-hide-pw > .dashicons {
-	line-height: inherit;
-}
-
-#pass-strength-result {
-	background-color: #eee;
-	border: 1px solid #ddd;
-	color: #23282d;
-	margin: -2px 0px 5px 5px;
-	padding: 3px 5px;
-	text-align: center;
-	width: 218px;
-	box-sizing: border-box;
-	opacity: 0;
-}
-
-#pass-strength-result.short {
-	background-color: #f1adad;
-	border-color: #e35b5b;
-	opacity: 1;
-}
-
-#pass-strength-result.bad {
-	background-color: #fbc5a9;
-	border-color: #f78b53;
-	opacity: 1;
-}
-
-#pass-strength-result.good {
-	background-color: #ffe399;
-	border-color: #ffc733;
-	opacity: 1;
-}
-
-#pass-strength-result.strong {
-	background-color: #c1e1b9;
-	border-color: #83c373;
-	opacity: 1;
-}
-
-#pass1.short, #pass1-text.short {
-	border-color: #e35b5b;
-}
-
-#pass1.bad, #pass1-text.bad {
-	border-color: #f78b53;
-}
-
-#pass1.good, #pass1-text.good {
-	border-color: #ffc733;
-}
-
-#pass1.strong, #pass1-text.strong {
-	border-color: #83c373;
-}
-
-.pw-weak {
-	display: none;
-}
-
 .message {
 	border-right: 4px solid #dc3232;
 	padding: .7em .6em;
@@ -295,20 +232,6 @@ submit {
 	direction: ltr;
 }

-#pass1-text,
-.show-password #pass1 {
-	display: none;
-}
-
-.show-password #pass1-text
-{
-	display: inline-block;
-}
-
-.form-table span.description.important {
-	font-size: 12px;
-}
-

 /* localization */
 body.rtl,
@@ -334,7 +257,7 @@ body.rtl,
 	}
 }

-@media screen and ( max-width: 782px ) {
+@media screen and (max-width: 782px) {

 	.form-table {
 		margin-top: 0;
--- a/wp-admin/css/install-rtl.min.css
+++ b/wp-admin/css/install-rtl.min.css
--- a/wp-admin/css/install.css
+++ b/wp-admin/css/install.css
@@ -11,7 +11,7 @@ body {
 	padding: 20px 20px 10px 20px;
 	max-width: 700px;
 	-webkit-font-smoothing: subpixel-antialiased;
-	box-shadow: 0 1px 3px rgba(0,0,0,0.13);
+	box-shadow: 0 1px 3px rgba(0, 0, 0, 0.13);
 }

 a {
@@ -27,7 +27,7 @@ a:focus {
 	color: #124964;
 	box-shadow:
 		0 0 0 1px #5b9dd9,
-		0 0 2px 1px rgba(30, 140, 190, .8);
+		0 0 2px 1px rgba(30, 140, 190, 0.8);
 }

 .ie8 a:focus {
@@ -63,7 +63,7 @@ ul, ol, dl {
 }

 a img {
-	border:0
+	border: 0
 }
 abbr {
 	border: 0;
@@ -84,7 +84,7 @@ label {
 	margin: 6px 0 14px 0;
 	padding: 0 0 7px 0;
 	border-bottom: none;
-	text-align:center
+	text-align: center
 }
 #logo a {
 	background-image: url(../images/w-logo-blue.png?ver=20131202);
@@ -107,10 +107,6 @@ label {
 	display: block;
 }

-#logo a:focus {
-	box-shadow: none;
-}
-
 .step {
 	margin: 20px 0 15px;
 }
@@ -167,7 +163,7 @@ textarea {
 	font-size: 15px;
 	padding: 3px 5px;
 	border: 1px solid #ddd;
-	box-shadow: inset 0 1px 2px rgba(0,0,0,0.07);
+	box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.07);
 }

 input,
@@ -178,8 +174,9 @@ submit {
 .form-table input[type=text],
 .form-table input[type=email],
 .form-table input[type=url],
-.form-table input[type=password] {
-	width: 206px;
+.form-table input[type=password],
+#pass-strength-result {
+	width: 218px;
 }

 .form-table th p {
@@ -216,66 +213,6 @@ submit {
 	font-family: Consolas, Monaco, monospace;
 }

-.wp-hide-pw > .dashicons {
-	line-height: inherit;
-}
-
-#pass-strength-result {
-	background-color: #eee;
-	border: 1px solid #ddd;
-	color: #23282d;
-	margin: -2px 5px 5px 0px;
-	padding: 3px 5px;
-	text-align: center;
-	width: 218px;
-	box-sizing: border-box;
-	opacity: 0;
-}
-
-#pass-strength-result.short {
-	background-color: #f1adad;
-	border-color: #e35b5b;
-	opacity: 1;
-}
-
-#pass-strength-result.bad {
-	background-color: #fbc5a9;
-	border-color: #f78b53;
-	opacity: 1;
-}
-
-#pass-strength-result.good {
-	background-color: #ffe399;
-	border-color: #ffc733;
-	opacity: 1;
-}
-
-#pass-strength-result.strong {
-	background-color: #c1e1b9;
-	border-color: #83c373;
-	opacity: 1;
-}
-
-#pass1.short, #pass1-text.short {
-	border-color: #e35b5b;
-}
-
-#pass1.bad, #pass1-text.bad {
-	border-color: #f78b53;
-}
-
-#pass1.good, #pass1-text.good {
-	border-color: #ffc733;
-}
-
-#pass1.strong, #pass1-text.strong {
-	border-color: #83c373;
-}
-
-.pw-weak {
-	display: none;
-}
-
 .message {
 	border-left: 4px solid #dc3232;
 	padding: .7em .6em;
@@ -295,20 +232,6 @@ submit {
 	direction: ltr;
 }

-#pass1-text,
-.show-password #pass1 {
-	display: none;
-}
-
-.show-password #pass1-text
-{
-	display: inline-block;
-}
-
-.form-table span.description.important {
-	font-size: 12px;
-}
-

 /* localization */
 body.rtl,
@@ -334,7 +257,7 @@ body.rtl,
 	}
 }

-@media screen and ( max-width: 782px ) {
+@media screen and (max-width: 782px) {

 	.form-table {
 		margin-top: 0;
--- a/wp-admin/css/install.min.css
+++ b/wp-admin/css/install.min.css
--- a/wp-admin/css/list-tables-rtl.css
+++ b/wp-admin/css/list-tables-rtl.css
@@ -152,10 +152,19 @@
 	overflow: hidden;
 }

+#replysubmit .reply-submit-buttons {
+	margin-bottom: 0;
+}
+
 #replysubmit .button {
 	margin-left: 5px;
 }

+#replysubmit .spinner {
+	float: none;
+	margin: -4px 0 0;
+}
+
 #replyrow.inline-edit-row fieldset.comment-reply {
 	font-size: inherit;
 	line-height: inherit;
@@ -243,12 +252,12 @@

 #the-comment-list tr:last-child th,
 #the-comment-list tr:last-child td {
-    box-shadow: none;
+	box-shadow: none;
 }

 #the-comment-list tr.unapproved + tr.approved th,
 #the-comment-list tr.unapproved + tr.approved td {
-    border-top: 1px solid rgba(0, 0, 0, 0.03);
+	border-top: 1px solid rgba(0, 0, 0, 0.03);
 }

 /* table vim shortcuts */
@@ -351,7 +360,7 @@ td.plugin-title p {
 table.media .column-title .media-icon {
 	float: right;
 	min-height: 60px;
- 	margin: 0 0 0 9px;
+	margin: 0 0 0 9px;
 }

 table.media .column-title .media-icon img {
@@ -393,7 +402,7 @@ table.media .column-title .filename {
 }

 #commentsdiv .inside .row-actions {
-	line-height:18px;
+	line-height: 18px;
 }

 #commentsdiv .inside .column-author {
@@ -495,9 +504,9 @@ th.asc a:focus span.sorting-indicator:before {
 }

 .wp-list-table .toggle-row:focus:before {
-    box-shadow:
-    	0 0 0 1px #5b9dd9,
-		0 0 2px 1px rgba(30, 140, 190, .8);
+	box-shadow:
+		0 0 0 1px #5b9dd9,
+		0 0 2px 1px rgba(30, 140, 190, 0.8);
 }

 .ie8 .wp-list-table .toggle-row:focus:before {
@@ -610,15 +619,9 @@ th.asc a:focus span.sorting-indicator {
 	visibility: visible;
 }

-/* Bulk Actions */
-.tablenav-pages a,
-.tablenav-pages-navspan {
-	font-weight: 600;
-	padding: 0 2px;
-}
-
 .tablenav-pages .current-page {
 	margin: 0 0 0 2px;
+	padding-top: 5px;
 	padding-bottom: 5px;
 	font-size: 13px;
 	text-align: center;
@@ -632,12 +635,6 @@ th.asc a:focus span.sorting-indicator {
 	margin-right: 2px;
 }

-.tablenav a.button,
-.tablenav a.button-secondary {
-	display: block;
-	margin: 3px 0 0 8px;
-}
-
 .tablenav {
 	clear: both;
 	height: 30px;
@@ -651,10 +648,7 @@ th.asc a:focus span.sorting-indicator {

 .tablenav .tablenav-pages {
 	float: left;
-	height: 28px;
-	margin-top: 3px;
-	cursor: default;
-	color: #555;
+	margin: 3px 0 9px;
 }

 .tablenav .no-pages,
@@ -662,49 +656,26 @@ th.asc a:focus span.sorting-indicator {
 	display: none;
 }

-.tablenav .tablenav-pages a,
-.tablenav-pages span.current  {
-	text-decoration: none;
-	padding: 3px 6px;
-}
-
-.tablenav .tablenav-pages a,
-.tablenav-pages-navspan {
+.tablenav .tablenav-pages .button,
+.tablenav .tablenav-pages .tablenav-pages-navspan {
 	display: inline-block;
-	min-width: 17px;
-	border: 1px solid #ccc; /* same color as buttons border */
-	padding: 3px 5px 7px;
-	background: #e5e5e5;
+	vertical-align: baseline;
+	min-width: 28px;
+	min-height: 28px;
+	margin: 0;
+	padding: 0 4px;
 	font-size: 16px;
-	line-height: 1;
-	font-weight: 400;
+	line-height: 1.5;
 	text-align: center;
 }

-.tablenav-pages-navspan {
-	height: 16px;
-	border-color: #ddd; /* same as disabled buttons */
-	background: #f7f7f7; /* same as disabled buttons */
-	color: #a0a5aa; /* same as disabled buttons */
-}
-
-.tablenav .tablenav-pages a:hover,
-.tablenav .tablenav-pages a:focus {
-	border-color: #5b9dd9;
-	color: #fff;
-	background: #00a0d2;
-	box-shadow: none;
-	outline: none; /* IE8 */
-}
-
 .tablenav .displaying-num {
 	margin-left: 7px;
 }

 .tablenav .one-page .displaying-num {
 	display: inline-block;
-	margin-top: 5px;
-	margin-left: 0;
+	margin: 5px 0;
 }

 .tablenav .actions {
@@ -721,24 +692,7 @@ th.asc a:focus span.sorting-indicator {
 	margin-left: 20px;
 }

-/* @todo: unclear if the following tablenav rules are actually used.
-classes exist in paginate_links() but not seen in list table output. */
-.tablenav .dots {
-	border-color: transparent;
-}
-
-.tablenav .next,
-.tablenav .prev {
-	border-color: transparent;
-	color: #0073aa;
-}
-
-.tablenav .next:hover,
-.tablenav .prev:hover {
-	border-color: transparent;
-	color: #00a0d2;
-}
-
+/* This view-switcher is still used on multisite. */
 .tablenav .view-switch {
 	float: left;
 	margin: 0 5px;
@@ -1257,15 +1211,15 @@ ul.cat-checklist {
 .plugin-install #the-list td,
 .upgrade .plugins td,
 .upgrade .plugins th {
-	box-shadow: inset 0 -1px 0 rgba(0,0,0,0.1);
+	box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.1);
 }

 .plugins tr.active.plugin-update-tr + tr.inactive th,
 .plugins tr.active.plugin-update-tr + tr.inactive td,
 .plugins tr.active + tr.inactive th,
 .plugins tr.active + tr.inactive td {
-	border-top: 1px solid rgba(0,0,0,0.03);
-	box-shadow: inset 0 1px 0 rgba(0,0,0,0.02), inset 0 -1px 0 #e1e1e1;
+	border-top: 1px solid rgba(0, 0, 0, 0.03);
+	box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.02), inset 0 -1px 0 #e1e1e1;
 }

 .plugins .update td,
@@ -1303,7 +1257,7 @@ ul.cat-checklist {
 .plugins .plugin-title .dashicons:before {
 	padding: 2px;
 	background-color: #eee;
-	box-shadow: inset 0 0 10px rgba(160,165,170,.15);
+	box-shadow: inset 0 0 10px rgba(160, 165, 170, 0.15);
 	font-size: 60px;
 	color: #B4B9BE;
 }
@@ -1336,7 +1290,7 @@ ul.cat-checklist {
 }

 .plugins .plugin-update-tr .plugin-update {
-	box-shadow: inset 0 -1px 0 rgba(0,0,0,0.1);
+	box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.1);
 	overflow: hidden; /* clearfix */
 	padding: 0;
 }
@@ -1350,6 +1304,37 @@ ul.cat-checklist {
 	margin: 0.5em 0;
 }

+.plugins .plugin-description a,
+.plugins .plugin-update a,
+.updates-table .plugin-title a {
+	text-decoration: underline;
+}
+
+.plugins tr.paused th.check-column {
+	border-right: 4px solid #d54e21;
+}
+
+.plugins tr.paused th,
+.plugins tr.paused td {
+	background-color: #fef7f1;
+}
+
+.plugins tr.paused .plugin-title,
+.plugins .paused .dashicons-warning {
+	color: #dc3232;
+}
+
+.plugins .paused .error-display p,
+.plugins .paused .error-display code {
+	font-size: 90%;
+	font-style: italic;
+	color: rgb( 0, 0, 0, 0.7 );
+}
+
+.plugins .resume-link {
+	color: #dc3232;
+}
+
 .plugin-card .update-now:before {
 	color: #f56e28;
 	content: "\f463";
@@ -1422,7 +1407,7 @@ ul.cat-checklist {
 	margin-left: 0;
 }

-@media screen and ( min-width: 1600px ) {
+@media screen and (min-width: 1600px) and ( max-width: 2299px ) {
 	.plugin-card {
 		width: 30%;
 		width: calc( 33.1% - 8px );
@@ -1447,6 +1432,31 @@ ul.cat-checklist {
 	}
 }

+@media screen and (min-width: 2300px) {
+	.plugin-card {
+		width: 25%;
+		width: calc( 25% - 12px );
+	}
+
+	.plugin-card:nth-child(odd) {
+		clear: none;
+		margin-right: 8px;
+	}
+
+	.plugin-card:nth-child(even) {
+		margin-left: 8px;
+	}
+
+	.plugin-card:nth-child(4n+1) {
+		clear: both;
+		margin-right: 0;
+	}
+
+	.plugin-card:nth-child(4n) {
+		margin-left: 0;
+	}
+}
+
 .plugin-card-top {
 	position: relative;
 	padding: 20px 20px 10px;
@@ -1555,12 +1565,18 @@ div.action-links,
 	color: #444;
 }

-.plugin-card .compatibility-incompatible:before {
+.plugin-card .column-compatibility .compatibility-incompatible:before {
 	content: "\f158";
+	color: #c62d2d;
 }

-.plugin-card .compatibility-compatible:before {
+.plugin-card .column-compatibility .compatibility-compatible:before {
 	content: "\f147";
+	color: #31843f;
+}
+
+.plugin-card .notice {
+	margin: 20px 20px 0 20px;
 }

 .plugin-icon {
@@ -1612,7 +1628,7 @@ div.action-links,
 /* =Media Queries
 -------------------------------------------------------------- */

-@media screen and ( max-width: 1100px ) and ( min-width: 782px ), ( max-width: 480px ) {
+@media screen and (max-width: 1100px) and (min-width: 782px), (max-width: 480px) {
 	.plugin-card .action-links {
 		position: static;
 		margin-right: 148px;
@@ -1648,7 +1664,7 @@ div.action-links,
 	}
 }

-@media screen and ( max-width: 782px ) {
+@media screen and (max-width: 782px) {
 	/* WP List Table Options & Filters */
 	.tablenav {
 		height: auto;
@@ -1697,7 +1713,6 @@ div.action-links,

 	.tablenav .tablenav-pages {
 		width: 100%;
-		height: auto;
 		text-align: center;
 		margin: 0 0 25px;
 	}
@@ -1719,19 +1734,19 @@ div.action-links,
 		font-size: 16px;
 	}

-	.tablenav-pages .pagination-links a,
-	.tablenav-pages-navspan {
-		padding: 9px 11px 12px;
+	.tablenav .tablenav-pages .button,
+	.tablenav .tablenav-pages .tablenav-pages-navspan {
+		min-width: 44px;
+		padding: 12px 8px;
 		font-size: 18px;
-	}
-
-	.tablenav-pages-navspan {
-		height: 18px;
+		line-height: 1;
 	}

 	.tablenav-pages .pagination-links .current-page {
-		padding: 8px 9px 9px;
+		min-width: 44px;
+		padding: 12px 6px;
 		font-size: 16px;
+		line-height: 18px;
 	}

 	/* WP List Table Adjustments: General */
@@ -1808,6 +1823,11 @@ div.action-links,
 		display: block;
 	}

+	/* Comment author hidden via Screen Options */
+	.fixed .column-author.hidden ~ .column-comment .comment-author {
+		display: none;
+	}
+
 	#the-comment-list .is-expanded td {
 		box-shadow: none;
 	}
@@ -1885,6 +1905,30 @@ div.action-links,
 		word-wrap: normal;
 	}

+	/* Make row actions more easy to select on mobile */
+	body:not(.plugins-php) .row-actions {
+		display: -ms-grid;
+		display: grid;
+		-ms-grid-columns: auto auto auto;
+		grid-template-columns: auto auto auto;
+		color: transparent;
+	}
+
+	.row-actions span {
+		padding: 4px 0;
+	}
+
+	.row-actions span a,
+	.row-actions span .button-link {
+		display: inline-block;
+		padding: 4px 0;
+	}
+
+	.row-actions span.approve:before,
+	.row-actions span.unapprove:before {
+		content: "| ";
+	}
+
 	/* Quick Edit and Bulk Edit */
 	#wpbody-content .quick-edit-row-post .inline-edit-col-left,
 	#wpbody-content .quick-edit-row-post .inline-edit-col-right,
@@ -2004,6 +2048,11 @@ div.action-links,
 		padding: 10px 9px; /* reset from other list tables that have a label at this width */
 	}

+	/* Plugin description hidden via Screen Options */
+	#wpbody-content .wp-list-table.plugins .desc.hidden {
+		display: none;
+	}
+
 	#wpbody-content .wp-list-table.plugins .column-description {
 		padding-top: 2px;
 	}
@@ -2108,7 +2157,7 @@ div.action-links,

 	table.plugin-install #the-list tr {
 		display: block;
-		box-shadow: inset 0 -1px 0 rgba(0,0,0,0.1);
+		box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.1);
 	}

 	.plugin-card {
@@ -2118,11 +2167,17 @@ div.action-links,
 	}
 }

-@media screen and ( max-width: 480px ) {
+@media screen and (max-width: 480px) {
 	.tablenav-pages .current-page {
 		margin: 0;
 	}

+	/* Drop row actions to two columns on a small screen */
+	.row-actions:not(.plugins-php) {
+		-ms-grid-columns: auto auto;
+		grid-template-columns: auto auto;
+	}
+
 	.tablenav-pages .tablenav-paging-text {
 		float: right;
 		width: 100%;
--- a/wp-admin/css/list-tables-rtl.min.css
+++ b/wp-admin/css/list-tables-rtl.min.css
--- a/wp-admin/css/list-tables.css
+++ b/wp-admin/css/list-tables.css
@@ -152,10 +152,19 @@
 	overflow: hidden;
 }

+#replysubmit .reply-submit-buttons {
+	margin-bottom: 0;
+}
+
 #replysubmit .button {
 	margin-right: 5px;
 }

+#replysubmit .spinner {
+	float: none;
+	margin: -4px 0 0;
+}
+
 #replyrow.inline-edit-row fieldset.comment-reply {
 	font-size: inherit;
 	line-height: inherit;
@@ -243,12 +252,12 @@

 #the-comment-list tr:last-child th,
 #the-comment-list tr:last-child td {
-    box-shadow: none;
+	box-shadow: none;
 }

 #the-comment-list tr.unapproved + tr.approved th,
 #the-comment-list tr.unapproved + tr.approved td {
-    border-top: 1px solid rgba(0, 0, 0, 0.03);
+	border-top: 1px solid rgba(0, 0, 0, 0.03);
 }

 /* table vim shortcuts */
@@ -351,7 +360,7 @@ td.plugin-title p {
 table.media .column-title .media-icon {
 	float: left;
 	min-height: 60px;
- 	margin: 0 9px 0 0;
+	margin: 0 9px 0 0;
 }

 table.media .column-title .media-icon img {
@@ -393,7 +402,7 @@ table.media .column-title .filename {
 }

 #commentsdiv .inside .row-actions {
-	line-height:18px;
+	line-height: 18px;
 }

 #commentsdiv .inside .column-author {
@@ -495,9 +504,9 @@ th.asc a:focus span.sorting-indicator:before {
 }

 .wp-list-table .toggle-row:focus:before {
-    box-shadow:
-    	0 0 0 1px #5b9dd9,
-		0 0 2px 1px rgba(30, 140, 190, .8);
+	box-shadow:
+		0 0 0 1px #5b9dd9,
+		0 0 2px 1px rgba(30, 140, 190, 0.8);
 }

 .ie8 .wp-list-table .toggle-row:focus:before {
@@ -610,15 +619,9 @@ th.asc a:focus span.sorting-indicator {
 	visibility: visible;
 }

-/* Bulk Actions */
-.tablenav-pages a,
-.tablenav-pages-navspan {
-	font-weight: 600;
-	padding: 0 2px;
-}
-
 .tablenav-pages .current-page {
 	margin: 0 2px 0 0;
+	padding-top: 5px;
 	padding-bottom: 5px;
 	font-size: 13px;
 	text-align: center;
@@ -632,12 +635,6 @@ th.asc a:focus span.sorting-indicator {
 	margin-left: 2px;
 }

-.tablenav a.button,
-.tablenav a.button-secondary {
-	display: block;
-	margin: 3px 8px 0 0;
-}
-
 .tablenav {
 	clear: both;
 	height: 30px;
@@ -651,10 +648,7 @@ th.asc a:focus span.sorting-indicator {

 .tablenav .tablenav-pages {
 	float: right;
-	height: 28px;
-	margin-top: 3px;
-	cursor: default;
-	color: #555;
+	margin: 3px 0 9px;
 }

 .tablenav .no-pages,
@@ -662,49 +656,26 @@ th.asc a:focus span.sorting-indicator {
 	display: none;
 }

-.tablenav .tablenav-pages a,
-.tablenav-pages span.current  {
-	text-decoration: none;
-	padding: 3px 6px;
-}
-
-.tablenav .tablenav-pages a,
-.tablenav-pages-navspan {
+.tablenav .tablenav-pages .button,
+.tablenav .tablenav-pages .tablenav-pages-navspan {
 	display: inline-block;
-	min-width: 17px;
-	border: 1px solid #ccc; /* same color as buttons border */
-	padding: 3px 5px 7px;
-	background: #e5e5e5;
+	vertical-align: baseline;
+	min-width: 28px;
+	min-height: 28px;
+	margin: 0;
+	padding: 0 4px;
 	font-size: 16px;
-	line-height: 1;
-	font-weight: 400;
+	line-height: 1.5;
 	text-align: center;
 }

-.tablenav-pages-navspan {
-	height: 16px;
-	border-color: #ddd; /* same as disabled buttons */
-	background: #f7f7f7; /* same as disabled buttons */
-	color: #a0a5aa; /* same as disabled buttons */
-}
-
-.tablenav .tablenav-pages a:hover,
-.tablenav .tablenav-pages a:focus {
-	border-color: #5b9dd9;
-	color: #fff;
-	background: #00a0d2;
-	box-shadow: none;
-	outline: none; /* IE8 */
-}
-
 .tablenav .displaying-num {
 	margin-right: 7px;
 }

 .tablenav .one-page .displaying-num {
 	display: inline-block;
-	margin-top: 5px;
-	margin-right: 0;
+	margin: 5px 0;
 }

 .tablenav .actions {
@@ -721,24 +692,7 @@ th.asc a:focus span.sorting-indicator {
 	margin-right: 20px;
 }

-/* @todo: unclear if the following tablenav rules are actually used.
-classes exist in paginate_links() but not seen in list table output. */
-.tablenav .dots {
-	border-color: transparent;
-}
-
-.tablenav .next,
-.tablenav .prev {
-	border-color: transparent;
-	color: #0073aa;
-}
-
-.tablenav .next:hover,
-.tablenav .prev:hover {
-	border-color: transparent;
-	color: #00a0d2;
-}
-
+/* This view-switcher is still used on multisite. */
 .tablenav .view-switch {
 	float: right;
 	margin: 0 5px;
@@ -1257,15 +1211,15 @@ ul.cat-checklist {
 .plugin-install #the-list td,
 .upgrade .plugins td,
 .upgrade .plugins th {
-	box-shadow: inset 0 -1px 0 rgba(0,0,0,0.1);
+	box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.1);
 }

 .plugins tr.active.plugin-update-tr + tr.inactive th,
 .plugins tr.active.plugin-update-tr + tr.inactive td,
 .plugins tr.active + tr.inactive th,
 .plugins tr.active + tr.inactive td {
-	border-top: 1px solid rgba(0,0,0,0.03);
-	box-shadow: inset 0 1px 0 rgba(0,0,0,0.02), inset 0 -1px 0 #e1e1e1;
+	border-top: 1px solid rgba(0, 0, 0, 0.03);
+	box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.02), inset 0 -1px 0 #e1e1e1;
 }

 .plugins .update td,
@@ -1303,7 +1257,7 @@ ul.cat-checklist {
 .plugins .plugin-title .dashicons:before {
 	padding: 2px;
 	background-color: #eee;
-	box-shadow: inset 0 0 10px rgba(160,165,170,.15);
+	box-shadow: inset 0 0 10px rgba(160, 165, 170, 0.15);
 	font-size: 60px;
 	color: #B4B9BE;
 }
@@ -1336,7 +1290,7 @@ ul.cat-checklist {
 }

 .plugins .plugin-update-tr .plugin-update {
-	box-shadow: inset 0 -1px 0 rgba(0,0,0,0.1);
+	box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.1);
 	overflow: hidden; /* clearfix */
 	padding: 0;
 }
@@ -1350,6 +1304,37 @@ ul.cat-checklist {
 	margin: 0.5em 0;
 }

+.plugins .plugin-description a,
+.plugins .plugin-update a,
+.updates-table .plugin-title a {
+	text-decoration: underline;
+}
+
+.plugins tr.paused th.check-column {
+	border-left: 4px solid #d54e21;
+}
+
+.plugins tr.paused th,
+.plugins tr.paused td {
+	background-color: #fef7f1;
+}
+
+.plugins tr.paused .plugin-title,
+.plugins .paused .dashicons-warning {
+	color: #dc3232;
+}
+
+.plugins .paused .error-display p,
+.plugins .paused .error-display code {
+	font-size: 90%;
+	font-style: italic;
+	color: rgb( 0, 0, 0, 0.7 );
+}
+
+.plugins .resume-link {
+	color: #dc3232;
+}
+
 .plugin-card .update-now:before {
 	color: #f56e28;
 	content: "\f463";
@@ -1422,7 +1407,7 @@ ul.cat-checklist {
 	margin-right: 0;
 }

-@media screen and ( min-width: 1600px ) {
+@media screen and (min-width: 1600px) and ( max-width: 2299px ) {
 	.plugin-card {
 		width: 30%;
 		width: calc( 33.1% - 8px );
@@ -1447,6 +1432,31 @@ ul.cat-checklist {
 	}
 }

+@media screen and (min-width: 2300px) {
+	.plugin-card {
+		width: 25%;
+		width: calc( 25% - 12px );
+	}
+
+	.plugin-card:nth-child(odd) {
+		clear: none;
+		margin-left: 8px;
+	}
+
+	.plugin-card:nth-child(even) {
+		margin-right: 8px;
+	}
+
+	.plugin-card:nth-child(4n+1) {
+		clear: both;
+		margin-left: 0;
+	}
+
+	.plugin-card:nth-child(4n) {
+		margin-right: 0;
+	}
+}
+
 .plugin-card-top {
 	position: relative;
 	padding: 20px 20px 10px;
@@ -1555,12 +1565,18 @@ div.action-links,
 	color: #444;
 }

-.plugin-card .compatibility-incompatible:before {
+.plugin-card .column-compatibility .compatibility-incompatible:before {
 	content: "\f158";
+	color: #c62d2d;
 }

-.plugin-card .compatibility-compatible:before {
+.plugin-card .column-compatibility .compatibility-compatible:before {
 	content: "\f147";
+	color: #31843f;
+}
+
+.plugin-card .notice {
+	margin: 20px 20px 0 20px;
 }

 .plugin-icon {
@@ -1612,7 +1628,7 @@ div.action-links,
 /* =Media Queries
 -------------------------------------------------------------- */

-@media screen and ( max-width: 1100px ) and ( min-width: 782px ), ( max-width: 480px ) {
+@media screen and (max-width: 1100px) and (min-width: 782px), (max-width: 480px) {
 	.plugin-card .action-links {
 		position: static;
 		margin-left: 148px;
@@ -1648,7 +1664,7 @@ div.action-links,
 	}
 }

-@media screen and ( max-width: 782px ) {
+@media screen and (max-width: 782px) {
 	/* WP List Table Options & Filters */
 	.tablenav {
 		height: auto;
@@ -1697,7 +1713,6 @@ div.action-links,

 	.tablenav .tablenav-pages {
 		width: 100%;
-		height: auto;
 		text-align: center;
 		margin: 0 0 25px;
 	}
@@ -1719,19 +1734,19 @@ div.action-links,
 		font-size: 16px;
 	}

-	.tablenav-pages .pagination-links a,
-	.tablenav-pages-navspan {
-		padding: 9px 11px 12px;
+	.tablenav .tablenav-pages .button,
+	.tablenav .tablenav-pages .tablenav-pages-navspan {
+		min-width: 44px;
+		padding: 12px 8px;
 		font-size: 18px;
-	}
-
-	.tablenav-pages-navspan {
-		height: 18px;
+		line-height: 1;
 	}

 	.tablenav-pages .pagination-links .current-page {
-		padding: 8px 9px 9px;
+		min-width: 44px;
+		padding: 12px 6px;
 		font-size: 16px;
+		line-height: 18px;
 	}

 	/* WP List Table Adjustments: General */
@@ -1808,6 +1823,11 @@ div.action-links,
 		display: block;
 	}

+	/* Comment author hidden via Screen Options */
+	.fixed .column-author.hidden ~ .column-comment .comment-author {
+		display: none;
+	}
+
 	#the-comment-list .is-expanded td {
 		box-shadow: none;
 	}
@@ -1885,6 +1905,30 @@ div.action-links,
 		word-wrap: normal;
 	}

+	/* Make row actions more easy to select on mobile */
+	body:not(.plugins-php) .row-actions {
+		display: -ms-grid;
+		display: grid;
+		-ms-grid-columns: auto auto auto;
+		grid-template-columns: auto auto auto;
+		color: transparent;
+	}
+
+	.row-actions span {
+		padding: 4px 0;
+	}
+
+	.row-actions span a,
+	.row-actions span .button-link {
+		display: inline-block;
+		padding: 4px 0;
+	}
+
+	.row-actions span.approve:before,
+	.row-actions span.unapprove:before {
+		content: "| ";
+	}
+
 	/* Quick Edit and Bulk Edit */
 	#wpbody-content .quick-edit-row-post .inline-edit-col-left,
 	#wpbody-content .quick-edit-row-post .inline-edit-col-right,
@@ -2004,6 +2048,11 @@ div.action-links,
 		padding: 10px 9px; /* reset from other list tables that have a label at this width */
 	}

+	/* Plugin description hidden via Screen Options */
+	#wpbody-content .wp-list-table.plugins .desc.hidden {
+		display: none;
+	}
+
 	#wpbody-content .wp-list-table.plugins .column-description {
 		padding-top: 2px;
 	}
@@ -2108,7 +2157,7 @@ div.action-links,

 	table.plugin-install #the-list tr {
 		display: block;
-		box-shadow: inset 0 -1px 0 rgba(0,0,0,0.1);
+		box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.1);
 	}

 	.plugin-card {
@@ -2118,11 +2167,17 @@ div.action-links,
 	}
 }

-@media screen and ( max-width: 480px ) {
+@media screen and (max-width: 480px) {
 	.tablenav-pages .current-page {
 		margin: 0;
 	}

+	/* Drop row actions to two columns on a small screen */
+	.row-actions:not(.plugins-php) {
+		-ms-grid-columns: auto auto;
+		grid-template-columns: auto auto;
+	}
+
 	.tablenav-pages .tablenav-paging-text {
 		float: left;
 		width: 100%;
--- a/Show More
+++ b/Show More