diff --git a/wp-admin/css/colors-classic.css b/wp-admin/css/colors-classic.css
index 2f8861bd59..7cef937817 100644
--- a/wp-admin/css/colors-classic.css
+++ b/wp-admin/css/colors-classic.css
@@ -298,7 +298,6 @@ ul#widget-list li.widget-list-item h4.widget-title {
 
 .button:hover,
 .submit input:hover,
-#edit-slug-buttons a.save:hover,
 #postcustomstuff .submit input:hover {
 	border-color: #535353;
 }
@@ -314,8 +313,6 @@ a:hover,
 .subsubsub a.current:hover,
 #login form .submit input:hover,
 div.dashboard-widget-submit input:hover,
-#edit-slug-buttons a.save:hover,
-#media-upload a.delete:hover,
 #media-upload a.del-link:hover,
 .ui-tabs-nav a:hover,
 #user_info a:hover {
diff --git a/wp-admin/css/colors-fresh.css b/wp-admin/css/colors-fresh.css
index 12852ae848..1035e881af 100644
--- a/wp-admin/css/colors-fresh.css
+++ b/wp-admin/css/colors-fresh.css
@@ -303,7 +303,6 @@ ul#widget-list li.widget-list-item h4.widget-title {
 
 .button:hover,
 .submit input:hover,
-#edit-slug-buttons a.save:hover,
 #postcustomstuff .submit input:hover {
 	border-color: #535353;
 }
@@ -319,8 +318,6 @@ a:hover,
 .subsubsub a.current:hover,
 #login form .submit input:hover,
 div.dashboard-widget-submit input:hover,
-#edit-slug-buttons a.save:hover,
-#media-upload a.delete:hover,
 #media-upload a.del-link:hover,
 .ui-tabs-nav a:hover,
 #user_info a:hover {
diff --git a/wp-admin/includes/post.php b/wp-admin/includes/post.php
index eb8c090974..1928614987 100644
--- a/wp-admin/includes/post.php
+++ b/wp-admin/includes/post.php
@@ -917,7 +917,7 @@ function get_sample_permalink_html($id, $new_title=null, $new_slug=null) {
 	$post_name_html = '<span id="editable-post-name" title="'.$title.'">'.$post_name_abridged.'</span><span id="editable-post-name-full">'.$post_name.'</span>';
 	$display_link = str_replace(array('%pagename%','%postname%'), $post_name_html, $permalink);
 	$return = '<strong>' . __('Permalink:') . "</strong>\n" . '<span id="sample-permalink">' . $display_link . "</span>\n";
-	$return .= '<span id="edit-slug-buttons"><a href="#post_name" class="edit-slug" onclick="edit_permalink(' . $id . '); return false;">' . __('Edit') . "</a></span>\n";
+	$return .= '<span id="edit-slug-buttons"><a href="#post_name" class="edit-slug button" onclick="edit_permalink(' . $id . '); return false;">' . __('Edit') . "</a></span>\n";
 	return $return;
 }
 
diff --git a/wp-admin/includes/template.php b/wp-admin/includes/template.php
index f535e014ca..4091224513 100644
--- a/wp-admin/includes/template.php
+++ b/wp-admin/includes/template.php
@@ -610,7 +610,7 @@ function _tag_row( $tag, $class = '' ) {
 						$out .= "<span class='$action'>$link$sep</span>";
 					}
 					$out .= '<div class="hidden" id="inline_' . $tag->term_id . '">';
-					$out .= '<div class="name">' . $name . '</div>';
+					$out .= '<div class="name">' . attribute_escape($tag->name) . '</div>';
 					$out .= '<div class="slug">' . $tag->slug . '</div></div></td>';
 					break;
 				case 'slug':
@@ -1150,7 +1150,7 @@ function get_inline_data($post) {
 	if ( ! current_user_can('edit_' . $post->post_type, $post->ID) )
 		return;
 
-	$title = _draft_or_post_title($post->ID);
+	$title = attribute_escape($post->post_title);
 
 	echo '
 <div class="hidden" id="inline_' . $post->ID . '">
diff --git a/wp-admin/js/categories.js b/wp-admin/js/categories.js
index 88d7a04175..6a9a2a3e13 100644
--- a/wp-admin/js/categories.js
+++ b/wp-admin/js/categories.js
@@ -7,6 +7,14 @@ jQuery(function($) {
 		var name = $("<span>" + $('name', r).text() + "</span>").html();
 		var id = $('cat', r).attr('id');
 		options[options.length] = new Option(name, id);
+		
+		addAfter2( r, settings );
+	}
+
+	var addAfter2 = function( x, r ) {
+		var t = $(r.parsed.responses[0].data);
+		if ( t.length == 1 )
+			inlineEditTax.addEvents($(t.id));
 	}
 
 	var delAfter = function( r, settings ) {
@@ -19,7 +27,7 @@ jQuery(function($) {
 	if ( options )
 		$('#the-list').wpList( { addAfter: addAfter, delAfter: delAfter } );
 	else
-		$('#the-list').wpList();
+		$('#the-list').wpList({ addAfter: addAfter2 });
 
 	if ( jQuery('#link-category-search').size() ) {
 		columns.init('link-category');
diff --git a/wp-admin/js/inline-edit-tax.js b/wp-admin/js/inline-edit-tax.js
index a6d8cb3f8a..b3cff3e68b 100644
--- a/wp-admin/js/inline-edit-tax.js
+++ b/wp-admin/js/inline-edit-tax.js
@@ -37,8 +37,8 @@ inlineEditTax = {
 
 	addEvents : function(r) {
 		r.each(function() {
-			var row = $(this);
-			$('a.editinline', row).click(function() { inlineEditTax.edit(this); return false; });
+			$(this).find('a.editinline').click(function() { inlineEditTax.edit(this); return false; });
+			$(this).find('.hide-if-no-js').removeClass('hide-if-no-js');
 		});
 	},
 
diff --git a/wp-admin/js/slug.js b/wp-admin/js/slug.js
index f26a5f202e..cfd5ce4077 100644
--- a/wp-admin/js/slug.js
+++ b/wp-admin/js/slug.js
@@ -8,7 +8,7 @@ function edit_permalink(post_id) {
 	var revert_b = b.html();
 	var full = jQuery('#editable-post-name-full').html();
 
-	b.html('<a href="" class="save">'+slugL10n.save+'</a> <a class="cancel" href="">'+slugL10n.cancel+'</a>');
+	b.html('<a href="" class="save button">'+slugL10n.save+'</a> <a class="cancel" href="">'+slugL10n.cancel+'</a>');
 	b.children('.save').click(function() {
 		var new_slug = e.children('input').val();
 		jQuery.post(slugL10n.requestFile, {
diff --git a/wp-admin/js/tags.js b/wp-admin/js/tags.js
index d54e6c2a9b..cfc2024caf 100644
--- a/wp-admin/js/tags.js
+++ b/wp-admin/js/tags.js
@@ -5,6 +5,13 @@ jQuery(function($) {
 		var name = $("<span>" + $('name', r).text() + "</span>").html();
 		var id = $('tag', r).attr('id');
 		options[options.length] = new Option(name, id);
+
+	}
+
+	var addAfter2 = function( x, r ) {
+		var t = $(r.parsed.responses[0].data);
+		if ( t.length == 1 )
+			inlineEditTax.addEvents($(t.id));
 	}
 
 	var delAfter = function( r, settings ) {
@@ -17,7 +24,7 @@ jQuery(function($) {
 	if ( options )
 		$('#the-list').wpList( { addAfter: addAfter, delAfter: delAfter } );
 	else
-		$('#the-list').wpList();
+		$('#the-list').wpList({ addAfter: addAfter2 });
 
 	columns.init('tag');
 });
\ No newline at end of file
diff --git a/wp-admin/rtl.css b/wp-admin/rtl.css
index e2216994b3..56193d4864 100644
--- a/wp-admin/rtl.css
+++ b/wp-admin/rtl.css
@@ -257,7 +257,7 @@ ul#adminmenu li.write-new-button a {
 #poststuff .stuffbox h3 {
 	background-position: right top;
 }
-#edit-slug-buttons a.save {
+#edit-slug-buttons a {
 	margin-right: 0;
 	margin-left: 4px;
 }
diff --git a/wp-admin/wp-admin.css b/wp-admin/wp-admin.css
index 29f27954f8..17a6f94cc3 100644
--- a/wp-admin/wp-admin.css
+++ b/wp-admin/wp-admin.css
@@ -348,7 +348,7 @@ form p.submit .cancel:hover {
 }
 
 a.button {
-	padding: 4px 8px;
+	padding: 3px 8px;
 }
 
 #doaction,
@@ -1721,19 +1721,6 @@ table.form-table td .updated {
 	width: 16em;
 }
 
-#edit-slug-buttons a.save {
-	padding: 6px 4px;
-	margin-right: 4px;
-	text-decoration: none;
-	border-width: 1px;
-	border-style: solid;
-	-moz-border-radius: 3px;
-	-khtml-border-radius: 3px;
-	-webkit-border-radius: 3px;
-	border-radius: 3px;
-	font-weight: bold;
-}
-
 .postarea h3 label {
 	float: left;
 }