diff --git a/wp-admin/css/colors-classic.dev.css b/wp-admin/css/colors-classic.dev.css
index 079511b..759b6ba 100644
--- a/wp-admin/css/colors-classic.dev.css
+++ b/wp-admin/css/colors-classic.dev.css
@@ -484,8 +484,8 @@ h3.dashboard-widget-title small a:hover {
 
 a,
 #adminmenu a,
-#poststuff #edButtonPreview,
-#poststuff #edButtonHTML,
+#poststuff .edButtonPreview,
+#poststuff .edButtonHTML,
 #the-comment-list p.comment-author strong a,
 #media-upload a.del-link,
 #media-items a.delete,
@@ -675,7 +675,7 @@ table.widefat span.spam a,
 	background-image: url(../images/date-button.gif);
 }
 
-#quicktags #ed_link {
+.quicktags #ed_link {
 	color: #00f;
 }
 
@@ -778,7 +778,7 @@ table.widefat .spam a:hover,
 }
 
 /* editors */
-#quicktags {
+.quicktags {
 	border-color: #dfdfdf;
 	background-color: #dfdfdf;
 }
@@ -796,21 +796,21 @@ table.widefat .spam a:hover,
 	border-color: #ededed;
 }
 
-#poststuff #edButtonPreview,
-#poststuff #edButtonHTML {
+#poststuff .edButtonPreview,
+#poststuff .edButtonHTML {
 	background-color: #f2f1eb;
 	border-color: #dfdfdf;
 	color: #999;
 }
 
-#poststuff #editor-toolbar .active {
+#poststuff .editor-toolbar .active {
 	border-bottom-color: #e3eef7;
 	background-color: #e3eef7;
 	color: #333;
 }
 
 /* TinyMCE */
-#post-status-info {
+.post-status-info {
 	background-color: #ededed;
 }
 
@@ -947,7 +947,7 @@ table.widefat .spam a:hover,
 	color: #888;
 }
 
-#quicktags,
+.quicktags,
 .wp_themeSkin tr.mceFirst td.mceToolbar {
 	background: #e3eef7 url("../images/ed-bg-vs.gif") repeat-x scroll left top;
 }
@@ -1016,8 +1016,8 @@ table.widefat .spam a:hover,
 }
 /* end TinyMCE */
 
-#editorcontainer,
-#post-status-info,
+.editorcontainer,
+.post-status-info,
 #titlediv #title,
 .editwidget .widget-inside {
 	border-color: #dfdfdf;
diff --git a/wp-admin/css/colors-fresh.dev.css b/wp-admin/css/colors-fresh.dev.css
index 76b9c19..44dc067 100644
--- a/wp-admin/css/colors-fresh.dev.css
+++ b/wp-admin/css/colors-fresh.dev.css
@@ -480,8 +480,8 @@ h3.dashboard-widget-title small a:hover {
 
 a,
 #adminmenu a,
-#poststuff #edButtonPreview,
-#poststuff #edButtonHTML,
+#poststuff .edButtonPreview,
+#poststuff .edButtonHTML,
 #the-comment-list p.comment-author strong a,
 #media-upload a.del-link,
 #media-items a.delete,
@@ -670,7 +670,7 @@ table.widefat span.spam a,
 	background-image: url(../images/date-button.gif);
 }
 
-#quicktags #ed_link {
+.quicktags #ed_link {
 	color: #00f;
 }
 
@@ -776,7 +776,7 @@ table.widefat .spam a:hover,
 }
 
 /* editors */
-#quicktags {
+.quicktags {
 	border-color: #dfdfdf;
 	background-color: #dfdfdf;
 }
@@ -794,21 +794,21 @@ table.widefat .spam a:hover,
 	border-color: #EDEDED;
 }
 
-#poststuff #edButtonPreview,
-#poststuff #edButtonHTML {
+#poststuff .edButtonPreview,
+#poststuff .edButtonHTML {
 	background-color: #f1f1f1;
 	border-color: #dfdfdf;
 	color: #999;
 }
 
-#poststuff #editor-toolbar .active {
+#poststuff .editor-toolbar .active {
 	border-bottom-color: #e9e9e9;
 	background-color: #e9e9e9;
 	color: #333;
 }
 
 /* TinyMCE */
-#post-status-info {
+.post-status-info {
 	background-color: #EDEDED;
 }
 
@@ -1011,8 +1011,8 @@ table.widefat .spam a:hover,
 }
 /* end TinyMCE */
 
-#editorcontainer,
-#post-status-info,
+.editorcontainer,
+.post-status-info,
 #titlediv #title,
 .editwidget .widget-inside {
 	border-color: #dfdfdf;
diff --git a/wp-admin/css/dashboard-rtl.css b/wp-admin/css/dashboard-rtl.css
index ce37292..5edeb76 100644
--- a/wp-admin/css/dashboard-rtl.css
+++ b/wp-admin/css/dashboard-rtl.css
@@ -68,7 +68,7 @@
 #dashboard_quick_press .input-text-wrap, #dashboard_quick_press .textarea-wrap {
 	margin: 0 5em 1em 0;
 }
-#dashboard_quick_press #media-buttons {
+#dashboard_quick_press .media-buttons {
 	margin: 0 5em .5em 0;
 	padding: 0 10px 0 0;
 }
diff --git a/wp-admin/css/dashboard.dev.css b/wp-admin/css/dashboard.dev.css
index 782c367..6f9b32b 100644
--- a/wp-admin/css/dashboard.dev.css
+++ b/wp-admin/css/dashboard.dev.css
@@ -276,13 +276,13 @@ div.postbox div.inside {
 	margin: 0 0 1em 5em;
 }
 
-#dashboard_quick_press #media-buttons {
+#dashboard_quick_press .media-buttons {
 	margin: 0 0 .5em 5em;
 	padding: 0 0 0 10px;
 	font-size: 11px;
 }
 
-#dashboard_quick_press #media-buttons a {
+#dashboard_quick_press .media-buttons a {
 	vertical-align: bottom;
 }
 
diff --git a/wp-admin/css/ie-rtl.css b/wp-admin/css/ie-rtl.css
index 067f59a..159a4bf 100644
--- a/wp-admin/css/ie-rtl.css
+++ b/wp-admin/css/ie-rtl.css
@@ -74,7 +74,7 @@ p.row-actions {
 	position: absolute;
 	right:0;
 }
-#post-status-info {
+.post-status-info {
 	height: 25px;
 }
 #screen-meta {
diff --git a/wp-admin/css/ie.css b/wp-admin/css/ie.css
index e8eea47..ef9593f 100644
--- a/wp-admin/css/ie.css
+++ b/wp-admin/css/ie.css
@@ -231,7 +231,7 @@ a.button {
 }
 
 #the-comment-list .comment-item,
-#post-status-info,
+.post-status-info,
 #wpwrap,
 #wpcontent,
 #wrap,
@@ -241,7 +241,7 @@ a.button {
 .metabox-holder,
 #titlediv,
 #post-body,
-#editorcontainer,
+.editorcontainer,
 .tablenav,
 .widget-liquid-left,
 .widget-liquid-right,
@@ -266,11 +266,11 @@ p.search-box {
 	margin: -3px 0 4px;
 }
 
-* html #editorcontainer {
+* html .editorcontainer {
 	padding: 0;
 }
 
-#editorcontainer #content {
+.editorcontainer .the-editor-html-content {
 	overflow: auto;
 	margin: auto;
 	width: 98%;
diff --git a/wp-admin/css/press-this-rtl.css b/wp-admin/css/press-this-rtl.css
index 9f4a37e..ed1aa96 100644
--- a/wp-admin/css/press-this-rtl.css
+++ b/wp-admin/css/press-this-rtl.css
@@ -2,8 +2,8 @@ body {
 	font-family: Tahoma, Arial;
 }
 
-#poststuff #edButtonPreview,
-#poststuff #edButtonHTML {
+#poststuff .edButtonPreview,
+#poststuff .edButtonHTML {
 	margin: 0 0 0 5px;
 	float: right;
 }
diff --git a/wp-admin/css/press-this.dev.css b/wp-admin/css/press-this.dev.css
index 2e6f3f6..9986574 100644
--- a/wp-admin/css/press-this.dev.css
+++ b/wp-admin/css/press-this.dev.css
@@ -23,8 +23,8 @@ img {
 	background: transparent url(../images/xit.gif) no-repeat 0 0;
 }
 
-#poststuff #edButtonPreview,
-#poststuff #edButtonHTML {
+#poststuff .edButtonPreview,
+#poststuff .edButtonHTML {
 	-moz-border-radius: 3px 3px 0 0;
 	-webkit-border-top-right-radius: 3px;
 	-webkit-border-top-left-radius: 3px;
@@ -80,8 +80,8 @@ div.zerosize {
 	width: 0;
 }
 
-#poststuff #edButtonPreview.active,
-#poststuff #edButtonHTML.active {
+#poststuff .edButtonPreview.active,
+#poststuff .edButtonHTML.active {
 	display: none;
 }
 
diff --git a/wp-admin/css/wp-admin-rtl.dev.css b/wp-admin/css/wp-admin-rtl.dev.css
index d659511..e62c75f 100644
--- a/wp-admin/css/wp-admin-rtl.dev.css
+++ b/wp-admin/css/wp-admin-rtl.dev.css
@@ -56,7 +56,7 @@ td.available-theme {
 #wpcontent select {
 	font-family: Tahoma, Arial, sans-serif;
 }
-#quicktags {
+.quicktags {
 	background-position: right top;
 }
 /* 500 - 700
@@ -221,7 +221,7 @@ td.available-theme {
 	margin-right: 0;
 	margin-left: 5px;
 }
-#post-status-info {
+.post-status-info {
 	padding: 0 7px 0 15px;
 }
 #comment-status-radio input {
@@ -270,16 +270,16 @@ td.available-theme {
 .wp_themeSkin tr.mceFirst td.mceToolbar {
 	background-position: right top;
 }
-#poststuff #edButtonPreview,
-#poststuff #edButtonHTML {
+#poststuff .edButtonPreview,
+#poststuff .edButtonHTML {
 	margin: 5px 0 0 5px;
 	float: left;
 }
-#poststuff #edButtonHTML {
+#poststuff .edButtonHTML {
 	margin-right: 0;
 	margin-left: 15px;
 }
-#media-buttons a {
+.media-buttons a {
 	padding: 0 10px 5px 0;
 }
 .submitbox .submit {
diff --git a/wp-admin/css/wp-admin.dev.css b/wp-admin/css/wp-admin.dev.css
index 8139ce9..871cdde 100644
--- a/wp-admin/css/wp-admin.dev.css
+++ b/wp-admin/css/wp-admin.dev.css
@@ -32,7 +32,7 @@ select option {
 #pass-strength-result.short,
 .button-highlighted,
 input.button-highlighted,
-#quicktags #ed_strong,
+.quicktags #ed_strong,
 #ed_reply_toolbar #ed_reply_strong {
 	font-weight: bold;
 }
@@ -494,12 +494,12 @@ textarea.all-options, input.all-options {
 	padding-top: 10px;
 }
 
-#content {
+.the-editor-html-content {
 	margin: 0;
 	width: 100%;
 }
 
-#editorcontainer #content {
+.editorcontainer .the-editor-html-content {
 	padding: 6px;
 	line-height: 150%;
 	border: 0 none;
@@ -510,8 +510,8 @@ textarea.all-options, input.all-options {
 	box-sizing: border-box;
 }
 
-#editorcontainer,
-#quicktags {
+.editorcontainer,
+.quicktags {
 	border-style: solid;
 	border-width: 1px;
 	border-collapse: separate;
@@ -524,7 +524,7 @@ textarea.all-options, input.all-options {
 	border-top-left-radius: 6px;
 }
 
-#quicktags {
+.quicktags {
 	padding: 0;
 	margin-bottom: -3px;
 	border-bottom-width: 3px;
@@ -533,7 +533,7 @@ textarea.all-options, input.all-options {
 	background-repeat: repeat-x;
 }
 
-#quicktags #ed_toolbar {
+.quicktags #ed_toolbar {
 	padding: 2px 4px 0;
 }
 
@@ -551,17 +551,17 @@ textarea.all-options, input.all-options {
 	margin: 1px 2px 1px 1px;
 }
 
-#quicktags #ed_link,
+.quicktags #ed_link,
 #ed_reply_toolbar #ed_reply_link {
 	text-decoration: underline;
 }
 
-#quicktags #ed_del,
+.quicktags #ed_del,
 #ed_reply_toolbar #ed_reply_del {
 	text-decoration: line-through;
 }
 
-#quicktags #ed_em,
+.quicktags #ed_em,
 #ed_reply_toolbar #ed_reply_em {
 	font-style: italic;
 }
@@ -1524,7 +1524,8 @@ span.description,
 	width: 68%;
 }
 
-#post-status-info {
+.post-status-info {
+	line-height: 1.4em;
 	border-width: 0 1px 1px;
 	border-style: none solid solid;
 	width: 100%;
@@ -1537,7 +1538,7 @@ span.description,
 	border-bottom-right-radius: 6px;
 }
 
-#post-status-info td {
+.post-status-info td {
 	font-size: 11px;
 }
 
@@ -1546,7 +1547,7 @@ span.description,
 	text-align: right;
 }
 
-#editorcontent #post-status-info {
+#editorcontent .post-status-info {
 	border: none;
 }
 
@@ -1842,7 +1843,7 @@ input#link_url {
 	right: 10px;
 }
 
-#poststuff #editor-toolbar {
+#poststuff .editor-toolbar {
 	height: 30px;
 }
 
@@ -1851,8 +1852,8 @@ input#link_url {
 	border-style: none none solid;
 }
 
-#edButtonPreview,
-#edButtonHTML {
+.edButtonPreview,
+.edButtonHTML {
 	height: 18px;
 	margin: 5px 5px 0 0;
 	padding: 4px 5px 2px;
@@ -1873,21 +1874,21 @@ input#link_url {
 	color: white;
 }
 
-#poststuff #edButtonHTML {
+#poststuff .edButtonHTML {
 	margin-right: 15px;
 }
 
-#media-buttons {
+.media-buttons {
 	cursor: default;
 	padding: 8px 8px 0;
 }
 
-#media-buttons a {
+.media-buttons a {
 	cursor: pointer;
 	padding: 0 0 5px 10px;
 }
 
-#media-buttons img,
+.media-buttons img,
 #submitpost #ajax-loading {
 	vertical-align: middle;
 }
@@ -2399,7 +2400,7 @@ fieldset {
 	padding: 2px;
 }
 
-#replyrow #editorcontainer {
+#replyrow .editorcontainer {
 	border: 0 none;
 }
 
diff --git a/wp-admin/edit-form-advanced.php b/wp-admin/edit-form-advanced.php
index 78cbde7..f5e4213 100644
--- a/wp-admin/edit-form-advanced.php
+++ b/wp-admin/edit-form-advanced.php
@@ -211,7 +211,7 @@ endif; ?>
 
 <?php the_editor($post->post_content); ?>
 
-<table id="post-status-info" cellspacing="0"><tbody><tr>
+<table class="post-status-info" cellspacing="0"><tbody><tr>
 	<td id="wp-word-count"></td>
 	<td class="autosave-info">
 	<span id="autosave">&nbsp;</span>
diff --git a/wp-admin/includes/dashboard.php b/wp-admin/includes/dashboard.php
index 7b26991..bb0f9da 100644
--- a/wp-admin/includes/dashboard.php
+++ b/wp-admin/includes/dashboard.php
@@ -398,7 +398,7 @@ function wp_dashboard_quick_press() {
 		</div>
 
 		<?php if ( current_user_can( 'upload_files' ) ) : ?>
-		<div id="media-buttons" class="hide-if-no-js">
+		<div class="media-buttons hide-if-no-js">
 			<?php do_action( 'media_buttons' ); ?>
 		</div>
 		<?php endif; ?>
diff --git a/wp-admin/js/editor.dev.js b/wp-admin/js/editor.dev.js
index ce6f835..417d3f4 100644
--- a/wp-admin/js/editor.dev.js
+++ b/wp-admin/js/editor.dev.js
@@ -9,7 +9,7 @@ jQuery(document).ready(function($){
 		if ( typeof tinyMCE != 'object' ) {
 			$('#content').css('color', '#000');
 		} else {
-			$('#quicktags').hide();
+			$('.quicktags').hide();
 		}
 	}
 });
@@ -83,7 +83,7 @@ var switchEditors = {
 		id = id || 'content';
 		mode = mode || this.mode || '';
 
-		var ed, qt = this.I('quicktags'), H = this.I('edButtonHTML'), P = this.I('edButtonPreview'), ta = this.I(id);
+		var ed, qt = this.I('quicktags-' + id), H = this.I('edButtonHTML-' + id), P = this.I('edButtonPreview-' + id), ta = this.I(id);
 
 		try { ed = tinyMCE.get(id); }
 		catch(e) { ed = false; }
@@ -95,8 +95,8 @@ var switchEditors = {
 			setUserSetting( 'editor', 'tinymce' );
 			this.mode = 'html';
 
-			P.className = 'active';
-			H.className = '';
+			jQuery(P).addClass('active');
+			jQuery(H).removeClass('active');
 			edCloseAllTags(); // :-(
 			qt.style.display = 'none';
 
@@ -115,8 +115,8 @@ var switchEditors = {
 			setUserSetting( 'editor', 'html' );
 			ta.style.color = '#000';
 			this.mode = 'tinymce';
-			H.className = 'active';
-			P.className = '';
+			jQuery(H).addClass('active');
+			jQuery(P).removeClass('active');
 
 			if ( ed && !ed.isHidden() ) {
 				ta.style.height = ed.getContentAreaContainer().offsetHeight + 24 + 'px';
diff --git a/wp-admin/press-this.php b/wp-admin/press-this.php
index a456b0c..4f2f8e0 100644
--- a/wp-admin/press-this.php
+++ b/wp-admin/press-this.php
@@ -557,13 +557,13 @@ var photostorage = false;
 				<li id="switcher">
 					<?php wp_print_scripts( 'quicktags' ); ?>
 					<?php add_filter('the_editor_content', 'wp_richedit_pre'); ?>
-					<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>
+					<a id="edButtonHTML-content" class="edButtonHTML" onclick="switchEditors.go('content', 'html');"><?php _e('HTML'); ?></a>
+					<a id="edButtonPreview-content" class="edButtonPreview 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>
-			<div id="quicktags"></div>
+			<div class="quicktags"></div>
 			<div class="editor-container">
 				<textarea name="content" id="content" style="width:100%;" class="theEditor" rows="15"><?php
 					if ( $selection )
diff --git a/wp-includes/general-template.php b/wp-includes/general-template.php
index 3180f92..c59e0bf 100644
--- a/wp-includes/general-template.php
+++ b/wp-includes/general-template.php
@@ -1797,25 +1797,25 @@ function the_editor($content, $id = 'content', $prev_id = 'title', $media_button
 	$class = '';
 
 	if ( $richedit || $media_buttons ) { ?>
-	<div id="editor-toolbar">
+	<div class="editor-toolbar">
 <?php
 	if ( $richedit ) {
 		$wp_default_editor = wp_default_editor(); ?>
 		<div class="zerosize"><input accesskey="e" type="button" onclick="switchEditors.go('<?php echo $id; ?>')" /></div>
 <?php	if ( 'html' == $wp_default_editor ) {
 			add_filter('the_editor_content', 'wp_htmledit_pre'); ?>
-			<a id="edButtonHTML" class="active hide-if-no-js" onclick="switchEditors.go('<?php echo $id; ?>', 'html');"><?php _e('HTML'); ?></a>
-			<a id="edButtonPreview" class="hide-if-no-js" onclick="switchEditors.go('<?php echo $id; ?>', 'tinymce');"><?php _e('Visual'); ?></a>
+			<a id="edButtonHTML-<?php echo $id; ?>" class="edButtonHTML active hide-if-no-js" onclick="switchEditors.go('<?php echo $id; ?>', 'html');"><?php _e('HTML'); ?></a>
+			<a id="edButtonPreview-<?php echo $id; ?>" class="edButtonPreview hide-if-no-js" onclick="switchEditors.go('<?php echo $id; ?>', 'tinymce');"><?php _e('Visual'); ?></a>
 <?php	} else {
 			$class = " class='theEditor'";
 			add_filter('the_editor_content', 'wp_richedit_pre'); ?>
-			<a id="edButtonHTML" class="hide-if-no-js" onclick="switchEditors.go('<?php echo $id; ?>', 'html');"><?php _e('HTML'); ?></a>
-			<a id="edButtonPreview" class="active hide-if-no-js" onclick="switchEditors.go('<?php echo $id; ?>', 'tinymce');"><?php _e('Visual'); ?></a>
+			<a id="edButtonHTML-<?php echo $id; ?>" class="edButtonHTML hide-if-no-js" onclick="switchEditors.go('<?php echo $id; ?>', 'html');"><?php _e('HTML'); ?></a>
+			<a id="edButtonPreview-<?php echo $id; ?>" class="edButtonPreview active hide-if-no-js" onclick="switchEditors.go('<?php echo $id; ?>', 'tinymce');"><?php _e('Visual'); ?></a>
 <?php	}
 	}
 
 	if ( $media_buttons ) { ?>
-		<div id="media-buttons" class="hide-if-no-js">
+		<div class="media-buttons hide-if-no-js">
 <?php	do_action( 'media_buttons' ); ?>
 		</div>
 <?php
@@ -1824,13 +1824,13 @@ function the_editor($content, $id = 'content', $prev_id = 'title', $media_button
 <?php
 	}
 ?>
-	<div id="quicktags"><?php
+	<div id="quicktags-<?php echo $id; ?>" class="quicktags"><?php
 	wp_print_scripts( 'quicktags' ); ?>
 	<script type="text/javascript">edToolbar()</script>
 	</div>
 
 <?php
-	$the_editor = apply_filters('the_editor', "<div id='editorcontainer'><textarea rows='$rows'$class cols='40' name='$id' tabindex='$tab_index' id='$id'>%s</textarea></div>\n");
+	$the_editor = apply_filters('the_editor', "<div class='editorcontainer'><textarea rows='$rows'$class cols='40' name='$id' tabindex='$tab_index' id='$id' class='the-editor-html-content'>%s</textarea></div>\n");
 	$the_editor_content = apply_filters('the_editor_content', $content);
 
 	printf($the_editor, $the_editor_content);
diff --git a/wp-includes/js/quicktags.dev.js b/wp-includes/js/quicktags.dev.js
index 48b7b6a..db421ba 100644
--- a/wp-includes/js/quicktags.dev.js
+++ b/wp-includes/js/quicktags.dev.js
@@ -154,13 +154,13 @@ edLinks[edLinks.length] = new edLink('alexking.org'
 
 function edShowButton(button, i) {
 	if (button.id == 'ed_img') {
-		document.write('<input type="button" id="' + button.id + '" accesskey="' + button.access + '" class="ed_button" onclick="edInsertImage(edCanvas);" value="' + button.display + '" />');
+		document.write('<input type="button" accesskey="' + button.access + '" class="ed_button ' + button.id + '" onclick="edInsertImage(edCanvas);" value="' + button.display + '" />');
 	}
 	else if (button.id == 'ed_link') {
-		document.write('<input type="button" id="' + button.id + '" accesskey="' + button.access + '" class="ed_button" onclick="edInsertLink(edCanvas, ' + i + ');" value="' + button.display + '" />');
+		document.write('<input type="button" accesskey="' + button.access + '" class="ed_button ' + button.id + '" onclick="edInsertLink(edCanvas, ' + i + ');" value="' + button.display + '" />');
 	}
 	else {
-		document.write('<input type="button" id="' + button.id + '" accesskey="' + button.access + '" class="ed_button" onclick="edInsertTag(edCanvas, ' + i + ');" value="' + button.display + '"  />');
+		document.write('<input type="button" accesskey="' + button.access + '" class="ed_button ' + button.id + '" onclick="edInsertTag(edCanvas, ' + i + ');" value="' + button.display + '"  />');
 	}
 }
 
@@ -253,12 +253,12 @@ function edSpell(myField) {
 }
 
 function edToolbar() {
-	document.write('<div id="ed_toolbar">');
+	document.write('<div class="ed_toolbar">');
 	for (var i = 0; i < edButtons.length; i++) {
 		edShowButton(edButtons[i], i);
 	}
-	document.write('<input type="button" id="ed_spell" class="ed_button" onclick="edSpell(edCanvas);" title="' + quicktagsL10n.dictionaryLookup + '" value="' + quicktagsL10n.lookup + '" />');
-	document.write('<input type="button" id="ed_close" class="ed_button" onclick="edCloseAllTags();" title="' + quicktagsL10n.closeAllOpenTags + '" value="' + quicktagsL10n.closeTags + '" />');
+	document.write('<input type="button" class="ed_button ed_spell" onclick="edSpell(edCanvas);" title="' + quicktagsL10n.dictionaryLookup + '" value="' + quicktagsL10n.lookup + '" />');
+	document.write('<input type="button" class="ed_button ed_close" onclick="edCloseAllTags();" title="' + quicktagsL10n.closeAllOpenTags + '" value="' + quicktagsL10n.closeTags + '" />');
 //	edShowLinks(); // disabled by default
 	document.write('</div>');
 }