Index: wp-admin/includes/class-wp-posts-list-table.php
===================================================================
--- wp-admin/includes/class-wp-posts-list-table.php	(revision 21655)
+++ wp-admin/includes/class-wp-posts-list-table.php	(working copy)
@@ -218,11 +218,11 @@
 				wp_dropdown_categories( $dropdown_options );
 			}
 			do_action( 'restrict_manage_posts' );
-			submit_button( __( 'Filter' ), 'secondary', false, false, array( 'id' => 'post-query-submit' ) );
+			submit_button( __( 'Filter' ), 'button button-secondary secondary short', false, false, array( 'id' => 'post-query-submit' ) );
 		}
 
 		if ( $this->is_trash && current_user_can( $post_type_object->cap->edit_others_posts ) ) {
-			submit_button( __( 'Empty Trash' ), 'button-secondary apply', 'delete_all', false );
+			submit_button( __( 'Empty Trash' ), 'button button-secondary apply short', 'delete_all', false );
 		}
 ?>
 		</div>
Index: wp-admin/includes/plugin-install.php
===================================================================
--- wp-admin/includes/plugin-install.php	(revision 21655)
+++ wp-admin/includes/plugin-install.php	(working copy)
@@ -130,7 +130,7 @@
 		<?php endif; ?>
 		<input type="search" name="s" value="<?php echo esc_attr($term) ?>" autofocus="autofocus" />
 		<label class="screen-reader-text" for="plugin-search-input"><?php _e('Search Plugins'); ?></label>
-		<?php submit_button( __( 'Search Plugins' ), 'button', 'plugin-search-input', false ); ?>
+		<?php submit_button( __( 'Search Plugins' ), 'button short', 'plugin-search-input', false ); ?>
 	</form><?php
 }
 
Index: wp-admin/includes/class-wp-media-list-table.php
===================================================================
--- wp-admin/includes/class-wp-media-list-table.php	(revision 21655)
+++ wp-admin/includes/class-wp-media-list-table.php	(working copy)
@@ -91,13 +91,13 @@
 			$this->months_dropdown( 'attachment' );
 
 			do_action( 'restrict_manage_posts' );
-			submit_button( __( 'Filter' ), 'secondary', false, false, array( 'id' => 'post-query-submit' ) );
+			submit_button( __( 'Filter' ), 'button button-secondary secondary short', false, false, array( 'id' => 'post-query-submit' ) );
 		}
 
 		if ( $this->detached ) {
 			submit_button( __( 'Scan for lost attachments' ), 'secondary', 'find_detached', false );
 		} elseif ( $this->is_trash && current_user_can( 'edit_others_posts' ) ) {
-			submit_button( __( 'Empty Trash' ), 'button-secondary apply', 'delete_all', false );
+			submit_button( __( 'Empty Trash' ), 'button button-secondary apply short', 'delete_all', false );
 		} ?>
 		</div>
 <?php
Index: wp-admin/includes/class-wp-links-list-table.php
===================================================================
--- wp-admin/includes/class-wp-links-list-table.php	(revision 21655)
+++ wp-admin/includes/class-wp-links-list-table.php	(working copy)
@@ -68,7 +68,7 @@
 				'orderby' => 'name',
 			);
 			wp_dropdown_categories( $dropdown_options );
-			submit_button( __( 'Filter' ), 'secondary', false, false, array( 'id' => 'post-query-submit' ) );
+			submit_button( __( 'Filter' ), 'button button-secondary secondary short', false, false, array( 'id' => 'post-query-submit' ) );
 ?>
 		</div>
 <?php
Index: wp-admin/includes/post.php
===================================================================
--- wp-admin/includes/post.php	(revision 21655)
+++ wp-admin/includes/post.php	(working copy)
@@ -1076,9 +1076,9 @@
 	if ( false === strpos($permalink, '%postname%') && false === strpos($permalink, '%pagename%') ) {
 		$return = '<strong>' . __('Permalink:') . "</strong>\n" . '<span id="sample-permalink" tabindex="-1">' . $permalink . "</span>\n";
 		if ( '' == get_option( 'permalink_structure' ) && current_user_can( 'manage_options' ) && !( 'page' == get_option('show_on_front') && $id == get_option('page_on_front') ) )
-			$return .= '<span id="change-permalinks"><a href="options-permalink.php" class="button" target="_blank">' . __('Change Permalinks') . "</a></span>\n";
+			$return .= '<span id="change-permalinks"><a href="options-permalink.php" class="button small" target="_blank">' . __('Change Permalinks') . "</a></span>\n";
 		if ( isset($view_post) )
-			$return .= "<span id='view-post-btn'><a href='$permalink' class='button'>$view_post</a></span>\n";
+			$return .= "<span id='view-post-btn'><a href='$permalink' class='button small'>$view_post</a></span>\n";
 
 		$return = apply_filters('get_sample_permalink_html', $return, $id, $new_title, $new_slug);
 
@@ -1105,10 +1105,10 @@
 	$return =  '<strong>' . __('Permalink:') . "</strong>\n";
 	$return .= '<span id="sample-permalink" tabindex="-1">' . $display_link . "</span>\n";
 	$return .= '&lrm;'; // Fix bi-directional text display defect in RTL languages.
-	$return .= '<span id="edit-slug-buttons"><a href="#post_name" class="edit-slug button hide-if-no-js" onclick="editPermalink(' . $id . '); return false;">' . __('Edit') . "</a></span>\n";
+	$return .= '<span id="edit-slug-buttons"><a href="#post_name" class="edit-slug button small button-highlighted hide-if-no-js" onclick="editPermalink(' . $id . '); return false;">' . __('Edit') . "</a></span>\n";
 	$return .= '<span id="editable-post-name-full">' . $post_name . "</span>\n";
 	if ( isset($view_post) )
-		$return .= "<span id='view-post-btn'><a href='$view_link' class='button'>$view_post</a></span>\n";
+		$return .= "<span id='view-post-btn'><a href='$view_link' class='button small'>$view_post</a></span>\n";
 
 	$return = apply_filters('get_sample_permalink_html', $return, $id, $new_title, $new_slug);
 
Index: wp-admin/includes/class-wp-users-list-table.php
===================================================================
--- wp-admin/includes/class-wp-users-list-table.php	(revision 21655)
+++ wp-admin/includes/class-wp-users-list-table.php	(working copy)
@@ -145,7 +145,7 @@
 			<option value=''><?php _e( 'Change role to&hellip;' ) ?></option>
 			<?php wp_dropdown_roles(); ?>
 		</select>
-		<?php submit_button( __( 'Change' ), 'secondary', 'changeit', false ); ?>
+		<?php submit_button( __( 'Change' ), 'button button-secondary secondary short', 'changeit', false ); ?>
 	</div>
 <?php
 	}
Index: wp-admin/includes/dashboard.php
===================================================================
--- wp-admin/includes/dashboard.php	(revision 21655)
+++ wp-admin/includes/dashboard.php	(working copy)
@@ -439,14 +439,14 @@
 	<form action="<?php echo network_admin_url('users.php'); ?>" method="get">
 		<p>
 			<input type="search" name="s" value="" size="30" autocomplete="off" />
-			<?php submit_button( __( 'Search Users' ), 'button', 'submit', false, array( 'id' => 'submit_users' ) ); ?>
+			<?php submit_button( __( 'Search Users' ), 'button short', 'submit', false, array( 'id' => 'submit_users' ) ); ?>
 		</p>
 	</form>
 
 	<form action="<?php echo network_admin_url('sites.php'); ?>" method="get">
 		<p>
 			<input type="search" name="s" value="" size="30" autocomplete="off" />
-			<?php submit_button( __( 'Search Sites' ), 'button', 'submit', false, array( 'id' => 'submit_sites' ) ); ?>
+			<?php submit_button( __( 'Search Sites' ), 'button short', 'submit', false, array( 'id' => 'submit_sites' ) ); ?>
 		</p>
 	</form>
 <?php
Index: wp-admin/includes/class-wp-list-table.php
===================================================================
--- wp-admin/includes/class-wp-list-table.php	(revision 21655)
+++ wp-admin/includes/class-wp-list-table.php	(working copy)
@@ -213,7 +213,7 @@
 <p class="search-box">
 	<label class="screen-reader-text" for="<?php echo $input_id ?>"><?php echo $text; ?>:</label>
 	<input type="search" id="<?php echo $input_id ?>" name="s" value="<?php _admin_search_query(); ?>" />
-	<?php submit_button( $text, 'button', false, false, array('id' => 'search-submit') ); ?>
+	<?php submit_button( $text, 'button short', false, false, array('id' => 'search-submit') ); ?>
 </p>
 <?php
 	}
@@ -300,7 +300,7 @@
 
 		echo "</select>\n";
 
-		submit_button( __( 'Apply' ), 'button-secondary action', false, false, array( 'id' => "doaction$two" ) );
+		submit_button( __( 'Apply' ), 'button button-secondary action short', false, false, array( 'id' => "doaction$two" ) );
 		echo "\n";
 	}
 
Index: wp-admin/includes/meta-boxes.php
===================================================================
--- wp-admin/includes/meta-boxes.php	(revision 21655)
+++ wp-admin/includes/meta-boxes.php	(working copy)
@@ -288,7 +288,7 @@
 		<label class="screen-reader-text" for="new-tag-<?php echo $tax_name; ?>"><?php echo $box['title']; ?></label>
 		<div class="taghint"><?php echo $taxonomy->labels->add_new_item; ?></div>
 		<p><input type="text" id="new-tag-<?php echo $tax_name; ?>" name="newtag[<?php echo $tax_name; ?>]" class="newtag form-input-tip" size="16" autocomplete="off" value="" />
-		<input type="button" class="button tagadd" value="<?php esc_attr_e('Add'); ?>" /></p>
+		<input type="button" class="button tagadd small" value="<?php esc_attr_e('Add'); ?>" /></p>
 	</div>
 	<p class="howto"><?php echo esc_attr( $taxonomy->labels->separate_items_with_commas ); ?></p>
 	<?php endif; ?>
Index: wp-admin/includes/class-wp-plugins-list-table.php
===================================================================
--- wp-admin/includes/class-wp-plugins-list-table.php	(revision 21655)
+++ wp-admin/includes/class-wp-plugins-list-table.php	(working copy)
@@ -272,7 +272,7 @@
 		$screen = get_current_screen();
 
 		if ( ! $screen->is_network && 'recently_activated' == $status )
-			submit_button( __( 'Clear List' ), 'secondary', 'clear-recent-list', false );
+			submit_button( __( 'Clear List' ), 'button button-secondary secondary short', 'clear-recent-list', false );
 		elseif ( 'top' == $which && 'mustuse' == $status )
 			echo '<p>' . sprintf( __( 'Files in the <code>%s</code> directory are executed automatically.' ), str_replace( ABSPATH, '/', WPMU_PLUGIN_DIR ) ) . '</p>';
 		elseif ( 'top' == $which && 'dropins' == $status )
Index: wp-admin/includes/class-wp-comments-list-table.php
===================================================================
--- wp-admin/includes/class-wp-comments-list-table.php	(revision 21655)
+++ wp-admin/includes/class-wp-comments-list-table.php	(working copy)
@@ -224,13 +224,13 @@
 			?>
 			</select>
 <?php
-			submit_button( __( 'Filter' ), 'secondary', false, false, array( 'id' => 'post-query-submit' ) );
+			submit_button( __( 'Filter' ), 'button button-secondary short', false, false, array( 'id' => 'post-query-submit' ) );
 		}
 
 		if ( ( 'spam' == $comment_status || 'trash' == $comment_status ) && current_user_can( 'moderate_comments' ) ) {
 			wp_nonce_field( 'bulk-destroy', '_destroy_nonce' );
 			$title = ( 'spam' == $comment_status ) ? esc_attr__( 'Empty Spam' ) : esc_attr__( 'Empty Trash' );
-			submit_button( $title, 'button-secondary apply', 'delete_all', false );
+			submit_button( $title, 'button button-secondary apply short', 'delete_all', false );
 		}
 		do_action( 'manage_comments_nav', $comment_status );
 		echo '</div>';
Index: wp-admin/includes/template.php
===================================================================
--- wp-admin/includes/template.php	(revision 21655)
+++ wp-admin/includes/template.php	(working copy)
@@ -555,7 +555,7 @@
 </tr>
 
 <tr><td colspan="2" class="submit">
-<?php submit_button( __( 'Add Custom Field' ), 'add:the-list:newmeta', 'addmeta', false, array( 'id' => 'addmetasub' ) ); ?>
+<?php submit_button( __( 'Add Custom Field' ), 'add:the-list:newmeta button', 'addmeta', false, array( 'id' => 'addmetasub' ) ); ?>
 <?php wp_nonce_field( 'add-meta', '_ajax_nonce-add-meta', false ); ?>
 </td></tr>
 </tbody>
Index: wp-admin/js/post.js
===================================================================
--- wp-admin/js/post.js	(revision 21655)
+++ wp-admin/js/post.js	(working copy)
@@ -558,7 +558,7 @@
 			var i, c = 0, e = $('#editable-post-name'), revert_e = e.html(), real_slug = $('#post_name'), revert_slug = real_slug.val(), b = $('#edit-slug-buttons'), revert_b = b.html(), full = $('#editable-post-name-full').html();
 
 			$('#view-post-btn').hide();
-			b.html('<a href="#" class="save button">'+postL10n.ok+'</a> <a class="cancel" href="#">'+postL10n.cancel+'</a>');
+			b.html('<a href="#" class="save button small major">'+postL10n.ok+'</a> <a class="cancel" href="#">'+postL10n.cancel+'</a>');
 			b.children('.save').click(function() {
 				var new_slug = e.children('input').val();
 				if ( new_slug == $('#editable-post-name-full').text() ) {
Index: wp-admin/edit-form-advanced.php
===================================================================
--- wp-admin/edit-form-advanced.php	(revision 21655)
+++ wp-admin/edit-form-advanced.php	(working copy)
@@ -290,7 +290,7 @@
 $sample_permalink_html = $post_type_object->public ? get_sample_permalink_html($post->ID) : '';
 $shortlink = wp_get_shortlink($post->ID, 'post');
 if ( !empty($shortlink) )
-    $sample_permalink_html .= '<input id="shortlink" type="hidden" value="' . esc_attr($shortlink) . '" /><a href="#" class="button" onclick="prompt(&#39;URL:&#39;, jQuery(\'#shortlink\').val()); return false;">' . __('Get Shortlink') . '</a>';
+    $sample_permalink_html .= '<input id="shortlink" type="hidden" value="' . esc_attr($shortlink) . '" /><a href="#" class="button small" onclick="prompt(&#39;URL:&#39;, jQuery(\'#shortlink\').val()); return false;">' . __('Get Shortlink') . '</a>';
 
 if ( $post_type_object->public && ! ( 'pending' == $post->post_status && !current_user_can( $post_type_object->cap->publish_posts ) ) ) { ?>
 	<div id="edit-slug-box">
Index: wp-admin/css/colors-fresh.css
===================================================================
--- wp-admin/css/colors-fresh.css	(revision 21655)
+++ wp-admin/css/colors-fresh.css	(working copy)
@@ -368,13 +368,26 @@
 	color: #666;
 }
 
+a.button:active {
+	outline: none;
+}
+
 .button,
 .button-secondary,
 .submit input,
 input[type=button],
 input[type=submit] {
-	border-color: #bbb;
-	color: #464646;
+	background: #ececec;
+	background-image: -webkit-gradient(linear, left top, left bottom, from(#fff), to(#eee));
+	background-image: -webkit-linear-gradient(top, #fff, #eee);
+	background-image:    -moz-linear-gradient(top, #fff, #eee);
+	background-image:      -o-linear-gradient(top, #fff, #eee);
+	background-image:   linear-gradient(to bottom, #fff, #eee);
+	border-color: #ccc;
+	-webkit-box-shadow: inset 0 0 1px 1px rgba(255,255,255, 0.9); 
+ 	box-shadow: inset 0 0 1px 1px rgba(255,255,255, 0.9);
+ 	color: #464646;
+	text-shadow: 1px 1px 0 #fff;
 }
 
 .button:hover,
@@ -382,67 +395,108 @@
 .submit input:hover,
 input[type=button]:hover,
 input[type=submit]:hover {
+	border-color: #bbb;
+	-webkit-box-shadow: 0px 1px 2px rgba(0,0,0,.2); 
+	box-shadow: 0px 1px 2px rgba(0,0,0,.2);
 	color: #000;
-	border-color: #666;
 }
 
-.button,
-.submit input,
-.button-secondary {
-	text-shadow: 0 1px 0 #fff;
-	background: #f2f2f2;
-	background-image: -webkit-gradient(linear, left bottom, left top, from(#ededed), to(#fff));
-	background-image: -webkit-linear-gradient(bottom, #ededed, #fff);
-	background-image:    -moz-linear-gradient(bottom, #ededed, #fff);
-	background-image:      -o-linear-gradient(bottom, #ededed, #fff);
-	background-image: linear-gradient(to top, #ededed, #fff);
-}
-
 .button:active,
+.button-secondary:active,
 .submit input:active,
-.button-secondary:active {
+input[type=button]:active,
+input[type=submit]:active {
 	background: #eee;
-	background-image: -webkit-gradient(linear, left top, left bottom, from(#ededed), to(#fff));
-	background-image: -webkit-linear-gradient(top, #ededed, #fff);
-	background-image:    -moz-linear-gradient(top, #ededed, #fff);
-	background-image:      -o-linear-gradient(top, #ededed, #fff);
-	background-image: linear-gradient(to bottom, #ededed, #fff);
+	background-image: -webkit-gradient(linear, left top, left bottom, from(#eee), to(#f9f9f9));
+	background-image: -webkit-linear-gradient(top, #eee, #f9f9f9);
+	background-image:    -moz-linear-gradient(top, #eee, #f9f9f9);
+	background-image:      -o-linear-gradient(top, #eee, #f9f9f9);
+	background-image:   linear-gradient(to bottom, #eee, #f9f9f9);
+	border-color: #999 #ddd #ddd #999;
+	color: #555;
+	-webkit-box-shadow: inset 1px 1px 0 rgba(50,50,50,0.1); 
+ 	box-shadow: inset 1px 1px 0 rgba(50,50,50,0.1); 
 }
 
+.button:focus,
+.button-secondary:focus,
+.submit input:focus,
+input[type=button]:focus,
+input[type=submit]:focus { 
+	background: #eee;
+	background-image: -webkit-gradient(linear, left top, left bottom, from(#eee), to(#f9f9f9));
+	background-image: -webkit-linear-gradient(top, #eee, #f9f9f9);
+	background-image:    -moz-linear-gradient(top, #eee, #f9f9f9);
+	background-image:      -o-linear-gradient(top, #eee, #f9f9f9);
+	background-image:   linear-gradient(to bottom, #eee, #f9f9f9);
+	border: 1px solid #999;
+	-webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.2), inset 0 -1px 0 rgba(255,255,255,.5);  
+	box-shadow: inset 0 1px 1px rgba(0,0,0,.2), inset 0 -1px 0 rgba(255,255,255,.5); 
+	text-shadow: 0 1px 0 rgba(255,255,255,.3);
+}
+
 input.button-primary,
 button.button-primary,
 a.button-primary {
-	border-color: #298cba;
-	font-weight: bold;
+	background-color: #21759b;
+	background-image: -webkit-gradient(linear, left top, left bottom, from(#2a95c5), to(#21759b));
+	background-image: -webkit-linear-gradient(top, #2a95c5, #21759b);
+	background-image:    -moz-linear-gradient(top, #2a95c5, #21759b);
+	background-image:      -o-linear-gradient(top, #2a95c5, #21759b);
+	background-image:   linear-gradient(to bottom, #2a95c5, #21759b);
+	border-color: #21759b;
+	border-bottom-color: #1e6a8d;
+	-webkit-box-shadow: inset 0 1px 0 rgba(120,200,230,0.5); 
+ 	box-shadow: inset 0 1px 0 rgba(120,200,230,0.5);
+ 	color: #fff;
+	text-decoration: none;
+	text-shadow: 1px 1px 1px rgba(0,0,0,0.1);
+}
+
+input.button-primary:hover,
+button.button-primary:hover,
+a.button-primary:hover {
+	background-color: #278ab7;
+	background-image: -webkit-gradient(linear, left top, left bottom, from(#2e9fd2), to(#21759b));
+	background-image: -webkit-linear-gradient(top, #2e9fd2, #21759b);
+	background-image:    -moz-linear-gradient(top, #2e9fd2, #21759b);
+	background-image:      -o-linear-gradient(top, #2e9fd2, #21759b);
+	background-image:   linear-gradient(to bottom, #2e9fd2, #21759b);
+	border-color: #1b607f;
+	-webkit-box-shadow: inset 0 1px 0 rgba(120,200,230,0.6), 0px 1px 2px rgba(0,0,0,.4); 
+ 	box-shadow: inset 0 1px 0 rgba(120,200,230,0.6), 0px 1px 2px rgba(0,0,0,.4);
 	color: #fff;
-	text-shadow: 0 -1px 0 rgba(0,0,0,0.3);
-	background: #21759b;
-	background-image: -webkit-gradient(linear, left bottom, left top, from(#227199), to(#298cba));
-	background-image: -webkit-linear-gradient(bottom, #227199, #298cba);
-	background-image:    -moz-linear-gradient(bottom, #227199, #298cba);
-	background-image:      -o-linear-gradient(bottom, #227199, #298cba);
-	background-image: linear-gradient(to top, #227199, #298cba);
+	text-shadow: 1px 1px 1px rgba(0,0,0,0.3);
 }
 
 input.button-primary:active,
 button.button-primary:active,
 a.button-primary:active {
-	color: #eaf2fa;
-	background: #298cba;
-	background-image: -webkit-gradient(linear, left top, left bottom, from(#227199), to(#298cba));
-	background-image: -webkit-linear-gradient(top, #227199, #298cba);
-	background-image:    -moz-linear-gradient(top, #227199, #298cba);
-	background-image:      -o-linear-gradient(top, #227199, #298cba);
-	background-image: linear-gradient(to bottom, #227199, #298cba);
+	background: #1b607f;
+	background-image: -webkit-gradient(linear, left top, left bottom, from(#21759b), to(#278ab7));
+	background-image: -webkit-linear-gradient(top, #21759b, #278ab7);
+	background-image:    -moz-linear-gradient(top, #21759b, #278ab7);
+	background-image:      -o-linear-gradient(top, #21759b, #278ab7);
+	background-image:   linear-gradient(to bottom, #21759b, #278ab7);
+	border-color: #124560 #2382ae #2382ae #124560;
+	color: rgba(255,255,255,0.95);
+	-webkit-box-shadow: inset 1px 1px 0 rgba(0,0,0,0.1); 
+ 	box-shadow: inset 1px 1px 0 rgba(0,0,0,0.1); 
 }
 
-input.button-primary:hover,
-button.button-primary:hover,
-a.button-primary:hover,
-a.button-primary:focus,
-a.button-primary:active {
-	border-color: #13455b;
-	color: #eaf2fa;
+input.button-primary:focus,
+button.button-primary:focus,
+a.button-primary:focus {
+	background-color: #21759b;
+	background-image: -webkit-gradient(linear, left top, left bottom, from(#2a95c5), to(#21759b));
+	background-image: -webkit-linear-gradient(top, #2a95c5, #21759b);
+	background-image:    -moz-linear-gradient(top, #2a95c5, #21759b);
+	background-image:      -o-linear-gradient(top, #2a95c5, #21759b);
+	background-image:   linear-gradient(to bottom, #2a95c5, #21759b);
+	border: 1px solid #002E45; 
+	-webkit-box-shadow: inset 0 1px 3px #005684, inset 0 -1px 0 #1e8cbe;
+	box-shadow: inset 0 1px 3px #005684, inset 0 -1px 0 #1e8cbe;
+	text-shadow: 1px 1px 1px rgba(0,0,0,0.3);
 }
 
 .button-disabled,
@@ -458,7 +512,7 @@
 .button-primary-disabled,
 .button-primary[disabled],
 .button-primary:disabled {
-	color: #9fd0d5 !important;
+	color: #94cde7 !important;
 	background: #298cba !important;
 }
 
Index: wp-admin/css/wp-admin.css
===================================================================
--- wp-admin/css/wp-admin.css	(revision 21655)
+++ wp-admin/css/wp-admin.css	(working copy)
@@ -780,26 +780,50 @@
 .button-secondary,
 input.button-secondary,
 .button-highlighted,
-input.button-highlighted,
-#postcustomstuff .submit input {
+input.button-highlighted {
+	display: inline-block;
 	text-decoration: none;
-	font-size: 12px !important;
-	line-height: 13px;
-	padding: 3px 8px;
+	font-size: 12px;
+	line-height: 15px;
+	margin: 0;
+	padding: 0.5em .8em;
 	cursor: pointer;
 	border-width: 1px;
 	border-style: solid;
-	-webkit-border-radius: 11px;
-	border-radius: 11px;
+	-webkit-border-radius: 3px;
+	border-radius: 3px;
+	-webkit-box-sizing: content-box;
 	-moz-box-sizing: content-box;
-	-webkit-box-sizing: content-box;
 	box-sizing: content-box;
+	white-space: nowrap;
 }
 
+input.button-primary,
+button.button-primary,
+a.button-primary,
+.button-highlighted,
+input.button-highlighted,
+button.button-highlighted {
+	font-weight: bold;
+	letter-spacing: .01em;
+}
+
+.button.short {
+	padding: 3px .8em;
+}
+
+.button.big {
+    font-size: 14px;
+}
+
+.button.small {
+	padding: .2em .8em;
+	font-size: 11px;
+}
+
 #minor-publishing-actions input,
 #major-publishing-actions input,
 #minor-publishing-actions .preview {
-	min-width: 80px;
 	text-align: center;
 }
 
@@ -1014,15 +1038,6 @@
 	list-style: square;
 }
 
-a.button,
-a.button-primary,
-a.button-secondary {
-	line-height: 15px;
-	padding: 3px 10px;
-	white-space: nowrap;
-	-webkit-border-radius: 10px;
-}
-
 .approve,
 .unapproved .unapprove {
 	display: none;
@@ -2803,7 +2818,7 @@
 
 #titlediv {
 	position: relative;
-	margin-bottom: 20px;
+	margin-bottom: 10px;
 }
 #titlediv label { cursor: text; }
 
@@ -2856,11 +2871,15 @@
 }
 
 #edit-slug-box {
-	height: 1em;
 	margin-top: 8px;
 	padding: 0 10px;
 }
 
+#edit-slug-box .cancel {
+	margin-right: 10px;
+	font-size: 11px;
+}
+
 #editable-post-name-full {
 	display: none;
 }
@@ -3158,7 +3177,7 @@
 #postcustom #postcustomstuff .submit {
 	border: 0 none;
 	float: none;
-	padding: 5px 8px;
+	padding: 0;
 }
 
 #side-sortables #postcustom #postcustomstuff .submit {
@@ -3194,10 +3213,6 @@
 	width: 38%;
 }
 
-#postcustomstuff #newmeta .submit {
-	padding: 0 8px;
-}
-
 #postcustomstuff .submit input,
 #postcustomstuff table #addmetasub {
 	width: auto;
@@ -4214,7 +4229,7 @@
 
 #replysubmit {
 	margin: 0;
-	padding: 0 7px 3px;
+	padding: 0 5px 3px;
 	text-align: center;
 }
 
@@ -4643,8 +4658,6 @@
 .plugins .name,
 #pass-strength-result.strong,
 #pass-strength-result.short,
-.button-highlighted,
-input.button-highlighted,
 #ed_reply_toolbar #ed_reply_strong,
 .item-controls .item-order a,
 .feature-filter .feature-name {
@@ -5602,7 +5615,6 @@
 	padding: 0;
 }
 
-#titlediv,
 #poststuff .postarea {
 	margin-bottom: 20px;
 }
@@ -6055,7 +6067,7 @@
 }
 
 #dashboard-widgets #dashboard_quick_press form p.submit #save-post {
-	margin: 0 1em 0 10px;
+	margin: 0 1em 0 5px;
 }
 
 #dashboard-widgets #dashboard_quick_press form p.submit #publish {
@@ -6249,8 +6261,7 @@
 
 .login .button-primary {
 	font-size: 13px !important;
-	line-height: 16px;
-	padding: 3px 10px;
+	padding: .4em .8em;
 	float: right;
 }
 
Index: wp-admin/css/colors-classic.css
===================================================================
--- wp-admin/css/colors-classic.css	(revision 21655)
+++ wp-admin/css/colors-classic.css	(working copy)
@@ -377,13 +377,26 @@
 	color: #666;
 }
 
+a.button:active {
+	outline: none;
+}
+
 .button,
 .button-secondary,
 .submit input,
 input[type=button],
 input[type=submit] {
-	border-color: #bbb;
-	color: #464646;
+	background: #ececec;
+	background-image: -webkit-gradient(linear, left top, left bottom, from(#fff), to(#eee));
+	background-image: -webkit-linear-gradient(top, #fff, #eee);
+	background-image:    -moz-linear-gradient(top, #fff, #eee);
+	background-image:      -o-linear-gradient(top, #fff, #eee);
+	background-image:   linear-gradient(to bottom, #fff, #eee);
+	border-color: #ccc;
+	-webkit-box-shadow: inset 0 0 1px 1px rgba(255,255,255, 0.9); 
+ 	box-shadow: inset 0 0 1px 1px rgba(255,255,255, 0.9);
+ 	color: #464646;
+	text-shadow: 1px 1px 0 #fff;
 }
 
 .button:hover,
@@ -391,67 +404,108 @@
 .submit input:hover,
 input[type=button]:hover,
 input[type=submit]:hover {
+	border-color: #bbb;
+	-webkit-box-shadow: 0px 1px 2px rgba(0,0,0,.2); 
+	box-shadow: 0px 1px 2px rgba(0,0,0,.2);
 	color: #000;
-	border-color: #666;
 }
 
-.button,
-.submit input,
-.button-secondary {
-	text-shadow: 0 1px 0 #fff;
-	background: #f2f2f2;
-	background-image: -webkit-gradient(linear, left bottom, left top, from(#ededed), to(#fff));
-	background-image: -webkit-linear-gradient(bottom, #ededed, #fff);
-	background-image:    -moz-linear-gradient(bottom, #ededed, #fff);
-	background-image:      -o-linear-gradient(bottom, #ededed, #fff);
-	background-image: linear-gradient(to top, #ededed, #fff);
-}
-
 .button:active,
+.button-secondary:active,
 .submit input:active,
-.button-secondary:active {
+input[type=button]:active,
+input[type=submit]:active {
 	background: #eee;
-	background-image: -webkit-gradient(linear, left top, left bottom, from(#ededed), to(#fff));
-	background-image: -webkit-linear-gradient(top, #ededed, #fff);
-	background-image:    -moz-linear-gradient(top, #ededed, #fff);
-	background-image:      -o-linear-gradient(top, #ededed, #fff);
-	background-image: linear-gradient(to bottom, #ededed, #fff);
+	background-image: -webkit-gradient(linear, left top, left bottom, from(#eee), to(#f9f9f9));
+	background-image: -webkit-linear-gradient(top, #eee, #f9f9f9);
+	background-image:    -moz-linear-gradient(top, #eee, #f9f9f9);
+	background-image:      -o-linear-gradient(top, #eee, #f9f9f9);
+	background-image:   linear-gradient(to bottom, #eee, #f9f9f9);
+	border-color: #999 #ddd #ddd #999;
+	color: #555;
+	-webkit-box-shadow: inset 1px 1px 0 rgba(50,50,50,0.1); 
+ 	box-shadow: inset 1px 1px 0 rgba(50,50,50,0.1); 
 }
 
+.button:focus,
+.button-secondary:focus,
+.submit input:focus,
+input[type=button]:focus,
+input[type=submit]:focus { 
+	background: #eee;
+	background-image: -webkit-gradient(linear, left top, left bottom, from(#eee), to(#f9f9f9));
+	background-image: -webkit-linear-gradient(top, #eee, #f9f9f9);
+	background-image:    -moz-linear-gradient(top, #eee, #f9f9f9);
+	background-image:      -o-linear-gradient(top, #eee, #f9f9f9);
+	background-image:   linear-gradient(to bottom, #eee, #f9f9f9);
+	border: 1px solid #999;
+	-webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.2), inset 0 -1px 0 rgba(255,255,255,.5);  
+	box-shadow: inset 0 1px 1px rgba(0,0,0,.2), inset 0 -1px 0 rgba(255,255,255,.5); 
+	text-shadow: 0 1px 0 rgba(255,255,255,.3);
+}
+
 input.button-primary,
 button.button-primary,
 a.button-primary {
-	border-color: #298cba;
-	font-weight: bold;
+	background-color: #21759b;
+	background-image: -webkit-gradient(linear, left top, left bottom, from(#2a95c5), to(#21759b));
+	background-image: -webkit-linear-gradient(top, #2a95c5, #21759b);
+	background-image:    -moz-linear-gradient(top, #2a95c5, #21759b);
+	background-image:      -o-linear-gradient(top, #2a95c5, #21759b);
+	background-image:   linear-gradient(to bottom, #2a95c5, #21759b);
+	border-color: #21759b;
+	border-bottom-color: #1e6a8d;
+	-webkit-box-shadow: inset 0 1px 0 rgba(120,200,230,0.5); 
+ 	box-shadow: inset 0 1px 0 rgba(120,200,230,0.5);
+ 	color: #fff;
+	text-decoration: none;
+	text-shadow: 1px 1px 1px rgba(0,0,0,0.1);
+}
+
+input.button-primary:hover,
+button.button-primary:hover,
+a.button-primary:hover {
+	background-color: #278ab7;
+	background-image: -webkit-gradient(linear, left top, left bottom, from(#2e9fd2), to(#21759b));
+	background-image: -webkit-linear-gradient(top, #2e9fd2, #21759b);
+	background-image:    -moz-linear-gradient(top, #2e9fd2, #21759b);
+	background-image:      -o-linear-gradient(top, #2e9fd2, #21759b);
+	background-image:   linear-gradient(to bottom, #2e9fd2, #21759b);
+	border-color: #1b607f;
+	-webkit-box-shadow: inset 0 1px 0 rgba(120,200,230,0.6), 0px 1px 2px rgba(0,0,0,.4); 
+ 	box-shadow: inset 0 1px 0 rgba(120,200,230,0.6), 0px 1px 2px rgba(0,0,0,.4);
 	color: #fff;
-	text-shadow: 0 -1px 0 rgba(0,0,0,0.3);
-	background: #21759b;
-	background-image: -webkit-gradient(linear, left bottom, left top, from(#227199), to(#298cba));
-	background-image: -webkit-linear-gradient(bottom, #227199, #298cba);
-	background-image:    -moz-linear-gradient(bottom, #227199, #298cba);
-	background-image:      -o-linear-gradient(bottom, #227199, #298cba);
-	background-image: linear-gradient(to top, #227199, #298cba);
+	text-shadow: 1px 1px 1px rgba(0,0,0,0.3);
 }
 
 input.button-primary:active,
 button.button-primary:active,
 a.button-primary:active {
-	color: #eaf2fa;
-	background: #298cba;
-	background-image: -webkit-gradient(linear, left top, left bottom, from(#227199), to(#298cba));
-	background-image: -webkit-linear-gradient(top, #227199, #298cba);
-	background-image:    -moz-linear-gradient(top, #227199, #298cba);
-	background-image:      -o-linear-gradient(top, #227199, #298cba);
-	background-image: linear-gradient(to bottom, #227199, #298cba);
+	background: #1b607f;
+	background-image: -webkit-gradient(linear, left top, left bottom, from(#21759b), to(#278ab7));
+	background-image: -webkit-linear-gradient(top, #21759b, #278ab7);
+	background-image:    -moz-linear-gradient(top, #21759b, #278ab7);
+	background-image:      -o-linear-gradient(top, #21759b, #278ab7);
+	background-image:   linear-gradient(to bottom, #21759b, #278ab7);
+	border-color: #124560 #2382ae #2382ae #124560;
+	color: rgba(255,255,255,0.95);
+	-webkit-box-shadow: inset 1px 1px 0 rgba(0,0,0,0.1); 
+ 	box-shadow: inset 1px 1px 0 rgba(0,0,0,0.1); 
 }
 
-input.button-primary:hover,
-button.button-primary:hover,
-a.button-primary:hover,
-a.button-primary:focus,
-a.button-primary:active {
-	border-color: #13455b;
-	color: #eaf2fa;
+input.button-primary:focus,
+button.button-primary:focus,
+a.button-primary:focus {
+	background-color: #21759b;
+	background-image: -webkit-gradient(linear, left top, left bottom, from(#2a95c5), to(#21759b));
+	background-image: -webkit-linear-gradient(top, #2a95c5, #21759b);
+	background-image:    -moz-linear-gradient(top, #2a95c5, #21759b);
+	background-image:      -o-linear-gradient(top, #2a95c5, #21759b);
+	background-image:   linear-gradient(to bottom, #2a95c5, #21759b);
+	border: 1px solid #002E45; 
+	-webkit-box-shadow: inset 0 1px 3px #005684, inset 0 -1px 0 #1e8cbe;
+	box-shadow: inset 0 1px 3px #005684, inset 0 -1px 0 #1e8cbe;
+	text-shadow: 1px 1px 1px rgba(0,0,0,0.3);
 }
 
 .button-disabled,
@@ -467,7 +521,7 @@
 .button-primary-disabled,
 .button-primary[disabled],
 .button-primary:disabled {
-	color: #9fd0d5 !important;
+	color: #94cde7 !important;
 	background: #298cba !important;
 }