Index: components/editor/gtkhtml-editor.ui
===================================================================
--- components/editor/gtkhtml-editor.ui	(revision 8876)
+++ components/editor/gtkhtml-editor.ui	(working copy)
@@ -112,18 +112,9 @@
     <separator/>
     <toolitem action='show-find'/>
     <toolitem action='show-replace'/>
-    <separator/>
-    <toolitem action='insert-image'/>
-    <toolitem action='insert-link'/>
-    <toolitem action='insert-rule'/>
-    <toolitem action='insert-table'/>
   </toolbar>
   <toolbar name='edit-toolbar'>
-    <toolitem action='monospaced'/>
-    <toolitem action='bold'/>
-    <toolitem action='italic'/>
-    <toolitem action='underline'/>
-    <toolitem action='strikethrough'/>
+    <toolitem action='html-mode'/>
     <separator/>
     <toolitem action='justify-left'/>
     <toolitem action='justify-center'/>
@@ -132,6 +123,19 @@
     <toolitem action='unindent'/>
     <toolitem action='indent'/>
   </toolbar>
+  <toolbar name='html-toolbar'>
+    <separator/>
+    <toolitem action='monospaced'/>
+    <toolitem action='bold'/>
+    <toolitem action='italic'/>
+    <toolitem action='underline'/>
+    <toolitem action='strikethrough'/>
+    <separator/>
+    <toolitem action='insert-image'/>
+    <toolitem action='insert-link'/>
+    <toolitem action='insert-rule'/>
+    <toolitem action='insert-table'/>
+  </toolbar>
   <popup name='context-menu'>
     <menuitem action='undo'/>
     <menuitem action='redo'/>
Index: components/editor/gtkhtml-editor-actions.c
===================================================================
--- components/editor/gtkhtml-editor-actions.c	(revision 8876)
+++ components/editor/gtkhtml-editor-actions.c	(working copy)
@@ -638,6 +638,11 @@ action_html_mode_cb (GtkToggleAction *ac
 
         gtk_widget_set_sensitive (editor->priv->color_combo_box, active);
 
+	if (active)
+		gtk_widget_show (editor->priv->html_toolbar);
+	else
+		gtk_widget_hide (editor->priv->html_toolbar);
+
 	/* Certain paragraph styles are HTML-only. */
 	gtk_action_set_sensitive (ACTION (STYLE_H1), active);
 	gtk_action_set_sensitive (ACTION (STYLE_H2), active);
Index: components/editor/gtkhtml-editor-private.c
===================================================================
--- components/editor/gtkhtml-editor-private.c	(revision 8876)
+++ components/editor/gtkhtml-editor-private.c	(working copy)
@@ -219,6 +219,12 @@ gtkhtml_editor_private_init (GtkhtmlEdit
 	priv->edit_toolbar = g_object_ref (widget);
 	gtk_widget_show (widget);
 
+	widget = gtkhtml_editor_get_managed_widget (editor, "/html-toolbar");
+	gtk_toolbar_set_style (GTK_TOOLBAR (widget), GTK_TOOLBAR_ICONS);
+	gtk_box_pack_start (GTK_BOX (editor->vbox), widget, FALSE, FALSE, 0);
+	priv->html_toolbar = g_object_ref (widget);
+	gtk_widget_show (widget);
+
 	widget = gtk_scrolled_window_new (NULL, NULL);
 	gtk_scrolled_window_set_policy (
 		GTK_SCROLLED_WINDOW (widget),
@@ -236,22 +242,28 @@ gtkhtml_editor_private_init (GtkhtmlEdit
 
 	/* Add some combo boxes to the "edit" toolbar. */
 
-	tool_item = gtk_separator_tool_item_new ();
-	gtk_toolbar_insert (GTK_TOOLBAR (priv->edit_toolbar), tool_item, 0);
-	gtk_widget_show_all (GTK_WIDGET (tool_item));
-
 	tool_item = gtk_tool_item_new ();
 	widget = gtkhtml_combo_box_new_with_action (
 		GTK_RADIO_ACTION (ACTION (STYLE_NORMAL)));
 	gtk_combo_box_set_focus_on_click (GTK_COMBO_BOX (widget), FALSE);
 	gtk_container_add (GTK_CONTAINER (tool_item), widget);
 	gtk_widget_set_tooltip_text (widget, _("Paragraph Style"));
-	gtk_toolbar_insert (GTK_TOOLBAR (priv->edit_toolbar), tool_item, 0);
+	gtk_toolbar_insert (GTK_TOOLBAR (priv->edit_toolbar), tool_item, 1);
 	priv->style_combo_box = g_object_ref (widget);
 	gtk_widget_show_all (GTK_WIDGET (tool_item));
 
 	tool_item = gtk_separator_tool_item_new ();
-	gtk_toolbar_insert (GTK_TOOLBAR (priv->edit_toolbar), tool_item, 0);
+	gtk_toolbar_insert (GTK_TOOLBAR (priv->edit_toolbar), tool_item, 1);
+	gtk_widget_show_all (GTK_WIDGET (tool_item));
+
+	/* Add some combo boxes to the "html" toolbar. */
+
+	tool_item = gtk_tool_item_new ();
+	widget = gtkhtml_color_combo_new ();
+	gtk_container_add (GTK_CONTAINER (tool_item), widget);
+	gtk_widget_set_tooltip_text (widget, _("Font Color"));
+	gtk_toolbar_insert (GTK_TOOLBAR (priv->html_toolbar), tool_item, 0);
+	priv->color_combo_box = g_object_ref (widget);
 	gtk_widget_show_all (GTK_WIDGET (tool_item));
 
 	tool_item = gtk_tool_item_new ();
@@ -260,22 +272,10 @@ gtkhtml_editor_private_init (GtkhtmlEdit
 	gtk_combo_box_set_focus_on_click (GTK_COMBO_BOX (widget), FALSE);
 	gtk_container_add (GTK_CONTAINER (tool_item), widget);
 	gtk_widget_set_tooltip_text (widget, _("Font Size"));
-	gtk_toolbar_insert (GTK_TOOLBAR (priv->edit_toolbar), tool_item, 0);
+	gtk_toolbar_insert (GTK_TOOLBAR (priv->html_toolbar), tool_item, 0);
 	priv->size_combo_box = g_object_ref (widget);
 	gtk_widget_show_all (GTK_WIDGET (tool_item));
 
-	tool_item = gtk_separator_tool_item_new ();
-	gtk_toolbar_insert (GTK_TOOLBAR (priv->edit_toolbar), tool_item, -1);
-	gtk_widget_show_all (GTK_WIDGET (tool_item));
-
-	tool_item = gtk_tool_item_new ();
-	widget = gtkhtml_color_combo_new ();
-	gtk_container_add (GTK_CONTAINER (tool_item), widget);
-	gtk_widget_set_tooltip_text (widget, _("Font Color"));
-	gtk_toolbar_insert (GTK_TOOLBAR (priv->edit_toolbar), tool_item, -1);
-	priv->color_combo_box = g_object_ref (widget);
-	gtk_widget_show_all (GTK_WIDGET (tool_item));
-
 	/* Initialize painters (requires "edit_area"). */
 
 	html = gtkhtml_editor_get_html (editor);
@@ -368,6 +368,7 @@ gtkhtml_editor_private_dispose (GtkhtmlE
 	DISPOSE (priv->main_menu);
 	DISPOSE (priv->main_toolbar);
 	DISPOSE (priv->edit_toolbar);
+	DISPOSE (priv->html_toolbar);
 	DISPOSE (priv->edit_area);
 
 	DISPOSE (priv->color_combo_box);
Index: components/editor/gtkhtml-editor-private.h
===================================================================
--- components/editor/gtkhtml-editor-private.h	(revision 8876)
+++ components/editor/gtkhtml-editor-private.h	(working copy)
@@ -121,6 +121,7 @@ struct _GtkhtmlEditorPrivate {
 	GtkWidget *main_menu;
 	GtkWidget *main_toolbar;
 	GtkWidget *edit_toolbar;
+	GtkWidget *html_toolbar;
 	GtkWidget *edit_area;
 
 	GtkWidget *color_combo_box;
