Index: options-privacy.php
===================================================================
--- options-privacy.php	(revision 15739)
+++ options-privacy.php	(working copy)
@@ -50,9 +50,7 @@
 
 <?php do_settings_sections('privacy'); ?>
 
-<p class="submit">
-	<input type="submit" name="Submit" class="button-primary" value="<?php esc_attr_e('Save Changes') ?>" />
-</p>
+<?php submit_button(); ?>
 </form>
 
 </div>
Index: includes/template.php
===================================================================
--- includes/template.php	(revision 15739)
+++ includes/template.php	(working copy)
@@ -2064,3 +2064,34 @@
 	$current_screen = apply_filters('current_screen', $current_screen);
 }
 
+/**
+ * Echos a paragraph-wrapped submit button, with provided text and appropriate class
+ * @param string $text The text of the button (defaults to 'Save Changes')
+ * @param string $type The type of button. One of: primary, secondary, delete
+ * @param string $name The HTML name of the submit button. Defaults to "submit"
+ */
+function submit_button( $text = NULL, $type = 'primary', $name = 'submit' ) {
+	echo get_submit_button( $text, $type, $name );
+}
+
+/**
+ * Returns a paragraph-wrapped submit button, with provided text and appropriate class
+ * @param string $text The text of the button (defaults to 'Save Changes')
+ * @param string $type The type of button. One of: primary, secondary, delete
+ * @param string $name The HTML name of the submit button. Defaults to "submit"
+ */
+function get_submit_button( $text = NULL, $type = 'primary', $name = 'submit' ) {
+	switch ( $type ) :
+		case 'primary' :
+		case 'secondary' :
+			$class = 'button-' . $type;
+			break;
+		case 'delete' :
+			$class = 'button-secondary delete';
+			break;
+		default :
+			$class = $type; // Custom cases can just pass in the classes they want to be used
+	endswitch;
+	$text = ( NULL == $text ) ? __( 'Save Changes' ) : $text;
+	return '<p class="submit"><input type="submit" name="' . esc_attr( $name ) . ' class="' . esc_attr( $class ) . '" value="' . esc_attr( $text ) . '" /></p>';
+}
Index: options-media.php
===================================================================
--- options-media.php	(revision 15739)
+++ options-media.php	(working copy)
@@ -132,9 +132,7 @@
 
 <?php do_settings_sections('media'); ?>
 
-<p class="submit">
-	<input type="submit" name="Submit" class="button-primary" value="<?php esc_attr_e('Save Changes') ?>" />
-</p>
+<?php submit_button(); ?>
 
 </form>
 
Index: options-permalink.php
===================================================================
--- options-permalink.php	(revision 15739)
+++ options-permalink.php	(working copy)
@@ -221,9 +221,7 @@
 
 <?php do_settings_sections('permalink'); ?>
 
-<p class="submit">
-	<input type="submit" name="submit" class="button-primary" value="<?php esc_attr_e('Save Changes') ?>" />
-</p>
+<?php submit_button(); ?>
   </form>
 <?php if ( !is_multisite() ) { ?>
 <?php if ( $iis7_permalinks ) :
Index: options-writing.php
===================================================================
--- options-writing.php	(revision 15739)
+++ options-writing.php	(working copy)
@@ -148,9 +148,7 @@
 
 <?php do_settings_sections('writing'); ?>
 
-<p class="submit">
-	<input type="submit" name="Submit" class="button-primary" value="<?php esc_attr_e('Save Changes') ?>" />
-</p>
+<?php submit_button(); ?>
 </form>
 </div>