Index: src/wp-admin/css/common.css
===================================================================
--- src/wp-admin/css/common.css	(revision 31467)
+++ src/wp-admin/css/common.css	(working copy)
@@ -794,7 +794,8 @@
 .submitbox .submitdelete,
 #media-items a.delete,
 #media-items a.delete-permanently,
-#nav-menu-footer .menu-delete {
+#nav-menu-footer .menu-delete,
+#delete-link a.delete  {
 	color: #a00;
 }
 
@@ -810,7 +811,8 @@
 .submitbox .submitdelete:hover,
 #media-items a.delete:hover,
 #media-items a.delete-permanently:hover,
-#nav-menu-footer .menu-delete:hover {
+#nav-menu-footer .menu-delete:hover,
+#delete-link a.delete:hover {
 	color: #f00;
 	text-decoration: none;
 	border: none;
@@ -834,6 +836,17 @@
 	float: left;
 }
 
+#delete-link {
+	line-height: 28px;
+	vertical-align: middle;
+	text-align: left;
+	margin-left: 15px;
+}
+
+#delete-link a {
+	text-decoration: none;
+}
+
 #publishing-action {
 	text-align: right;
 	float: right;
Index: src/wp-admin/edit-tag-form.php
===================================================================
--- src/wp-admin/edit-tag-form.php	(revision 31467)
+++ src/wp-admin/edit-tag-form.php	(working copy)
@@ -211,8 +211,14 @@
  */
 do_action( "{$taxonomy}_edit_form", $tag, $taxonomy );
 
-submit_button( __('Update') );
+submit_button( __( 'Update' ), 'primary', null, false );
 ?>
+
+<?php if ( $tag_ID !== (int) get_option( 'default_category' ) ) : ?>
+	<span id="delete-link">
+		<a class="delete" href="<?php echo admin_url( wp_nonce_url( "edit-tags.php?action=delete&taxonomy=$taxonomy&tag_ID=$tag->term_id", 'delete-tag_' . $tag->term_id ) ) ?>"'><?php _e( 'Delete' ); ?></a>
+	</span>
+<?php endif; ?>
 </form>
 </div>
 
Index: src/wp-admin/edit-tags.php
===================================================================
--- src/wp-admin/edit-tags.php	(revision 31467)
+++ src/wp-admin/edit-tags.php	(working copy)
@@ -91,6 +91,7 @@
 	wp_delete_term( $tag_ID, $taxonomy );
 
 	$location = add_query_arg( 'message', 2, $location );
+	$location = remove_query_arg( array( 'tag_ID', 'action' ), $location );
 
 	break;
 
@@ -123,8 +124,12 @@
 	$tag_ID = (int) $_REQUEST['tag_ID'];
 
 	$tag = get_term( $tag_ID, $taxonomy, OBJECT, 'edit' );
-	if ( ! $tag )
+	if ( ! $tag ) {
 		wp_die( __( 'You attempted to edit an item that doesn&#8217;t exist. Perhaps it was deleted?' ) );
+	}
+
+	wp_enqueue_script( 'admin-tags' );
+
 	require_once( ABSPATH . 'wp-admin/admin-header.php' );
 	include( ABSPATH . 'wp-admin/edit-tag-form.php' );
 	include( ABSPATH . 'wp-admin/admin-footer.php' );
Index: src/wp-admin/js/tags.js
===================================================================
--- src/wp-admin/js/tags.js	(revision 31467)
+++ src/wp-admin/js/tags.js	(working copy)
@@ -28,6 +28,13 @@
 		return false;
 	});
 
+	$( '#edittag' ).on( 'click', '.delete', function() {
+		if ( 'undefined' === typeof showNotice ) {
+			return true;
+		}
+		return showNotice.warn();
+	});
+
 	$('#submit').click(function(){
 		var form = $(this).parents('form');