--- tangogps-0.9.3/src/interface.c	2008-08-25 10:25:54.000000000 +0200
+++ tangogps-0.9.3/src/interface.c.new	2008-10-16 18:11:16.000000000 +0200
@@ -31,15 +31,11 @@
   GtkWidget *notebook1;
   GtkWidget *vbox1;
   GtkWidget *toolbar1;
-  GtkIconSize tmp_toolbar_icon_size;
-  GtkWidget *toolitem1;
-  GtkWidget *button1;
-  GtkWidget *toolitem2;
-  GtkWidget *button4;
-  GtkWidget *toolitem3;
-  GtkWidget *button5;
-  GtkWidget *toolitem5;
-  GtkWidget *button3;
+  GtkTooltips *tooltips;
+  GtkToolItem *button1;
+  GtkToolItem *button4;
+  GtkToolItem *button5;
+  GtkToolItem *button3;
   GtkWidget *toolitem6;
   GtkWidget *togglebutton1;
   GtkWidget *hbox1;
@@ -264,53 +260,38 @@
                                       TRUE, TRUE, GTK_PACK_START);
 
   toolbar1 = gtk_toolbar_new ();
+  gtk_toolbar_set_tooltips(GTK_TOOLBAR (toolbar1), TRUE);
   gtk_widget_show (toolbar1);
   gtk_box_pack_start (GTK_BOX (vbox1), toolbar1, FALSE, FALSE, 0);
-  gtk_widget_set_size_request (toolbar1, -1, 60);
-  gtk_container_set_border_width (GTK_CONTAINER (toolbar1), 2);
   gtk_toolbar_set_style (GTK_TOOLBAR (toolbar1), GTK_TOOLBAR_ICONS);
-  tmp_toolbar_icon_size = gtk_toolbar_get_icon_size (GTK_TOOLBAR (toolbar1));
+  gtk_toolbar_set_icon_size (GTK_TOOLBAR (toolbar1), GTK_ICON_SIZE_LARGE_TOOLBAR);
 
-  toolitem1 = (GtkWidget*) gtk_tool_item_new ();
-  gtk_widget_show (toolitem1);
-  gtk_container_add (GTK_CONTAINER (toolbar1), toolitem1);
-
-  button1 = gtk_button_new_with_mnemonic (_("fullscreen"));
-  gtk_widget_show (button1);
-  gtk_container_add (GTK_CONTAINER (toolitem1), button1);
-  gtk_widget_set_size_request (button1, -1, 40);
-  GTK_WIDGET_UNSET_FLAGS (button1, GTK_CAN_FOCUS);
-  gtk_button_set_focus_on_click (GTK_BUTTON (button1), FALSE);
-
-  toolitem2 = (GtkWidget*) gtk_tool_item_new ();
-  gtk_widget_show (toolitem2);
-  gtk_container_add (GTK_CONTAINER (toolbar1), toolitem2);
-
-  button4 = gtk_button_new_with_mnemonic (_("      +      "));
-  gtk_widget_show (button4);
-  gtk_container_add (GTK_CONTAINER (toolitem2), button4);
-  GTK_WIDGET_UNSET_FLAGS (button4, GTK_CAN_FOCUS);
-  gtk_button_set_focus_on_click (GTK_BUTTON (button4), FALSE);
-
-  toolitem3 = (GtkWidget*) gtk_tool_item_new ();
-  gtk_widget_show (toolitem3);
-  gtk_container_add (GTK_CONTAINER (toolbar1), toolitem3);
-
-  button5 = gtk_button_new_with_mnemonic (_("      -      "));
-  gtk_widget_show (button5);
-  gtk_container_add (GTK_CONTAINER (toolitem3), button5);
-  GTK_WIDGET_UNSET_FLAGS (button5, GTK_CAN_FOCUS);
-  gtk_button_set_focus_on_click (GTK_BUTTON (button5), FALSE);
-
-  toolitem5 = (GtkWidget*) gtk_tool_item_new ();
-  gtk_widget_show (toolitem5);
-  gtk_container_add (GTK_CONTAINER (toolbar1), toolitem5);
-
-  button3 = gtk_button_new_with_mnemonic (_("autocenter"));
-  gtk_widget_show (button3);
-  gtk_container_add (GTK_CONTAINER (toolitem5), button3);
-  GTK_WIDGET_UNSET_FLAGS (button3, GTK_CAN_FOCUS);
-  gtk_button_set_focus_on_click (GTK_BUTTON (button3), FALSE);
+  tooltips = gtk_tooltips_new();
+  gtk_tooltips_enable(tooltips);
+
+  button1 = gtk_tool_button_new_from_stock (GTK_STOCK_FULLSCREEN);
+  gtk_tool_item_set_expand(button1, TRUE);
+  gtk_tool_item_set_tooltip(button1, tooltips, _("Fullscreen"), NULL);
+  gtk_widget_show (GTK_WIDGET(button1));
+  gtk_toolbar_insert (GTK_TOOLBAR (toolbar1), button1, -1);
+
+  button4 = gtk_tool_button_new_from_stock (GTK_STOCK_ZOOM_IN);
+  gtk_tool_item_set_expand(button4, TRUE);
+  gtk_tool_item_set_tooltip(button4, tooltips, _("Zoom in"), NULL);
+  gtk_widget_show (GTK_WIDGET(button4));
+  gtk_toolbar_insert (GTK_TOOLBAR (toolbar1), button4, -1);
+
+  button5 = gtk_tool_button_new_from_stock (GTK_STOCK_ZOOM_OUT);
+  gtk_tool_item_set_expand(button5, TRUE);
+  gtk_tool_item_set_tooltip(button5, tooltips, _("Zoom out"), NULL);
+  gtk_widget_show (GTK_WIDGET(button5));
+  gtk_toolbar_insert (GTK_TOOLBAR (toolbar1), button5, -1);
+
+  button3 = gtk_tool_button_new_from_stock (GTK_STOCK_ZOOM_FIT);
+  gtk_tool_item_set_expand(button3, TRUE);
+  gtk_tool_item_set_tooltip(button3, tooltips, _("Autocenter"), NULL);
+  gtk_widget_show (GTK_WIDGET(button3));
+  gtk_toolbar_insert (GTK_TOOLBAR (toolbar1), button3, -1);
 
   toolitem6 = (GtkWidget*) gtk_tool_item_new ();
   gtk_widget_show (toolitem6);
@@ -1572,15 +1553,10 @@
   GLADE_HOOKUP_OBJECT (window1, notebook1, "notebook1");
   GLADE_HOOKUP_OBJECT (window1, vbox1, "vbox1");
   GLADE_HOOKUP_OBJECT (window1, toolbar1, "toolbar1");
-  GLADE_HOOKUP_OBJECT (window1, toolitem1, "toolitem1");
   GLADE_HOOKUP_OBJECT (window1, button1, "button1");
-  GLADE_HOOKUP_OBJECT (window1, toolitem2, "toolitem2");
   GLADE_HOOKUP_OBJECT (window1, button4, "button4");
-  GLADE_HOOKUP_OBJECT (window1, toolitem3, "toolitem3");
   GLADE_HOOKUP_OBJECT (window1, button5, "button5");
-  GLADE_HOOKUP_OBJECT (window1, toolitem5, "toolitem5");
   GLADE_HOOKUP_OBJECT (window1, button3, "button3");
-  GLADE_HOOKUP_OBJECT (window1, toolitem6, "toolitem6");
   GLADE_HOOKUP_OBJECT (window1, togglebutton1, "togglebutton1");
   GLADE_HOOKUP_OBJECT (window1, hbox1, "hbox1");
   GLADE_HOOKUP_OBJECT (window1, drawingarea1, "drawingarea1");
@@ -2760,7 +2736,6 @@
   GtkWidget *radiobutton10;
   GtkWidget *checkbutton10;
   GtkWidget *toolbar2;
-  GtkIconSize tmp_toolbar_icon_size;
   GtkWidget *toolitem8;
   GtkWidget *toolitem7;
   GtkWidget *label118;
@@ -2926,7 +2901,6 @@
   gtk_box_pack_start (GTK_BOX (vbox33), toolbar2, FALSE, FALSE, 0);
   gtk_container_set_border_width (GTK_CONTAINER (toolbar2), 6);
   gtk_toolbar_set_style (GTK_TOOLBAR (toolbar2), GTK_TOOLBAR_ICONS);
-  tmp_toolbar_icon_size = gtk_toolbar_get_icon_size (GTK_TOOLBAR (toolbar2));
 
   toolitem8 = (GtkWidget*) gtk_tool_item_new ();
   gtk_widget_show (toolitem8);
@@ -3125,7 +3099,6 @@
   GtkWidget *checkbutton11;
   GtkWidget *label126;
   GtkWidget *toolbar3;
-  GtkIconSize tmp_toolbar_icon_size;
   GtkWidget *toolitem11;
   GtkWidget *toolitem12;
   GtkWidget *label125;
@@ -3295,7 +3268,6 @@
   gtk_box_pack_start (GTK_BOX (vbox36), toolbar3, FALSE, FALSE, 0);
   gtk_container_set_border_width (GTK_CONTAINER (toolbar3), 6);
   gtk_toolbar_set_style (GTK_TOOLBAR (toolbar3), GTK_TOOLBAR_ICONS);
-  tmp_toolbar_icon_size = gtk_toolbar_get_icon_size (GTK_TOOLBAR (toolbar3));
 
   toolitem11 = (GtkWidget*) gtk_tool_item_new ();
   gtk_widget_show (toolitem11);