diff --git a/wp-admin/options-discussion.php b/wp-admin/options-discussion.php
index 8ab6883d78..edbeab853f 100644
--- a/wp-admin/options-discussion.php
+++ b/wp-admin/options-discussion.php
@@ -23,7 +23,7 @@ include('admin-header.php');
 <input type="hidden" name="action" value="update" />
 <?php wp_nonce_field('discussion-options') ?>
 
-<p class="submit">
+<p class="submit submit-top">
 <input type="submit" name="Submit" value="<?php _e('Save Changes') ?>" />
 </p>
 
diff --git a/wp-admin/options-general.php b/wp-admin/options-general.php
index 07ceb19420..a9397470d4 100644
--- a/wp-admin/options-general.php
+++ b/wp-admin/options-general.php
@@ -54,7 +54,7 @@ include('./admin-header.php');
 <form method="post" action="options.php">
 <?php settings_fields('general'); ?>
 
-<p class="submit">
+<p class="submit submit-top">
 <input type="submit" name="Submit" value="<?php _e('Save Changes') ?>" />
 </p>
 
diff --git a/wp-admin/options-media.php b/wp-admin/options-media.php
index 175ad5e93f..7337ccdb24 100644
--- a/wp-admin/options-media.php
+++ b/wp-admin/options-media.php
@@ -25,7 +25,7 @@ include('admin-header.php');
 <input type='hidden' name='option_page' value='media' />
 <input type="hidden" name="page_options" value="thumbnail_size_w,thumbnail_size_h,thumbnail_crop,medium_size_w,medium_size_h,image_default_size,image_default_align,image_default_link_type,large_size_w,large_size_h" /> <!-- is this needed anymore TODO -->
 
-<p class="submit">
+<p class="submit submit-top">
 	<input type="submit" name="Submit" value="<?php _e('Save Changes') ?>" />
 </p>
 
diff --git a/wp-admin/options-misc.php b/wp-admin/options-misc.php
index 12a73f72f0..173a3eacb5 100644
--- a/wp-admin/options-misc.php
+++ b/wp-admin/options-misc.php
@@ -24,7 +24,7 @@ include('admin-header.php');
 <input type="hidden" name="action" value="update" />
 <?php wp_nonce_field('misc-options') ?>
 
-<p class="submit">
+<p class="submit submit-top">
 	<input type="submit" name="Submit" value="<?php _e('Save Changes') ?>" class="button" />
 </p>
 
diff --git a/wp-admin/options-permalink.php b/wp-admin/options-permalink.php
index bd44b1fc06..afa6abdc41 100644
--- a/wp-admin/options-permalink.php
+++ b/wp-admin/options-permalink.php
@@ -129,7 +129,7 @@ else
 <?php wp_nonce_field('update-permalink') ?>
 
 
-<p class="submit">
+<p class="submit submit-top">
 	<input type="submit" name="submit" class="button" value="<?php _e('Save Changes') ?>" />
 </p>
 
diff --git a/wp-admin/options-privacy.php b/wp-admin/options-privacy.php
index f9efc0927e..f61950d142 100644
--- a/wp-admin/options-privacy.php
+++ b/wp-admin/options-privacy.php
@@ -23,7 +23,7 @@ include('./admin-header.php');
 <input type='hidden' name='option_page' value='privacy' />
 <input type="hidden" name="action" value="update" />
 
-<p class="submit">
+<p class="submit submit-top">
 	<input type="submit" name="submit" class="button" value="<?php _e('Save Changes') ?>" />
 </p>
 
diff --git a/wp-admin/options-reading.php b/wp-admin/options-reading.php
index f516656af9..35cbbba3fa 100644
--- a/wp-admin/options-reading.php
+++ b/wp-admin/options-reading.php
@@ -23,7 +23,7 @@ include('admin-header.php');
 <input type='hidden' name='option_page' value='reading' />
 <input type="hidden" name="action" value="update" />
 
-<p class="submit">
+<p class="submit submit-top">
 	<input type="submit" name="Submit" value="<?php _e('Save Changes') ?>" />
 </p>
 
diff --git a/wp-admin/options-writing.php b/wp-admin/options-writing.php
index 15db411b38..28434c251d 100644
--- a/wp-admin/options-writing.php
+++ b/wp-admin/options-writing.php
@@ -23,7 +23,7 @@ include('admin-header.php');
 <input type='hidden' name='option_page' value='writing' />
 <input type="hidden" name="action" value="update" />
 
-<p class="submit">
+<p class="submit submit-top">
 	<input type="submit" name="Submit" value="<?php _e('Save Changes') ?>" />
 </p>
 
diff --git a/wp-admin/options.php b/wp-admin/options.php
index 10a5bac4ca..08f3c62188 100644
--- a/wp-admin/options.php
+++ b/wp-admin/options.php
@@ -85,14 +85,14 @@ default:
 	include('admin-header.php'); ?>
 
 <div class="wrap">
-<ul class="wp-menu">
-<?php $array = array(); _wp_menu_output( $submenu['options-general.php'], $array ); unset($array); ?>
-</ul>
   <h2><?php _e('All Settings'); ?></h2>
   <form name="form" action="options.php" method="post" id="all-options">
   <?php wp_nonce_field('options-options') ?>
   <input type="hidden" name="action" value="update" />
   <input type='hidden' name='option_page' value='options' />
+<p class="submit submit-top">
+	<input type="submit" name="Submit" value="<?php _e('Save Changes') ?>" class="button" />
+</p>
   <table class="form-table">
 <?php
 $options = $wpdb->get_results("SELECT * FROM $wpdb->options ORDER BY option_name");
diff --git a/wp-admin/wp-admin.css b/wp-admin/wp-admin.css
index 3fed3affde..33976d3466 100644
--- a/wp-admin/wp-admin.css
+++ b/wp-admin/wp-admin.css
@@ -189,8 +189,8 @@ table#availablethemes td.bottom {
 
 .submit {
 	border-top: 1px solid #ccc;
-	padding: 1.5em 0 0 0;
-	margin: 10px 0 0 0;
+	padding: 1.5em 0;
+	margin: 5px 0;
 	-moz-border-radius: 0 0 3px 3px;
 	-webkit-border-bottom-left-radius: 3px;
 	-webkit-border-bottom-right-radius: 3px;
@@ -200,6 +200,11 @@ table#availablethemes td.bottom {
 	border-bottom-right-radius: 3px;
 }
 
+.submit-top {
+	border-top: 0;
+	border-bottom: 1px solid #ccc;
+}
+
 #misc-publishing-actions {
 	width: 70%;
 	float: left;