diff --git a/wp-admin/css/colors-classic.css b/wp-admin/css/colors-classic.css
index e019888f60..4da48b2d96 100644
--- a/wp-admin/css/colors-classic.css
+++ b/wp-admin/css/colors-classic.css
@@ -387,15 +387,15 @@ a.button:active {
 .submit input,
 input[type=button],
 input[type=submit] {
-	background: #ececec;
+	background: #f3f3f3;
 	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);
+	-webkit-box-shadow: inset 0 0 1px 2px rgba(255,255,255, 0.9);
+ 	box-shadow: inset 0 0 1px 2px rgba(255,255,255, 0.9);
  	color: #464646;
 	text-shadow: 1px 1px 0 #fff;
 }
@@ -413,21 +413,35 @@ input[type=submit]:hover,
 .button-secondary:focus,
 .submit input.focus,
 .submit input:focus,
+input[type=button].focus,
 input[type=button]:focus,
-input[type=submit].focus,
 input[type=submit]:focus {
-	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);
+	background: #f3f3f3;
+	background-image: -webkit-gradient(linear, left top, left bottom, from(#fff), to(#f3f3f3));
+	background-image: -webkit-linear-gradient(top, #fff, #f3f3f3);
+	background-image:    -moz-linear-gradient(top, #fff, #f3f3f3);
+	background-image:      -o-linear-gradient(top, #fff, #f3f3f3);
+	background-image:   linear-gradient(to bottom, #fff, #f3f3f3);
 	border-color: #bbb;
-	-webkit-box-shadow: 0px 1px 1px rgba(0,0,0,.1);
-	box-shadow: 0px 1px 1px rgba(0,0,0,.1);
+	-webkit-box-shadow: inset 0 0 1px 2px #fff, 0px 1px 1px rgba(0,0,0,.1);
+	box-shadow: inset 0 0 1px 2px #fff, 0px 1px 1px rgba(0,0,0,.1);
 	color: #000;
 }
 
+.button.focus,
+.button:focus,
+.button-secondary.focus,
+.button-secondary:focus,
+.submit input.focus,
+.submit input:focus,
+input[type=button].focus,
+input[type=button]:focus,
+input[type=submit]:focus {
+	border-color: #999;
+	-webkit-box-shadow: 1px 1px 1px rgba(0,0,0,.2);
+	box-shadow: 1px 1px 1px rgba(0,0,0,.2);
+}
+
 .button.active,
 .button:active,
 .button-secondary.active,
@@ -448,17 +462,6 @@ input[type=submit]:active {
  	box-shadow: inset 1px 1px 0 rgba(50,50,50,0.1);
 }
 
-.button.focus,
-.button:focus,
-.button-secondary.focus,
-.button-secondary:focus,
-.submit input.focus,
-.submit input:focus,
-input[type=button].focus,
-input[type=submit]:focus {
-	border-color: #aaa;
-}
-
 input.button-primary,
 button.button-primary,
 a.button-primary {
@@ -498,6 +501,15 @@ a.button-primary:focus {
 	text-shadow: -1px -1px 0 rgba(0,0,0,0.3);
 }
 
+input.button-primary.focus,
+input.button-primary:focus,
+button.button-primary:focus,
+a.button-primary:focus {
+	border-color: #0e3950;
+	-webkit-box-shadow: inset 0 1px 0 rgba(120,200,230,0.6), 1px 1px 2px rgba(0,0,0,.4);
+	box-shadow: inset 0 1px 0 rgba(120,200,230,0.6), 1px 1px 2px rgba(0,0,0,.4);
+}
+
 input.button-primary.active,
 input.button-primary:active,
 button.button-primary:active,
@@ -514,13 +526,6 @@ a.button-primary:active {
  	box-shadow: inset 1px 1px 0 rgba(0,0,0,0.1);
 }
 
-input.button-primary.focus,
-input.button-primary:focus,
-button.button-primary:focus,
-a.button-primary:focus {
-	border-color: #124560;
-}
-
 .button-disabled,
 .button[disabled],
 .button:disabled,
@@ -542,6 +547,11 @@ a.button.disabled {
 	box-shadow:         none !important;
 }
 
+.button-primary-disabled:hover,
+.button-primary[disabled]:hover {
+	text-shadow: none;
+}
+
 a:hover,
 a:active {
 	color: #d54e21;
diff --git a/wp-admin/css/colors-fresh.css b/wp-admin/css/colors-fresh.css
index cc7b995e35..67af31cda9 100644
--- a/wp-admin/css/colors-fresh.css
+++ b/wp-admin/css/colors-fresh.css
@@ -378,15 +378,15 @@ a.button:active {
 .submit input,
 input[type=button],
 input[type=submit] {
-	background: #ececec;
+	background: #f3f3f3;
 	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);
+	-webkit-box-shadow: inset 0 0 1px 2px rgba(255,255,255, 0.9);
+ 	box-shadow: inset 0 0 1px 2px rgba(255,255,255, 0.9);
  	color: #464646;
 	text-shadow: 1px 1px 0 #fff;
 }
@@ -407,22 +407,34 @@ input[type=submit]:hover,
 input[type=button].focus,
 input[type=button]:focus,
 input[type=submit]:focus {
-	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);
+	background: #f3f3f3;
+	background-image: -webkit-gradient(linear, left top, left bottom, from(#fff), to(#f3f3f3));
+	background-image: -webkit-linear-gradient(top, #fff, #f3f3f3);
+	background-image:    -moz-linear-gradient(top, #fff, #f3f3f3);
+	background-image:      -o-linear-gradient(top, #fff, #f3f3f3);
+	background-image:   linear-gradient(to bottom, #fff, #f3f3f3);
 	border-color: #bbb;
-	-webkit-box-shadow: 0px 1px 1px rgba(0,0,0,.1);
-	box-shadow: 0px 1px 1px rgba(0,0,0,.1);
+	-webkit-box-shadow: inset 0 0 1px 2px #fff, 0px 1px 1px rgba(0,0,0,.1);
+	box-shadow: inset 0 0 1px 2px #fff, 0px 1px 1px rgba(0,0,0,.1);
 	color: #000;
 }
 
+.button.focus,
+.button:focus,
+.button-secondary.focus,
+.button-secondary:focus,
+.submit input.focus,
+.submit input:focus,
+input[type=button].focus,
+input[type=button]:focus,
+input[type=submit]:focus {
+	border-color: #999;
+	-webkit-box-shadow: 1px 1px 1px rgba(0,0,0,.2);
+	box-shadow: 1px 1px 1px rgba(0,0,0,.2);
+}
+
 .button.active,
 .button:active,
-.small.active,
-.small:active,
 .button-secondary.active,
 .button-secondary:active,
 .submit input:active,
@@ -441,18 +453,6 @@ input[type=submit]:active {
  	box-shadow: inset 1px 1px 0 rgba(50,50,50,0.1);
 }
 
-.button.focus,
-.button:focus,
-.button-secondary.focus,
-.button-secondary:focus,
-.submit input.focus,
-.submit input:focus,
-input[type=button].focus,
-input[type=button]:focus,
-input[type=submit]:focus {
-	border-color: #aaa;
-}
-
 input.button-primary,
 button.button-primary,
 a.button-primary {
@@ -492,6 +492,15 @@ a.button-primary:focus {
 	text-shadow: -1px -1px 0 rgba(0,0,0,0.3);
 }
 
+input.button-primary.focus,
+input.button-primary:focus,
+button.button-primary:focus,
+a.button-primary:focus {
+	border-color: #0e3950;
+	-webkit-box-shadow: inset 0 1px 0 rgba(120,200,230,0.6), 1px 1px 2px rgba(0,0,0,.4);
+	box-shadow: inset 0 1px 0 rgba(120,200,230,0.6), 1px 1px 2px rgba(0,0,0,.4);
+}
+
 input.button-primary.active,
 input.button-primary:active,
 button.button-primary:active,
@@ -508,13 +517,6 @@ a.button-primary:active {
  	box-shadow: inset 1px 1px 0 rgba(0,0,0,0.1);
 }
 
-input.button-primary.focus,
-input.button-primary:focus,
-button.button-primary:focus,
-a.button-primary:focus {
-	border-color: #124560;
-}
-
 .button-disabled,
 .button[disabled],
 .button:disabled,
@@ -536,6 +538,11 @@ a.button.disabled {
 	box-shadow:         none !important;
 }
 
+.button-primary-disabled:hover,
+.button-primary[disabled]:hover {
+	text-shadow: none;
+}
+
 a:hover,
 a:active {
 	color: #d54e21;
diff --git a/wp-admin/css/customize-controls.css b/wp-admin/css/customize-controls.css
index 4d7d31927e..68429914ef 100644
--- a/wp-admin/css/customize-controls.css
+++ b/wp-admin/css/customize-controls.css
@@ -157,7 +157,7 @@ body {
 
 #customize-header-actions .button-primary {
 	float: right;
-	margin-top: 11px;
+	margin-top: 10px;
 }
 
 #customize-header-actions img {
diff --git a/wp-admin/css/wp-admin.css b/wp-admin/css/wp-admin.css
index c0fc733f84..8d4e20db9c 100644
--- a/wp-admin/css/wp-admin.css
+++ b/wp-admin/css/wp-admin.css
@@ -783,9 +783,10 @@ input.button-secondary {
 	display: inline-block;
 	text-decoration: none;
 	font-size: 12px;
-	line-height: 15px;
+	line-height: 17px;
+	height: 15px;
 	margin: 0;
-	padding: 0.5em 0.8em 0.4em;
+	padding: 0.25em 0.8em 0.35em;
 	cursor: pointer;
 	border-width: 1px;
 	border-style: solid;
@@ -797,18 +798,17 @@ input.button-secondary {
 	white-space: nowrap;
 }
 
+.button.button-large,
+.button.button-primary {
+	padding: 0.4em 0.8em 0.5em;
+}
+
 .button.button-small {
-	padding: 3px .8em 2px;
+	padding: 0.15em 0.8em 0.17em;
 }
 
-.button.button-large {
-    font-size: 14px;
-    padding: 0.6em 1em 0.5em;
-}
-
-.button.button-tiny {
-	padding: .2em .8em;
-	font-size: 11px;
+.button.regular {
+	padding: 0.25em 0.8em 0.35em !important;
 }
 
 #minor-publishing-actions input,
@@ -843,10 +843,12 @@ input[type="number"].small-text {
 #doaction,
 #doaction2,
 #post-query-submit {
-	margin-right: 8px;
+	margin: 1px 8px 0 0;
 }
 
 .tablenav .actions select {
+	float: left;
+	margin-right: 6px;
 	max-width: 200px;
 }
 
@@ -894,6 +896,12 @@ p.search-box {
 	margin: 0;
 }
 
+.search-box input[name="s"], #search-plugins input[name="s"], .tagsdiv .newtag {
+	float: left;
+	height: 2em;
+	margin: 0 4px 0 0;
+}
+
 input[type="text"].ui-autocomplete-loading {
 	background: transparent url('../images/loading.gif') no-repeat right center;
 	visibility: visible;
@@ -2482,6 +2490,7 @@ th.asc:hover span.sorting-indicator {
 }
 
 .tablenav .actions {
+	overflow: hidden;
 	padding: 2px 8px 0 0;
 }
 
@@ -5848,7 +5857,7 @@ h3:hover .edit-box {
 }
 
 #dashboard-widgets-wrap #dashboard-widgets .postbox form .submit input {
-	margin: 0;
+	margin: 0 5px 0 0;
 }
 
 #dashboard-widgets-wrap #dashboard-widgets .postbox form .submit #publish {
@@ -6105,7 +6114,7 @@ h3:hover .edit-box {
 }
 
 #dashboard-widgets #dashboard_quick_press form p.submit #save-post {
-	margin: 0 1em 0 0;
+	margin: 0 0.7em 0 1px;
 }
 
 #dashboard-widgets #dashboard_quick_press form p.submit #publish {
diff --git a/wp-admin/custom-background.php b/wp-admin/custom-background.php
index 8fb1399b3b..05d3006a2a 100644
--- a/wp-admin/custom-background.php
+++ b/wp-admin/custom-background.php
@@ -260,7 +260,7 @@ if ( get_background_image() ) {
 		<input type="file" id="upload" name="import" />
 		<input type="hidden" name="action" value="save" />
 		<?php wp_nonce_field( 'custom-background-upload', '_wpnonce-custom-background-upload' ); ?>
-		<?php submit_button( __( 'Upload' ), 'button', 'submit', false ); ?>
+		<?php submit_button( __( 'Upload' ), 'small', 'submit', false ); ?>
 	</p>
 	<?php
 		$image_library_url = get_upload_iframe_src( 'image', null, 'library' );
diff --git a/wp-admin/custom-header.php b/wp-admin/custom-header.php
index 10a92df6b6..3d66cb3fe3 100644
--- a/wp-admin/custom-header.php
+++ b/wp-admin/custom-header.php
@@ -558,7 +558,7 @@ var farbtastic;
 		<input type="file" id="upload" name="import" />
 		<input type="hidden" name="action" value="save" />
 		<?php wp_nonce_field( 'custom-header-upload', '_wpnonce-custom-header-upload' ); ?>
-		<?php submit_button( __( 'Upload' ), 'button', 'submit', false ); ?>
+		<?php submit_button( __( 'Upload' ), 'small', 'submit', false ); ?>
 	</p>
 	<?php
 		$image_library_url = get_upload_iframe_src( 'image', null, 'library' );
diff --git a/wp-admin/edit-form-advanced.php b/wp-admin/edit-form-advanced.php
index 830855de7a..7d90db2b38 100644
--- a/wp-admin/edit-form-advanced.php
+++ b/wp-admin/edit-form-advanced.php
@@ -294,7 +294,7 @@ wp_nonce_field( 'closedpostboxes', 'closedpostboxesnonce', false );
 $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 button-tiny" 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 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">
diff --git a/wp-admin/includes/class-wp-comments-list-table.php b/wp-admin/includes/class-wp-comments-list-table.php
index 9e98f03882..87e105cf06 100644
--- a/wp-admin/includes/class-wp-comments-list-table.php
+++ b/wp-admin/includes/class-wp-comments-list-table.php
@@ -224,13 +224,13 @@ class WP_Comments_List_Table extends WP_List_Table {
 			?>
 			</select>
 <?php
-			submit_button( __( 'Filter' ), 'small', false, false, array( 'id' => 'post-query-submit' ) );
+			submit_button( __( 'Filter' ), 'button', 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, 'small apply', 'delete_all', false );
+			submit_button( $title, 'apply', 'delete_all', false );
 		}
 		do_action( 'manage_comments_nav', $comment_status );
 		echo '</div>';
diff --git a/wp-admin/includes/class-wp-links-list-table.php b/wp-admin/includes/class-wp-links-list-table.php
index 2a897b76ba..b5cbc55609 100644
--- a/wp-admin/includes/class-wp-links-list-table.php
+++ b/wp-admin/includes/class-wp-links-list-table.php
@@ -69,7 +69,7 @@ class WP_Links_List_Table extends WP_List_Table {
 				'orderby' => 'name',
 			);
 			wp_dropdown_categories( $dropdown_options );
-			submit_button( __( 'Filter' ), 'small', false, false, array( 'id' => 'post-query-submit' ) );
+			submit_button( __( 'Filter' ), 'button', false, false, array( 'id' => 'post-query-submit' ) );
 ?>
 		</div>
 <?php
diff --git a/wp-admin/includes/class-wp-list-table.php b/wp-admin/includes/class-wp-list-table.php
index 97489cdb86..d888d59eaa 100644
--- a/wp-admin/includes/class-wp-list-table.php
+++ b/wp-admin/includes/class-wp-list-table.php
@@ -218,7 +218,7 @@ class WP_List_Table {
 <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, 'small', false, false, array('id' => 'search-submit') ); ?>
+	<?php submit_button( $text, 'button', false, false, array('id' => 'search-submit') ); ?>
 </p>
 <?php
 	}
@@ -301,7 +301,7 @@ class WP_List_Table {
 
 		echo "</select>\n";
 
-		submit_button( __( 'Apply' ), 'small action', false, false, array( 'id' => "doaction$two" ) );
+		submit_button( __( 'Apply' ), 'action', false, false, array( 'id' => "doaction$two" ) );
 		echo "\n";
 	}
 
diff --git a/wp-admin/includes/class-wp-media-list-table.php b/wp-admin/includes/class-wp-media-list-table.php
index b4126f5ee9..465612cbb6 100644
--- a/wp-admin/includes/class-wp-media-list-table.php
+++ b/wp-admin/includes/class-wp-media-list-table.php
@@ -92,13 +92,13 @@ class WP_Media_List_Table extends WP_List_Table {
 			$this->months_dropdown( 'attachment' );
 
 			do_action( 'restrict_manage_posts' );
-			submit_button( __( 'Filter' ), 'small', false, false, array( 'id' => 'post-query-submit' ) );
+			submit_button( __( 'Filter' ), 'button', 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' ), 'small apply', 'delete_all', false );
+			submit_button( __( 'Empty Trash' ), 'apply', 'delete_all', false );
 		} ?>
 		</div>
 <?php
diff --git a/wp-admin/includes/class-wp-posts-list-table.php b/wp-admin/includes/class-wp-posts-list-table.php
index aea8f7a54b..a04970a931 100644
--- a/wp-admin/includes/class-wp-posts-list-table.php
+++ b/wp-admin/includes/class-wp-posts-list-table.php
@@ -215,11 +215,11 @@ class WP_Posts_List_Table extends WP_List_Table {
 				wp_dropdown_categories( $dropdown_options );
 			}
 			do_action( 'restrict_manage_posts' );
-			submit_button( __( 'Filter' ), 'small', false, false, array( 'id' => 'post-query-submit' ) );
+			submit_button( __( 'Filter' ), 'button', false, false, array( 'id' => 'post-query-submit' ) );
 		}
 
 		if ( $this->is_trash && current_user_can( get_post_type_object( $this->screen->post_type )->cap->edit_others_posts ) ) {
-			submit_button( __( 'Empty Trash' ), 'small apply', 'delete_all', false );
+			submit_button( __( 'Empty Trash' ), 'apply', 'delete_all', false );
 		}
 ?>
 		</div>
diff --git a/wp-admin/includes/dashboard.php b/wp-admin/includes/dashboard.php
index 1cc3c813df..5bfb71ccd3 100644
--- a/wp-admin/includes/dashboard.php
+++ b/wp-admin/includes/dashboard.php
@@ -439,14 +439,14 @@ function wp_network_dashboard_right_now() {
 	<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' ), 'small', 'submit', false, array( 'id' => 'submit_users' ) ); ?>
+			<?php submit_button( __( 'Search Users' ), 'button', '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' ), 'small', 'submit', false, array( 'id' => 'submit_sites' ) ); ?>
+			<?php submit_button( __( 'Search Sites' ), 'button', 'submit', false, array( 'id' => 'submit_sites' ) ); ?>
 		</p>
 	</form>
 <?php
diff --git a/wp-admin/includes/media.php b/wp-admin/includes/media.php
index ef7e3a929d..0531da2a4a 100644
--- a/wp-admin/includes/media.php
+++ b/wp-admin/includes/media.php
@@ -1882,7 +1882,7 @@ foreach ($arc_result as $arc_row) {
 </select>
 <?php } ?>
 
-<?php submit_button( __( 'Filter &#187;' ), 'secondary', 'post-query-submit', false ); ?>
+<?php submit_button( __( 'Filter &#187;' ), 'button', 'post-query-submit', false ); ?>
 
 </div>
 
diff --git a/wp-admin/includes/meta-boxes.php b/wp-admin/includes/meta-boxes.php
index ea7e2d345f..2b3e6ab2a7 100644
--- a/wp-admin/includes/meta-boxes.php
+++ b/wp-admin/includes/meta-boxes.php
@@ -206,19 +206,19 @@ if ( !in_array( $post->post_status, array('publish', 'future', 'private') ) || 0
 	if ( $can_publish ) :
 		if ( !empty($post->post_date_gmt) && time() < strtotime( $post->post_date_gmt . ' +0000' ) ) : ?>
 		<input name="original_publish" type="hidden" id="original_publish" value="<?php esc_attr_e('Schedule') ?>" />
-		<?php submit_button( __( 'Schedule' ), 'primary', 'publish', false, array( 'accesskey' => 'p' ) ); ?>
+		<?php submit_button( __( 'Schedule' ), 'primary button-large', 'publish', false, array( 'accesskey' => 'p' ) ); ?>
 <?php	else : ?>
 		<input name="original_publish" type="hidden" id="original_publish" value="<?php esc_attr_e('Publish') ?>" />
-		<?php submit_button( __( 'Publish' ), 'primary', 'publish', false, array( 'accesskey' => 'p' ) ); ?>
+		<?php submit_button( __( 'Publish' ), 'primary button-large', 'publish', false, array( 'accesskey' => 'p' ) ); ?>
 <?php	endif;
 	else : ?>
 		<input name="original_publish" type="hidden" id="original_publish" value="<?php esc_attr_e('Submit for Review') ?>" />
-		<?php submit_button( __( 'Submit for Review' ), 'primary', 'publish', false, array( 'accesskey' => 'p' ) ); ?>
+		<?php submit_button( __( 'Submit for Review' ), 'primary button-large', 'publish', false, array( 'accesskey' => 'p' ) ); ?>
 <?php
 	endif;
 } else { ?>
 		<input name="original_publish" type="hidden" id="original_publish" value="<?php esc_attr_e('Update') ?>" />
-		<input name="save" type="submit" class="button-primary" id="publish" accesskey="p" value="<?php esc_attr_e('Update') ?>" />
+		<input name="save" type="submit" class="button-primary button-large" id="publish" accesskey="p" value="<?php esc_attr_e('Update') ?>" />
 <?php
 } ?>
 </div>
@@ -286,7 +286,7 @@ function post_tags_meta_box($post, $box) {
 		<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 button-tiny tagadd" value="<?php esc_attr_e('Add'); ?>" /></p>
+		<input type="button" class="button tagadd" value="<?php esc_attr_e('Add'); ?>" /></p>
 	</div>
 	<p class="howto"><?php echo esc_attr( $taxonomy->labels->separate_items_with_commas ); ?></p>
 	<?php endif; ?>
@@ -636,9 +636,9 @@ if ( !empty($_GET['action']) && 'edit' == $_GET['action'] && current_user_can('m
 
 <div id="publishing-action">
 <?php if ( !empty($link->link_id) ) { ?>
-	<input name="save" type="submit" class="button-primary" id="publish" accesskey="p" value="<?php esc_attr_e('Update Link') ?>" />
+	<input name="save" type="submit" class="button-large button-primary" id="publish" accesskey="p" value="<?php esc_attr_e('Update Link') ?>" />
 <?php } else { ?>
-	<input name="save" type="submit" class="button-primary" id="publish" accesskey="p" value="<?php esc_attr_e('Add Link') ?>" />
+	<input name="save" type="submit" class="button-large button-primary" id="publish" accesskey="p" value="<?php esc_attr_e('Add Link') ?>" />
 <?php } ?>
 </div>
 <div class="clear"></div>
diff --git a/wp-admin/includes/nav-menu.php b/wp-admin/includes/nav-menu.php
index 5fc73fcbbf..6d87e247a1 100644
--- a/wp-admin/includes/nav-menu.php
+++ b/wp-admin/includes/nav-menu.php
@@ -693,7 +693,7 @@ function wp_nav_menu_item_post_type_meta_box( $object, $post_type ) {
 			<p class="quick-search-wrap">
 				<input type="search" class="quick-search input-with-default-title" title="<?php esc_attr_e('Search'); ?>" value="<?php echo $searched; ?>" name="quick-search-posttype-<?php echo $post_type_name; ?>" />
 				<img class="waiting" src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" alt="" />
-				<?php submit_button( __( 'Search' ), 'quick-search-submit button-secondary hide-if-js', 'submit', false, array( 'id' => 'submit-quick-search-posttype-' . $post_type_name ) ); ?>
+				<?php submit_button( __( 'Search' ), 'button-small quick-search-submit button-secondary hide-if-js', 'submit', false, array( 'id' => 'submit-quick-search-posttype-' . $post_type_name ) ); ?>
 			</p>
 
 			<ul id="<?php echo $post_type_name; ?>-search-checklist" class="list:<?php echo $post_type_name?> categorychecklist form-no-clear">
@@ -924,7 +924,7 @@ function wp_nav_menu_item_taxonomy_meta_box( $object, $taxonomy ) {
 			<p class="quick-search-wrap">
 				<input type="search" class="quick-search input-with-default-title" title="<?php esc_attr_e('Search'); ?>" value="<?php echo $searched; ?>" name="quick-search-taxonomy-<?php echo $taxonomy_name; ?>" />
 				<img class="waiting" src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" alt="" />
-				<?php submit_button( __( 'Search' ), 'quick-search-submit button-secondary hide-if-js', 'submit', false, array( 'id' => 'submit-quick-search-taxonomy-' . $taxonomy_name ) ); ?>
+				<?php submit_button( __( 'Search' ), 'button-small quick-search-submit button-secondary hide-if-js', 'submit', false, array( 'id' => 'submit-quick-search-taxonomy-' . $taxonomy_name ) ); ?>
 			</p>
 
 			<ul id="<?php echo $taxonomy_name; ?>-search-checklist" class="list:<?php echo $taxonomy_name?> categorychecklist form-no-clear">
diff --git a/wp-admin/includes/plugin-install.php b/wp-admin/includes/plugin-install.php
index a72f4539b3..3d1b2dad3a 100644
--- a/wp-admin/includes/plugin-install.php
+++ b/wp-admin/includes/plugin-install.php
@@ -130,7 +130,7 @@ function install_search_form( $type_selector = true ) {
 		<?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' ), 'small', 'plugin-search-input', false ); ?>
+		<?php submit_button( __( 'Search Plugins' ), 'button', 'plugin-search-input', false ); ?>
 	</form><?php
 }
 
diff --git a/wp-admin/includes/post.php b/wp-admin/includes/post.php
index 8296607968..c1caded3d0 100644
--- a/wp-admin/includes/post.php
+++ b/wp-admin/includes/post.php
@@ -1075,9 +1075,9 @@ function get_sample_permalink_html( $id, $new_title = null, $new_slug = null ) {
 	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 button-tiny" target="_blank">' . __('Change Permalinks') . "</a></span>\n";
+			$return .= '<span id="change-permalinks"><a href="options-permalink.php" class="button button-small" target="_blank">' . __('Change Permalinks') . "</a></span>\n";
 		if ( isset($view_post) )
-			$return .= "<span id='view-post-btn'><a href='$permalink' class='button button-tiny'>$view_post</a></span>\n";
+			$return .= "<span id='view-post-btn'><a href='$permalink' class='button button-small'>$view_post</a></span>\n";
 
 		$return = apply_filters('get_sample_permalink_html', $return, $id, $new_title, $new_slug);
 
@@ -1104,10 +1104,10 @@ function get_sample_permalink_html( $id, $new_title = null, $new_slug = null ) {
 	$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 button-tiny 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 button-small 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 button-tiny'>$view_post</a></span>\n";
+		$return .= "<span id='view-post-btn'><a href='$view_link' class='button button-small'>$view_post</a></span>\n";
 
 	$return = apply_filters('get_sample_permalink_html', $return, $id, $new_title, $new_slug);
 
diff --git a/wp-admin/includes/template.php b/wp-admin/includes/template.php
index 5791c4195c..e4b07f8287 100644
--- a/wp-admin/includes/template.php
+++ b/wp-admin/includes/template.php
@@ -1651,7 +1651,7 @@ function get_submit_button( $text = null, $type = 'primary', $name = 'submit', $
 	if ( ! is_array( $type ) )
 		$type = explode( ' ', $type ); 
 
-	$button_shorthand = array( 'primary', 'tiny', 'small', 'large' );
+	$button_shorthand = array( 'primary', 'small', 'large' );
 	$classes = array( 'button' );
 	foreach ( $type as $t ) {
 		if ( 'secondary' === $t || 'button-secondary' === $t )
diff --git a/wp-admin/includes/widgets.php b/wp-admin/includes/widgets.php
index fcb91c443f..22ead6f76e 100644
--- a/wp-admin/includes/widgets.php
+++ b/wp-admin/includes/widgets.php
@@ -212,7 +212,7 @@ function wp_widget_control( $sidebar_args ) {
 		</div>
 		<div class="alignright<?php if ( 'noform' === $has_form ) echo ' widget-control-noform'; ?>">
 		<img src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" class="ajax-feedback" title="" alt="" />
-		<?php submit_button( __( 'Save' ), 'button-primary widget-control-save', 'savewidget', false, array( 'id' => 'widget-' . esc_attr( $id_format ) . '-savewidget' ) ); ?>
+		<?php submit_button( __( 'Save' ), 'button button-primary widget-control-save', 'savewidget', false, array( 'id' => 'widget-' . esc_attr( $id_format ) . '-savewidget' ) ); ?>
 		</div>
 		<br class="clear" />
 	</div>
diff --git a/wp-admin/js/post.js b/wp-admin/js/post.js
index c61b9e5275..5910ea9d39 100644
--- a/wp-admin/js/post.js
+++ b/wp-admin/js/post.js
@@ -568,7 +568,7 @@ jQuery(document).ready( function($) {
 			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 button-tiny">'+postL10n.ok+'</a> <a class="cancel" href="#">'+postL10n.cancel+'</a>');
+			b.html('<a href="#" class="save button button-small">'+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() ) {
diff --git a/wp-admin/update-core.php b/wp-admin/update-core.php
index a4170c5bd4..a45b9be988 100644
--- a/wp-admin/update-core.php
+++ b/wp-admin/update-core.php
@@ -74,7 +74,7 @@ function list_core_update( $update ) {
 	echo '<input name="locale" value="'. esc_attr($update->locale) .'" type="hidden"/>';
 	if ( $show_buttons ) {
 		if ( $first_pass ) {
-			submit_button( $submit, $current ? 'button' : 'primary', 'upgrade', false );
+			submit_button( $submit, $current ? 'button' : 'primary regular', 'upgrade', false );
 			$first_pass = false;
 		} else {
 			submit_button( $submit, 'button', 'upgrade', false );