Index: calendar/gui/dialogs/comp-editor.c
===================================================================
--- calendar/gui/dialogs/comp-editor.c	(revision 36987)
+++ calendar/gui/dialogs/comp-editor.c	(working copy)
@@ -164,6 +164,7 @@
 "    <toolitem action='close'/>"
 "    <separator/>"
 "    <toolitem action='attach'/>"
+"    <separator/>"
 "  </toolbar>"
 "</ui>";
 
Index: calendar/gui/dialogs/event-editor.c
===================================================================
--- calendar/gui/dialogs/event-editor.c	(revision 36987)
+++ calendar/gui/dialogs/event-editor.c	(working copy)
@@ -79,20 +79,21 @@
 "    <menu action='options-menu'>"
 "      <menuitem action='alarms'/>"
 "      <menuitem action='show-time-busy'/>"
+"      <menuitem action='recurrence'/>"
 "      <menuitem action='all-day-event'/>"
+"      <menuitem action='free-busy'/>"
 "      <menu action='classification-menu'>"
 "        <menuitem action='classify-public'/>"
 "        <menuitem action='classify-private'/>"
 "        <menuitem action='classify-confidential'/>"
 "      </menu>"
-"      <menuitem action='recurrence'/>"
-"      <menuitem action='free-busy'/>"
 "    </menu>"
 "  </menubar>"
 "  <toolbar name='main-toolbar'>"
 "    <toolitem action='alarms'/>"
+"    <toolitem action='show-time-busy'/>"
+"    <toolitem action='recurrence'/>"
 "    <toolitem action='all-day-event'/>"
-"    <toolitem action='recurrence'/>"
 "    <toolitem action='free-busy'/>"
 "  </toolbar>"
 "</ui>";
@@ -149,9 +150,15 @@
                          EventEditor *editor)
 {
 	gboolean active;
+	GtkAction *action_show_busy;
+	CompEditor *comp_editor = COMP_EDITOR (editor);
 
 	active = gtk_toggle_action_get_active (action);
 	event_page_set_all_day_event (editor->priv->event_page, active);
+
+	action_show_busy = comp_editor_get_action (comp_editor, "show-time-busy");
+	gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action_show_busy), !active);
+	event_page_set_show_time_busy (editor->priv->event_page, !active);
 }
 
 static void
@@ -223,7 +230,7 @@
 	  FALSE },
 
 	{ "show-time-busy",
-	  NULL,
+	  GTK_STOCK_DIALOG_ERROR,
 	  N_("Show Time as _Busy"),
 	  NULL,
 	  N_("Toggles whether to show time as busy"),