Index: wp-admin/comment.php
===================================================================
--- wp-admin/comment.php	(revision 19125)
+++ wp-admin/comment.php	(working copy)
@@ -112,7 +112,7 @@
 <div class="narrow">
 
 <?php screen_icon(); ?>
-<h2><?php echo esc_html( $title ); ?></h2>
+<h2><?php echo esc_html( $title ); $current_screen->print_toggles(); ?></h2>
 
 <?php
 switch ( $action ) {
Index: wp-admin/css/colors-classic.dev.css
===================================================================
--- wp-admin/css/colors-classic.dev.css	(revision 19125)
+++ wp-admin/css/colors-classic.dev.css	(working copy)
@@ -1618,9 +1618,8 @@
 #contextual-help-back {
 	background-color: #EFF8FF;
 	border-color: #D1E5EE;
-	-webkit-box-shadow: 0 1px 3px rgba( 0, 0, 0, 0.05 );
-	-moz-box-shadow: 0 1px 3px rgba( 0, 0, 0, 0.05 );
-	box-shadow: 0 1px 3px rgba( 0, 0, 0, 0.05 );
+	-webkit-box-shadow: 0 3px 10px rgba(0, 0, 0, 0.3);
+	box-shadow: 0 3px 10px rgba(0, 0, 0, 0.3);
 }
 
 .contextual-help-tabs a:hover {
Index: wp-admin/css/colors-fresh.dev.css
===================================================================
--- wp-admin/css/colors-fresh.dev.css	(revision 19125)
+++ wp-admin/css/colors-fresh.dev.css	(working copy)
@@ -784,13 +784,12 @@
 #screen-meta {
 	background-color: #fff;
 }
+
 #contextual-help-back {
 	background-color: #f1f1f1;
 	border-color: #ccc;
-
-	-webkit-box-shadow: 0 1px 3px rgba( 0, 0, 0, 0.05 );
-	-moz-box-shadow: 0 1px 3px rgba( 0, 0, 0, 0.05 );
-	box-shadow: 0 1px 3px rgba( 0, 0, 0, 0.05 );
+	-webkit-box-shadow: 0 3px 10px rgba(0, 0, 0, 0.3);
+	box-shadow: 0 3px 10px rgba(0, 0, 0, 0.3);
 }
 
 .contextual-help-tabs a:hover {
Index: wp-admin/css/wp-admin.dev.css
===================================================================
--- wp-admin/css/wp-admin.dev.css	(revision 19125)
+++ wp-admin/css/wp-admin.dev.css	(working copy)
@@ -39,7 +39,6 @@
 20.0 - Settings
 21.0 - Admin Footer
 22.0 - Misc
-23.0 - Dead
 
 ------------------------------------------------------------------------*/
 
@@ -606,7 +605,7 @@
 
 .wrap h2 {
 	font-size: 23px;
-	padding: 9px 15px 4px 0;
+	padding: 9px 0 4px;
 	line-height: 29px;
 }
 
@@ -1367,6 +1366,7 @@
 	padding: 8px 20px 12px;
 	max-height: 300px;
 	overflow: auto;
+	position: relative;
 }
 
 #screen-meta .screen-reader-text {
@@ -1428,7 +1428,6 @@
 }
 
 #contextual-help-wrap {
-	position: relative;
 	padding: 0 0 0 4px;
 	overflow: auto;
 }
@@ -4624,7 +4623,8 @@
   22.0 - Misc
 ------------------------------------------------------------------------------*/
 
-#excerpt, .attachmentlinks {
+#excerpt,
+.attachmentlinks {
 	margin: 0;
 	height: 4em;
 	width: 98%;
@@ -4740,16 +4740,19 @@
 	padding: 0;
 }
 
-#titlediv, #poststuff .postarea {
+#titlediv,
+#poststuff .postarea {
 	margin-bottom: 20px;
 }
 
-td.post-title strong, td.plugin-title strong {
+td.post-title strong,
+td.plugin-title strong {
 	display: block;
 	margin-bottom: .2em;
 }
 
-td.post-title p, td.plugin-title p {
+td.post-title p,
+td.plugin-title p {
 	margin: 6px 0;
 }
 
@@ -4810,7 +4813,8 @@
 	display: none;
 }
 
-.plugin-install #description, .plugin-install-network #description {
+.plugin-install #description,
+.plugin-install-network #description {
 	width: 60%;
 }
 
@@ -4830,7 +4834,16 @@
 	height: 98%;
 }
 
+.screen-meta-toggle {
+	float: right;
+	padding-left: 8px;
+	font-size: 12px;
+}
 
+.screen-meta-toggle a {
+	text-decoration: none;
+}
+
 /* - Only used once or twice in all of WP - deprecate for global style
 ------------------------------------------------------------------------------*/
 td.media-icon {
Index: wp-admin/custom-background.php
===================================================================
--- wp-admin/custom-background.php	(revision 19125)
+++ wp-admin/custom-background.php	(working copy)
@@ -172,7 +172,7 @@
 ?>
 <div class="wrap" id="custom-background">
 <?php screen_icon(); ?>
-<h2><?php _e('Custom Background'); ?></h2>
+<h2><?php _e('Custom Background'); $current_screen->print_toggles(); ?></h2>
 <?php if ( !empty($this->updated) ) { ?>
 <div id="message" class="updated">
 <p><?php printf( __( 'Background updated. <a href="%s">Visit your site</a> to see how it looks.' ), home_url( '/' ) ); ?></p>
Index: wp-admin/custom-header.php
===================================================================
--- wp-admin/custom-header.php	(revision 19125)
+++ wp-admin/custom-header.php	(working copy)
@@ -472,7 +472,7 @@
 
 <div class="wrap">
 <?php screen_icon(); ?>
-<h2><?php _e('Custom Header'); ?></h2>
+<h2><?php _e('Custom Header'); $current_screen->print_toggles(); ?></h2>
 
 <?php if ( ! empty( $this->updated ) ) { ?>
 <div id="message" class="updated">
@@ -687,7 +687,7 @@
 
 <div class="wrap">
 <?php screen_icon(); ?>
-<h2><?php _e( 'Crop Header Image' ); ?></h2>
+<h2><?php _e( 'Crop Header Image' ); $current_screen->print_toggles(); ?></h2>
 
 <form method="post" action="<?php echo esc_attr(add_query_arg('step', 3)); ?>">
 	<p class="hide-if-no-js"><?php _e('Choose the part of the image you want to use as your header.'); ?></p>
Index: wp-admin/edit-comments.php
===================================================================
--- wp-admin/edit-comments.php	(revision 19125)
+++ wp-admin/edit-comments.php	(working copy)
@@ -144,9 +144,11 @@
 	echo __('Comments');
 
 if ( isset($_REQUEST['s']) && $_REQUEST['s'] )
-	printf( '<span class="subtitle">' . sprintf( __( 'Search results for &#8220;%s&#8221;' ), wp_html_excerpt( esc_html( stripslashes( $_REQUEST['s'] ) ), 50 ) ) . '</span>' ); ?>
-</h2>
+	printf( '<span class="subtitle">' . sprintf( __( 'Search results for &#8220;%s&#8221;' ), wp_html_excerpt( esc_html( stripslashes( $_REQUEST['s'] ) ), 50 ) ) . '</span>' );
 
+$current_screen->print_toggles();
+?></h2>
+
 <?php
 if ( isset( $_REQUEST['error'] ) ) {
 	$error = (int) $_REQUEST['error'];
Index: wp-admin/edit-form-advanced.php
===================================================================
--- wp-admin/edit-form-advanced.php	(revision 19125)
+++ wp-admin/edit-form-advanced.php	(working copy)
@@ -242,7 +242,16 @@
 
 <div class="wrap columns-<?php echo (int) $screen_layout_columns ? (int) $screen_layout_columns : 'auto'; ?>">
 <?php screen_icon(); ?>
-<h2><?php echo esc_html( $title ); ?><?php if ( isset( $post_new_file ) ) : ?> <a href="<?php echo esc_url( $post_new_file ) ?>" class="add-new-h2"><?php echo esc_html($post_type_object->labels->add_new); ?></a><?php endif; ?></h2>
+<h2><?php
+echo esc_html( $title );
+
+if ( isset( $post_new_file ) ) :
+	?> <a href="<?php echo esc_url( $post_new_file ) ?>" class="add-new-h2"><?php echo esc_html($post_type_object->labels->add_new); ?></a><?php
+endif;
+
+$current_screen->print_toggles();
+?></h2>
+
 <?php if ( $notice ) : ?>
 <div id="notice" class="error"><p><?php echo $notice ?></p></div>
 <?php endif; ?>
Index: wp-admin/edit-form-comment.php
===================================================================
--- wp-admin/edit-form-comment.php	(revision 19125)
+++ wp-admin/edit-form-comment.php	(working copy)
@@ -24,7 +24,7 @@
 <?php wp_nonce_field('update-comment_' . $comment->comment_ID) ?>
 <div class="wrap">
 <?php screen_icon(); ?>
-<h2><?php _e('Edit Comment'); ?></h2>
+<h2><?php _e('Edit Comment'); $current_screen->print_toggles(); ?></h2>
 
 <div id="poststuff" class="metabox-holder has-right-sidebar">
 <input type="hidden" name="user_ID" value="<?php echo (int) $user_ID ?>" />
Index: wp-admin/edit-link-form.php
===================================================================
--- wp-admin/edit-link-form.php	(revision 19125)
+++ wp-admin/edit-link-form.php	(working copy)
@@ -56,7 +56,7 @@
 
 <div class="wrap columns-<?php echo (int) $screen_layout_columns ? (int) $screen_layout_columns : 'auto'; ?>">
 <?php screen_icon(); ?>
-<h2><?php echo esc_html( $title ); ?>  <a href="link-add.php" class="add-new-h2"><?php echo esc_html_x('Add New', 'link'); ?></a></h2>
+<h2><?php echo esc_html( $title ); ?> <a href="link-add.php" class="add-new-h2"><?php echo esc_html_x('Add New', 'link'); ?></a> <?php $current_screen->print_toggles(); ?></h2>
 
 <?php if ( isset( $_GET['added'] ) ) : ?>
 <div id="message" class="updated"><p><?php _e('Link added.'); ?></p></div>
Index: wp-admin/edit-tag-form.php
===================================================================
--- wp-admin/edit-tag-form.php	(revision 19125)
+++ wp-admin/edit-tag-form.php	(working copy)
@@ -28,7 +28,7 @@
 
 <div class="wrap">
 <?php screen_icon(); ?>
-<h2><?php echo $tax->labels->edit_item; ?></h2>
+<h2><?php echo $tax->labels->edit_item; $current_screen->print_toggles(); ?></h2>
 <div id="ajax-response"></div>
 <form name="edittag" id="edittag" method="post" action="edit-tags.php" class="validate">
 <input type="hidden" name="action" value="editedtag" />
Index: wp-admin/edit-tags.php
===================================================================
--- wp-admin/edit-tags.php	(revision 19125)
+++ wp-admin/edit-tags.php	(working copy)
@@ -261,11 +261,15 @@
 
 <div class="wrap nosubsub">
 <?php screen_icon(); ?>
-<h2><?php echo esc_html( $title );
+<h2><?php
+echo esc_html( $title );
+
 if ( !empty($_REQUEST['s']) )
-	printf( '<span class="subtitle">' . __('Search results for &#8220;%s&#8221;') . '</span>', esc_html( stripslashes($_REQUEST['s']) ) ); ?>
-</h2>
+	printf( '<span class="subtitle">' . __('Search results for &#8220;%s&#8221;') . '</span>', esc_html( stripslashes($_REQUEST['s']) ) );
 
+$current_screen->print_toggles();
+?></h2>
+
 <?php if ( isset($_REQUEST['message']) && ( $msg = (int) $_REQUEST['message'] ) ) : ?>
 <div id="message" class="updated"><p><?php echo $messages[$msg]; ?></p></div>
 <?php $_SERVER['REQUEST_URI'] = remove_query_arg(array('message'), $_SERVER['REQUEST_URI']);
Index: wp-admin/edit.php
===================================================================
--- wp-admin/edit.php	(revision 19125)
+++ wp-admin/edit.php	(working copy)
@@ -193,10 +193,13 @@
 <div class="wrap">
 <?php screen_icon(); ?>
 <h2><?php echo esc_html( $post_type_object->labels->name ); ?> <a href="<?php echo $post_new_file ?>" class="add-new-h2"><?php echo esc_html($post_type_object->labels->add_new); ?></a> <?php
+
 if ( isset($_REQUEST['s']) && $_REQUEST['s'] )
-	printf( '<span class="subtitle">' . __('Search results for &#8220;%s&#8221;') . '</span>', get_search_query() ); ?>
-</h2>
+	printf( '<span class="subtitle">' . __('Search results for &#8220;%s&#8221;') . '</span>', get_search_query() );
 
+$current_screen->print_toggles();
+?></h2>
+
 <?php
 if ( isset($_REQUEST['posted']) && $_REQUEST['posted'] ) : $_REQUEST['posted'] = (int) $_REQUEST['posted']; ?>
 <div id="message" class="updated"><p><strong><?php _e('This has been saved.'); ?></strong> <a href="<?php echo get_permalink( $_REQUEST['posted'] ); ?>"><?php _e('View Post'); ?></a> | <a href="<?php echo get_edit_post_link( $_REQUEST['posted'] ); ?>"><?php _e('Edit Post'); ?></a></p></div>
Index: wp-admin/export.php
===================================================================
--- wp-admin/export.php	(revision 19125)
+++ wp-admin/export.php	(working copy)
@@ -119,7 +119,7 @@
 
 <div class="wrap">
 <?php screen_icon(); ?>
-<h2><?php echo esc_html( $title ); ?></h2>
+<h2><?php echo esc_html( $title ); $current_screen->print_toggles(); ?></h2>
 
 <p><?php _e('When you click the button below WordPress will create an XML file for you to save to your computer.'); ?></p>
 <p><?php _e('This format, which we call WordPress eXtended RSS or WXR, will contain your posts, pages, comments, custom fields, categories, and tags.'); ?></p>
Index: wp-admin/import.php
===================================================================
--- wp-admin/import.php	(revision 19125)
+++ wp-admin/import.php	(working copy)
@@ -54,7 +54,7 @@
 
 <div class="wrap">
 <?php screen_icon(); ?>
-<h2><?php echo esc_html( $title ); ?></h2>
+<h2><?php echo esc_html( $title ); $current_screen->print_toggles(); ?></h2>
 <?php if ( ! empty( $_GET['invalid'] ) ) : ?>
 	<div class="error"><p><strong><?php _e('ERROR:')?></strong> <?php printf( __('The <strong>%s</strong> importer is invalid or is not installed.'), esc_html( $_GET['invalid'] ) ); ?></p></div>
 <?php endif; ?>
Index: wp-admin/includes/file.php
===================================================================
--- wp-admin/includes/file.php	(revision 19125)
+++ wp-admin/includes/file.php	(working copy)
@@ -998,7 +998,7 @@
 <form action="<?php echo $form_post ?>" method="post">
 <div class="wrap">
 <?php screen_icon(); ?>
-<h2><?php _e('Connection Information') ?></h2>
+<h2><?php _e('Connection Information'); $current_screen->print_toggles(); ?></h2>
 <p><?php
 	$label_user = __('Username');
 	$label_pass = __('Password');
Index: wp-admin/includes/screen.php
===================================================================
--- wp-admin/includes/screen.php	(revision 19125)
+++ wp-admin/includes/screen.php	(working copy)
@@ -689,20 +689,9 @@
 			) );
 		}
 
-		// Add screen options tab
-		if ( $this->show_screen_options() ) {
-			$this->add_help_tab( array(
-				'id'       => 'screen-options',
-				'title'    => __('Screen Options'),
-				'callback' => array( $this, 'render_screen_options' ),
-			) );
-			$_options_tab = array_pop( $this->_help_tabs );
-			array_unshift( $this->_help_tabs, $_options_tab );
-		}
-
 		// Time to render!
 		?>
-		<div id="screen-meta" class='metabox-prefs'>
+		<div id="screen-meta" class="metabox-prefs">
 			<div id="contextual-help-back"></div>
 			<div id="contextual-help-wrap" class="hidden">
 				<div class="contextual-help-tabs">
@@ -748,6 +737,11 @@
 					<?php endforeach; ?>
 				</div>
 			</div>
+		<?php
+		// Add screen options
+		if ( $this->show_screen_options() )
+			$this->render_screen_options();
+		?>
 		</div>
 		<?php
 	}
@@ -789,6 +783,7 @@
 		$hidden  = get_hidden_columns( $this );
 
 		?>
+		<div id="screen-options-wrap" class="hidden">
 		<form id="adv-settings" action="" method="post">
 		<?php
 		if ( $this->get_option('overview') )
@@ -840,6 +835,7 @@
 		?>
 		<div><?php wp_nonce_field( 'screen-options-nonce', 'screenoptionnonce', false ); ?></div>
 		</form>
+		</div>
 		<?php
 	}
 
@@ -939,4 +935,13 @@
 		</div>
 		<?php
 	}
-}
\ No newline at end of file
+	
+	public function print_toggles() {
+		echo ' <span class="screen-meta-toggle">';
+		
+		if ( $this->show_screen_options() )
+			echo '<a href="#screen-options-wrap">' . __('Screen Options') . '</a> |';
+	
+		echo ' <a href="#contextual-help-wrap">' . __('Help') . '</a></span>';
+	}
+}
Index: wp-admin/index.php
===================================================================
--- wp-admin/index.php	(revision 19125)
+++ wp-admin/index.php	(working copy)
@@ -84,7 +84,7 @@
 
 <div class="wrap">
 <?php screen_icon(); ?>
-<h2><?php echo esc_html( $title ); ?></h2>
+<h2><?php echo esc_html( $title ); $current_screen->print_toggles(); ?></h2>
 
 <?php wp_welcome_panel(); ?>
 
Index: wp-admin/js/common.dev.js
===================================================================
--- wp-admin/js/common.dev.js	(revision 19125)
+++ wp-admin/js/common.dev.js	(working copy)
@@ -95,29 +95,22 @@
 	page:    null, // #wpcontent
 	padding: null, // the closed page padding-top property
 	top:     null, // the closed element top property
-	map: {
-		'wp-admin-bar-screen-options': 'screen-options-wrap',
-		'wp-admin-bar-help': 'contextual-help-wrap'
-	},
 
 	init: function() {
 		screenMeta.element = $('#screen-meta');
-		screenMeta.toggles = $('.screen-meta-toggle');
+		screenMeta.toggles = $('.screen-meta-toggle a');
 		screenMeta.page    = $('#wpcontent');
 
 		screenMeta.toggles.click( screenMeta.toggleEvent );
 	},
 
 	toggleEvent: function( e ) {
-		var panel;
+		var panel = $( this.href.replace(/.+#/, '#') );
 		e.preventDefault();
 
-		// Check to see if we found a panel.
-		if ( ! screenMeta.map[ this.id ] )
+		if ( !panel.length )
 			return;
 
-		panel = $('#' + screenMeta.map[ this.id ]);
-
 		if ( panel.is(':visible') )
 			screenMeta.close( panel, $(this) );
 		else
Index: wp-admin/link-manager.php
===================================================================
--- wp-admin/link-manager.php	(revision 19125)
+++ wp-admin/link-manager.php	(working copy)
@@ -62,11 +62,16 @@
 
 <div class="wrap nosubsub">
 <?php screen_icon(); ?>
-<h2><?php echo esc_html( $title ); ?> <a href="link-add.php" class="add-new-h2"><?php echo esc_html_x('Add New', 'link'); ?></a> <?php
+<h2><?php
+echo esc_html( $title );
+?> <a href="link-add.php" class="add-new-h2"><?php echo esc_html_x('Add New', 'link'); ?></a> <?php
+
 if ( !empty($_REQUEST['s']) )
-	printf( '<span class="subtitle">' . __('Search results for &#8220;%s&#8221;') . '</span>', esc_html( stripslashes($_REQUEST['s']) ) ); ?>
-</h2>
+	printf( '<span class="subtitle">' . __('Search results for &#8220;%s&#8221;') . '</span>', esc_html( stripslashes($_REQUEST['s']) ) );
 
+$current_screen->print_toggles();
+?></h2>
+
 <?php
 if ( isset($_REQUEST['deleted']) ) {
 	echo '<div id="message" class="updated"><p>';
Index: wp-admin/media-upload.php
===================================================================
--- wp-admin/media-upload.php	(revision 19125)
+++ wp-admin/media-upload.php	(working copy)
@@ -76,7 +76,7 @@
 	require_once('./admin-header.php'); ?>
 	<div class="wrap">
 	<?php screen_icon(); ?>
-	<h2><?php echo esc_html( $title ); ?></h2>
+	<h2><?php echo esc_html( $title ); $current_screen->print_toggles(); ?></h2>
 
 	<form enctype="multipart/form-data" method="post" action="<?php echo admin_url('media-upload.php?inline=&amp;upload-page-form='); ?>" class="media-upload-form type-form validate" id="file-form">
 
Index: wp-admin/media.php
===================================================================
--- wp-admin/media.php	(revision 19125)
+++ wp-admin/media.php	(working copy)
@@ -100,14 +100,16 @@
 
 <div class="wrap">
 <?php screen_icon(); ?>
-<h2>
-<?php
+<h2><?php
 echo esc_html( $title );
+
 if ( current_user_can( 'upload_files' ) ) { ?>
 	<a href="media-new.php" class="add-new-h2"><?php echo esc_html_x('Add New', 'file'); ?></a>
-<?php } ?>
-</h2>
+<?php }
 
+$current_screen->print_toggles();
+?></h2>
+
 <form method="post" action="" class="media-upload-form" id="media-single-form">
 <p class="submit" style="padding-bottom: 0;">
 <?php submit_button( __( 'Update Media' ), 'primary', 'save', false ); ?>
Index: wp-admin/my-sites.php
===================================================================
--- wp-admin/my-sites.php	(revision 19125)
+++ wp-admin/my-sites.php	(working copy)
@@ -57,7 +57,7 @@
 
 <div class="wrap">
 <?php screen_icon(); ?>
-<h2><?php echo esc_html( $title ); ?></h2>
+<h2><?php echo esc_html( $title ); $current_screen->print_toggles(); ?></h2>
 <form id="myblogs" action="" method="post">
 	<?php
 	choose_primary_blog();
Index: wp-admin/nav-menus.php
===================================================================
--- wp-admin/nav-menus.php	(revision 19125)
+++ wp-admin/nav-menus.php	(working copy)
@@ -462,7 +462,7 @@
 ?>
 <div class="wrap">
 	<?php screen_icon(); ?>
-	<h2><?php esc_html_e('Menus'); ?></h2>
+	<h2><?php esc_html_e('Menus'); $current_screen->print_toggles(); ?></h2>
 	<?php
 	foreach( $messages as $message ) :
 		echo $message . "\n";
Index: wp-admin/network.php
===================================================================
--- wp-admin/network.php	(revision 19125)
+++ wp-admin/network.php	(working copy)
@@ -123,7 +123,7 @@
 ?>
 <div class="wrap">
 <?php screen_icon('tools'); ?>
-<h2><?php echo esc_html( $title ); ?></h2>
+<h2><?php echo esc_html( $title ); $current_screen->print_toggles(); ?></h2>
 
 <?php
 /**
Index: wp-admin/network/index.php
===================================================================
--- wp-admin/network/index.php	(revision 19125)
+++ wp-admin/network/index.php	(working copy)
@@ -49,7 +49,7 @@
 
 <div class="wrap">
 <?php screen_icon(); ?>
-<h2><?php echo esc_html( $title ); ?></h2>
+<h2><?php echo esc_html( $title ); $current_screen->print_toggles(); ?></h2>
 
 <div id="dashboard-widgets-wrap">
 
Index: wp-admin/network/settings.php
===================================================================
--- wp-admin/network/settings.php	(revision 19125)
+++ wp-admin/network/settings.php	(working copy)
@@ -111,8 +111,17 @@
 ?>
 
 <div class="wrap">
-	<?php screen_icon('options-general'); ?>
-	<h2><?php echo esc_html( $title ); ?></h2>
+<?php screen_icon('options-general'); ?>
+	<h2><?php
+
+	echo esc_html( $title );
+
+	if ( $current_screen->show_screen_options() )
+		echo ' <a class="screen-meta-toggle" href="#screen-options-wrap">' . __('Screen Options') . '</a>';
+
+	echo ' <a class="screen-meta-toggle" href="#contextual-help-wrap">' . __('Help') . '</a>';
+
+?></h2>
 	<form method="post" action="settings.php">
 		<?php wp_nonce_field( 'siteoptions' ); ?>
 		<h3><?php _e( 'Operational Settings' ); ?></h3>
Index: wp-admin/network/themes.php
===================================================================
--- wp-admin/network/themes.php	(revision 19125)
+++ wp-admin/network/themes.php	(working copy)
@@ -224,11 +224,19 @@
 
 <div class="wrap">
 <?php screen_icon('themes'); ?>
-<h2><?php echo esc_html( $title ); if ( current_user_can('install_themes') ) { ?> <a href="theme-install.php" class="add-new-h2"><?php echo esc_html_x('Add New', 'theme'); ?></a><?php }
+<h2><?php
+echo esc_html( $title );
+
+if ( current_user_can('install_themes') ) {
+	?> <a href="theme-install.php" class="add-new-h2"><?php echo esc_html_x('Add New', 'theme'); ?></a><?php
+}
+
 if ( $s ) 
-	printf( '<span class="subtitle">' . __('Search results for &#8220;%s&#8221;') . '</span>', esc_html( $s ) ); ?> 
-</h2>
+	printf( '<span class="subtitle">' . __('Search results for &#8220;%s&#8221;') . '</span>', esc_html( $s ) );
 
+$current_screen->print_toggles();
+?></h2>
+
 <?php
 if ( isset( $_GET['enabled'] ) ) {
 	$_GET['enabled'] = absint( $_GET['enabled'] );
Index: wp-admin/network/user-new.php
===================================================================
--- wp-admin/network/user-new.php	(revision 19125)
+++ wp-admin/network/user-new.php	(working copy)
@@ -68,7 +68,7 @@
 
 <div class="wrap">
 <?php screen_icon(); ?>
-<h2 id="add-new-user"><?php _e('Add New User') ?></h2>
+<h2 id="add-new-user"><?php _e('Add New User'); $current_screen->print_toggles(); ?></h2>
 <?php
 if ( ! empty( $messages ) ) {
 	foreach ( $messages as $msg )
Index: wp-admin/network/users.php
===================================================================
--- wp-admin/network/users.php	(revision 19125)
+++ wp-admin/network/users.php	(working copy)
@@ -23,7 +23,7 @@
 
 	screen_icon();
 	?>
-	<h2><?php esc_html_e( 'Users' ); ?></h2>
+	<h2><?php esc_html_e( 'Users' ); $current_screen->print_toggles(); ?></h2>
 	<p><?php _e( 'Transfer or delete posts and links before deleting users.' ); ?></p>
 	<form action="users.php?action=dodelete" method="post">
 	<input type="hidden" name="dodelete" />
@@ -274,15 +274,18 @@
 	?>
 <div class="wrap">
 	<?php screen_icon(); ?>
-	<h2><?php esc_html_e( 'Users' );
+	<h2><?php
+	esc_html_e( 'Users' );
+
 	if ( current_user_can( 'create_users') ) : ?>
 		<a href="<?php echo network_admin_url('user-new.php'); ?>" class="add-new-h2"><?php echo esc_html_x( 'Add New', 'user' ); ?></a><?php
 	endif;
 	
 	if ( !empty( $usersearch ) )
-	printf( '<span class="subtitle">' . __( 'Search results for &#8220;%s&#8221;' ) . '</span>', esc_html( $usersearch ) );
-	?>
-	</h2>
+		printf( '<span class="subtitle">' . __( 'Search results for &#8220;%s&#8221;' ) . '</span>', esc_html( $usersearch ) );
+	
+	$current_screen->print_toggles();
+	?></h2>
 
 	<?php $wp_list_table->views(); ?>
 
Index: wp-admin/options-discussion.php
===================================================================
--- wp-admin/options-discussion.php	(revision 19125)
+++ wp-admin/options-discussion.php	(working copy)
@@ -31,7 +31,7 @@
 
 <div class="wrap">
 <?php screen_icon(); ?>
-<h2><?php echo esc_html( $title ); ?></h2>
+<h2><?php echo esc_html( $title ); $current_screen->print_toggles(); ?></h2>
 
 <form method="post" action="options.php">
 <?php settings_fields('discussion'); ?>
Index: wp-admin/options-general.php
===================================================================
--- wp-admin/options-general.php	(revision 19125)
+++ wp-admin/options-general.php	(working copy)
@@ -78,7 +78,7 @@
 
 <div class="wrap">
 <?php screen_icon(); ?>
-<h2><?php echo esc_html( $title ); ?></h2>
+<h2><?php echo esc_html( $title ); $current_screen->print_toggles(); ?></h2>
 
 <form method="post" action="options.php">
 <?php settings_fields('general'); ?>
Index: wp-admin/options-media.php
===================================================================
--- wp-admin/options-media.php	(revision 19125)
+++ wp-admin/options-media.php	(working copy)
@@ -34,7 +34,7 @@
 
 <div class="wrap">
 <?php screen_icon(); ?>
-<h2><?php echo esc_html( $title ); ?></h2>
+<h2><?php echo esc_html( $title ); $current_screen->print_toggles(); ?></h2>
 
 <form action="options.php" method="post">
 <?php settings_fields('media'); ?>
Index: wp-admin/options-permalink.php
===================================================================
--- wp-admin/options-permalink.php	(revision 19125)
+++ wp-admin/options-permalink.php	(working copy)
@@ -152,7 +152,7 @@
 
 <div class="wrap">
 <?php screen_icon(); ?>
-<h2><?php echo esc_html( $title ); ?></h2>
+<h2><?php echo esc_html( $title ); $current_screen->print_toggles(); ?></h2>
 
 <form name="form" action="options-permalink.php" method="post">
 <?php wp_nonce_field('update-permalink') ?>
Index: wp-admin/options-privacy.php
===================================================================
--- wp-admin/options-privacy.php	(revision 19125)
+++ wp-admin/options-privacy.php	(working copy)
@@ -32,7 +32,7 @@
 
 <div class="wrap">
 <?php screen_icon(); ?>
-<h2><?php echo esc_html( $title ); ?></h2>
+<h2><?php echo esc_html( $title ); $current_screen->print_toggles(); ?></h2>
 
 <form method="post" action="options.php">
 <?php settings_fields('privacy'); ?>
Index: wp-admin/options-reading.php
===================================================================
--- wp-admin/options-reading.php	(revision 19125)
+++ wp-admin/options-reading.php	(working copy)
@@ -59,7 +59,7 @@
 
 <div class="wrap">
 <?php screen_icon(); ?>
-<h2><?php echo esc_html( $title ); ?></h2>
+<h2><?php echo esc_html( $title ); $current_screen->print_toggles(); ?></h2>
 
 <form name="form1" method="post" action="options.php">
 <?php settings_fields( 'reading' ); ?>
Index: wp-admin/options-writing.php
===================================================================
--- wp-admin/options-writing.php	(revision 19125)
+++ wp-admin/options-writing.php	(working copy)
@@ -31,7 +31,7 @@
 
 <div class="wrap">
 <?php screen_icon(); ?>
-<h2><?php echo esc_html( $title ); ?></h2>
+<h2><?php echo esc_html( $title ); $current_screen->print_toggles(); ?></h2>
 
 <form method="post" action="options.php">
 <?php settings_fields('writing'); ?>
Index: wp-admin/plugin-editor.php
===================================================================
--- wp-admin/plugin-editor.php	(revision 19125)
+++ wp-admin/plugin-editor.php	(working copy)
@@ -158,7 +158,7 @@
 <?php endif; ?>
 <div class="wrap">
 <?php screen_icon(); ?>
-<h2><?php echo esc_html( $title ); ?></h2>
+<h2><?php echo esc_html( $title ); $current_screen->print_toggles(); ?></h2>
 
 <div class="fileedit-sub">
 <div class="alignleft">
Index: wp-admin/plugin-install.php
===================================================================
--- wp-admin/plugin-install.php	(revision 19125)
+++ wp-admin/plugin-install.php	(working copy)
@@ -52,7 +52,7 @@
 ?>
 <div class="wrap">
 <?php screen_icon(); ?>
-<h2><?php echo esc_html( $title ); ?></h2>
+<h2><?php echo esc_html( $title ); $current_screen->print_toggles(); ?></h2>
 
 <?php $wp_list_table->views(); ?>
 
Index: wp-admin/plugins.php
===================================================================
--- wp-admin/plugins.php	(revision 19125)
+++ wp-admin/plugins.php	(working copy)
@@ -382,14 +382,19 @@
 
 <div class="wrap">
 <?php screen_icon(); ?>
-<h2><?php echo esc_html( $title );
+<h2><?php
+echo esc_html( $title );
+
 if ( ( ! is_multisite() || is_network_admin() ) && current_user_can('install_plugins') ) { ?>
 <a href="<?php echo self_admin_url( 'plugin-install.php' ); ?>" class="add-new-h2"><?php echo esc_html_x('Add New', 'plugin'); ?></a>
 <?php }
+
 if ( $s )
-	printf( '<span class="subtitle">' . __('Search results for &#8220;%s&#8221;') . '</span>', esc_html( $s ) ); ?>
-</h2>
+	printf( '<span class="subtitle">' . __('Search results for &#8220;%s&#8221;') . '</span>', esc_html( $s ) );
 
+$current_screen->print_toggles();
+?></h2>
+
 <?php do_action( 'pre_current_active_plugins', $plugins['all'] ) ?>
 
 <?php $wp_list_table->views(); ?>
Index: wp-admin/theme-editor.php
===================================================================
--- wp-admin/theme-editor.php	(revision 19125)
+++ wp-admin/theme-editor.php	(working copy)
@@ -143,7 +143,7 @@
 ?>
 <div class="wrap">
 <?php screen_icon(); ?>
-<h2><?php echo esc_html( $title ); ?></h2>
+<h2><?php echo esc_html( $title ); $current_screen->print_toggles(); ?></h2>
 
 <div class="fileedit-sub">
 <div class="alignleft">
Index: wp-admin/theme-install.php
===================================================================
--- wp-admin/theme-install.php	(revision 19125)
+++ wp-admin/theme-install.php	(working copy)
@@ -57,11 +57,9 @@
 screen_icon();
 
 if ( is_network_admin() ) : ?>
-<h2><?php echo esc_html( $title ); ?></h2>
-<?php else : ?>
-<h2 class="nav-tab-wrapper"><a href="themes.php" class="nav-tab"><?php echo esc_html_x('Manage Themes', 'theme'); ?></a><a href="theme-install.php" class="nav-tab nav-tab-active"><?php echo esc_html( $title ); ?></a></h2>
-
-<?php
+<h2><?php echo esc_html( $title ); $current_screen->print_toggles(); ?></h2><?php
+else :
+?><h2 class="nav-tab-wrapper"><a href="themes.php" class="nav-tab"><?php echo esc_html_x('Manage Themes', 'theme'); ?></a><a href="theme-install.php" class="nav-tab nav-tab-active"><?php echo esc_html( $title ); ?></a><?php $current_screen->print_toggles(); ?></h2><?php
 endif;
 
 $wp_list_table->views(); ?>
Index: wp-admin/themes.php
===================================================================
--- wp-admin/themes.php	(revision 19125)
+++ wp-admin/themes.php	(working copy)
@@ -75,10 +75,11 @@
 screen_icon();
 if ( ! is_multisite() && current_user_can( 'install_themes' ) ) : ?>
 <h2 class="nav-tab-wrapper">
-<a href="themes.php" class="nav-tab nav-tab-active"><?php echo esc_html( $title ); ?></a><a href="<?php echo admin_url( 'theme-install.php'); ?>" class="nav-tab"><?php echo esc_html_x('Install Themes', 'theme'); ?></a>
-<?php else : ?>
-<h2><?php echo esc_html( $title ); ?>
-<?php endif; ?>
+<a href="themes.php" class="nav-tab nav-tab-active"><?php echo esc_html( $title ); ?></a><a href="<?php echo admin_url( 'theme-install.php'); ?>" class="nav-tab"><?php echo esc_html_x('Install Themes', 'theme'); ?></a><?php
+$current_screen->print_toggles();
+else : ?>
+<h2><?php echo esc_html( $title ); $current_screen->print_toggles();
+endif; ?>
 </h2>
 
 <h3><?php _e('Current Theme'); ?></h3>
Index: wp-admin/tools.php
===================================================================
--- wp-admin/tools.php	(revision 19125)
+++ wp-admin/tools.php	(working copy)
@@ -28,7 +28,7 @@
 ?>
 <div class="wrap">
 <?php screen_icon(); ?>
-<h2><?php echo esc_html( $title ); ?></h2>
+<h2><?php echo esc_html( $title ); $current_screen->print_toggles(); ?></h2>
 
 <?php if ( current_user_can('edit_posts') ) : ?>
 <div class="tool-box">
Index: wp-admin/upload.php
===================================================================
--- wp-admin/upload.php	(revision 19125)
+++ wp-admin/upload.php	(working copy)
@@ -164,10 +164,13 @@
 <div class="wrap">
 <?php screen_icon(); ?>
 <h2><?php echo esc_html( $title ); ?> <a href="media-new.php" class="add-new-h2"><?php echo esc_html_x('Add New', 'file'); ?></a> <?php
+
 if ( ! empty( $_REQUEST['s'] ) )
-	printf( '<span class="subtitle">' . __('Search results for &#8220;%s&#8221;') . '</span>', get_search_query() ); ?>
-</h2>
+	printf( '<span class="subtitle">' . __('Search results for &#8220;%s&#8221;') . '</span>', get_search_query() );
 
+$current_screen->print_toggles();
+?></h2>
+
 <?php
 $message = '';
 if ( ! empty( $_GET['posted'] ) ) {
Index: wp-admin/user-edit.php
===================================================================
--- wp-admin/user-edit.php	(revision 19125)
+++ wp-admin/user-edit.php	(working copy)
@@ -170,18 +170,20 @@
 
 <div class="wrap" id="profile-page">
 <?php screen_icon(); ?>
-<h2>
-<?php
+<h2><?php
 echo esc_html( $title );
+
 if ( ! IS_PROFILE_PAGE ) {
 	if ( current_user_can( 'create_users' ) ) { ?>
 		<a href="user-new.php" class="add-new-h2"><?php echo esc_html_x( 'Add New', 'user' ); ?></a>
 	<?php } elseif ( is_multisite() && current_user_can( 'promote_users' ) ) { ?>
 		<a href="user-new.php" class="add-new-h2"><?php echo esc_html_x( 'Add Existing', 'user' ); ?></a>
 	<?php }
-} ?>
-</h2>
+}
 
+$current_screen->print_toggles();
+?></h2>
+
 <form id="your-profile" action="<?php echo esc_url( self_admin_url( IS_PROFILE_PAGE ? 'profile.php' : 'user-edit.php' ) ); ?>" method="post"<?php do_action('user_edit_form_tag'); ?>>
 <?php wp_nonce_field('update-user_' . $user_id) ?>
 <?php if ( $wp_http_referer ) : ?>
Index: wp-admin/user-new.php
===================================================================
--- wp-admin/user-new.php	(revision 19125)
+++ wp-admin/user-new.php	(working copy)
@@ -189,13 +189,15 @@
 <div class="wrap">
 <?php screen_icon(); ?>
 <h2 id="add-new-user"> <?php
-if ( current_user_can( 'create_users' ) ) {
+
+if ( current_user_can( 'create_users' ) )
 	echo _x( 'Add New User', 'user' );
-} elseif ( current_user_can( 'promote_users' ) ) {
+elseif ( current_user_can( 'promote_users' ) )
 	echo _x( 'Add Existing User', 'user' );
-} ?>
-</h2>
 
+$current_screen->print_toggles();
+?></h2>
+
 <?php if ( isset($errors) && is_wp_error( $errors ) ) : ?>
 	<div class="error">
 		<ul>
Index: wp-admin/users.php
===================================================================
--- wp-admin/users.php	(revision 19125)
+++ wp-admin/users.php	(working copy)
@@ -359,9 +359,9 @@
 
 <div class="wrap">
 <?php screen_icon(); ?>
-<h2>
-<?php
+<h2><?php
 echo esc_html( $title );
+
 if ( current_user_can( 'create_users' ) ) { ?>
 	<a href="user-new.php" class="add-new-h2"><?php echo esc_html_x( 'Add New', 'user' ); ?></a>
 <?php } elseif ( is_multisite() && current_user_can( 'promote_users' ) ) { ?>
@@ -369,9 +369,11 @@
 <?php }
 
 if ( $usersearch )
-	printf( '<span class="subtitle">' . __('Search results for &#8220;%s&#8221;') . '</span>', esc_html( $usersearch ) ); ?>
-</h2>
+	printf( '<span class="subtitle">' . __('Search results for &#8220;%s&#8221;') . '</span>', esc_html( $usersearch ) );
 
+$current_screen->print_toggles();
+?></h2>
+
 <?php $wp_list_table->views(); ?>
 
 <form action="" method="get">
Index: wp-admin/widgets.php
===================================================================
--- wp-admin/widgets.php	(revision 19125)
+++ wp-admin/widgets.php	(working copy)
@@ -301,7 +301,7 @@
 
 <div class="wrap">
 <?php screen_icon(); ?>
-<h2><?php echo esc_html( $title ); ?></h2>
+<h2><?php echo esc_html( $title ); $current_screen->print_toggles(); ?></h2>
 
 <?php if ( isset($_GET['message']) && isset($messages[$_GET['message']]) ) { ?>
 <div id="message" class="updated"><p><?php echo $messages[$_GET['message']]; ?></p></div>
Index: wp-content/themes/twentyeleven/inc/theme-options.php
===================================================================
--- wp-content/themes/twentyeleven/inc/theme-options.php	(revision 19125)
+++ wp-content/themes/twentyeleven/inc/theme-options.php	(working copy)
@@ -293,7 +293,7 @@
 	?>
 	<div class="wrap">
 		<?php screen_icon(); ?>
-		<h2><?php printf( __( '%s Theme Options', 'twentyeleven' ), get_current_theme() ); ?></h2>
+		<h2><?php printf( __( '%s Theme Options', 'twentyeleven' ), get_current_theme() ); $current_screen->print_toggles(); ?></h2>
 		<?php settings_errors(); ?>
 
 		<form method="post" action="options.php">
@@ -425,4 +425,4 @@
 
 	return array_merge( $existing_classes, $classes );
 }
-add_filter( 'body_class', 'twentyeleven_layout_classes' );
\ No newline at end of file
+add_filter( 'body_class', 'twentyeleven_layout_classes' );
Index: wp-includes/admin-bar.php
===================================================================
--- wp-includes/admin-bar.php	(revision 19125)
+++ wp-includes/admin-bar.php	(working copy)
@@ -633,22 +633,6 @@
 }
 
 /**
- * Add help link.
- *
- * @since 3.3.0
- */
-function wp_admin_bar_help_menu( $wp_admin_bar ) {
-	$wp_admin_bar->add_menu( array(
-		'id'    => 'help',
-		'title' => __('Help'),
-		'href'  => '#',
-		'meta'  => array(
-			'class' => 'screen-meta-toggle hide-if-no-js',
-		),
-	) );
-}
-
-/**
  * Add search form.
  *
  * @since 3.3.0
Index: wp-includes/class-wp-admin-bar.php
===================================================================
--- wp-includes/class-wp-admin-bar.php	(revision 19125)
+++ wp-includes/class-wp-admin-bar.php	(working copy)
@@ -201,13 +201,10 @@
 		add_action( 'admin_bar_menu', 'wp_admin_bar_edit_menu', 80 );
 		add_action( 'admin_bar_menu', 'wp_admin_bar_shortlink_menu', 90 );
 
-		if ( ! is_admin() ) {
+		if ( ! is_admin() )
 			add_action( 'admin_bar_menu', 'wp_admin_bar_search_menu', 100 );
-		} else {
-			add_action( 'admin_bar_menu', 'wp_admin_bar_help_menu', 90 );
-		}
-
+		
 		do_action( 'add_admin_bar_menus' );
 	}
 }
-?>
\ No newline at end of file
+?>
Index: wp-includes/css/admin-bar.dev.css
===================================================================
--- wp-includes/css/admin-bar.dev.css	(revision 19125)
+++ wp-includes/css/admin-bar.dev.css	(working copy)
@@ -178,17 +178,14 @@
 }
 
 #wpadminbar.nojs .ab-top-menu > li.menupop:hover,
-#wpadminbar .ab-top-menu li.menupop.hover,
-#wpadminbar .ab-top-menu .selected.screen-meta-toggle {
+#wpadminbar .ab-top-menu li.menupop.hover {
 	background: #fff;
 }
 
 #wpadminbar.nojs .quicklinks .menupop:hover a,
 #wpadminbar.nojs .quicklinks .menupop:hover span,
 #wpadminbar .quicklinks .menupop.hover a,
-#wpadminbar .quicklinks .menupop.hover span,
-#wpadminbar .ab-top-menu .selected.screen-meta-toggle a,
-#wpadminbar .ab-top-menu .selected.screen-meta-toggle span {
+#wpadminbar .quicklinks .menupop.hover span {
 	color: #333;
 	text-shadow: none;
 }