diff --git a/terminal/terminal-preferences-dialog.c b/terminal/terminal-preferences-dialog.c
index 5aca41b..a37f8b3 100644
--- a/terminal/terminal-preferences-dialog.c
+++ b/terminal/terminal-preferences-dialog.c
@@ -101,7 +101,6 @@ transform_is1_or_is2 (const GValue *src_value,
 static void
 terminal_preferences_dialog_init (TerminalPreferencesDialog *dialog)
 {
-  GtkListStore      *store;
   GtkTreeIter        iter;
   GdkPixbuf         *icon;
   GtkWidget         *button;
@@ -155,29 +154,21 @@ terminal_preferences_dialog_init (TerminalPreferencesDialog *dialog)
   gtk_box_pack_start (GTK_BOX (hbox), swin, FALSE, FALSE, 0);
   gtk_widget_show (swin);
 
-  store = gtk_list_store_new (LAST_COLUMN, GDK_TYPE_PIXBUF, G_TYPE_STRING, G_TYPE_INT);
-
-  dialog->icon_bar = exo_icon_bar_new_with_model (GTK_TREE_MODEL (store));
-  exo_icon_bar_set_pixbuf_column (EXO_ICON_BAR (dialog->icon_bar), PIXBUF_COLUMN);
-  exo_icon_bar_set_text_column (EXO_ICON_BAR (dialog->icon_bar), TEXT_COLUMN);
-  gtk_container_add (GTK_CONTAINER (swin), dialog->icon_bar);
-  gtk_widget_show (dialog->icon_bar);
-
   dialog->notebook = gtk_notebook_new ();
   g_object_set (G_OBJECT (dialog->notebook),
                 "show-border", FALSE,
-                "show-tabs", FALSE,
                 NULL);
   gtk_box_pack_start (GTK_BOX (hbox), dialog->notebook, TRUE, TRUE, 0);
   gtk_widget_show (dialog->notebook);
 
-  
+
   /*
      General
    */
   box = gtk_vbox_new (FALSE, 12);
   gtk_container_set_border_width (GTK_CONTAINER (box), 12);
   index = gtk_notebook_append_page (GTK_NOTEBOOK (dialog->notebook), box, NULL);
+  gtk_notebook_set_tab_label_text (GTK_NOTEBOOK (dialog->notebook), box, _("General"));
   gtk_widget_show (box);
 
   frame = g_object_new (GTK_TYPE_FRAME, "border-width", 0, "shadow-type", GTK_SHADOW_NONE, NULL);
@@ -359,25 +350,13 @@ terminal_preferences_dialog_init (TerminalPreferencesDialog *dialog)
   /* set Atk label relation for the spin button */
   terminal_gtk_label_set_a11y_relation (GTK_LABEL (label), button);
 
-  icon = gtk_widget_render_icon (GTK_WIDGET (dialog->icon_bar),
-                                 TERMINAL_STOCK_GENERAL,
-                                 GTK_ICON_SIZE_DIALOG,
-                                 NULL);
-  gtk_list_store_append (store, &iter);
-  gtk_list_store_set (store, &iter,
-                      PIXBUF_COLUMN, icon,
-                      TEXT_COLUMN, _("General"),
-                      INDEX_COLUMN, index,
-                      -1);
-  g_object_unref (G_OBJECT (icon));
-
-
   /*
      Appearance
    */
   box = gtk_vbox_new (FALSE, 12);
   gtk_container_set_border_width (GTK_CONTAINER (box), 12);
   index = gtk_notebook_append_page (GTK_NOTEBOOK (dialog->notebook), box, NULL);
+  gtk_notebook_set_tab_label_text (GTK_NOTEBOOK (dialog->notebook), box, _("Appearance"));
   gtk_widget_show (box);
 
   frame = g_object_new (GTK_TYPE_FRAME, "border-width", 0, "shadow-type", GTK_SHADOW_NONE, NULL);
@@ -564,18 +543,6 @@ terminal_preferences_dialog_init (TerminalPreferencesDialog *dialog)
   gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
   gtk_widget_show (button);
 
-  icon = gtk_widget_render_icon (GTK_WIDGET (dialog->icon_bar),
-                                 TERMINAL_STOCK_APPEARANCE,
-                                 GTK_ICON_SIZE_DIALOG,
-                                 NULL);
-  gtk_list_store_append (store, &iter);
-  gtk_list_store_set (store, &iter,
-                      PIXBUF_COLUMN, icon,
-                      TEXT_COLUMN, _("Appearance"),
-                      INDEX_COLUMN, index,
-                      -1);
-  g_object_unref (icon);
-
 
   /*
      Colors
@@ -583,6 +550,7 @@ terminal_preferences_dialog_init (TerminalPreferencesDialog *dialog)
   box = gtk_vbox_new (FALSE, 12);
   gtk_container_set_border_width (GTK_CONTAINER (box), 12);
   index = gtk_notebook_append_page (GTK_NOTEBOOK (dialog->notebook), box, NULL);
+  gtk_notebook_set_tab_label_text (GTK_NOTEBOOK (dialog->notebook), box, _("Colors"));
   gtk_widget_show (box);
 
   frame = g_object_new (GTK_TYPE_FRAME, "border-width", 0, "shadow-type", GTK_SHADOW_NONE, NULL);
@@ -814,18 +782,6 @@ terminal_preferences_dialog_init (TerminalPreferencesDialog *dialog)
   atk_relation_set_add (relations, relation);
   g_object_unref (G_OBJECT (relation));
 
-  icon = gtk_widget_render_icon (GTK_WIDGET (dialog->icon_bar),
-                                 TERMINAL_STOCK_COLORS,
-                                 GTK_ICON_SIZE_DIALOG,
-                                 NULL);
-  gtk_list_store_append (store, &iter);
-  gtk_list_store_set (store, &iter,
-                      PIXBUF_COLUMN, icon,
-                      TEXT_COLUMN, _("Colors"),
-                      INDEX_COLUMN, index,
-                      -1);
-  g_object_unref (G_OBJECT (icon));
-
 
   /*
      Shortcuts
@@ -833,6 +789,7 @@ terminal_preferences_dialog_init (TerminalPreferencesDialog *dialog)
   box = gtk_vbox_new (FALSE, 12);
   gtk_container_set_border_width (GTK_CONTAINER (box), 12);
   index = gtk_notebook_append_page (GTK_NOTEBOOK (dialog->notebook), box, NULL);
+  gtk_notebook_set_tab_label_text (GTK_NOTEBOOK (dialog->notebook), box, _("Shortcuts"));
   gtk_widget_show (box);
 
   frame = g_object_new (GTK_TYPE_FRAME, "border-width", 0, "shadow-type", GTK_SHADOW_NONE, NULL);
@@ -884,18 +841,6 @@ terminal_preferences_dialog_init (TerminalPreferencesDialog *dialog)
   gtk_box_pack_start (GTK_BOX (vbox), button, TRUE, TRUE, 0);
   gtk_widget_show (button);
 
-  icon = gtk_widget_render_icon (GTK_WIDGET (dialog->icon_bar),
-                                 TERMINAL_STOCK_SHORTCUTS,
-                                 GTK_ICON_SIZE_DIALOG,
-                                 NULL);
-  gtk_list_store_append (store, &iter);
-  gtk_list_store_set (store, &iter,
-                      PIXBUF_COLUMN, icon,
-                      TEXT_COLUMN, _("Shortcuts"),
-                      INDEX_COLUMN, index,
-                      -1);
-  g_object_unref (icon);
-
 
   /*
      Advanced
@@ -903,6 +848,7 @@ terminal_preferences_dialog_init (TerminalPreferencesDialog *dialog)
   box = gtk_vbox_new (FALSE, 12);
   gtk_container_set_border_width (GTK_CONTAINER (box), 12);
   index = gtk_notebook_append_page (GTK_NOTEBOOK (dialog->notebook), box, NULL);
+  gtk_notebook_set_tab_label_text (GTK_NOTEBOOK (dialog->notebook), box, _("Advanced"));
   gtk_widget_show (box);
 
   frame = g_object_new (GTK_TYPE_FRAME, "border-width", 0, "shadow-type", GTK_SHADOW_NONE, NULL);
@@ -1068,21 +1014,6 @@ terminal_preferences_dialog_init (TerminalPreferencesDialog *dialog)
   gtk_widget_show (label);
 
 /*end */
-  icon = gtk_widget_render_icon (GTK_WIDGET (dialog->icon_bar),
-                                 TERMINAL_STOCK_ADVANCED,
-                                 GTK_ICON_SIZE_DIALOG,
-                                 NULL);
-  gtk_list_store_append (store, &iter);
-  gtk_list_store_set (store, &iter,
-                      PIXBUF_COLUMN, icon,
-                      TEXT_COLUMN, _("Advanced"),
-                      INDEX_COLUMN, index,
-                      -1);
-  g_object_unref (icon);
-
-  exo_mutual_binding_new (G_OBJECT (dialog->notebook), "page", G_OBJECT (dialog->icon_bar), "active");
-
-  g_object_unref (G_OBJECT (store));
 }