diff --git a/wp-admin/admin-header.php b/wp-admin/admin-header.php
index 71732d739..68e61715d 100644
--- a/wp-admin/admin-header.php
+++ b/wp-admin/admin-header.php
@@ -81,9 +81,12 @@ if ( '' == $blog_name )
 
 <img id="logo50" src="images/wp-logo.gif" alt="" /> <h1><a href="<?php echo trailingslashit( get_bloginfo('url') ); ?>" title="<?php _e('Visit site') ?>"><?php echo $blog_name ?></a>
 <?php if ( in_array( $pagenow, $settings_pages ) ) { ?>
-<span id="edit-settings">
-<a href="#edit_settings" id="show-settings-link" class="hide-if-no-js show-settings"><?php _e('Page Options') ?></a>
-<a href="#edit_settings" id="hide-settings-link" class="show-settings" style="display:none;"><?php _e('Hide Options') ?></a>
+
+<span id="screen-options-link-wrap" class="hide-if-no-js">
+<span id="screen-options" class="screen-options-closed">
+<a href="#screen-options" id="show-settings-link" class="show-settings"><?php _e('Screen Options') ?></a>
+<a href="#screen-options" id="hide-settings-link" class="show-settings" style="display:none;"><?php _e('Hide Options') ?></a>
+</span>
 </span>
 <?php } ?></h1>
 
diff --git a/wp-admin/categories.php b/wp-admin/categories.php
index eefb37686..decfe90e0 100644
--- a/wp-admin/categories.php
+++ b/wp-admin/categories.php
@@ -131,7 +131,7 @@ $messages[4] = __('Category not added.');
 $messages[5] = __('Category not updated.');
 ?>
 
-<div id="edit-settings-wrap" class="hidden">
+<div id="screen-options-wrap" class="hidden">
 <h5><?php _e('Show on screen') ?></h5>
 <form id="adv-settings" action="" method="get">
 <div class="metabox-prefs">
diff --git a/wp-admin/css/colors-classic.css b/wp-admin/css/colors-classic.css
index 44ff67249..a23cb6827 100644
--- a/wp-admin/css/colors-classic.css
+++ b/wp-admin/css/colors-classic.css
@@ -63,7 +63,7 @@ li.widget-list-control-item h4.widget-title a,
 
 li.widget-list-control-item, div.nav, .tablenav, #dashboard-widgets p.dashboard-widget-links,
 .form-table tr, #poststuff h3, .metabox-holder h3, #replyhandle,
-.login form, h3.info-box-title, #post-status-info, #edit-settings-wrap,
+.login form, h3.info-box-title, #post-status-info, #screen-options-wrap,
 #wpbody-content .describe tr, #edithead, #replyhead {
 	background-color: #cfebf7;
 }
@@ -241,7 +241,7 @@ div.dashboard-widget-submit input,
 #login form .submit input:hover, div.dashboard-widget-submit input:hover,
 #edit-slug-buttons a.save:hover, #media-upload a.delete:hover,
 #media-upload a.del-link:hover, .ui-tabs-nav a:hover, #user_info a:hover,
-#edit-settings a.show-settings:hover {
+#screen-options a.show-settings:hover {
 	color: #d54e21;
 }
 
@@ -352,7 +352,7 @@ h3.dashboard-widget-title small a:hover {
 	color: #5a5a5a;
 }
 
-#poststuff #edButtonPreview, #poststuff #edButtonHTML, #the-comment-list p.comment-author strong a, #media-upload a.del-link, #media-upload a.delete, .ui-sortable .postbox h3:hover span, a, #edit-settings a.show-settings {
+#poststuff #edButtonPreview, #poststuff #edButtonHTML, #the-comment-list p.comment-author strong a, #media-upload a.del-link, #media-upload a.delete, .ui-sortable .postbox h3:hover span, a, #screen-options a.show-settings {
 	color: #2e7ca0;
 }
 
@@ -803,7 +803,7 @@ table.diff .diff-addedline ins {
 	color: #CFEBF6;
 }
 
-#edit-settings-wrap {
+#screen-options-wrap {
 	background-color: #14568A;
 	border-color: #14568A;
 	color: #CFEBF6;
diff --git a/wp-admin/css/colors-fresh.css b/wp-admin/css/colors-fresh.css
index d56b1fe1f..b04906fce 100644
--- a/wp-admin/css/colors-fresh.css
+++ b/wp-admin/css/colors-fresh.css
@@ -59,7 +59,7 @@ li.widget-list-control-item h4.widget-title a,
 
 li.widget-list-control-item, div.nav, .tablenav, #dashboard-widgets p.dashboard-widget-links,
 .form-table tr, #poststuff h3, .metabox-holder h3, #replyhandle,
-.login form, h3.info-box-title, #post-status-info, #edit-settings-wrap,
+.login form, h3.info-box-title, #post-status-info, #screen-options-wrap,
 #wpbody-content .describe tr, #edithead, #replyhead  {
 	background-color: #eaf3fa;
 }
@@ -234,8 +234,7 @@ div.dashboard-widget-submit input,
 #rightnow a:hover, a:hover, .subsubsub a:hover, .subsubsub a.current:hover,
 #login form .submit input:hover, div.dashboard-widget-submit input:hover,
 #edit-slug-buttons a.save:hover, #media-upload a.delete:hover,
-#media-upload a.del-link:hover, .ui-tabs-nav a:hover, #user_info a:hover,
-#edit-settings a.show-settings:hover {
+#media-upload a.del-link:hover, .ui-tabs-nav a:hover, #user_info a:hover {
 	color: #d54e21;
 }
 
@@ -341,7 +340,7 @@ h3.dashboard-widget-title small a:hover {
 }
 
 
-#adminmenu a, #poststuff #edButtonPreview, #poststuff #edButtonHTML, #the-comment-list p.comment-author strong a, #media-upload a.del-link, #media-upload a.delete, .ui-tabs-nav a, .ui-sortable .postbox h3:hover span, a, #edit-settings a.show-settings {
+#adminmenu a, #poststuff #edButtonPreview, #poststuff #edButtonHTML, #the-comment-list p.comment-author strong a, #media-upload a.del-link, #media-upload a.delete, .ui-tabs-nav a, .ui-sortable .postbox h3:hover span, a {
 	color: #2583ad;
 }
 
@@ -772,7 +771,7 @@ table.diff .diff-addedline ins {
 	border-top-color: #e4f2fd;
 }
 
-#edit-settings-wrap {
+#screen-options-wrap {
 	background-color: #E4F2FD;
 	border-color: #c6d9e9;
 }
diff --git a/wp-admin/edit-comments.php b/wp-admin/edit-comments.php
index 241482d03..7ae26e111 100644
--- a/wp-admin/edit-comments.php
+++ b/wp-admin/edit-comments.php
@@ -81,7 +81,7 @@ $post_id = isset($_GET['p']) ? (int) $_GET['p'] : 0;
 $search_dirty = ( isset($_GET['s']) ) ? $_GET['s'] : '';
 $search = attribute_escape( $search_dirty ); ?>
 
-<div id="edit-settings-wrap" class="hidden">
+<div id="screen-options-wrap" class="hidden">
 <h5><?php _e('Show on screen') ?></h5>
 <form id="adv-settings" action="" method="get">
 <div class="metabox-prefs">
diff --git a/wp-admin/edit-form-advanced.php b/wp-admin/edit-form-advanced.php
index 56ba5e5c6..20912a588 100644
--- a/wp-admin/edit-form-advanced.php
+++ b/wp-admin/edit-form-advanced.php
@@ -459,7 +459,7 @@ endif;
 
 ?>
 
-<div id="edit-settings-wrap" class="hidden">
+<div id="screen-options-wrap" class="hidden">
 <h5><?php _e('Show on screen') ?></h5>
 <form id="adv-settings" action="" method="get">
 <div class="metabox-prefs">
diff --git a/wp-admin/edit-link-categories.php b/wp-admin/edit-link-categories.php
index a2c63e3c4..e4c86e2dd 100644
--- a/wp-admin/edit-link-categories.php
+++ b/wp-admin/edit-link-categories.php
@@ -60,7 +60,7 @@ $messages[4] = __('Category not added.');
 $messages[5] = __('Category not updated.');
 $messages[6] = __('Categories deleted.'); ?>
 
-<div id="edit-settings-wrap" class="hidden">
+<div id="screen-options-wrap" class="hidden">
 <h5><?php _e('Show on screen') ?></h5>
 <form id="adv-settings" action="" method="get">
 <div class="metabox-prefs">
diff --git a/wp-admin/edit-link-form.php b/wp-admin/edit-link-form.php
index a999d2dbf..f6688fca7 100644
--- a/wp-admin/edit-link-form.php
+++ b/wp-admin/edit-link-form.php
@@ -309,7 +309,7 @@ function link_advanced_meta_box($link) {
 }
 add_meta_box('linkadvanceddiv', __('Advanced'), 'link_advanced_meta_box', 'link', 'normal', 'core'); ?>
 
-<div id="edit-settings-wrap" class="hidden">
+<div id="screen-options-wrap" class="hidden">
 <h5><?php _e('Show on screen') ?></h5>
 <form id="adv-settings" action="" method="get">
 <div class="metabox-prefs">
diff --git a/wp-admin/edit-page-form.php b/wp-admin/edit-page-form.php
index 64c829bd5..cf1a1a005 100644
--- a/wp-admin/edit-page-form.php
+++ b/wp-admin/edit-page-form.php
@@ -347,7 +347,7 @@ add_meta_box('revisionsdiv', __('Page Revisions'), 'page_revisions_meta_box', 'p
 endif;
 ?>
 
-<div id="edit-settings-wrap" class="hidden">
+<div id="screen-options-wrap" class="hidden">
 <h5><?php _e('Show on screen') ?></h5>
 <form id="adv-settings" action="" method="get">
 <div class="metabox-prefs">
diff --git a/wp-admin/edit-pages.php b/wp-admin/edit-pages.php
index 9437d78a2..09f4be6d8 100644
--- a/wp-admin/edit-pages.php
+++ b/wp-admin/edit-pages.php
@@ -100,7 +100,7 @@ if ( is_singular() ) {
 
 require_once('admin-header.php'); ?>
 
-<div id="edit-settings-wrap" class="hidden">
+<div id="screen-options-wrap" class="hidden">
 <h5><?php _e('Show on screen') ?></h5>
 <form id="adv-settings" action="" method="get">
 <div class="metabox-prefs">
diff --git a/wp-admin/edit-tags.php b/wp-admin/edit-tags.php
index 5857d9605..957538ec2 100644
--- a/wp-admin/edit-tags.php
+++ b/wp-admin/edit-tags.php
@@ -127,7 +127,7 @@ $messages[4] = __('Tag not added.');
 $messages[5] = __('Tag not updated.');
 $messages[6] = __('Tags deleted.'); ?>
 
-<div id="edit-settings-wrap" class="hidden">
+<div id="screen-options-wrap" class="hidden">
 <h5><?php _e('Show on screen') ?></h5>
 <form id="adv-settings" action="" method="get">
 <div class="metabox-prefs">
diff --git a/wp-admin/edit.php b/wp-admin/edit.php
index 7cf8e6033..9bac0974f 100644
--- a/wp-admin/edit.php
+++ b/wp-admin/edit.php
@@ -90,7 +90,7 @@ if ( empty($_GET['mode']) )
 else
 	$mode = attribute_escape($_GET['mode']); ?>
 
-<div id="edit-settings-wrap" class="hidden">
+<div id="screen-options-wrap" class="hidden">
 <h5><?php _e('Show on screen') ?></h5>
 <form id="adv-settings" action="" method="get">
 <div class="metabox-prefs">
diff --git a/wp-admin/gears-manifest.php b/wp-admin/gears-manifest.php
index 3c74db79f..c44c92f4b 100644
--- a/wp-admin/gears-manifest.php
+++ b/wp-admin/gears-manifest.php
@@ -170,6 +170,8 @@ header( 'Content-Type: application/x-javascript; charset=UTF-8' );
 { "url" : "images/no.png" },
 { "url" : "images/yes.png" },
 { "url" : "images/se.png" },
+{ "url" : "images/screen-options-left.gif" },
+{ "url" : "images/screen-options-right.gif" },
 
 <?php if ( is_file('../wp-includes/js/tinymce/tiny_mce.js') ) { ?>
 { "url" : "../wp-includes/js/tinymce/tiny_mce.js", "src" : "../wp-includes/js/tinymce/tiny_mce.js?ver=<?php echo $mce_ver; ?>", "ignoreQuery" : true },
diff --git a/wp-admin/images/screen-options-left.gif b/wp-admin/images/screen-options-left.gif
new file mode 100644
index 000000000..d692d8643
Binary files /dev/null and b/wp-admin/images/screen-options-left.gif differ
diff --git a/wp-admin/images/screen-options-right.gif b/wp-admin/images/screen-options-right.gif
new file mode 100644
index 000000000..e2508a051
Binary files /dev/null and b/wp-admin/images/screen-options-right.gif differ
diff --git a/wp-admin/index.php b/wp-admin/index.php
index e3ff326ea..cf7ea2424 100644
--- a/wp-admin/index.php
+++ b/wp-admin/index.php
@@ -28,7 +28,7 @@ require_once('admin-header.php');
 $today = current_time('mysql', 1);
 ?>
 
-<div id="edit-settings-wrap" class="hidden">
+<div id="screen-options-wrap" class="hidden">
 <h5><?php _e('Show on screen') ?></h5>
 <form id="adv-settings" action="" method="get">
 <div class="metabox-prefs">
diff --git a/wp-admin/js/settings-box.js b/wp-admin/js/settings-box.js
index f32def851..f96f365e2 100644
--- a/wp-admin/js/settings-box.js
+++ b/wp-admin/js/settings-box.js
@@ -1,6 +1,6 @@
 jQuery(document).ready( function($) {
 	$('#show-settings-link').click(function () {
-		$('#edit-settings-wrap').slideDown('normal', function(){
+		$('#screen-options-wrap').slideDown('normal', function(){
 			$('#hide-settings-link').show();
 			$('#show-settings-link').hide();
 		});
@@ -9,7 +9,7 @@ jQuery(document).ready( function($) {
 	});
 	
 	$('#hide-settings-link').click(function () {
-		$('#edit-settings-wrap').slideUp('normal', function(){
+		$('#screen-options-wrap').slideUp('normal', function(){
 			$('#show-settings-link').show();
 			$('#hide-settings-link').hide();
 		});
diff --git a/wp-admin/link-manager.php b/wp-admin/link-manager.php
index 49b5852d7..d4177af1e 100644
--- a/wp-admin/link-manager.php
+++ b/wp-admin/link-manager.php
@@ -74,7 +74,7 @@ switch ($order_by) {
 		break;
 } ?>
 
-<div id="edit-settings-wrap" class="hidden">
+<div id="screen-options-wrap" class="hidden">
 <h5><?php _e('Show on screen') ?></h5>
 <form id="adv-settings" action="" method="get">
 <div class="metabox-prefs">
diff --git a/wp-admin/upload.php b/wp-admin/upload.php
index 232ece172..81cd2859c 100644
--- a/wp-admin/upload.php
+++ b/wp-admin/upload.php
@@ -145,7 +145,7 @@ if ( is_singular() ) {
 
 require_once('admin-header.php'); ?>
 
-<div id="edit-settings-wrap" class="hidden">
+<div id="screen-options-wrap" class="hidden">
 <h5><?php _e('Show on screen') ?></h5>
 <form id="adv-settings" action="" method="get">
 <div class="metabox-prefs">
diff --git a/wp-admin/users.php b/wp-admin/users.php
index f63308833..f20c666c9 100644
--- a/wp-admin/users.php
+++ b/wp-admin/users.php
@@ -237,7 +237,7 @@ default:
 		}
 	endif; ?>
 
-<div id="edit-settings-wrap" class="hidden">
+<div id="screen-options-wrap" class="hidden">
 <h5><?php _e('Show on screen') ?></h5>
 <form id="adv-settings" action="" method="get">
 <div class="metabox-prefs">
diff --git a/wp-admin/wp-admin.css b/wp-admin/wp-admin.css
index d810abb9f..3fed3affd 100644
--- a/wp-admin/wp-admin.css
+++ b/wp-admin/wp-admin.css
@@ -2183,29 +2183,43 @@ fieldset {
 }
 
 /* show/hide settings */
-#edit-settings {
-	margin-left: 20px;
+#screen-options-link-wrap {
+	background: url( images/screen-options-left.gif ) no-repeat 0 0;
+	font-family: "Lucida Grande", "Lucida Sans Unicode", Tahoma, Verdana, sans-serif;
+	height: 23px;
+	position: absolute;
+	right: 100px;
+	top: 46px;
+	padding: 0 0 0 8px;
 }
 
-#edit-settings a.show-settings {
-	height: 18px;
+#screen-options {
+	vertical-align: middle;
+	height: 23px;
+	line-height: 23px;
 	font-size: 11px;
+	background: url( images/screen-options-right.gif ) no-repeat 100% 0;
+	display: block;
+	padding-right: 20px;
+}
+
+#screen-options a.show-settings {
+	color: #666;
 	text-decoration: none;
 	z-index: 1;
-	padding: 3px 8px;
 }
 
-#edit-settings a.show-settings:hover {
+#screen-options a.show-settings:hover {
 	text-decoration: none;
 }
 
-#edit-settings-wrap h5 {
+#screen-options-wrap h5 {
 	padding: 10px 0 0 15px;
 	margin: 0;
 	font-size: 13px;
 }
 
-#edit-settings-wrap {
+#screen-options-wrap {
 	border-style: none solid solid;
 	border-top: 0 none;
 	border-width: 0 1px 1px;
@@ -2229,7 +2243,7 @@ fieldset {
 	padding: 5px 3px;
 	white-space: nowrap;
 	overflow: hidden;
-	width: 13em;
+	width: 14em;
 }
 
 .metabox-prefs label input {
diff --git a/wp-includes/script-loader.php b/wp-includes/script-loader.php
index 741860d02..123f7d46f 100644
--- a/wp-includes/script-loader.php
+++ b/wp-includes/script-loader.php
@@ -308,14 +308,14 @@ function wp_default_styles( &$styles ) {
 
 	$rtl_styles = array( 'global', 'colors', 'dashboard', 'ie', 'install', 'login', 'media', 'theme-editor', 'upload', 'widgets', 'press-this', 'press-this-ie' );
 
-	$styles->add( 'wp-admin', '/wp-admin/wp-admin.css', array(), '20081023' );
+	$styles->add( 'wp-admin', '/wp-admin/wp-admin.css', array(), '20081023b' );
 	$styles->add_data( 'wp-admin', 'rtl', '/wp-admin/rtl.css' );
 
 	$styles->add( 'ie', '/wp-admin/css/ie.css' );
 	$styles->add_data( 'ie', 'conditional', 'gte IE 6' );
 
 	$styles->add( 'colors', true ); // Register "meta" stylesheet for admin colors
-	$styles->add( 'colors-fresh', '/wp-admin/css/colors-fresh.css' ); // for login.php.  Is there a better way?
+	$styles->add( 'colors-fresh', '/wp-admin/css/colors-fresh.css', array(), '20081023'); // for login.php.  Is there a better way?
 	$styles->add_data( 'colors-fresh', 'rtl', true );
 
 	$styles->add( 'global', '/wp-admin/css/global.css', array(), '20081013' );