diff --git a/wp-admin/css/colors-classic.css b/wp-admin/css/colors-classic.css
index 9925989298..63ceee8bdb 100644
--- a/wp-admin/css/colors-classic.css
+++ b/wp-admin/css/colors-classic.css
@@ -925,7 +925,7 @@ abbr.required,
 }
 
 .wp_themeSkin tr.mceFirst td.mceToolbar {
-	background-color: #dfdfdf;
+	background: #dfdfdf url("../images/ed-bg.gif") repeat-x scroll left top;
 	border-color: #dfdfdf;
 }
 
diff --git a/wp-admin/css/colors-fresh.css b/wp-admin/css/colors-fresh.css
index 4960aa1fb6..73d941d53e 100644
--- a/wp-admin/css/colors-fresh.css
+++ b/wp-admin/css/colors-fresh.css
@@ -925,7 +925,7 @@ abbr.required,
 }
 
 .wp_themeSkin tr.mceFirst td.mceToolbar {
-	background-color: #dfdfdf;
+	background: #dfdfdf url("../images/ed-bg.gif") repeat-x scroll left top;
 	border-color: #dfdfdf;
 }
 
diff --git a/wp-admin/css/press-this.css b/wp-admin/css/press-this.css
index 6a4fbc1cb0..9b270c06e8 100644
--- a/wp-admin/css/press-this.css
+++ b/wp-admin/css/press-this.css
@@ -567,3 +567,9 @@ ul.categorychecklist li {
 .hidden {
 	display: none;
 }
+
+.postbox input[type="text"],
+.postbox textarea {
+	border-width: 1px;
+	border-style: solid;
+}
diff --git a/wp-admin/press-this.php b/wp-admin/press-this.php
index 1823d2173e..cff2faabaf 100644
--- a/wp-admin/press-this.php
+++ b/wp-admin/press-this.php
@@ -349,23 +349,6 @@ die;
 	}
 ?>
 	<script type="text/javascript">
-    jQuery('#tags-input').hide();
-	tag_update_quickclicks();
-	// add the quickadd form
-	jQuery('#jaxtag').prepend('<span id="ajaxtag"><input type="text" name="newtag" id="newtag" class="form-input-tip" size="16" autocomplete="off" value="'+postL10n.addTag+'" /><input type="submit" class="button" id="tagadd" value="' + postL10n.add + '" tabindex="3" onclick="return false;" /><input type="hidden"/><input type="hidden"/><span class="howto">'+postL10n.separate+'</span></span>');
-
-	jQuery('#tagadd').click( tag_flush_to_text );
-	jQuery('#newtag').focus(function() {
-		if ( this.value == postL10n.addTag )
-			jQuery(this).val( '' ).removeClass( 'form-input-tip' );
-	});
-	jQuery('#newtag').blur(function() {
-		if ( this.value == '' )
-			jQuery(this).val( postL10n.addTag ).addClass( 'form-input-tip' );
-	});
-	// auto-save tags on post save/publish
-	jQuery('#publish').click( tag_save_on_publish );
-	jQuery('#save').click( tag_save_on_publish );
 	function insert_plain_editor(text) {
 		edCanvas = document.getElementById('content');
 		edInsertContent(edCanvas, text);
@@ -492,15 +475,21 @@ die;
 				</div>
 			</div>
 
-			<div class="stuffbox">
-				<h2><?php _e('Tags') ?></h2>
+			<div id="tagsdiv-post_tag" class="postbox" >
+				<h3><span><?php _e('Post Tags'); ?></span></h3>
 				<div class="inside">
-
-					<div id="jaxtag">
-						<label class="hidden" for="newtag"><?php _e('Tags'); ?></label>
-						<input type="text" name="tags_input" class="tags-input" id="tags-input" size="40" tabindex="3" value="<?php echo get_tags_to_edit( $post->ID ); ?>" />
+					<div class="tagsdiv" id="post_tag"> 
+						<p class="jaxtag">
+							<label class="hidden" for="newtag"><?php _e('Post Tags'); ?></label>
+							<input type="hidden" name="tax_input[post_tag]" class="the-tags" id="tax-input[post_tag]" value="" /> 
+							<span class="ajaxtag" style="display:none;">
+								<input type="text" name="newtag[post_tag]" class="newtag form-input-tip" size="16" autocomplete="off" value="<?php _e('Add new tag'); ?>" />
+								<input type="button" class="button tagadd" value="Add" tabindex="3" />
+							</span>
+						</p> 
+						<div class="tagchecklist"></div> 
 					</div>
-					<div id="tagchecklist"></div>
+					<p class="tagcloud-link"><a href="#titlediv" class="tagcloud-link" id="link-post_tag"><?php _e('Choose from the most used tags in Post Tags'); ?></a></p>
 				</div>
 			</div>
 			<div id="submitdiv" class="postbox">
@@ -509,7 +498,7 @@ die;
 					<p>
 						<input class="button" type="submit" name="draft" value="<?php _e('Save Draft') ?>" id="save" />
 						<input class="button-primary" type="submit" name="publish" value="<?php _e('Publish') ?>" id="publish" />
-						<img src="images/loading-publish.gif" alt="" id="saving" style="display:none;"/>
+						<img src="images/loading-publish.gif" alt="" id="saving" style="display:none;" />
 					</p>
 				</div>
 			</div>
@@ -542,9 +531,9 @@ die;
 				<li id="switcher">
 					<?php wp_print_scripts( 'quicktags' ); ?>
 					<?php add_filter('the_editor_content', 'wp_richedit_pre'); ?>
-					<a id="edButtonHTML" onclick="switchEditors.go('<?php echo $id; ?>', 'html');"><?php _e('HTML'); ?></a>
-					<a id="edButtonPreview" class="active" onclick="switchEditors.go('<?php echo $id; ?>', 'tinymce');"><?php _e('Visual'); ?></a>
-					<div class="zerosize"><input accesskey="e" type="button" onclick="switchEditors.go('<?php echo $id; ?>')" /></div>
+					<a id="edButtonHTML" onclick="switchEditors.go('content', 'html');"><?php _e('HTML'); ?></a>
+					<a id="edButtonPreview" class="active" onclick="switchEditors.go('content', 'tinymce');"><?php _e('Visual'); ?></a>
+					<div class="zerosize"><input accesskey="e" type="button" onclick="switchEditors.go('content')" /></div>
 				</li>
 				<?php } ?>
 			</ul>
@@ -559,5 +548,6 @@ die;
 	</div>
 </div>
 </form>
+<?php do_action('admin_print_footer_scripts'); ?>
 </body>
 </html>
diff --git a/wp-admin/wp-admin.css b/wp-admin/wp-admin.css
index a97d73dea0..cc0a9532ff 100644
--- a/wp-admin/wp-admin.css
+++ b/wp-admin/wp-admin.css
@@ -1671,9 +1671,6 @@ input#link_url {
 }
 
 .wp_themeSkin tr.mceFirst td.mceToolbar {
-	background-image: url("images/ed-bg.gif");
-	background-position: left top;
-	background-repeat: repeat-x;
 	border-width: 0 0 1px;
 	border-style: none none solid;
 }