Index: gui-gtk-3.0/chatline.c
===================================================================
--- gui-gtk-3.0/chatline.c	(revision 21621)
+++ gui-gtk-3.0/chatline.c	(working copy)
@@ -1169,6 +1169,9 @@
                        FALSE, FALSE, 0);
     }
     gtk_widget_show_all(ptoolkit->main_widget);
+    if (!ptoolkit->toolbar_displayed) {
+      gtk_widget_hide(ptoolkit->toolbar);
+    }
 
     /* Hide all other buttons boxes. */
     list = gtk_container_get_children(GTK_CONTAINER(ptoolkit->button_box));
@@ -1408,11 +1411,7 @@
   button = gtk_toggle_button_new();
   gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 2);
   gtk_container_add(GTK_CONTAINER(button),
-#ifdef GTK_STOCK_EDIT
                     gtk_image_new_from_stock(GTK_STOCK_EDIT,
-#else
-                    gtk_image_new_from_stock(GTK_STOCK_PREFERENCES,
-#endif
                                              GTK_ICON_SIZE_MENU));
   g_signal_connect(button, "toggled", G_CALLBACK(button_toggled), &toolkit);
   gtk_widget_set_tooltip_text(GTK_WIDGET(button), _("Chat tools"));