diff --git a/wp-admin/admin-header.php b/wp-admin/admin-header.php
index 2de07d0d46..73ec721588 100644
--- a/wp-admin/admin-header.php
+++ b/wp-admin/admin-header.php
@@ -46,7 +46,7 @@ do_action('admin_head');
 <div id="wpwrap">
 <div id="wpcontent">
 <div id="wphead">
-<h1><?php bloginfo('name'); ?> <span id="viewsite"><a href="<?php echo get_option('home') . '/'; ?>"><?php _e('Visit Site') ?></a></span></h1>
+<h1><?php bloginfo('name'); ?><span id="viewsite"><a href="<?php echo get_option('home') . '/'; ?>"><?php _e('Visit Site') ?></a></span></h1>
 </div>
 <div id="user_info"><p><?php printf(__('Howdy, <a href="%1$s">%2$s</a>!'), 'profile.php', $user_identity) ?> | <a href="<?php echo get_option('siteurl'); ?>/wp-login.php?action=logout" title="<?php _e('Log Out') ?>"><?php _e('Log Out'); ?></a> | <?php printf(__('<a href="%s">Help</a>'), 'http://codex.wordpress.org/') ?> | <?php printf(__('<a href="%s">Forums</a>'), 'http://wordpress.org/support/') ?></p></div>
 
diff --git a/wp-admin/categories.php b/wp-admin/categories.php
index 41312ea5dd..4c4addba71 100644
--- a/wp-admin/categories.php
+++ b/wp-admin/categories.php
@@ -134,7 +134,7 @@ $messages[5] = __('Category not updated.');
 <div class="tablenav">
 
 <div style="float: left">
-<input type="submit" value="<?php _e('Delete'); ?>" name="deleteit" class="button" />
+<input type="submit" value="<?php _e('Delete'); ?>" name="deleteit" class="button-secondary" />
 <?php wp_nonce_field('bulk-categories'); ?>
 </div>
 
diff --git a/wp-admin/css/global.css b/wp-admin/css/global.css
index 169650f4d8..415d32a2b9 100644
--- a/wp-admin/css/global.css
+++ b/wp-admin/css/global.css
@@ -4,6 +4,12 @@ a { color: #2583ad; text-decoration: none; }
 
 a:hover, .subsubsub a:hover, .subsubsub a.current:hover { color: #d54e21; }
 
+a:focus, a:active {
+	border: none;
+	-moz-outline: none;
+	outline: none;
+}
+
 body	{
 	background: #ffffff;
 	color: #333333;
@@ -93,7 +99,7 @@ textarea, input, select {
 	clear: both;
 	color: #666666;
 	font: 24px Georgia, "Times New Roman", Times, serif;
-	margin: 0 0 0 -5px;
+	margin: 5px 0 0 -4px;
 	padding: 0;
-	padding-bottom: 5px;
+	padding-bottom: 7px;
 }
diff --git a/wp-admin/edit-category-form.php b/wp-admin/edit-category-form.php
index 701ba0e705..1d539a6374 100644
--- a/wp-admin/edit-category-form.php
+++ b/wp-admin/edit-category-form.php
@@ -43,7 +43,7 @@ if ( ! empty($cat_ID) ) {
 			<td><textarea name="category_description" id="category_description" rows="5" cols="50" style="width: 97%;"><?php echo wp_specialchars($category->description); ?></textarea></td>
 		</tr>
 	</table>
-<p class="submit"><input type="submit" name="submit" value="<?php echo $submit_text ?>" /></p>
+<p class="submit"><input type="submit" class="button" name="submit" value="<?php echo $submit_text ?>" /></p>
 <?php do_action('edit_category_form', $category); ?>
 </form>
 </div>
diff --git a/wp-admin/edit-form-advanced.php b/wp-admin/edit-form-advanced.php
index 38f89fbb7a..b46fd0050d 100644
--- a/wp-admin/edit-form-advanced.php
+++ b/wp-admin/edit-form-advanced.php
@@ -45,7 +45,7 @@ if ('' != $post->pinged) {
 	$pings .= '</ul>';
 }
 
-$saveasdraft = '<input name="save" type="submit" id="save" tabindex="3" value="' . attribute_escape( __('Save and Continue Editing') ) . '" />';
+$saveasdraft = '<input name="save" type="submit" id="save" class="button" tabindex="3" value="' . attribute_escape( __('Save and Continue Editing') ) . '" />';
 
 ?>
 
@@ -154,14 +154,14 @@ if ($post_ID) {
 </div>
 
 <p class="submit">
-<input type="submit" name="save" id="save-post" value="<?php _e('Save'); ?>" style="font-weight: bold;" tabindex="4" />
+<input type="submit" name="save" id="save-post" value="<?php _e('Save'); ?>" style="font-weight: bold;" tabindex="4" class="button" />
 <?php
 if ( !in_array( $post->post_status, array('publish', 'future') ) || 0 == $post_ID ) {
 ?>
 <?php if ( current_user_can('publish_posts') ) : ?>
-	<input name="publish" type="submit" id="publish" tabindex="5" accesskey="p" value="<?php _e('Publish') ?>" />
+	<input name="publish" type="submit" class="button" id="publish" tabindex="5" accesskey="p" value="<?php _e('Publish') ?>" />
 <?php else : ?>
-	<input name="publish" type="submit" id="publish" tabindex="5" accesskey="p" value="<?php _e('Submit for Review') ?>" />
+	<input name="publish" type="submit" class="button" id="publish" tabindex="5" accesskey="p" value="<?php _e('Submit for Review') ?>" />
 <?php endif; ?>
 <?php
 }
diff --git a/wp-admin/edit-link-categories.php b/wp-admin/edit-link-categories.php
index 60b7a42abb..5736874553 100644
--- a/wp-admin/edit-link-categories.php
+++ b/wp-admin/edit-link-categories.php
@@ -82,7 +82,7 @@ if ( $page_links )
 ?>
 
 <div style="float: left">
-<input type="submit" value="<?php _e('Delete'); ?>" name="deleteit" class="button" />
+<input type="submit" value="<?php _e('Delete'); ?>" name="deleteit" class="button-secondary" />
 <?php wp_nonce_field('bulk-link-categories'); ?>
 </div>
 
diff --git a/wp-admin/edit-link-category-form.php b/wp-admin/edit-link-category-form.php
index 9afd440899..8d1b864ef6 100644
--- a/wp-admin/edit-link-category-form.php
+++ b/wp-admin/edit-link-category-form.php
@@ -37,7 +37,7 @@ if ( ! empty($cat_ID) ) {
 			<td><textarea name="description" id="description" rows="5" cols="50" style="width: 97%;"><?php echo $category->description; ?></textarea></td>
 		</tr>
 	</table>
-<p class="submit"><input type="submit" name="submit" value="<?php echo $submit_text ?>" /></p>
+<p class="submit"><input type="submit" class="button" name="submit" value="<?php echo $submit_text ?>" /></p>
 <?php do_action('edit_link_category_form', $category); ?>
 </form>
 </div>
diff --git a/wp-admin/edit-link-form.php b/wp-admin/edit-link-form.php
index a387e49998..a108f8df87 100644
--- a/wp-admin/edit-link-form.php
+++ b/wp-admin/edit-link-form.php
@@ -73,7 +73,7 @@ function xfn_check($class, $value = '', $deprecated = '') {
 </div>
 
 <p class="submit">
-<input type="submit" name="save" value="<?php _e('Save'); ?>" style="font-weight: bold;" tabindex="4" />
+<input type="submit" class="button" name="save" value="<?php _e('Save'); ?>" style="font-weight: bold;" tabindex="4" />
 </p>
 
 <div class="inside">
diff --git a/wp-admin/edit-page-form.php b/wp-admin/edit-page-form.php
index eb0dc46495..49a39646e2 100644
--- a/wp-admin/edit-page-form.php
+++ b/wp-admin/edit-page-form.php
@@ -119,14 +119,14 @@ if ($post_ID) {
 </div>
 
 <p class="submit">
-<input type="submit" name="save" value="<?php _e('Save'); ?>" style="font-weight: bold;" tabindex="4" />
+<input type="submit" name="save" class="button" value="<?php _e('Save'); ?>" style="font-weight: bold;" tabindex="4" />
 <?php
 if ( !in_array( $post->post_status, array('publish', 'future') ) || 0 == $post_ID ) {
 ?>
 <?php if ( current_user_can('publish_pages') ) : ?>
-	<input name="publish" type="submit" id="publish" tabindex="5" accesskey="p" value="<?php _e('Publish') ?>" />
+	<input name="publish" type="submit" class="button" id="publish" tabindex="5" accesskey="p" value="<?php _e('Publish') ?>" />
 <?php else : ?>
-	<input name="publish" type="submit" id="publish" tabindex="5" accesskey="p" value="<?php _e('Submit for Review') ?>" />
+	<input name="publish" type="submit" class="button" id="publish" tabindex="5" accesskey="p" value="<?php _e('Submit for Review') ?>" />
 <?php endif; ?>
 <?php
 }
diff --git a/wp-admin/edit-pages.php b/wp-admin/edit-pages.php
index 7e60772222..a224a3a48b 100644
--- a/wp-admin/edit-pages.php
+++ b/wp-admin/edit-pages.php
@@ -107,7 +107,7 @@ unset($status_links);
 <div class="tablenav">
 
 <div style="float: left">
-<input type="submit" value="<?php _e('Delete'); ?>" name="deleteit" class="button" />
+<input type="submit" value="<?php _e('Delete'); ?>" name="deleteit" class="button-secondary" />
 <?php wp_nonce_field('bulk-pages'); ?>
 </div>
 
diff --git a/wp-admin/edit-tag-form.php b/wp-admin/edit-tag-form.php
index f94d44f3a9..48071e222f 100644
--- a/wp-admin/edit-tag-form.php
+++ b/wp-admin/edit-tag-form.php
@@ -33,7 +33,7 @@ if ( ! empty($tag_ID) ) {
 			<td><input name="slug" id="slug" type="text" value="<?php echo attribute_escape($tag->slug); ?>" size="40" /></td>
 		</tr>
 	</table>
-<p class="submit"><input type="submit" name="submit" value="<?php echo $submit_text ?>" /></p>
+<p class="submit"><input type="submit" class="button" name="submit" value="<?php echo $submit_text ?>" /></p>
 <?php do_action('edit_tag_form', $tag); ?>
 </form>
 </div>
diff --git a/wp-admin/edit-tags.php b/wp-admin/edit-tags.php
index 6ca56c1edb..0275f2b1ff 100644
--- a/wp-admin/edit-tags.php
+++ b/wp-admin/edit-tags.php
@@ -144,7 +144,7 @@ if ( $page_links )
 ?>
 
 <div style="float: left">
-<input type="submit" value="<?php _e('Delete'); ?>" name="deleteit" class="button" />
+<input type="submit" value="<?php _e('Delete'); ?>" name="deleteit" class="button-secondary" />
 <?php wp_nonce_field('bulk-tags'); ?>
 </div>
 
diff --git a/wp-admin/edit.php b/wp-admin/edit.php
index 71970f5386..66e6e89eb1 100644
--- a/wp-admin/edit.php
+++ b/wp-admin/edit.php
@@ -135,7 +135,7 @@ if ( $page_links )
 ?>
 
 <div style="float: left">
-<input type="submit" value="<?php _e('Delete'); ?>" name="deleteit" class="button" />
+<input type="submit" value="<?php _e('Delete'); ?>" name="deleteit" class="button-secondary" />
 <?php wp_nonce_field('bulk-posts'); ?>
 <?php
 
@@ -168,7 +168,7 @@ foreach ($arc_result as $arc_row) {
 <?php } ?>
 
 <?php wp_dropdown_categories('show_option_all='.__('View all categories').'&hide_empty=1&hierarchical=1&show_count=1&selected='.$cat);?>
-<input type="submit" id="post-query-submit" value="<?php _e('Filter'); ?>" class="button" />
+<input type="submit" id="post-query-submit" value="<?php _e('Filter'); ?>" class="button-secondary" />
 
 </div>
 
diff --git a/wp-admin/import/blogger.php b/wp-admin/import/blogger.php
index dfaf4fb53e..722bbff653 100644
--- a/wp-admin/import/blogger.php
+++ b/wp-admin/import/blogger.php
@@ -20,7 +20,7 @@ class Blogger_Import {
 		<div class='wrap'><h2>$title</h2><p>$welcome</p><p>$prereqs</p><p>$stepone</p>
 			<form action='$auth_url' method='get'>
 				<p class='submit' style='text-align:left;'>
-					<input type='submit' value='$auth' />
+					<input type='submit' class='button' value='$auth' />
 					<input type='hidden' name='scope' value='http://www.blogger.com/feeds/' />
 					<input type='hidden' name='session' value='1' />
 					<input type='hidden' name='secure' value='0' />
@@ -178,7 +178,7 @@ class Blogger_Import {
 			$init .= "blogs[$i]=new blog($i,'$blogtitle','{$blog['mode']}'," . $this->get_js_status($i) . ');';
 			$pstat = "<div class='ind' id='pind$i'>&nbsp;</div><div id='pstat$i' class='stat'>$pdone/{$blog['total_posts']}</div>";
 			$cstat = "<div class='ind' id='cind$i'>&nbsp;</div><div id='cstat$i' class='stat'>$cdone/{$blog['total_comments']}</div>";
-			$rows .= "<tr id='blog$i'><td class='blogtitle'>$blogtitle</td><td class='bloghost'>{$blog['host']}</td><td class='bar'>$pstat</td><td class='bar'>$cstat</td><td class='submit'><input type='submit' id='submit$i' value='$value' /><input type='hidden' name='blog' value='$i' /></td></tr>\n";
+			$rows .= "<tr id='blog$i'><td class='blogtitle'>$blogtitle</td><td class='bloghost'>{$blog['host']}</td><td class='bar'>$pstat</td><td class='bar'>$cstat</td><td class='submit'><input type='submit' class='button' id='submit$i' value='$value' /><input type='hidden' name='blog' value='$i' /></td></tr>\n";
 		}
 
 		echo "<div class='wrap'><h2>$title</h2><noscript>$noscript</noscript><table cellpadding='5px'><thead><td>$name</td><td>$url</td><td>$posts</td><td>$comments</td><td>$action</td></thead>\n$rows</table></form></div>";
@@ -618,7 +618,7 @@ class Blogger_Import {
 		foreach ( $blog['authors'] as $i => $author )
 			$rows .= "<tr><td><label for='authors[$i]'>{$author[0]}</label></td><td><select name='authors[$i]' id='authors[$i]'>" . $this->get_user_options($author[1]) . "</select></td></tr>";
 
-		return "<div class='wrap'><h2>$heading</h2><h3>$blogtitle</h3><p>$directions</p><form action='index.php?import=blogger&noheader=true&saveauthors=1' method='post'><input type='hidden' name='blog' value='$importing_blog' /><table cellpadding='5'><thead><td>$mapthis</td><td>$tothis</td></thead>$rows<tr><td></td><td class='submit'><input type='submit' class='authorsubmit' value='$submit' /></td></tr></table></form></div>";
+		return "<div class='wrap'><h2>$heading</h2><h3>$blogtitle</h3><p>$directions</p><form action='index.php?import=blogger&noheader=true&saveauthors=1' method='post'><input type='hidden' name='blog' value='$importing_blog' /><table cellpadding='5'><thead><td>$mapthis</td><td>$tothis</td></thead>$rows<tr><td></td><td class='submit'><input type='submit' class='button authorsubmit' value='$submit' /></td></tr></table></form></div>";
 	}
 
 	function get_user_options($current) {
@@ -788,7 +788,7 @@ class Blogger_Import {
 			$restart = __('Restart');
 			$message = __('We have saved some information about your Blogger account in your WordPress database. Clearing this information will allow you to start over. Restarting will not affect any posts you have already imported. If you attempt to re-import a blog, duplicate posts and comments will be skipped.');
 			$submit = __('Clear account information');
-			echo "<div class='wrap'><h2>$restart</h2><p>$message</p><form method='post' action='?import=blogger&noheader=true'><p class='submit' style='text-align:left;'><input type='submit' value='$submit' name='restart' /></p></form></div>";
+			echo "<div class='wrap'><h2>$restart</h2><p>$message</p><form method='post' action='?import=blogger&noheader=true'><p class='submit' style='text-align:left;'><input type='submit' class='button' value='$submit' name='restart' /></p></form></div>";
 		}
 	}
 
@@ -821,9 +821,6 @@ thead td { font-weight: bold; }
 	position: relative;
 	text-align: center;
 }
-.submit {
-	text-align: center !important;
-}
 </style>
 <?php
 	}
diff --git a/wp-admin/import/dotclear.php b/wp-admin/import/dotclear.php
index 774d6d9a7c..13c9f2ca96 100644
--- a/wp-admin/import/dotclear.php
+++ b/wp-admin/import/dotclear.php
@@ -640,7 +640,7 @@ class Dotclear_Import {
 
 	function db_form()
 	{
-		echo '<table class="editform">';
+		echo '<table class="niceblue">';
 		printf('<tr><th><label for="dbuser">%s</label></th><td><input type="text" name="dbuser" id="dbuser" /></td></tr>', __('DotClear Database User:'));
 		printf('<tr><th><label for="dbpass">%s</label></th><td><input type="password" name="dbpass" id="dbpass" /></td></tr>', __('DotClear Database Password:'));
 		printf('<tr><th><label for="dbname">%s</label></th><td><input type="text" name="dbname" id="dbname" /></td></tr>', __('DotClear Database Name:'));
diff --git a/wp-admin/import/greymatter.php b/wp-admin/import/greymatter.php
index 0b92865394..1004f76aa5 100644
--- a/wp-admin/import/greymatter.php
+++ b/wp-admin/import/greymatter.php
@@ -36,7 +36,7 @@ class GM_Import {
 <input type="hidden" name="step" value="1" />
 <?php wp_nonce_field('import-greymatter'); ?>
 <h3><?php _e('Second step: GreyMatter details:') ?></h3>
-<p><table cellpadding="0">
+<table class="niceblue">
 <tr>
 <td><?php _e('Path to GM files:') ?></td>
 <td><input type="text" style="width:300px" name="gmpath" value="/home/my/site/cgi-bin/greymatter/" /></td>
@@ -46,17 +46,14 @@ class GM_Import {
 <td><input type="text" style="width:300px" name="archivespath" value="/home/my/site/cgi-bin/greymatter/archives/" /></td>
 </tr>
 <tr>
-<td colspan="2"><br /><?php _e("This importer will search for files 00000001.cgi to 000-whatever.cgi,<br />so you need to enter the number of the last GM post here.<br />(if you don't know that number, just log into your FTP and look it out<br />in the entries' folder)") ?></td>
-</tr>
-<tr>
 <td><?php _e("Last entry's number:") ?></td>
-<td><input type="text" name="lastentry" value="00000001" /></td>
+<td><input type="text" name="lastentry" value="00000001" /><br />
+	<?php _e("This importer will search for files 00000001.cgi to 000-whatever.cgi,<br />so you need to enter the number of the last GM post here.<br />(if you don't know that number, just log into your FTP and look it out<br />in the entries' folder)") ?></td>
 </tr>
 </table>
 </p>
-<p><?php _e("When you're ready, click OK to start importing: ") ?><input type="submit" name="submit" value="<?php _e('OK') ?>" class="search" /></p>
+<p><input type="submit" name="submit" value="<?php _e('Start Importing') ?>" class="button" /></p>
 </form>
-<p>&nbsp</p>
 <?php
 		$this->footer();
 	}
diff --git a/wp-admin/import/jkw.php b/wp-admin/import/jkw.php
index 7886fde11b..e475fae2ba 100644
--- a/wp-admin/import/jkw.php
+++ b/wp-admin/import/jkw.php
@@ -20,11 +20,11 @@ class JeromesKeyword_Import {
 		echo '<p><strong>'.__('Don&#8217;t be stupid - backup your database before proceeding!').'</strong></p>';
 		echo '<form action="admin.php?import=jkw&amp;step=1" method="post">';
 		wp_nonce_field('import-jkw');
-		echo '<p class="submit"><input type="submit" name="submit" value="'.__('Import Version 1.x').'" /></p>';
+		echo '<p class="submit"><input type="submit" name="submit" class="button" value="'.__('Import Version 1.x').'" /></p>';
 		echo '</form>';
 		echo '<form action="admin.php?import=jkw&amp;step=3" method="post">';
 		wp_nonce_field('import-jkw');
-		echo '<p class="submit"><input type="submit" name="submit" value="'.__('Import Version 2.0a').'" /></p>';
+		echo '<p class="submit"><input type="submit" name="submit" class="button" value="'.__('Import Version 2.0a').'" /></p>';
 		echo '</form>';
 		echo '</div>';
 	}
diff --git a/wp-admin/import/textpattern.php b/wp-admin/import/textpattern.php
index 1ee7121d5d..52c5ba9d73 100644
--- a/wp-admin/import/textpattern.php
+++ b/wp-admin/import/textpattern.php
@@ -46,7 +46,7 @@ class Textpattern_Import {
 		echo '<form action="admin.php?import=textpattern&amp;step=1" method="post">';
 		wp_nonce_field('import-textpattern');
 		$this->db_form();
-		echo '<p class="submit"><input type="submit" name="submit" value="'.attribute_escape(__('Import Categories')).'" /></p>';
+		echo '<p class="submit"><input type="submit" class="button" name="submit" value="'.attribute_escape(__('Import')).'" /></p>';
 		echo '</form>';
 		echo '</div>';
 	}
@@ -481,7 +481,7 @@ class Textpattern_Import {
 
 		echo '<form action="admin.php?import=textpattern&amp;step=2" method="post">';
 		wp_nonce_field('import-textpattern');
-		printf('<input type="submit" name="submit" value="%s" />', attribute_escape(__('Import Users')));
+		printf('<input type="submit" class="button" name="submit" value="%s" />', attribute_escape(__('Import Users')));
 		echo '</form>';
 
 	}
@@ -494,7 +494,7 @@ class Textpattern_Import {
 
 		echo '<form action="admin.php?import=textpattern&amp;step=3" method="post">';
 		wp_nonce_field('import-textpattern');
-		printf('<input type="submit" name="submit" value="%s" />', attribute_escape(__('Import Posts')));
+		printf('<input type="submit" class="button" name="submit" value="%s" />', attribute_escape(__('Import Posts')));
 		echo '</form>';
 	}
 
@@ -508,7 +508,7 @@ class Textpattern_Import {
 
 		echo '<form action="admin.php?import=textpattern&amp;step=4" method="post">';
 		wp_nonce_field('import-textpattern');
-		printf('<input type="submit" name="submit" value="%s" />', attribute_escape(__('Import Comments')));
+		printf('<input type="submit" class="button" name="submit" value="%s" />', attribute_escape(__('Import Comments')));
 		echo '</form>';
 	}
 
@@ -520,7 +520,7 @@ class Textpattern_Import {
 
 		echo '<form action="admin.php?import=textpattern&amp;step=5" method="post">';
 		wp_nonce_field('import-textpattern');
-		printf('<input type="submit" name="submit" value="%s" />', attribute_escape(__('Import Links')));
+		printf('<input type="submit" class="button" name="submit" value="%s" />', attribute_escape(__('Import Links')));
 		echo '</form>';
 	}
 
@@ -533,7 +533,7 @@ class Textpattern_Import {
 
 		echo '<form action="admin.php?import=textpattern&amp;step=6" method="post">';
 		wp_nonce_field('import-textpattern');
-		printf('<input type="submit" name="submit" value="%s" />', attribute_escape(__('Finish')));
+		printf('<input type="submit" class="button" name="submit" value="%s" />', attribute_escape(__('Finish')));
 		echo '</form>';
 	}
 
@@ -575,7 +575,7 @@ class Textpattern_Import {
 
 	function db_form()
 	{
-		echo '<table class="editform">';
+		echo '<table class="niceblue">';
 		printf('<tr><th scope="row"><label for="dbuser">%s</label></th><td><input type="text" name="dbuser" id="dbuser" /></td></tr>', __('Textpattern Database User:'));
 		printf('<tr><th scope="row"><label for="dbpass">%s</label></th><td><input type="password" name="dbpass" id="dbpass" /></td></tr>', __('Textpattern Database Password:'));
 		printf('<tr><th scope="row"><label for="dbname">%s</label></th><td><input type="text" id="dbname" name="dbname" /></td></tr>', __('Textpattern Database Name:'));
diff --git a/wp-admin/import/wp-cat2tag.php b/wp-admin/import/wp-cat2tag.php
index 47fb19b23a..0f271cecaf 100644
--- a/wp-admin/import/wp-cat2tag.php
+++ b/wp-admin/import/wp-cat2tag.php
@@ -68,7 +68,7 @@ function check_all_rows() {
 </script>
 <?php
 		echo '<form name="formlist" id="formlist" action="admin.php?import=wp-cat2tag&amp;step=2" method="post">
-		<p><input type="button" value="' . __('Check All') . '"' . ' onClick="this.value=check_all_rows()"></p>';
+		<p><input type="button" class="button-secondary" value="' . __('Check All') . '"' . ' onClick="this.value=check_all_rows()"></p>';
 		wp_nonce_field('import-cat2tag');
 		echo '<ul style="list-style:none">';
 
@@ -90,7 +90,7 @@ function check_all_rows() {
 
 		echo '</ul>';
 
-		echo '<p class="submit"><input type="submit" name="submit" value="' . __('Convert Tags') . '" /></p>';
+		echo '<p class="submit"><input type="submit" name="submit" class="button" value="' . __('Convert Tags') . '" /></p>';
 
 		echo '</form>';
 	}
diff --git a/wp-admin/includes/template.php b/wp-admin/includes/template.php
index 097614c833..17b400a66d 100644
--- a/wp-admin/includes/template.php
+++ b/wp-admin/includes/template.php
@@ -945,7 +945,7 @@ function wp_import_upload_form( $action ) {
 <input type="hidden" name="max_file_size" value="<?php echo $bytes; ?>" />
 </p>
 <p class="submit">
-<input type="submit" value="<?php _e( 'Upload file and import' ); ?>" />
+<input type="submit" class="button" value="<?php _e( 'Upload file and import' ); ?>" />
 </p>
 </form>
 <?php
diff --git a/wp-admin/link-manager.php b/wp-admin/link-manager.php
index 13958074c9..493df7f49a 100644
--- a/wp-admin/link-manager.php
+++ b/wp-admin/link-manager.php
@@ -89,7 +89,7 @@ if ( isset($_GET['deleted']) ) {
 <div class="tablenav">
 
 <div style="float: left">
-<input type="submit" value="<?php _e('Delete'); ?>" name="deleteit" class="button" />
+<input type="submit" value="<?php _e('Delete'); ?>" name="deleteit" class="button-secondary" />
 <?php
 $categories = get_terms('link_category', "hide_empty=1");
 $select_cat = "<select name=\"cat_id\">\n";
@@ -109,7 +109,7 @@ echo $select_cat;
 echo $select_order;
 
 ?>
-<input type="submit" id="post-query-submit" value="<?php _e('Filter &#187;'); ?>" class="button" />
+<input type="submit" id="post-query-submit" value="<?php _e('Filter'); ?>" class="button-secondary" />
 
 </div>
 
diff --git a/wp-admin/upload.php b/wp-admin/upload.php
index 1dc1cc174d..3d293e24ac 100644
--- a/wp-admin/upload.php
+++ b/wp-admin/upload.php
@@ -138,7 +138,7 @@ if ( $page_links )
 ?>
 
 <div style="float: left">
-<input type="submit" value="<?php _e('Delete'); ?>" name="deleteit" class="button" />
+<input type="submit" value="<?php _e('Delete'); ?>" name="deleteit" class="button-secondary" />
 <?php wp_nonce_field('bulk-media'); ?>
 <?php
 
@@ -170,7 +170,7 @@ foreach ($arc_result as $arc_row) {
 </select>
 <?php } ?>
 
-<input type="submit" id="post-query-submit" value="<?php _e('Filter &#187;'); ?>" class="button" />
+<input type="submit" id="post-query-submit" value="<?php _e('Filter &#187;'); ?>" class="button-secondary" />
 
 </div>
 
diff --git a/wp-admin/users.php b/wp-admin/users.php
index 2b8a8a65ca..a472151b22 100644
--- a/wp-admin/users.php
+++ b/wp-admin/users.php
@@ -149,7 +149,7 @@ case 'delete':
 		<?php echo '<label for="delete_option1">'.__('Attribute all posts and links to:')."</label> $user_dropdown"; ?></li>
 	</ul>
 	<input type="hidden" name="action" value="dodelete" />
-	<p class="submit"><input type="submit" name="submit" value="<?php _e('Confirm Deletion'); ?>" class="button" /></p>
+	<p class="submit"><input type="submit" name="submit" value="<?php _e('Confirm Deletion'); ?>" class="button-secondary" /></p>
 <?php else : ?>
 	<p><?php _e('There are no valid users selected for deletion.'); ?></p>
 <?php endif; ?>
@@ -293,7 +293,7 @@ unset($role_links);
 <?php endif; ?>
 
 <div style="float: left">
-<input type="submit" value="<?php _e('Delete'); ?>" name="deleteit" class="button" />
+<input type="submit" value="<?php _e('Delete'); ?>" name="deleteit" class="button-secondary" />
 <?php wp_nonce_field('bulk-users'); ?>
 </div>
 
diff --git a/wp-admin/widgets.php b/wp-admin/widgets.php
index 67961f687d..1e86881063 100644
--- a/wp-admin/widgets.php
+++ b/wp-admin/widgets.php
@@ -193,7 +193,7 @@ if ( isset($_GET['message']) && isset($messages[$_GET['message']]) ) : ?>
 				<option value='<?php echo $show_value; ?>'<?php selected( $show_value, $show ); ?>><?php echo wp_specialchars( $show_text ); ?></option>
 <?php endforeach; ?>
 			</select>
-			<input type="submit" value="<?php _e('Show' ); ?>" class="button" />
+			<input type="submit" value="<?php _e('Show' ); ?>" class="button-secondary" />
 			<p class="pagenav">
 				<?php echo $page_links; ?>
 			</p>
@@ -210,7 +210,7 @@ if ( isset($_GET['message']) && isset($messages[$_GET['message']]) ) : ?>
 				<option value='<?php echo $sidebar_id; ?>'<?php selected( $sidebar_id, $sidebar ); ?>><?php echo wp_specialchars( $registered_sidebar['name'] ); ?></option>
 <?php endforeach; ?>
 			</select>
-			<input type="submit" value="<?php _e('Go' ); ?>" class="button" />
+			<input type="submit" value="<?php _e('Show' ); ?>" class="button-secondary" />
 		</div>
 
 	</div>
diff --git a/wp-admin/wp-admin.css b/wp-admin/wp-admin.css
index 8ad3586142..1e8b7d995e 100644
--- a/wp-admin/wp-admin.css
+++ b/wp-admin/wp-admin.css
@@ -17,12 +17,6 @@ a.delete:hover {
 	font-size: 16px;
 }
 
-#import-upload-form {
-	margin: auto;
-	background: #eee;
-	padding: 1em;
-}
-
 .form-invalid {
 	background-color: #FF9999 !important;
 }
@@ -131,19 +125,24 @@ form#upload #post_content {
 	margin: 1.5em 0;
 }
 
-.submit input, .submit input:focus, .button, .button:focus {
+.submit input, .button, .button-secondary {
 	font-family: "Lucida Grande", "Lucida Sans Unicode", Tahoma, Verdana, sans-serif;
-	color: #246;
 	padding: 4px 6px;
-	background: #e5e5e5;
 	border: none;
+	font-size: 13px;
 	-moz-border-radius: 2px;
 	-khtml-border-radius: 2px;	
 	-webkit-border-radius: 2px;
 	border-radius: 2px;
+	color: #246;
+	background: #e5e5e5;
 }
 
-.submit input:hover, .button:hover {
+.button-secondary {
+	background: #cee1ef;
+}
+
+.submit input:hover, .button:hover, .button-secondary:hover {
 	color: #d54e21;
 }
 
@@ -154,10 +153,6 @@ select {
 	padding: none;
 }
 
-.editform th, #postcustomsubmit {
-	text-align: right;
-}
-
 .submit a{
 	color: #fff;
 }
@@ -515,13 +510,6 @@ p.pagenav {
 	margin: 0 6px;
 }
 
-.tablenav .button,
-div.nav .button,
-.niceblue tr .button {
-	padding: 4px 6px;
-	background: #cee1ef;
-}
-
 .tablenav .dots {
 	background-color: #e4f2fd;
 	border-color: #e4f2fd;
@@ -608,9 +596,9 @@ a.view-comment-post-link {
 #user_info {
 	position: absolute;
 	right: 15%;
-	top: 9px;
+	top: 11px;
 	color: #ccc;
-	font-size: 12px;
+	font-size: 11px;
 }
 
 #user_info p {
@@ -622,6 +610,10 @@ a.view-comment-post-link {
 	color: #fff;
 }
 
+#user_info a:hover {
+	text-decoration: underline;
+}
+
 #wphead {
 	border-top: 30px solid #464646;
 	background: #e4f2fd;
@@ -650,7 +642,7 @@ a.view-comment-post-link {
 #wphead h1 {
 	font: normal 36px Georgia, "Times New Roman", Times, serif;
 	color: #555;
-	padding: 15px 170px 18px 15px;
+	padding: 11px 170px 16px 12px;
 	margin: 0;
 	margin-right: 15%;
 }
@@ -661,10 +653,10 @@ a.view-comment-post-link {
 	margin: 0;
 	list-style: none;
 	position: absolute;
-	top: 5px;
+	top: 7px;
 	left: 0;
-	font-size: 12px;
-	padding-left: 12px;
+	font-size: 11px;
+	padding-left: 9px;
 }
 
 #dashmenu a {
@@ -674,7 +666,7 @@ a.view-comment-post-link {
 	margin-right: 8px;
 }
 
-#dashmenu a:hover, #dashmenu a.current, #dashmenu a.current:hover {
+#dashmenu a.current {
 	background: #e4f2fd;
 	color: #555;
 	-moz-border-radius-topleft: 3px;
@@ -687,12 +679,20 @@ a.view-comment-post-link {
 	border-top-right-radius: 3px;
 }
 
+#dashmenu a:hover {
+	color: #fff;
+}
+
+#dashmenu a.current:hover {
+	color: #555;
+}
+
 #adminmenu {
 	margin: 0;
 	list-style: none;
         background-color: #e4f2fd;
 	border-bottom: 1px solid #c6d9e9;
-	padding-left: 15px;
+	padding-left: 11px;
 }
 
 /* Because we don't want visited on these links */
@@ -702,15 +702,16 @@ a.view-comment-post-link {
 
 #adminmenu a {
 	font-size: 16px;
-	padding: 6px 7px 6px 7px;
-	line-height: 200%;
+	padding: 6px 7px;
+	line-height: 195%;
 }
 
-#adminmenu a:hover, #adminmenu a.current, #adminmenu a.current:hover {
+#adminmenu a.current {
 	background: #fff;
 	color: #d54e21;
 	border: 1px solid #c6d9e9;
-	font-weight: bold;
+	border-bottom: 2px solid #fff;
+	font-weight: normal;
 	padding: 6px;
 	-moz-border-radius-topleft: 4px;
 	-khtml-border-top-left-radius: 4px;
@@ -723,16 +724,11 @@ a.view-comment-post-link {
 }
 
 #adminmenu a:hover {
-	border-bottom: 0;
-	font-weight: normal;
-}
-
-#adminmenu a.current, #adminmenu a.current:hover {
-	border-bottom: 2px solid #fff;
+	color: #d54e21;
 }
 
 #sidemenu {
-	margin: 0;
+	margin: 0 -3px 0 0;
 	color: #999;
 	list-style: none;
 	position: absolute;
@@ -762,8 +758,7 @@ a.view-comment-post-link {
 
 #adminmenu li a #awaiting-mod {
 	position: absolute;
-	margin-left: -1.2em;
-	margin-top: -0.2em;
+	margin-left: -0.2em;
 	font-size: 0.7em;
 	background-image: url(images/comment-stalk.gif);
 	background-repeat: no-repeat;
@@ -843,7 +838,7 @@ strong .post-com-count span {
 #submenu {
 	margin: 0;
 	list-style: none;
-	padding: 12px 0 15px 0;
+	padding: 7px 0 15px 0;
 }
 
 #submenu a {
@@ -871,7 +866,7 @@ html, body {
 	min-height: 100%;
 }
 #wpcontent{
-	padding-bottom: 65px;
+	padding-bottom: 95px;
 }
 #footer {
 	clear: both;
@@ -881,7 +876,7 @@ html, body {
 	background: #464646 url('images/logo-ghost.png') no-repeat 20px 10px;
 	color: #999;
 	position: relative; 
-// 	margin-top: -75px; 
+ 	margin-top: -75px; 
 }
 
 #footer a {
@@ -1006,9 +1001,6 @@ html, body {
 	border-bottom: 1px solid #ccc;
 	padding: 2px;
 	margin-bottom: 10px;
-}
-
-#poststuff .postarea {
 	margin-right: 8px;
 }
 
diff --git a/wp-content/themes/default/functions.php b/wp-content/themes/default/functions.php
index 4c65eb60ef..e0451e7df4 100644
--- a/wp-content/themes/default/functions.php
+++ b/wp-content/themes/default/functions.php
@@ -157,7 +157,7 @@ function kubrick_theme_page_head() {
 		kUpdate(ColorPicker_targetInput.id);
 	}
 	function PopupWindow_populate(contents) {
-		contents += '<br /><p style="text-align:center;margin-top:0px;"><input type="button" value="<?php echo attribute_escape(__('Close Color Picker')); ?>" onclick="cp.hidePopup(\'prettyplease\')"></input></p>';
+		contents += '<br /><p style="text-align:center;margin-top:0px;"><input type="button" class="button-secondary" value="<?php echo attribute_escape(__('Close Color Picker')); ?>" onclick="cp.hidePopup(\'prettyplease\')"></input></p>';
 		this.contents = contents;
 		this.populated = false;
 	}
@@ -386,18 +386,18 @@ function kubrick_theme_page() {
 		<div id="jsForm">
 			<form style="display:inline;" method="post" name="hicolor" id="hicolor" action="<?php echo attribute_escape($_SERVER['REQUEST_URI']); ?>">
 				<?php wp_nonce_field('kubrick-header'); ?>
-	<input type="button" onclick="tgt=document.getElementById('fontcolor');colorSelect(tgt,'pick1');return false;" name="pick1" id="pick1" value="<?php echo attribute_escape(__('Font Color')); ?>"></input>
-		<input type="button" onclick="tgt=document.getElementById('uppercolor');colorSelect(tgt,'pick2');return false;" name="pick2" id="pick2" value="<?php echo attribute_escape(__('Upper Color')); ?>"></input>
-		<input type="button" onclick="tgt=document.getElementById('lowercolor');colorSelect(tgt,'pick3');return false;" name="pick3" id="pick3" value="<?php echo attribute_escape(__('Lower Color')); ?>"></input>
-				<input type="button" name="revert" value="<?php echo attribute_escape(__('Revert')); ?>" onclick="kRevert()" />
-				<input type="button" value="<?php echo attribute_escape(__('Advanced')); ?>" onclick="toggleAdvanced()" />
+	<input type="button"  class="button-secondary" onclick="tgt=document.getElementById('fontcolor');colorSelect(tgt,'pick1');return false;" name="pick1" id="pick1" value="<?php echo attribute_escape(__('Font Color')); ?>"></input>
+		<input type="button" class="button-secondary" onclick="tgt=document.getElementById('uppercolor');colorSelect(tgt,'pick2');return false;" name="pick2" id="pick2" value="<?php echo attribute_escape(__('Upper Color')); ?>"></input>
+		<input type="button" class="button-secondary" onclick="tgt=document.getElementById('lowercolor');colorSelect(tgt,'pick3');return false;" name="pick3" id="pick3" value="<?php echo attribute_escape(__('Lower Color')); ?>"></input>
+				<input type="button" class="button-secondary" name="revert" value="<?php echo attribute_escape(__('Revert')); ?>" onclick="kRevert()" />
+				<input type="button" class="button-secondary" value="<?php echo attribute_escape(__('Advanced')); ?>" onclick="toggleAdvanced()" />
 				<input type="hidden" name="action" value="save" />
 				<input type="hidden" name="fontdisplay" id="fontdisplay" value="<?php echo attribute_escape(kubrick_header_display()); ?>" />
 				<input type="hidden" name="fontcolor" id="fontcolor" value="<?php echo attribute_escape(kubrick_header_color()); ?>" />
 				<input type="hidden" name="uppercolor" id="uppercolor" value="<?php echo attribute_escape(kubrick_upper_color()); ?>" />
 				<input type="hidden" name="lowercolor" id="lowercolor" value="<?php echo attribute_escape(kubrick_lower_color()); ?>" />
 				<input type="hidden" name="headerimage" id="headerimage" value="<?php echo attribute_escape(kubrick_header_image()); ?>" />
-				<p class="submit"><input type="submit" name="submitform" class="defbutton" value="<?php echo attribute_escape(__('Update Header &raquo;')); ?>" onclick="cp.hidePopup('prettyplease')" /></p>
+				<p class="submit"><input type="submit" name="submitform" class="defbutton" value="<?php echo attribute_escape(__('Update Header')); ?>" onclick="cp.hidePopup('prettyplease')" /></p>
 			</form>
 			<div id="colorPickerDiv" style="z-index: 100;background:#eee;border:1px solid #ccc;position:absolute;visibility:hidden;"> </div>
 			<div id="advanced">
@@ -406,8 +406,8 @@ function kubrick_theme_page() {
 					<label for="advfontcolor"><?php _e('Font Color (CSS):'); ?> </label><input type="text" id="advfontcolor" onchange="advUpdate(this.value, 'fontcolor')" value="<?php echo attribute_escape(kubrick_header_color()); ?>" /><br />
 					<label for="advuppercolor"><?php _e('Upper Color (HEX):');?> </label><input type="text" id="advuppercolor" onchange="advUpdate(this.value, 'uppercolor')" value="#<?php echo attribute_escape(kubrick_upper_color()); ?>" /><br />
 					<label for="advlowercolor"><?php _e('Lower Color (HEX):'); ?> </label><input type="text" id="advlowercolor" onchange="advUpdate(this.value, 'lowercolor')" value="#<?php echo attribute_escape(kubrick_lower_color()); ?>" /><br />
-					<input type="button" name="default" value="<?php echo attribute_escape(__('Select Default Colors')); ?>" onclick="kDefaults()" /><br />
-					<input type="button" onclick="toggleDisplay();return false;" name="pick" id="pick" value="<?php echo attribute_escape(__('Toggle Text Display')); ?>"></input><br />
+					<input type="button" class="button-secondary" name="default" value="<?php echo attribute_escape(__('Select Default Colors')); ?>" onclick="kDefaults()" /><br />
+					<input type="button" class="button-secondary" onclick="toggleDisplay();return false;" name="pick" id="pick" value="<?php echo attribute_escape(__('Toggle Text Display')); ?>"></input><br />
 				</form>
 			</div>
 		</div>