diff --git a/wp-admin/comment.php b/wp-admin/comment.php
index dfaf672b40..990d4b52da 100644
--- a/wp-admin/comment.php
+++ b/wp-admin/comment.php
@@ -91,25 +91,25 @@ if ( 'spam' == $_GET['dt'] ) {
 <input type='hidden' name='noredir' value='1' />
 </form>
 
-<table class="editform" cellpadding="5">
+<table class="niceblue" cellpadding="5">
 <tr class="alt">
-<th scope="row"><?php _e('Author:'); ?></th>
+<th scope="row"><?php _e('Author'); ?></th>
 <td><?php echo $comment->comment_author; ?></td>
 </tr>
 <?php if ( $comment->comment_author_email ) { ?>
 <tr>
-<th scope="row"><?php _e('E-mail:'); ?></th>
+<th scope="row"><?php _e('E-mail'); ?></th>
 <td><?php echo $comment->comment_author_email; ?></td>
 </tr>
 <?php } ?>
 <?php if ( $comment->comment_author_url ) { ?>
 <tr>
-<th scope="row"><?php _e('URL:'); ?></th>
+<th scope="row"><?php _e('URL'); ?></th>
 <td><a href='<?php echo $comment->comment_author_url; ?>'><?php echo $comment->comment_author_url; ?></a></td>
 </tr>
 <?php } ?>
 <tr>
-<th scope="row" valign="top"><?php _e('Comment:'); ?></th>
+<th scope="row" valign="top"><?php _e('Comment'); ?></th>
 <td><?php echo $comment->comment_content; ?></td>
 </tr>
 </table>
diff --git a/wp-admin/options-general.php b/wp-admin/options-general.php
index 3e6ce862a9..eac43ad39f 100644
--- a/wp-admin/options-general.php
+++ b/wp-admin/options-general.php
@@ -12,7 +12,7 @@ include('./admin-header.php');
 <form method="post" action="options.php">
 <?php wp_nonce_field('update-options') ?>
 <p class="submit"><input type="submit" name="Submit" value="<?php _e('Update Options &raquo;') ?>" /></p>
-<table class="optiontable">
+<table class="niceblue">
 <tr valign="top">
 <th scope="row"><?php _e('Blog title:') ?></th>
 <td><input name="blogname" type="text" id="blogname" value="<?php form_option('blogname'); ?>" size="40" /></td>
@@ -54,10 +54,6 @@ include('./admin-header.php');
 <select name="default_role" id="default_role"><?php wp_dropdown_roles( get_option('default_role') ); ?></select></label>
 </td>
 </tr>
-</table>
-<fieldset class="options">
-<legend><?php _e('Date and Time') ?></legend>
-<table class="optiontable">
 <tr>
 <th scope="row"><?php _e('<abbr title="Coordinated Universal Time">UTC</abbr> time is:') ?> </th>
 <td><code><?php echo gmdate(__('Y-m-d g:i:s a')); ?></code></td>
@@ -93,7 +89,6 @@ endfor;
 </select></td>
 </tr>
 </table>
-</fieldset>
 
 <p class="submit"><input type="submit" name="Submit" value="<?php _e('Update Options &raquo;') ?>" />
 <input type="hidden" name="action" value="update" />
diff --git a/wp-admin/options-misc.php b/wp-admin/options-misc.php
index ec4296590a..9a6b045e9c 100644
--- a/wp-admin/options-misc.php
+++ b/wp-admin/options-misc.php
@@ -15,7 +15,7 @@ include('admin-header.php');
 <p class="submit"><input type="submit" name="Submit" value="<?php _e('Update Options &raquo;') ?>" /></p>
 <fieldset class="options">
 <legend><?php _e('Uploading'); ?></legend>
-<table class="editform optiontable">
+<table class="niceblue">
 <tr valign="top">
 <th scope="row"><?php _e('Store uploads in this folder'); ?>:</th>
 <td><input name="upload_path" type="text" id="upload_path" class="code" value="<?php echo attribute_escape(str_replace(ABSPATH, '', get_option('upload_path'))); ?>" size="40" />
diff --git a/wp-admin/options-privacy.php b/wp-admin/options-privacy.php
index ac6810b3a0..f791d00a4c 100644
--- a/wp-admin/options-privacy.php
+++ b/wp-admin/options-privacy.php
@@ -11,7 +11,7 @@ include('./admin-header.php');
 <h2><?php _e('Privacy Options') ?></h2>
 <form method="post" action="options.php">
 <?php wp_nonce_field('update-options') ?>
-<table class="optiontable">
+<table class="niceblue">
 <tr valign="top">
 <th scope="row"><?php _e('Blog visibility:') ?> </th>
 <td>
diff --git a/wp-admin/options-reading.php b/wp-admin/options-reading.php
index 3a7f80e7e3..624aed3778 100644
--- a/wp-admin/options-reading.php
+++ b/wp-admin/options-reading.php
@@ -15,7 +15,7 @@ include('admin-header.php');
 <?php if ( get_pages() ): ?>
 <fieldset class="options">
 <legend><?php _e('Front Page') ?></legend>
-<table width="100%" cellspacing="2" cellpadding="5" class="optiontable editform">
+<table class="niceblue">
 <tr valign="top">
 <th width="33%" scope="row"><?php _e('Front page displays:')?></th>
 <td>
@@ -48,7 +48,7 @@ include('admin-header.php');
 
 <fieldset class="options">
 <legend><?php _e('Blog Pages') ?></legend>
-<table width="100%" cellspacing="2" cellpadding="5" class="optiontable editform">
+<table class="niceblue">
 <tr valign="top">
 <th width="33%" scope="row"><?php _e('Show at most:') ?></th>
 <td>
@@ -75,7 +75,7 @@ include('admin-header.php');
 </tr>
 </table>
 </fieldset>
-<table width="100%" cellspacing="2" cellpadding="5" class="optiontable editform">
+<table class="niceblue">
 <tr valign="top">
 <th width="33%" scope="row"><?php _e('Encoding for pages and feeds:') ?></th>
 <td><input name="blog_charset" type="text" id="blog_charset" value="<?php form_option('blog_charset'); ?>" size="20" class="code" /><br />
diff --git a/wp-admin/options-writing.php b/wp-admin/options-writing.php
index 13f7710b22..c0a9439b44 100644
--- a/wp-admin/options-writing.php
+++ b/wp-admin/options-writing.php
@@ -12,7 +12,8 @@ include('admin-header.php');
 <form method="post" action="options.php">
 <?php wp_nonce_field('update-options') ?>
 <p class="submit"><input type="submit" name="Submit" value="<?php _e('Update Options &raquo;') ?>" /></p>
-<table width="100%" cellspacing="2" cellpadding="5" class="optiontable editform">
+
+<table class="niceblue">
 <tr valign="top">
 <th width="33%" scope="row"> <?php _e('Size of the post box:') ?></th>
 <td><input name="default_post_edit_rows" type="text" id="default_post_edit_rows" value="<?php form_option('default_post_edit_rows'); ?>" size="2" style="width: 1.5em; " />
@@ -61,7 +62,7 @@ endforeach;
 <legend><?php _e('Post via e-mail') ?></legend>
 <p><?php printf(__('To post to WordPress by e-mail you must set up a secret e-mail account with POP3 access. Any mail received at this address will be posted, so it&#8217;s a good idea to keep this address very secret. Here are three random strings you could use: <code>%s</code>, <code>%s</code>, <code>%s</code>.'), wp_generate_password(), wp_generate_password(), wp_generate_password()) ?></p>
 
-<table width="100%" cellspacing="2" cellpadding="5" class="optiontable editform">
+<table class="niceblue">
 <tr valign="top">
 <th scope="row"><?php _e('Mail server:') ?></th>
 <td><input name="mailserver_url" type="text" id="mailserver_url" value="<?php form_option('mailserver_url'); ?>" size="40" />
diff --git a/wp-admin/wp-admin.css b/wp-admin/wp-admin.css
index ea7dc72b7d..6f56087311 100644
--- a/wp-admin/wp-admin.css
+++ b/wp-admin/wp-admin.css
@@ -343,48 +343,16 @@ form#upload #post_content {
 }
 
 .submit input, .submit input:focus, .button, .button:focus {
-	background: url( images/fade-butt.png );
-	border: 3px double #999;
-	border-left-color: #ccc;
-	border-top-color: #ccc;
-	color: #333;
-	padding: 0.25em;
-}
-
-.submit input:active, .button:active {
-	background: #f4f4f4;
-	border: 3px double #ccc;
-	border-left-color: #999;
-	border-top-color: #999;
-}
-
-.button, .button:focus {
-	padding: 0.15em;
-}
-
-* html .button {
-	padding: 0;
+	background: url(images/fade-butt.png);
+	color: #246;
+	padding: 0.3em;
+	-moz-border-radius: 4px;
 }
 
 .submit, .editform th, #postcustomsubmit {
 	text-align: right;
 }
 
-.optiontable {
-	width: 100%;
-}
-
-.optiontable td, .optiontable th {
-	padding: .5em;
-}
-
-.optiontable th {
-	width: 33%;
-	text-align: right;
-	font-size: 1.3em;
-	font-weight: normal;
-}
-
 .unapproved {
 	color: #888;
 }
@@ -427,11 +395,9 @@ form#upload #post_content {
 	padding: 0 1em 0 1em;
 }
 
-
-
 .narrow {
-	width: 450px;
-	margin: auto;
+	width: 70%;
+	margin-bottom: 40px;
 }
 
 .narrow p {
@@ -1393,4 +1359,27 @@ a.view-comment-post-link {
 #footer p {
 	margin: 0;
 	padding: 5px 0;
+}
+
+/* Tables used on comment.php and option/setting pages */
+
+.niceblue {
+	border-collapse: collapse;
+	margin-top: 1em;
+}
+
+.niceblue td {
+	margin-bottom: 9px;
+	padding: 10px;
+	border-bottom: 8px solid #fff;
+}
+
+.niceblue th {
+	text-align: left;
+	padding: 10px;
+	border-bottom: 8px solid #fff;
+}
+
+.niceblue tr {
+	background: #eaf3fa;
 }
\ No newline at end of file