diff --git a/wp-activate.php b/wp-activate.php
index 01d224dab..7fee70a84 100644
--- a/wp-activate.php
+++ b/wp-activate.php
@@ -48,9 +48,7 @@ get_header();
 			    <label for="key"><?php _e('Activation Key:') ?></label>
 			    <br /><input type="text" name="key" id="key" value="" size="50" />
 			</p>
-			<p class="submit">
-			    <input id="submit" type="submit" name="Submit" class="submit" value="<?php esc_attr_e('Activate') ?>" />
-			</p>
+			<?php submit_button( __('Activate'), 'submit' ); ?>
 		</form>
 
 	<?php } else {
diff --git a/wp-admin/custom-background.php b/wp-admin/custom-background.php
index 9b0102f6c..ba9391ca5 100644
--- a/wp-admin/custom-background.php
+++ b/wp-admin/custom-background.php
@@ -303,7 +303,7 @@ if ( get_background_image() ) {
 </table>
 
 <?php wp_nonce_field('custom-background'); ?>
-<p class="submit"><input type="submit" class="button-primary" name="save-background-options" value="<?php esc_attr_e('Save Changes'); ?>" /></p>
+<?php submit_button( null, 'primary', 'save-background-options' ); ?>
 </form>
 
 </div>
diff --git a/wp-admin/custom-header.php b/wp-admin/custom-header.php
index 659512df1..5cab9b074 100644
--- a/wp-admin/custom-header.php
+++ b/wp-admin/custom-header.php
@@ -562,7 +562,8 @@ class Custom_Image_Header {
 do_action( 'custom_header_options' ); 
 
 wp_nonce_field( 'custom-header-options', '_wpnonce-custom-header-options' ); ?>
-<p class="submit"><input type="submit" class="button-primary" name="save-header-options" value="<?php esc_attr_e( 'Save Changes' ); ?>" /></p>
+
+<?php submit_button(); ?>
 </form>
 </div>
 
@@ -636,7 +637,6 @@ wp_nonce_field( 'custom-header-options', '_wpnonce-custom-header-options' ); ?>
 		<img src="<?php echo esc_url( $url ); ?>" id="upload" width="<?php echo $width; ?>" height="<?php echo $height; ?>" />
 	</div>
 
-	<p class="submit">
 	<input type="hidden" name="x1" id="x1" value="0"/>
 	<input type="hidden" name="y1" id="y1" value="0"/>
 	<input type="hidden" name="width" id="width" value="<?php echo esc_attr( $width ); ?>"/>
@@ -644,7 +644,8 @@ wp_nonce_field( 'custom-header-options', '_wpnonce-custom-header-options' ); ?>
 	<input type="hidden" name="attachment_id" id="attachment_id" value="<?php echo esc_attr( $id ); ?>" />
 	<input type="hidden" name="oitar" id="oitar" value="<?php echo esc_attr( $oitar ); ?>" />
 	<?php wp_nonce_field( 'custom-header-crop-image' ) ?>
-	<input type="submit" class="button-primary" value="<?php esc_attr_e( 'Crop and Publish' ); ?>" />
+	
+	<?php submit_button( __( 'Crop and Publish' ) ); ?>
 	</p>
 </form>
 </div>
diff --git a/wp-admin/edit-tag-form.php b/wp-admin/edit-tag-form.php
index 7dc2eae4e..6faff0c70 100644
--- a/wp-admin/edit-tag-form.php
+++ b/wp-admin/edit-tag-form.php
@@ -86,7 +86,8 @@ else
 	do_action('edit_tag_form', $tag);
 
 do_action($taxonomy . '_edit_form', $tag, $taxonomy);
+
+submit_button( __('Update') );
 ?>
-<p class="submit"><input type="submit" class="button-primary" name="submit" value="<?php echo esc_attr( __( 'Update' ) ); ?>" /></p>
 </form>
 </div>
diff --git a/wp-admin/export.php b/wp-admin/export.php
index 01f3bf98b..d64876b75 100644
--- a/wp-admin/export.php
+++ b/wp-admin/export.php
@@ -136,7 +136,7 @@ foreach ( (array) $authors as $author ) {
 </td>
 </tr>
 </table>
-<p class="submit"><input type="submit" name="submit" class="button" value="<?php esc_attr_e('Download Export File'); ?>" />
+<?php submit_button( __('Download Export File'), 'secondary' ); ?>
 <input type="hidden" name="download" value="true" />
 </p>
 </form>
diff --git a/wp-admin/includes/dashboard.php b/wp-admin/includes/dashboard.php
index ccd143fc1..460e5d15a 100644
--- a/wp-admin/includes/dashboard.php
+++ b/wp-admin/includes/dashboard.php
@@ -152,8 +152,8 @@ function wp_add_dashboard_widget( $widget_id, $widget_name, $callback, $control_
 function _wp_dashboard_control_callback( $dashboard, $meta_box ) {
 	echo '<form action="" method="post" class="dashboard-widget-control-form">';
 	wp_dashboard_trigger_widget_control( $meta_box['id'] );
-	echo '<p class="submit"><input type="hidden" name="widget_id" value="' . esc_attr($meta_box['id']) . '" /><input type="submit" value="' . esc_attr__( 'Submit' ) . '" /></p>';
-
+	echo '<input type="hidden" name="widget_id" value="' . esc_attr($meta_box['id']) . '" />';
+	submit_button( __('Submit') );
 	echo '</form>';
 }
 
diff --git a/wp-admin/includes/template.php b/wp-admin/includes/template.php
index 8019118ec..12781fbd5 100644
--- a/wp-admin/includes/template.php
+++ b/wp-admin/includes/template.php
@@ -843,9 +843,7 @@ function wp_import_upload_form( $action ) {
 <input type="hidden" name="action" value="save" />
 <input type="hidden" name="max_file_size" value="<?php echo $bytes; ?>" />
 </p>
-<p class="submit">
-<input type="submit" class="button" value="<?php esc_attr_e( 'Upload file and import' ); ?>" />
-</p>
+<?php submit_button( __('Upload file and import'), 'secondary' ); ?>
 </form>
 <?php
 	endif;
diff --git a/wp-admin/media.php b/wp-admin/media.php
index 6715773b7..f7eba031e 100644
--- a/wp-admin/media.php
+++ b/wp-admin/media.php
@@ -100,14 +100,13 @@ case 'edit' :
 </div>
 </div>
 
-<p class="submit">
-<input type="submit" class="button-primary" name="save" value="<?php esc_attr_e('Update Media'); ?>" />
+<?php submit_button( __('Update Media') ); ?>
 <input type="hidden" name="post_id" id="post_id" value="<?php echo isset($post_id) ? esc_attr($post_id) : ''; ?>" />
 <input type="hidden" name="attachment_id" id="attachment_id" value="<?php echo esc_attr($att_id); ?>" />
 <input type="hidden" name="action" value="editattachment" />
 <?php wp_original_referer_field(true, 'previous'); ?>
 <?php wp_nonce_field('media-form'); ?>
-</p>
+
 </form>
 
 </div>
diff --git a/wp-admin/network/edit.php b/wp-admin/network/edit.php
index e041aff1a..fc7da7204 100644
--- a/wp-admin/network/edit.php
+++ b/wp-admin/network/edit.php
@@ -74,8 +74,9 @@ function confirm_delete_users( $users ) {
 			}
 		}
 	}
+	
+	submit_button( __('Confirm Deletion'), 'delete' );
 	?>
-	<p class="submit"><input type="submit" class="button-secondary delete" value="<?php esc_attr_e( 'Confirm Deletion' ); ?>" /></p>
 	</form>
     <?php
 	return true;
@@ -502,7 +503,7 @@ switch ( $_GET['action'] ) {
 					<input type="hidden" name="_wp_http_referer" value="<?php echo esc_attr( wp_get_referer() ); ?>" />
 					<?php wp_nonce_field( $_GET['action2'], '_wpnonce', false ); ?>
 					<p><?php echo esc_html( stripslashes( $_GET['msg'] ) ); ?></p>
-					<p class="submit"><input class="button" type="submit" value="<?php _e( 'Confirm' ); ?>" /></p>
+					<?php submit_button( __('Confirm'), 'secondary' ); ?>
 				</form>
 			</body>
 		</html>
diff --git a/wp-admin/network/settings.php b/wp-admin/network/settings.php
index 0a2f4f285..c39830c2c 100644
--- a/wp-admin/network/settings.php
+++ b/wp-admin/network/settings.php
@@ -273,7 +273,7 @@ if (isset($_GET['updated'])) {
 
 		<?php do_action( 'wpmu_options' ); // Add more options here ?>
 
-		<p class="submit"><input type="submit" class="button-primary" name="Submit" value="<?php esc_attr_e( 'Save Changes' ) ?>" /></p>
+		<?php submit_button(); ?>
 	</form>
 </div>
 
diff --git a/wp-admin/options.php b/wp-admin/options.php
index 15f489d3e..7acd64eeb 100644
--- a/wp-admin/options.php
+++ b/wp-admin/options.php
@@ -209,7 +209,11 @@ foreach ( (array) $options as $option ) :
 endforeach;
 ?>
   </table>
-<p class="submit"><input type="hidden" name="page_options" value="<?php echo esc_attr( implode( ',', $options_to_update ) ); ?>" /><input type="submit" name="Update" value="<?php esc_attr_e( 'Save Changes' ); ?>" class="button-primary" /></p>
+
+<input type="hidden" name="page_options" value="<?php echo esc_attr( implode( ',', $options_to_update ) ); ?>" />
+
+<?php submit_button( __('Save Changes') ); ?>
+
   </form>
 </div>
 
diff --git a/wp-admin/user-edit.php b/wp-admin/user-edit.php
index 896d01a31..be7820843 100644
--- a/wp-admin/user-edit.php
+++ b/wp-admin/user-edit.php
@@ -384,11 +384,11 @@ if ( $show_password_fields ) :
 	</table>
 <?php } ?>
 
-<p class="submit">
-	<input type="hidden" name="action" value="update" />
-	<input type="hidden" name="user_id" id="user_id" value="<?php echo esc_attr($user_id); ?>" />
-	<input type="submit" class="button-primary" value="<?php IS_PROFILE_PAGE ? esc_attr_e('Update Profile') : esc_attr_e('Update User') ?>" name="submit" />
-</p>
+<input type="hidden" name="action" value="update" />
+<input type="hidden" name="user_id" id="user_id" value="<?php echo esc_attr($user_id); ?>" />
+
+<?php submit_button( IS_PROFILE_PAGE ? __('Update Profile') : __('Update User') ); ?>
+
 </form>
 </div>
 <?php
diff --git a/wp-admin/user-new.php b/wp-admin/user-new.php
index 332b79985..cfc7f562d 100644
--- a/wp-admin/user-new.php
+++ b/wp-admin/user-new.php
@@ -265,9 +265,8 @@ $new_user_send_password = !$_POST || isset($_POST['send_password']);
 	</tr>
 	<?php } ?>
 </table>
-<p class="submit">
-	<input name="adduser" type="submit" id="addusersub" class="button-primary" value="<?php esc_attr_e('Add User') ?>" />
-</p>
+
+<?php submit_button( __('Add User'), 'primary', 'adduser' ); ?>
 </form>
 
 </div>
diff --git a/wp-admin/users.php b/wp-admin/users.php
index c76eabd15..15816bac8 100644
--- a/wp-admin/users.php
+++ b/wp-admin/users.php
@@ -190,7 +190,7 @@ case 'delete':
 		<?php echo '<label for="delete_option1">'.__('Attribute all posts and links to:')."</label> $user_dropdown"; ?></li>
 	</ul></fieldset>
 	<input type="hidden" name="action" value="dodelete" />
-	<p class="submit"><input type="submit" name="submit" value="<?php esc_attr_e('Confirm Deletion'); ?>" class="button-secondary" /></p>
+	<?php submit_button( __('Confirm Deletion'), 'secondary' ); ?>
 <?php else : ?>
 	<p><?php _e('There are no valid users selected for deletion.'); ?></p>
 <?php endif; ?>
@@ -278,7 +278,7 @@ case 'remove':
  	?>
 <?php if ( $go_remove ) : ?>
 		<input type="hidden" name="action" value="doremove" />
-		<p class="submit"><input type="submit" name="submit" value="<?php esc_attr_e('Confirm Removal'); ?>" class="button-secondary" /></p>
+		<?php submit_button( __('Confirm Removal'), 'secondary' ); ?>
 <?php else : ?>
 	<p><?php _e('There are no valid users selected for removal.'); ?></p>
 <?php endif; ?>