diff --git a/wp-admin/admin-header.php b/wp-admin/admin-header.php
index 9933effffe..2e090f5763 100644
--- a/wp-admin/admin-header.php
+++ b/wp-admin/admin-header.php
@@ -105,4 +105,11 @@ if ( $parent_file == 'options-general.php' ) {
 
 favorite_actions();
 
-?>
+$settings_pages = array( 'categories.php', 'edit.php', 'edit-comments.php', 'edit-form-advanced.php', 'edit-link-categories.php', 'edit-link-form.php', 'edit-page-form.php', 'edit-tags.php', 'link-manager.php', 'upload.php', 'users.php', 'edit-pages.php' );
+
+if ( in_array( $pagenow, $settings_pages ) ) { ?>
+<div 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>
+</div>
+<?php } ?>
diff --git a/wp-admin/categories.php b/wp-admin/categories.php
index c29c783c96..5a3473db6b 100644
--- a/wp-admin/categories.php
+++ b/wp-admin/categories.php
@@ -121,10 +121,7 @@ $messages[4] = __('Category not added.');
 $messages[5] = __('Category not updated.');
 ?>
 
-<div id="edit-settings">
-<a href="#edit_settings" id="show-settings-link" class="hide-if-no-js show-settings"><?php _e('Page Options') ?></a>
 <div id="edit-settings-wrap" class="hidden">
-<a href="#edit_settings" id="hide-settings-link" class="show-settings"><?php _e('Hide Options') ?></a>
 <h5><?php _e('Show on screen') ?></h5>
 <form id="adv-settings" action="" method="get">
 <div class="metabox-prefs">
@@ -132,7 +129,7 @@ $messages[5] = __('Category not updated.');
 <?php wp_nonce_field( 'hiddencolumns', 'hiddencolumnsnonce', false ); ?>
 <br class="clear" />
 </div></form>
-</div></div>
+</div>
 
 <?php
 if ( isset($_GET['message']) && ( $msg = (int) $_GET['message'] ) ) : ?>
diff --git a/wp-admin/edit-comments.php b/wp-admin/edit-comments.php
index ba3a3f1d08..32da3bc4d1 100644
--- a/wp-admin/edit-comments.php
+++ b/wp-admin/edit-comments.php
@@ -81,10 +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">
-<a href="#edit_settings" id="show-settings-link" class="hide-if-no-js show-settings"><?php _e('Page Options') ?></a>
 <div id="edit-settings-wrap" class="hidden">
-<a href="#edit_settings" id="hide-settings-link" class="show-settings"><?php _e('Hide Options') ?></a>
 <h5><?php _e('Show on screen') ?></h5>
 <form id="adv-settings" action="" method="get">
 <div class="metabox-prefs">
@@ -92,7 +89,7 @@ $search = attribute_escape( $search_dirty ); ?>
 <?php wp_nonce_field( 'hiddencolumns', 'hiddencolumnsnonce', false ); ?>
 <br class="clear" />
 </div></form>
-</div></div>
+</div>
 
 <?php
 if ( isset( $_GET['approved'] ) || isset( $_GET['deleted'] ) || isset( $_GET['spam'] ) ) {
diff --git a/wp-admin/edit-form-advanced.php b/wp-admin/edit-form-advanced.php
index 49dbc6a0fa..790bbcb0e3 100644
--- a/wp-admin/edit-form-advanced.php
+++ b/wp-admin/edit-form-advanced.php
@@ -401,17 +401,14 @@ endif;
 
 ?>
 
-<div id="edit-settings">
-<a href="#edit_settings" id="show-settings-link" class="hide-if-no-js show-settings"><?php _e('Page Options') ?></a>
 <div id="edit-settings-wrap" class="hidden">
-<a href="#edit_settings" id="hide-settings-link" class="show-settings"><?php _e('Hide Options') ?></a>
 <h5><?php _e('Show on screen') ?></h5>
 <form id="adv-settings" action="" method="get">
 <div class="metabox-prefs">
 <?php meta_box_prefs('post') ?>
 <br class="clear" />
 </div></form>
-</div></div>
+</div>
 
 <?php if ( $notice ) : ?>
 <div id="notice" class="error"><p><?php echo $notice ?></p></div>
diff --git a/wp-admin/edit-link-categories.php b/wp-admin/edit-link-categories.php
index 0efaf51bab..954364f956 100644
--- a/wp-admin/edit-link-categories.php
+++ b/wp-admin/edit-link-categories.php
@@ -58,10 +58,7 @@ $messages[4] = __('Category not added.');
 $messages[5] = __('Category not updated.');
 $messages[6] = __('Categories deleted.'); ?>
 
-<div id="edit-settings">
-<a href="#edit_settings" id="show-settings-link" class="hide-if-no-js show-settings"><?php _e('Page Options') ?></a>
 <div id="edit-settings-wrap" class="hidden">
-<a href="#edit_settings" id="hide-settings-link" class="show-settings"><?php _e('Hide Options') ?></a>
 <h5><?php _e('Show on screen') ?></h5>
 <form id="adv-settings" action="" method="get">
 <div class="metabox-prefs">
@@ -69,7 +66,7 @@ $messages[6] = __('Categories deleted.'); ?>
 <?php wp_nonce_field( 'hiddencolumns', 'hiddencolumnsnonce', false ); ?>
 <br class="clear" />
 </div></form>
-</div></div>
+</div>
 
 <?php if ( isset($_GET['message']) && ( $msg = (int) $_GET['message'] ) ) : ?>
 <div id="message" class="updated fade"><p><?php echo $messages[$msg]; ?></p></div>
diff --git a/wp-admin/edit-link-form.php b/wp-admin/edit-link-form.php
index a24420ff26..46824c0adb 100644
--- a/wp-admin/edit-link-form.php
+++ b/wp-admin/edit-link-form.php
@@ -263,10 +263,7 @@ function link_advanced_meta_box($link) {
 }
 add_meta_box('linkadvanceddiv', __('Advanced'), 'link_advanced_meta_box', 'link', 'normal', 'core'); ?>
 
-<div id="edit-settings">
-<a href="#edit_settings" id="show-settings-link" class="hide-if-no-js show-settings"><?php _e('Page Options') ?></a>
 <div id="edit-settings-wrap" class="hidden">
-<a href="#edit_settings" id="hide-settings-link" class="show-settings"><?php _e('Hide Options') ?></a>
 <h5><?php _e('Show on screen') ?></h5>
 <form id="adv-settings" action="" method="get">
 <div class="metabox-prefs">
@@ -274,7 +271,7 @@ add_meta_box('linkadvanceddiv', __('Advanced'), 'link_advanced_meta_box', 'link'
 <?php wp_nonce_field( 'hiddencolumns', 'hiddencolumnsnonce', false ); ?>
 <br class="clear" />
 </div></form>
-</div></div>
+</div>
 
 <div class="wrap">
 
diff --git a/wp-admin/edit-page-form.php b/wp-admin/edit-page-form.php
index 111ffd193a..62e529554d 100644
--- a/wp-admin/edit-page-form.php
+++ b/wp-admin/edit-page-form.php
@@ -277,10 +277,7 @@ add_meta_box('revisionsdiv', __('Page Revisions'), 'page_revisions_meta_box', 'p
 endif;
 ?>
 
-<div id="edit-settings">
-<a href="#edit_settings" id="show-settings-link" class="hide-if-no-js show-settings"><?php _e('Page Options') ?></a>
 <div id="edit-settings-wrap" class="hidden">
-<a href="#edit_settings" id="hide-settings-link" class="show-settings"><?php _e('Hide Options') ?></a>
 <h5><?php _e('Show on screen') ?></h5>
 <form id="adv-settings" action="" method="get">
 <div class="metabox-prefs">
@@ -288,7 +285,7 @@ endif;
 <?php wp_nonce_field( 'hiddencolumns', 'hiddencolumnsnonce', false ); ?>
 <br class="clear" />
 </div></form>
-</div></div>
+</div>
 
 <div class="wrap">
 
diff --git a/wp-admin/edit-pages.php b/wp-admin/edit-pages.php
index e1d6ecd6e4..0d45db259d 100644
--- a/wp-admin/edit-pages.php
+++ b/wp-admin/edit-pages.php
@@ -100,10 +100,7 @@ if ( is_singular() ) {
 
 require_once('admin-header.php'); ?>
 
-<div id="edit-settings">
-<a href="#edit_settings" id="show-settings-link" class="hide-if-no-js show-settings"><?php _e('Page Options') ?></a>
 <div id="edit-settings-wrap" class="hidden">
-<a href="#edit_settings" id="hide-settings-link" class="show-settings"><?php _e('Hide Options') ?></a>
 <h5><?php _e('Show on screen') ?></h5>
 <form id="adv-settings" action="" method="get">
 <div class="metabox-prefs">
@@ -111,7 +108,7 @@ require_once('admin-header.php'); ?>
 <?php wp_nonce_field( 'hiddencolumns', 'hiddencolumnsnonce', false ); ?>
 <br class="clear" />
 </div></form>
-</div></div>
+</div>
 
 <div class="wrap">
 
diff --git a/wp-admin/edit-tags.php b/wp-admin/edit-tags.php
index 7869b20592..9b327f1e68 100644
--- a/wp-admin/edit-tags.php
+++ b/wp-admin/edit-tags.php
@@ -125,10 +125,7 @@ $messages[4] = __('Tag not added.');
 $messages[5] = __('Tag not updated.');
 $messages[6] = __('Tags deleted.'); ?>
 
-<div id="edit-settings">
-<a href="#edit_settings" id="show-settings-link" class="hide-if-no-js show-settings"><?php _e('Page Options') ?></a>
 <div id="edit-settings-wrap" class="hidden">
-<a href="#edit_settings" id="hide-settings-link" class="show-settings"><?php _e('Hide Options') ?></a>
 <h5><?php _e('Show on screen') ?></h5>
 <form id="adv-settings" action="" method="get">
 <div class="metabox-prefs">
@@ -136,7 +133,7 @@ $messages[6] = __('Tags deleted.'); ?>
 <?php wp_nonce_field( 'hiddencolumns', 'hiddencolumnsnonce', false ); ?>
 <br class="clear" />
 </div></form>
-</div></div>
+</div>
 
 <?php if ( isset($_GET['message']) && ( $msg = (int) $_GET['message'] ) ) : ?>
 <div id="message" class="updated fade"><p><?php echo $messages[$msg]; ?></p></div>
diff --git a/wp-admin/edit.php b/wp-admin/edit.php
index 4a8f1b0759..2ba92cdbe5 100644
--- a/wp-admin/edit.php
+++ b/wp-admin/edit.php
@@ -90,10 +90,7 @@ if ( empty($_GET['mode']) )
 else
 	$mode = attribute_escape($_GET['mode']); ?>
 
-<div id="edit-settings">
-<a href="#edit_settings" id="show-settings-link" class="hide-if-no-js show-settings"><?php _e('Page Options') ?></a>
 <div id="edit-settings-wrap" class="hidden">
-<a href="#edit_settings" id="hide-settings-link" class="show-settings"><?php _e('Hide Options') ?></a>
 <h5><?php _e('Show on screen') ?></h5>
 <form id="adv-settings" action="" method="get">
 <div class="metabox-prefs">
@@ -101,8 +98,7 @@ else
 <?php wp_nonce_field( 'hiddencolumns', 'hiddencolumnsnonce', false ); ?>
 <br class="clear" />
 </div></form>
-</div></div>
-
+</div>
 <div class="wrap">
 
 <?php
diff --git a/wp-admin/js/settings-box.js b/wp-admin/js/settings-box.js
index 7b009cc044..f32def8516 100644
--- a/wp-admin/js/settings-box.js
+++ b/wp-admin/js/settings-box.js
@@ -1,14 +1,19 @@
 jQuery(document).ready( function($) {
 	$('#show-settings-link').click(function () {
-		$(this).hide()
-		$('#edit-settings-wrap').slideDown('normal');
+		$('#edit-settings-wrap').slideDown('normal', function(){
+			$('#hide-settings-link').show();
+			$('#show-settings-link').hide();
+		});
+
 		return false;
 	});
 	
 	$('#hide-settings-link').click(function () {
 		$('#edit-settings-wrap').slideUp('normal', function(){
 			$('#show-settings-link').show();
+			$('#hide-settings-link').hide();
 		});
+
 		return false;
 	});
 });
\ No newline at end of file
diff --git a/wp-admin/link-manager.php b/wp-admin/link-manager.php
index 862dc20d40..97b33b015c 100644
--- a/wp-admin/link-manager.php
+++ b/wp-admin/link-manager.php
@@ -74,10 +74,7 @@ switch ($order_by) {
 		break;
 } ?>
 
-<div id="edit-settings">
-<a href="#edit_settings" id="show-settings-link" class="hide-if-no-js show-settings"><?php _e('Page Options') ?></a>
 <div id="edit-settings-wrap" class="hidden">
-<a href="#edit_settings" id="hide-settings-link" class="show-settings"><?php _e('Hide Options') ?></a>
 <h5><?php _e('Show on screen') ?></h5>
 <form id="adv-settings" action="" method="get">
 <div class="metabox-prefs">
@@ -85,7 +82,7 @@ switch ($order_by) {
 <?php wp_nonce_field( 'hiddencolumns', 'hiddencolumnsnonce', false ); ?>
 <br class="clear" />
 </div></form>
-</div></div>
+</div>
 
 <?php
 if ( isset($_GET['deleted']) ) {
diff --git a/wp-admin/upload.php b/wp-admin/upload.php
index e6e94dbd7e..9a54e4b7fb 100644
--- a/wp-admin/upload.php
+++ b/wp-admin/upload.php
@@ -145,10 +145,7 @@ if ( is_singular() ) {
 
 require_once('admin-header.php'); ?>
 
-<div id="edit-settings">
-<a href="#edit_settings" id="show-settings-link" class="hide-if-no-js show-settings"><?php _e('Page Options') ?></a>
 <div id="edit-settings-wrap" class="hidden">
-<a href="#edit_settings" id="hide-settings-link" class="show-settings"><?php _e('Hide Options') ?></a>
 <h5><?php _e('Show on screen') ?></h5>
 <form id="adv-settings" action="" method="get">
 <div class="metabox-prefs">
@@ -156,7 +153,7 @@ require_once('admin-header.php'); ?>
 <?php wp_nonce_field( 'hiddencolumns', 'hiddencolumnsnonce', false ); ?>
 <br class="clear" />
 </div></form>
-</div></div>
+</div>
 
 <?php
 if ( isset($_GET['posted']) && (int) $_GET['posted'] ) {
diff --git a/wp-admin/users.php b/wp-admin/users.php
index 09a0fdb429..39d5bf4af9 100644
--- a/wp-admin/users.php
+++ b/wp-admin/users.php
@@ -237,10 +237,7 @@ default:
 		}
 	endif; ?>
 
-<div id="edit-settings">
-<a href="#edit_settings" id="show-settings-link" class="hide-if-no-js show-settings"><?php _e('Page Options') ?></a>
 <div id="edit-settings-wrap" class="hidden">
-<a href="#edit_settings" id="hide-settings-link" class="show-settings"><?php _e('Hide Options') ?></a>
 <h5><?php _e('Show on screen') ?></h5>
 <form id="adv-settings" action="" method="get">
 <div class="metabox-prefs">
@@ -248,7 +245,7 @@ default:
 <?php wp_nonce_field( 'hiddencolumns', 'hiddencolumnsnonce', false ); ?>
 <br class="clear" />
 </div></form>
-</div></div>
+</div>
 
 <?php if ( isset($errors) && is_wp_error( $errors ) ) : ?>
 	<div class="error">
diff --git a/wp-admin/wp-admin.css b/wp-admin/wp-admin.css
index 88cb4b0da8..36394b2d49 100644
--- a/wp-admin/wp-admin.css
+++ b/wp-admin/wp-admin.css
@@ -2052,31 +2052,19 @@ a.togbox {
 }
 
 /* show/hide settings */
-#show-settings-link,
-#hide-settings-link {
+#edit-settings {
+	position: absolute;
+	right: 200px;
+	top: 46px;
+}
+
+.show-settings {
 	display: block;
 	height: 18px;
 	font-size: 11px;
 	text-decoration: none;
 	z-index: 1;
-}
-
-#show-settings-link {
-	position: absolute;
-	padding: 3px 8px 1px;
-	right: 15px;
-	top: 0;
-}
-
-#hide-settings-link {
-	float: right;
 	padding: 3px 8px;
-	position: relative;
-}
-
-#edit-settings {
-	position: relative;
-	top: -12px;
 }
 
 #edit-settings-wrap h5 {
@@ -2089,7 +2077,7 @@ a.togbox {
 	border-style: none solid solid;
 	border-top: 0 none;
 	border-width: 0 1px 1px;
-	margin: 0 15px;
+	margin: -10px 15px 10px;
 	-moz-border-radius: 0 0 4px 4px;
 	-webkit-border-bottom-left-radius: 4px;
 	-webkit-border-bottom-right-radius: 4px;