--- /tmp/MVyHUZ_ev-toolbar.c
+++ /opt/evince/shell/ev-toolbar.c
@@ -69,7 +69,6 @@
                               GtkAction *action)
 {
         gtk_activatable_set_related_action (GTK_ACTIVATABLE (button), action);
-        gtk_button_set_label (button, NULL);
         gtk_button_set_focus_on_click (button, FALSE);
         gtk_widget_set_tooltip_text (GTK_WIDGET (button), gtk_action_get_tooltip (action));
 }
@@ -82,6 +81,8 @@
 
         gtk_widget_set_valign (button, GTK_ALIGN_CENTER);
         gtk_button_set_image (GTK_BUTTON (button), gtk_image_new ());
+        gtk_button_set_image_position (GTK_BUTTON (button), GTK_POS_TOP);
+        gtk_button_set_label (GTK_BUTTON (button), gtk_action_get_label (action));
         ev_toolbar_set_button_action (ev_toolbar, GTK_BUTTON (button), action);
 
         return button;
@@ -116,21 +117,6 @@
         gtk_menu_button_set_popup (GTK_MENU_BUTTON (button), menu);
 
         return button;
-}
-
-static GtkWidget *
-ev_toolbar_create_button_group (EvToolbar *ev_toolbar)
-{
-        GtkStyleContext *style_context;
-        GtkWidget *box;
-
-        box = gtk_box_new (gtk_orientable_get_orientation (GTK_ORIENTABLE (ev_toolbar)), 0);
-
-        style_context = gtk_widget_get_style_context (box);
-        gtk_style_context_add_class (style_context, GTK_STYLE_CLASS_RAISED);
-        gtk_style_context_add_class (style_context, GTK_STYLE_CLASS_LINKED);
-
-        return box;
 }
 
 static void
@@ -152,15 +138,22 @@
 
         /* Set the MENUBAR style class so it's possible to drag the app
          * using the toolbar. */
-        gtk_style_context_add_class (gtk_widget_get_style_context (GTK_WIDGET (ev_toolbar)),
-                                     GTK_STYLE_CLASS_MENUBAR);
+        gtk_style_context_add_class (gtk_widget_get_style_context (GTK_WIDGET (ev_toolbar)),GTK_STYLE_CLASS_MENUBAR);
 
         action_group = ev_window_get_main_action_group (ev_toolbar->priv->window);
         ui_manager = ev_window_get_ui_manager (ev_toolbar->priv->window);
 
+        hbox = gtk_box_new (gtk_orientable_get_orientation (GTK_ORIENTABLE (ev_toolbar)), 3);
+        gtk_box_set_homogeneous (GTK_BOX (hbox), TRUE);
+
+        /* Page selector */
+        action = gtk_action_group_get_action (action_group, "PageSelector");
+        gtk_action_set_label (action, "Page");
+        tool_item = gtk_action_create_tool_item (action);
+        gtk_container_add (GTK_CONTAINER (ev_toolbar), tool_item);
+        gtk_widget_show (tool_item);
+
         /* Navigation */
-        hbox = ev_toolbar_create_button_group (ev_toolbar);
-
         action = gtk_action_group_get_action (action_group, "GoPreviousPage");
         button = ev_toolbar_create_button (ev_toolbar, action);
         gtk_container_add (GTK_CONTAINER (hbox), button);
@@ -171,63 +164,60 @@
         gtk_container_add (GTK_CONTAINER (hbox), button);
         gtk_widget_show (button);
 
+
+        /* Zoom selector */
+        action = gtk_action_group_get_action (action_group, "ViewZoomIn");
+        button = ev_toolbar_create_button (ev_toolbar, action);
+        gtk_container_add (GTK_CONTAINER (hbox), button);
+        gtk_widget_show (button);
+
+        action = gtk_action_group_get_action (action_group, "ViewZoomOut");
+        button = ev_toolbar_create_button (ev_toolbar, action);
+        gtk_container_add (GTK_CONTAINER (hbox), button);
+        gtk_widget_show (button);
+
+        /* Rotate */
+        action = gtk_action_group_get_action (action_group, "EditRotateLeft");
+        button = ev_toolbar_create_button (ev_toolbar, action);
+        gtk_container_add (GTK_CONTAINER (hbox), button);
+        gtk_widget_show (button);
+
+        action = gtk_action_group_get_action (action_group, "EditRotateRight");
+        button = ev_toolbar_create_button (ev_toolbar, action);
+        gtk_container_add (GTK_CONTAINER (hbox), button);
+        gtk_widget_show (button);
+
+        /* Extras */
+        action = gtk_action_group_get_action (action_group, "FitWidth");
+        button = ev_toolbar_create_button (ev_toolbar, action);
+        gtk_container_add (GTK_CONTAINER (hbox), button);
+        gtk_widget_show (button);
+
+        action = gtk_action_group_get_action (action_group, "FitPage");
+        button = ev_toolbar_create_button (ev_toolbar, action);
+        gtk_container_add (GTK_CONTAINER (hbox), button);
+        gtk_widget_show (button);
+
+        action = gtk_action_group_get_action (action_group, "FilePrint");
+        button = ev_toolbar_create_button (ev_toolbar, action);
+        gtk_container_add (GTK_CONTAINER (hbox), button);
+        gtk_widget_show (button);
+
+        action = gtk_action_group_get_action (action_group, "FileCloseWindow");
+        button = ev_toolbar_create_button (ev_toolbar, action);
+        gtk_container_add (GTK_CONTAINER (hbox), button);
+        gtk_widget_show (button);
+
         tool_item = GTK_WIDGET (gtk_tool_item_new ());
-        if (rtl)
-                gtk_widget_set_margin_left (tool_item, 12);
-        else
-                gtk_widget_set_margin_right (tool_item, 12);
         gtk_container_add (GTK_CONTAINER (tool_item), hbox);
         gtk_widget_show (hbox);
-
-        gtk_container_add (GTK_CONTAINER (ev_toolbar), tool_item);
-        gtk_widget_show (tool_item);
-
-        /* Page selector */
-        action = gtk_action_group_get_action (action_group, "PageSelector");
-        tool_item = gtk_action_create_tool_item (action);
-        if (rtl)
-                gtk_widget_set_margin_left (tool_item, 12);
-        else
-                gtk_widget_set_margin_right (tool_item, 12);
-        gtk_container_add (GTK_CONTAINER (ev_toolbar), tool_item);
-        gtk_widget_show (tool_item);
-
-        /* History */
-        action = gtk_action_group_get_action (action_group, "History");
-        tool_item = gtk_action_create_tool_item (action);
-        if (rtl)
-                gtk_widget_set_margin_left (tool_item, 12);
-        else
-                gtk_widget_set_margin_right (tool_item, 12);
-        gtk_container_add (GTK_CONTAINER (ev_toolbar), tool_item);
-        gtk_widget_show (tool_item);
-
-        /* Find */
-        action = gtk_action_group_get_action (action_group, "EditFind");
-        button = ev_toolbar_create_toggle_button (ev_toolbar, action);
-        tool_item = GTK_WIDGET (gtk_tool_item_new ());
-        gtk_container_add (GTK_CONTAINER (tool_item), button);
-        gtk_widget_show (button);
-        if (rtl)
-                gtk_widget_set_margin_left (tool_item, 12);
-        else
-                gtk_widget_set_margin_right (tool_item, 12);
-        gtk_container_add (GTK_CONTAINER (ev_toolbar), tool_item);
-        gtk_widget_show (tool_item);
+        gtk_container_add (GTK_CONTAINER (ev_toolbar), tool_item);
+        gtk_widget_show (tool_item);
+
 
         /* Separator */
         tool_item = GTK_WIDGET (gtk_tool_item_new ());
         gtk_tool_item_set_expand (GTK_TOOL_ITEM (tool_item), TRUE);
-        gtk_container_add (GTK_CONTAINER (ev_toolbar), tool_item);
-        gtk_widget_show (tool_item);
-
-        /* Zoom selector */
-        action = gtk_action_group_get_action (action_group, "ViewZoom");
-        tool_item = gtk_action_create_tool_item (action);
-        if (rtl)
-                gtk_widget_set_margin_left (tool_item, 12);
-        else
-                gtk_widget_set_margin_right (tool_item, 12);
         gtk_container_add (GTK_CONTAINER (ev_toolbar), tool_item);
         gtk_widget_show (tool_item);
 
