Part of gtk 2.3 port, changelog too long to paste it

26 files changed, 779 insertions, 761 deletions

diff --git a/src/bookmarks/ephy-bookmark-action.c b/src/bookmarks/ephy-bookmark-action.c
index 42aa5cac4..9ddda53c0 100644
--- a/src/bookmarks/ephy-bookmark-action.c
+++ b/src/bookmarks/ephy-bookmark-action.c
@@ -22,13 +22,13 @@
 
 #include <bonobo/bonobo-i18n.h>
 #include <libgnomevfs/gnome-vfs-uri.h>
+#include <gtk/gtktoolitem.h>
 
 #include "ephy-bookmark-action.h"
 #include "ephy-bookmarks.h"
 #include "ephy-favicon-cache.h"
 #include "ephy-shell.h"
 #include "ephy-string.h"
-#include "eggtoolitem.h"
 #include "ephy-debug.h"
 
 #define MAX_LABEL_LENGTH 30
@@ -83,7 +83,7 @@ ephy_bookmark_action_get_type (void)
 			(GInstanceInitFunc) ephy_bookmark_action_init,
 		};
 
-		type = g_type_register_static (EGG_TYPE_ACTION,
+		type = g_type_register_static (GTK_TYPE_ACTION,
 					       "EphyBookmarkAction",
 					       &type_info, 0);
 	}
@@ -91,13 +91,13 @@ ephy_bookmark_action_get_type (void)
 }
 
 static GtkWidget *
-create_tool_item (EggAction *action)
+create_tool_item (GtkAction *action)
 {
 	GtkWidget *item, *button, *hbox, *label, *icon, *entry;
 
 	LOG ("Creating tool item for action %p", action)
 
-	item = (* EGG_ACTION_CLASS (parent_class)->create_tool_item) (action);
+	item = (* GTK_ACTION_CLASS (parent_class)->create_tool_item) (action);
 
 	hbox = gtk_hbox_new (FALSE, 0);
 	gtk_widget_show (hbox);
@@ -132,9 +132,9 @@ create_tool_item (EggAction *action)
 }
 
 static void
-ephy_bookmark_action_sync_smart_url (EggAction *action, GParamSpec *pspec, GtkWidget *proxy)
+ephy_bookmark_action_sync_smart_url (GtkAction *action, GParamSpec *pspec, GtkWidget *proxy)
 {
-	if (EGG_IS_TOOL_ITEM (proxy))
+	if (GTK_IS_TOOL_ITEM (proxy))
 	{
 		GtkWidget *entry;
 		gboolean smart_url;
@@ -154,7 +154,7 @@ ephy_bookmark_action_sync_smart_url (EggAction *action, GParamSpec *pspec, GtkWi
 }
 
 static void
-ephy_bookmark_action_sync_icon (EggAction *action, GParamSpec *pspec, GtkWidget *proxy)
+ephy_bookmark_action_sync_icon (GtkAction *action, GParamSpec *pspec, GtkWidget *proxy)
 {
 	char *icon_location;
 	EphyFaviconCache *cache;
@@ -172,7 +172,7 @@ ephy_bookmark_action_sync_icon (EggAction *action, GParamSpec *pspec, GtkWidget
 
 	if (pixbuf == NULL) return;
 
-	if (EGG_IS_TOOL_ITEM (proxy))
+	if (GTK_IS_TOOL_ITEM (proxy))
 	{
 		GtkImage *icon;
 
@@ -196,18 +196,24 @@ ephy_bookmark_action_sync_icon (EggAction *action, GParamSpec *pspec, GtkWidget
 }
 
 static void
-ephy_bookmark_action_sync_label (EggAction *action, GParamSpec *pspec, GtkWidget *proxy)
+ephy_bookmark_action_sync_label (GtkAction *action, GParamSpec *pspec, GtkWidget *proxy)
 {
 	GtkWidget *label;
 	char *label_text;
 	char *title;
+	GValue value = { 0, };
 
 	LOG ("Set bookmark action proxy label to %s", action->label)
-
-	title = ephy_string_shorten (action->label, MAX_LABEL_LENGTH);
+                                                                                                                             
+	g_value_init (&value, G_TYPE_STRING);
+	g_object_get_property (G_OBJECT (action), "label", &value);
+                                                                                                                             
+	title = ephy_string_shorten (g_value_get_string (&value),
+				     MAX_LABEL_LENGTH);
+	g_value_unset (&value);
 
 	if (EPHY_BOOKMARK_ACTION (action)->priv->smart_url
-	    && EGG_IS_TOOL_ITEM (proxy))
+	    && GTK_IS_TOOL_ITEM (proxy))
 	{
 		label_text = g_strdup_printf (_("%s:"), title);
 	}
@@ -216,7 +222,7 @@ ephy_bookmark_action_sync_label (EggAction *action, GParamSpec *pspec, GtkWidget
 		label_text = g_strdup (title);
 	}
 
-	if (EGG_IS_TOOL_ITEM (proxy))
+	if (GTK_IS_TOOL_ITEM (proxy))
 	{
 		label = g_object_get_data (G_OBJECT (proxy), "label");
 		g_return_if_fail (label != NULL);
@@ -238,7 +244,7 @@ ephy_bookmark_action_sync_label (EggAction *action, GParamSpec *pspec, GtkWidget
 }
 
 static void
-activate_cb (GtkWidget *widget, EggAction *action)
+activate_cb (GtkWidget *widget, GtkAction *action)
 {
 	char *location = NULL;
 	char *text = NULL;
@@ -292,7 +298,7 @@ activate_cb (GtkWidget *widget, EggAction *action)
 }
 
 static gboolean
-create_menu_proxy (EggToolItem *item, EggAction *action)
+create_menu_proxy (GtkToolItem *item, GtkAction *action)
 {
 	EphyBookmarkAction *bm_action = EPHY_BOOKMARK_ACTION (action);
 	GtkWidget *menu_item;
@@ -300,14 +306,14 @@ create_menu_proxy (EggToolItem *item, EggAction *action)
 
 	LOG ("create_menu_proxy item %p, action %p", item, action);
 
-	menu_item = EGG_ACTION_GET_CLASS (action)->create_menu_item (action);
+	menu_item = GTK_ACTION_GET_CLASS (action)->create_menu_item (action);
 
-	EGG_ACTION_GET_CLASS (action)->connect_proxy (action, menu_item);
+	GTK_ACTION_GET_CLASS (action)->connect_proxy (action, menu_item);
 
 	menu_id = g_strdup_printf ("ephy-bookmark-action-%d-menu-id",
 				   bm_action->priv->bookmark_id);
 
-	egg_tool_item_set_proxy_menu_item (item, menu_id, menu_item);
+	gtk_tool_item_set_proxy_menu_item (item, menu_id, menu_item);
 
 	g_free (menu_id);
 
@@ -315,13 +321,13 @@ create_menu_proxy (EggToolItem *item, EggAction *action)
 }
 
 static void
-connect_proxy (EggAction *action, GtkWidget *proxy)
+connect_proxy (GtkAction *action, GtkWidget *proxy)
 {
 	GtkWidget *button, *entry;
 
 	LOG ("Connecting action %p to proxy %p", action, proxy)
 
-	(* EGG_ACTION_CLASS (parent_class)->connect_proxy) (action, proxy);
+	(* GTK_ACTION_CLASS (parent_class)->connect_proxy) (action, proxy);
 
 	ephy_bookmark_action_sync_label (action, NULL, proxy);
 	g_signal_connect_object (action, "notify::label",
@@ -335,7 +341,7 @@ connect_proxy (EggAction *action, GtkWidget *proxy)
 	g_signal_connect_object (action, "notify::smarturl",
 			         G_CALLBACK (ephy_bookmark_action_sync_smart_url), proxy, 0);
 
-	if (EGG_IS_TOOL_ITEM (proxy))
+	if (GTK_IS_TOOL_ITEM (proxy))
 	{
 		button = GTK_WIDGET (g_object_get_data (G_OBJECT (proxy), "button"));
 		g_signal_connect (button, "clicked", G_CALLBACK (activate_cb), action);
@@ -424,13 +430,13 @@ ephy_bookmark_action_finalize (GObject *object)
 static void
 ephy_bookmark_action_class_init (EphyBookmarkActionClass *class)
 {
-	EggActionClass *action_class;
+	GtkActionClass *action_class;
 	GObjectClass *object_class = G_OBJECT_CLASS (class);
 
 	parent_class = g_type_class_peek_parent (class);
-	action_class = EGG_ACTION_CLASS (class);
+	action_class = GTK_ACTION_CLASS (class);
 
-	action_class->toolbar_item_type = EGG_TYPE_TOOL_ITEM;
+	action_class->toolbar_item_type = GTK_TYPE_TOOL_ITEM;
 	action_class->create_tool_item = create_tool_item;
 	action_class->menu_item_type = GTK_TYPE_IMAGE_MENU_ITEM;
 	action_class->connect_proxy = connect_proxy;
@@ -483,7 +489,7 @@ ephy_bookmark_action_class_init (EphyBookmarkActionClass *class)
 }
 
 static void
-sync_bookmark_properties (EggAction *action, EphyNode *bmk)
+sync_bookmark_properties (GtkAction *action, EphyNode *bmk)
 {
 	const char *title, *location, *icon;
 	gboolean smart_url;
@@ -506,7 +512,7 @@ sync_bookmark_properties (EggAction *action, EphyNode *bmk)
 }
 
 static void
-bookmarks_child_changed_cb (EphyNode *node, EphyNode *child, EggAction *action)
+bookmarks_child_changed_cb (EphyNode *node, EphyNode *child, GtkAction *action)
 {
 	gulong id;
 
@@ -537,19 +543,19 @@ ephy_bookmark_action_init (EphyBookmarkAction *action)
 				         G_OBJECT (action));
 }
 
-EggAction *
+GtkAction *
 ephy_bookmark_action_new (const char *name, guint id)
 {
 	EphyNode *bmk;
 	EphyBookmarks *bookmarks;
-	EggAction *action;
+	GtkAction *action;
 
 	bookmarks = ephy_shell_get_bookmarks (ephy_shell);
 
 	bmk = ephy_bookmarks_get_from_id (bookmarks, id);
 	g_return_val_if_fail (bmk != NULL, NULL);
 
-	action =  EGG_ACTION (g_object_new (EPHY_TYPE_BOOKMARK_ACTION,
+	action =  GTK_ACTION (g_object_new (EPHY_TYPE_BOOKMARK_ACTION,
 				            "name", name,
 					    "bookmark_id", id,
 					    NULL));
diff --git a/src/bookmarks/ephy-bookmark-action.h b/src/bookmarks/ephy-bookmark-action.h
index 2aa7a7ed0..d17dfe104 100644
--- a/src/bookmarks/ephy-bookmark-action.h
+++ b/src/bookmarks/ephy-bookmark-action.h
@@ -20,7 +20,7 @@
 #define EPHY_BOOKMARK_ACTION_H
 
 #include <gtk/gtk.h>
-#include <egg-action.h>
+#include <gtk/gtkaction.h>
 
 #define EPHY_TYPE_BOOKMARK_ACTION            (ephy_bookmark_action_get_type ())
 #define EPHY_BOOKMARK_ACTION(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), EPHY_TYPE_BOOKMARK_ACTION, EphyBookmarkAction))
@@ -35,20 +35,20 @@ typedef struct EphyBookmarkActionPrivate EphyBookmarkActionPrivate;
 
 struct _EphyBookmarkAction
 {
-	EggAction parent;
+	GtkAction parent;
 	EphyBookmarkActionPrivate *priv;
 };
 
 struct _EphyBookmarkActionClass
 {
-	EggActionClass parent_class;
+	GtkActionClass parent_class;
 
 	void (*go_location) (EphyBookmarkAction *action, char *location);
 };
 
 GType      ephy_bookmark_action_get_type	(void);
 
-EggAction *ephy_bookmark_action_new		(const char *name,
+GtkAction *ephy_bookmark_action_new		(const char *name,
 						 guint id);
 
 #endif
diff --git a/src/bookmarks/ephy-bookmarks-editor.c b/src/bookmarks/ephy-bookmarks-editor.c
index 952c848e6..aaf111f39 100644
--- a/src/bookmarks/ephy-bookmarks-editor.c
+++ b/src/bookmarks/ephy-bookmarks-editor.c
@@ -29,6 +29,10 @@
 #include <gtk/gtkhpaned.h>
 #include <gtk/gtkhbox.h>
 #include <gtk/gtkvbox.h>
+#include <gtk/gtkactiongroup.h>
+#include <gtk/gtktoggleaction.h>
+#include <gtk/gtkuimanager.h>
+#include <gtk/gtktoggleaction.h>
 #include <gdk/gdkkeysyms.h>
 #include <bonobo/bonobo-i18n.h>
 #include <libgnomeui/gnome-stock-icons.h>
@@ -45,10 +49,6 @@
 #include "ephy-prefs.h"
 #include "ephy-shell.h"
 #include "ephy-file-helpers.h"
-#include "egg-action-group.h"
-#include "egg-toggle-action.h"
-#include "egg-menu-merge.h"
-#include "egg-toggle-action.h"
 #include "popup-commands.h"
 #include "ephy-state.h"
 #include "window-commands.h"
@@ -94,33 +94,33 @@ static void ephy_bookmarks_editor_get_property (GObject *object,
 						GParamSpec *pspec);
 static void ephy_bookmarks_editor_update_menu  (EphyBookmarksEditor *editor);
 
-static void cmd_open_bookmarks_in_tabs    (EggAction *action,
+static void cmd_open_bookmarks_in_tabs    (GtkAction *action,
 					   EphyBookmarksEditor *editor);
-static void cmd_open_bookmarks_in_browser (EggAction *action,
+static void cmd_open_bookmarks_in_browser (GtkAction *action,
 					   EphyBookmarksEditor *editor);
-static void cmd_show_in_bookmarks_bar     (EggAction *action,
+static void cmd_show_in_bookmarks_bar     (GtkAction *action,
 					   EphyBookmarksEditor *editor);
-static void cmd_delete			  (EggAction *action,
+static void cmd_delete			  (GtkAction *action,
 				           EphyBookmarksEditor *editor);
-static void cmd_bookmark_properties	  (EggAction *action,
+static void cmd_bookmark_properties	  (GtkAction *action,
 					   EphyBookmarksEditor *editor);
-static void cmd_bookmarks_import	  (EggAction *action,
+static void cmd_bookmarks_import	  (GtkAction *action,
 					   EphyBookmarksEditor *editor);
-static void cmd_add_topic		  (EggAction *action,
+static void cmd_add_topic		  (GtkAction *action,
 					   EphyBookmarksEditor *editor);
-static void cmd_rename			  (EggAction *action,
+static void cmd_rename			  (GtkAction *action,
 					   EphyBookmarksEditor *editor);
-static void cmd_close			  (EggAction *action,
+static void cmd_close			  (GtkAction *action,
 					   EphyBookmarksEditor *editor);
-static void cmd_cut			  (EggAction *action,
+static void cmd_cut			  (GtkAction *action,
 					   EphyBookmarksEditor *editor);
-static void cmd_copy			  (EggAction *action,
+static void cmd_copy			  (GtkAction *action,
 					   EphyBookmarksEditor *editor);
-static void cmd_paste			  (EggAction *action,
+static void cmd_paste			  (GtkAction *action,
 					   EphyBookmarksEditor *editor);
-static void cmd_select_all		  (EggAction *action,
+static void cmd_select_all		  (GtkAction *action,
 					   EphyBookmarksEditor *editor);
-static void cmd_help_contents		  (EggAction *action,
+static void cmd_help_contents		  (GtkAction *action,
 					   EphyBookmarksEditor *editor);
 
 struct EphyBookmarksEditorPrivate
@@ -132,8 +132,8 @@ struct EphyBookmarksEditorPrivate
 	GtkWidget *search_entry;
 	GtkWidget *menu_dock;
 	GtkWidget *window;
-	EggMenuMerge *ui_merge;
-	EggActionGroup *action_group;
+	GtkUIManager *ui_merge;
+	GtkActionGroup *action_group;
 	int priority_col;
 	EphyToolbarsModel *tb_model;
 	GHashTable *props_dialogs;
@@ -147,58 +147,57 @@ enum
 
 static GObjectClass *parent_class = NULL;
 
-static EggActionGroupEntry ephy_bookmark_popup_entries [] = {
+static GtkActionEntry ephy_bookmark_popup_entries [] = {
 	/* Toplevel */
-	{ "File", N_("_File"), NULL, NULL, NULL, NULL, NULL },
-	{ "Edit", N_("_Edit"), NULL, NULL, NULL, NULL, NULL },
-	{ "View", N_("_View"), NULL, NULL, NULL, NULL, NULL },
-	{ "Help", N_("_Help"), NULL, NULL, NULL, NULL, NULL },
-	{ "FakeToplevel", (""), NULL, NULL, NULL, NULL, NULL },
+	{ "File", NULL, N_("_File") },
+	{ "Edit", NULL, N_("_Edit") },
+	{ "View", NULL, N_("_View") },
+	{ "Help", NULL, N_("_Help") },
 
 	/* File Menu*/
-	{ "NewTopic", N_("_New Topic"), GTK_STOCK_NEW, "<control>N",
+	{ "NewTopic", GTK_STOCK_NEW, N_("_New Topic"), "<control>N",
 	  N_("Create a new topic"), 
-	  G_CALLBACK (cmd_add_topic), NULL },
-	{ "OpenInWindow", N_("_Open in New Window"), GTK_STOCK_OPEN, "<control>O",
+	  G_CALLBACK (cmd_add_topic) },
+	{ "OpenInWindow", GTK_STOCK_OPEN, N_("_Open in New Window"), "<control>O",
 	  N_("Open the selected bookmark in a new window"), 
-	  G_CALLBACK (cmd_open_bookmarks_in_browser), NULL },
-	{ "OpenInTab", N_("Open in New _Tab"), NULL, "<shift><control>O",
+	  G_CALLBACK (cmd_open_bookmarks_in_browser) },
+	{ "OpenInTab", NULL, N_("Open in New _Tab"), "<shift><control>O",
 	  N_("Open the selected bookmark in a new tab"), 
-	  G_CALLBACK (cmd_open_bookmarks_in_tabs), NULL },
-	{ "Rename", N_("_Rename..."), NULL, "F2",
-	  N_("Rename the selected bookmark or topic"), G_CALLBACK (cmd_rename), NULL },
-	{ "Delete", N_("_Delete"), GTK_STOCK_DELETE, NULL,
+	  G_CALLBACK (cmd_open_bookmarks_in_tabs) },
+	{ "Rename", NULL, N_("_Rename..."), "F2",
+	  N_("Rename the selected bookmark or topic"), G_CALLBACK (cmd_rename) },
+	{ "Delete", GTK_STOCK_DELETE, N_("_Delete"), NULL,
 	  N_("Delete the selected bookmark or topic"), 
-	  G_CALLBACK (cmd_delete), NULL },
-	{ "ShowInBookmarksBar", N_("_Show in Bookmarks Bar"), NULL, NULL,
+	  G_CALLBACK (cmd_delete) },
+	{ "ShowInBookmarksBar", NULL, N_("_Show in Bookmarks Bar"), NULL,
 	  N_("Show the selected bookmark or topic in the bookmarks bar"), 
-	  G_CALLBACK (cmd_show_in_bookmarks_bar), NULL, TOGGLE_ACTION },
-	{ "Properties", N_("_Properties"), GTK_STOCK_PROPERTIES, "<alt>Return",
+	  G_CALLBACK (cmd_show_in_bookmarks_bar), TRUE },
+	{ "Properties", GTK_STOCK_PROPERTIES, N_("_Properties"), "<alt>Return",
 	  N_("View or modify the properties of the selected bookmark"), 
-	  G_CALLBACK (cmd_bookmark_properties), NULL },
-	{ "Import", N_("_Import Bookmarks..."), NULL, NULL,
+	  G_CALLBACK (cmd_bookmark_properties) },
+	{ "Import", NULL, N_("_Import Bookmarks..."), NULL,
 	  N_("Import bookmarks from another browser or a bookmarks file"), 
-	  G_CALLBACK (cmd_bookmarks_import), NULL },
-	{ "Close", N_("_Close"), GTK_STOCK_CLOSE, "<control>W",
+	  G_CALLBACK (cmd_bookmarks_import) },
+	{ "Close", GTK_STOCK_CLOSE, N_("_Close"), "<control>W",
 	  N_("Close the bookmarks window"), 
-	  G_CALLBACK (cmd_close), NULL },
+	  G_CALLBACK (cmd_close) },
 
 	/* Edit Menu */
-	{ "Cut", N_("Cu_t"), GTK_STOCK_CUT, "<control>X",
+	{ "Cut", GTK_STOCK_CUT, N_("Cu_t"), "<control>X",
 	  N_("Cut the selection"), 
-	  G_CALLBACK (cmd_cut), NULL },
-	{ "Copy", N_("_Copy"), GTK_STOCK_COPY, "<control>C",
+	  G_CALLBACK (cmd_cut) },
+	{ "Copy", GTK_STOCK_COPY, N_("_Copy"), "<control>C",
 	  N_("Copy the selection"), 
-	  G_CALLBACK (cmd_copy), NULL },
-	{ "Paste", N_("_Paste"), GTK_STOCK_PASTE, "<control>V",
+	  G_CALLBACK (cmd_copy) },
+	{ "Paste", GTK_STOCK_PASTE, N_("_Paste"), "<control>V",
 	  N_("Paste the clipboard"), 
-	  G_CALLBACK (cmd_paste), NULL },
-	{ "SelectAll", N_("Select _All"), NULL, "<control>A",
+	  G_CALLBACK (cmd_paste) },
+	{ "SelectAll", NULL, N_("Select _All"), "<control>A",
 	  N_("Select all bookmarks or text"), 
-	  G_CALLBACK (cmd_select_all), NULL },
+	  G_CALLBACK (cmd_select_all) },
 	
 	/* View Menu */
-	{ "ViewTitle", N_("_Title"), NULL, NULL,
+/*	{ "ViewTitle", N_("_Title"), NULL, NULL,
 	  N_("Show only the title column"), 
 	  NULL, NULL, RADIO_ACTION, NULL },
 	{ "ViewLocation", N_("_Address"), NULL, NULL,
@@ -206,15 +205,15 @@ static EggActionGroupEntry ephy_bookmark_popup_entries [] = {
 	  NULL, NULL, RADIO_ACTION, "ViewTitle" },
 	{ "ViewTitleLocation", N_("T_itle and Address"), NULL, NULL,
 	  N_("Show both the title and address columns"), 
-	  NULL, NULL, RADIO_ACTION, "ViewTitle" },	
+	  NULL, NULL, RADIO_ACTION, "ViewTitle" },	*/
 
 	/* Help Menu */	
-	{ "HelpContents", N_("_Contents"), GTK_STOCK_HELP, "F1",
+	{ "HelpContents", GTK_STOCK_HELP, N_("_Contents"), "F1",
 	  N_("Display bookmarks help"), 
-	  G_CALLBACK (cmd_help_contents), NULL },
-	{ "HelpAbout", N_("_About"), GNOME_STOCK_ABOUT, NULL,
+	  G_CALLBACK (cmd_help_contents) },
+	{ "HelpAbout", GNOME_STOCK_ABOUT, N_("_About"), NULL,
 	  N_("Display credits for the web browser creators"),
-	  G_CALLBACK (window_cmd_help_about), NULL },
+	  G_CALLBACK (window_cmd_help_about) },
 };
 static guint ephy_bookmark_popup_n_entries = G_N_ELEMENTS (ephy_bookmark_popup_entries);
 
@@ -249,7 +248,7 @@ add_text_renderer_monitor (EphyBookmarksEditor *editor)
 }
 
 static void
-cmd_add_topic (EggAction *action,
+cmd_add_topic (GtkAction *action,
 	       EphyBookmarksEditor *editor)
 {
 	EphyNode *node;
@@ -262,14 +261,14 @@ cmd_add_topic (EggAction *action,
 }
 
 static void
-cmd_close (EggAction *action,
+cmd_close (GtkAction *action,
 	   EphyBookmarksEditor *editor)
 {
 	gtk_widget_hide (GTK_WIDGET (editor));
 }
 
 static void
-cmd_rename (EggAction *action,
+cmd_rename (GtkAction *action,
 	    EphyBookmarksEditor *editor)
 {
 	if (ephy_node_view_is_target (EPHY_NODE_VIEW (editor->priv->bm_view)))
@@ -297,7 +296,7 @@ get_target_window (EphyBookmarksEditor *editor)
 }
 
 static void
-cmd_show_in_bookmarks_bar (EggAction *action,
+cmd_show_in_bookmarks_bar (GtkAction *action,
 		           EphyBookmarksEditor *editor)
 {
 	EphyNode *node;
@@ -324,7 +323,7 @@ cmd_show_in_bookmarks_bar (EggAction *action,
 
 	node = selection->data;
 	id = ephy_node_get_id (node);
-	state = EGG_TOGGLE_ACTION (action)->active;
+	state = gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action));
 
 	if (state)
 	{
@@ -341,7 +340,7 @@ cmd_show_in_bookmarks_bar (EggAction *action,
 }
 
 static void
-cmd_open_bookmarks_in_tabs (EggAction *action,
+cmd_open_bookmarks_in_tabs (GtkAction *action,
 			    EphyBookmarksEditor *editor)
 {
 	EphyWindow *window;
@@ -367,7 +366,7 @@ cmd_open_bookmarks_in_tabs (EggAction *action,
 }
 
 static void
-cmd_open_bookmarks_in_browser (EggAction *action,
+cmd_open_bookmarks_in_browser (GtkAction *action,
 			       EphyBookmarksEditor *editor)
 {
 	EphyWindow *window;
@@ -393,7 +392,7 @@ cmd_open_bookmarks_in_browser (EggAction *action,
 }
 
 static void
-cmd_delete (EggAction *action,
+cmd_delete (GtkAction *action,
 	    EphyBookmarksEditor *editor)
 {
 	if (ephy_node_view_is_target (EPHY_NODE_VIEW (editor->priv->bm_view)))
@@ -498,7 +497,7 @@ import_dialog_response_cb (GtkDialog *dialog, gint response,
 }
 
 static void
-cmd_bookmarks_import (EggAction *action,
+cmd_bookmarks_import (GtkAction *action,
 		      EphyBookmarksEditor *editor)
 {
 	GtkWidget *dialog;
@@ -556,7 +555,7 @@ cmd_bookmarks_import (EggAction *action,
 }
 
 static void
-cmd_bookmark_properties (EggAction *action,
+cmd_bookmark_properties (GtkAction *action,
 			 EphyBookmarksEditor *editor)
 {
 	GList *selection;
@@ -574,7 +573,7 @@ cmd_bookmark_properties (EggAction *action,
 }
 
 static void
-cmd_cut (EggAction *action,
+cmd_cut (GtkAction *action,
 	 EphyBookmarksEditor *editor)
 {
 	GtkWidget *widget = gtk_window_get_focus (GTK_WINDOW (editor));
@@ -586,7 +585,7 @@ cmd_cut (EggAction *action,
 }
 
 static void
-cmd_copy (EggAction *action,
+cmd_copy (GtkAction *action,
 	  EphyBookmarksEditor *editor)
 {
 	GtkWidget *widget = gtk_window_get_focus (GTK_WINDOW (editor));
@@ -615,7 +614,7 @@ cmd_copy (EggAction *action,
 }
 
 static void
-cmd_paste (EggAction *action,
+cmd_paste (GtkAction *action,
 	   EphyBookmarksEditor *editor)
 {
 	GtkWidget *widget = gtk_window_get_focus (GTK_WINDOW (editor));
@@ -627,7 +626,7 @@ cmd_paste (EggAction *action,
 }
 
 static void
-cmd_select_all (EggAction *action,
+cmd_select_all (GtkAction *action,
 		EphyBookmarksEditor *editor)
 {
 	GtkWidget *widget = gtk_window_get_focus (GTK_WINDOW (editor));
@@ -647,7 +646,7 @@ cmd_select_all (EggAction *action,
 }
 
 static void
-cmd_help_contents (EggAction *action,
+cmd_help_contents (GtkAction *action,
 		   EphyBookmarksEditor *editor)
 {
 	ephy_gui_help (GTK_WINDOW (editor), 
@@ -720,7 +719,7 @@ ephy_bookmarks_editor_finalize (GObject *object)
 	g_object_unref (G_OBJECT (editor->priv->bookmarks_filter));
 
 	g_object_unref (editor->priv->action_group);
-	egg_menu_merge_remove_action_group (editor->priv->ui_merge,
+	gtk_ui_manager_remove_action_group (editor->priv->ui_merge,
 					    editor->priv->action_group);
 	g_object_unref (editor->priv->ui_merge);
 
@@ -768,8 +767,8 @@ ephy_bookmarks_editor_update_menu (EphyBookmarksEditor *editor)
 	gboolean bmk_multiple_selection;
 	gboolean cut, copy, paste, select_all;
 	gboolean can_show_in_bookmarks_bar, show_in_bookmarks_bar = FALSE;
-	EggActionGroup *action_group;
-	EggAction *action;
+	GtkActionGroup *action_group;
+	GtkAction *action;
 	GList *selected;
 	GtkWidget *focus_widget;
 
@@ -874,37 +873,37 @@ ephy_bookmarks_editor_update_menu (EphyBookmarksEditor *editor)
 		 (key_selection && key_focus);
 
 	action_group = editor->priv->action_group;
-	action = egg_action_group_get_action (action_group, "OpenInWindow");
+	action = gtk_action_group_get_action (action_group, "OpenInWindow");
 	g_object_set (action, "sensitive", open_in_window, NULL);
 	g_object_set (action, "label", open_in_window_label, NULL);
-	action = egg_action_group_get_action (action_group, "OpenInTab");
+	action = gtk_action_group_get_action (action_group, "OpenInTab");
 	g_object_set (action, "sensitive", open_in_tab, NULL);
 	g_object_set (action, "label", open_in_tab_label, NULL);
-	action = egg_action_group_get_action (action_group, "Rename");
+	action = gtk_action_group_get_action (action_group, "Rename");
 	g_object_set (action, "sensitive", rename, NULL);
-	action = egg_action_group_get_action (action_group, "Delete");
+	action = gtk_action_group_get_action (action_group, "Delete");
 	g_object_set (action, "sensitive", delete, NULL);
-	action = egg_action_group_get_action (action_group, "Properties");
+	action = gtk_action_group_get_action (action_group, "Properties");
 	g_object_set (action, "sensitive", properties, NULL);
-	action = egg_action_group_get_action (action_group, "Cut");
+	action = gtk_action_group_get_action (action_group, "Cut");
 	g_object_set (action, "sensitive", cut, NULL);
-	action = egg_action_group_get_action (action_group, "Copy");
+	action = gtk_action_group_get_action (action_group, "Copy");
 	g_object_set (action, "sensitive", copy, NULL);
 	g_object_set (action, "label", copy_label, NULL);
-	action = egg_action_group_get_action (action_group, "Paste");
+	action = gtk_action_group_get_action (action_group, "Paste");
 	g_object_set (action, "sensitive", paste, NULL);
-	action = egg_action_group_get_action (action_group, "SelectAll");
+	action = gtk_action_group_get_action (action_group, "SelectAll");
 	g_object_set (action, "sensitive", select_all, NULL);
-	action = egg_action_group_get_action (action_group, "ShowInBookmarksBar");
+	action = gtk_action_group_get_action (action_group, "ShowInBookmarksBar");
 	g_object_set (action, "sensitive", can_show_in_bookmarks_bar, NULL);
 
 	g_signal_handlers_block_by_func
-		(G_OBJECT (EGG_TOGGLE_ACTION (action)),
+		(G_OBJECT (GTK_TOGGLE_ACTION (action)),
 		 G_CALLBACK (cmd_show_in_bookmarks_bar),
 		 editor);
-	egg_toggle_action_set_active (EGG_TOGGLE_ACTION (action), show_in_bookmarks_bar);
+	gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), show_in_bookmarks_bar);
 	g_signal_handlers_unblock_by_func
-		(G_OBJECT (EGG_TOGGLE_ACTION (action)),
+		(G_OBJECT (GTK_TOGGLE_ACTION (action)),
 		 G_CALLBACK (cmd_show_in_bookmarks_bar),
 		 editor);
 }
@@ -946,7 +945,7 @@ ephy_bookmarks_editor_show_popup_cb (GtkWidget *view,
 {
 	GtkWidget *widget;
 
-	widget = egg_menu_merge_get_widget (editor->priv->ui_merge,
+	widget = gtk_ui_manager_get_widget (editor->priv->ui_merge,
 					    "/popups/EphyBookmarkEditorPopup");
 	gtk_menu_popup (GTK_MENU (widget), NULL, NULL, NULL, NULL, 2,
 			gtk_get_current_event_time ());
@@ -1037,7 +1036,7 @@ keyword_node_show_popup_cb (GtkWidget *view, EphyBookmarksEditor *editor)
 {
 	GtkWidget *widget;
 
-	widget = egg_menu_merge_get_widget (editor->priv->ui_merge,
+	widget = gtk_ui_manager_get_widget (editor->priv->ui_merge,
 					   "/popups/EphyBookmarkKeywordPopup");
 	gtk_menu_popup (GTK_MENU (widget), NULL, NULL, NULL, NULL, 2,
 			gtk_get_current_event_time ());
@@ -1118,7 +1117,7 @@ build_search_box (EphyBookmarksEditor *editor)
 }
 
 static void
-add_widget (EggMenuMerge *merge, GtkWidget *widget, EphyBookmarksEditor *editor)
+add_widget (GtkUIManager *merge, GtkWidget *widget, EphyBookmarksEditor *editor)
 {
 	gtk_box_pack_start (GTK_BOX (editor->priv->menu_dock),
 			    widget, FALSE, FALSE, 0);
@@ -1206,11 +1205,11 @@ ephy_bookmarks_editor_construct (EphyBookmarksEditor *editor)
 	GtkWidget *bm_view, *key_view;
 	GtkWidget *scrolled_window;
 	EphyNode *node;
-	EggMenuMerge *ui_merge;
-	EggActionGroup *action_group;
-	EggAction *action;
+	GtkUIManager *ui_merge;
+	GtkActionGroup *action_group;
+	GtkAction *action;
 	GdkPixbuf *icon;
-	int i, col_id;
+	int col_id;
 
 	gtk_window_set_title (GTK_WINDOW (editor), _("Bookmarks"));
 
@@ -1223,33 +1222,29 @@ ephy_bookmarks_editor_construct (EphyBookmarksEditor *editor)
 	g_signal_connect (editor, "delete_event",
 			  G_CALLBACK (delete_event_cb), NULL);
 
-	for (i = 0; i < ephy_bookmark_popup_n_entries; i++)
-	{
-		ephy_bookmark_popup_entries[i].user_data = editor;
-	}
-
 	editor->priv->menu_dock = gtk_vbox_new (FALSE, 0);
 	gtk_widget_show (editor->priv->menu_dock);
 	gtk_container_add (GTK_CONTAINER (editor), editor->priv->menu_dock);
 
-	ui_merge = egg_menu_merge_new ();
+	ui_merge = gtk_ui_manager_new ();
 	g_signal_connect (ui_merge, "add_widget", G_CALLBACK (add_widget), editor);
-	action_group = egg_action_group_new ("PopupActions");
-	egg_action_group_add_actions (action_group, ephy_bookmark_popup_entries,
-				      ephy_bookmark_popup_n_entries);
-	egg_menu_merge_insert_action_group (ui_merge,
+	action_group = gtk_action_group_new ("PopupActions");
+	gtk_action_group_add_actions (action_group, ephy_bookmark_popup_entries,
+				      ephy_bookmark_popup_n_entries, editor);
+	gtk_ui_manager_insert_action_group (ui_merge,
 					    action_group, 0);
-	egg_menu_merge_add_ui_from_file (ui_merge,
+	gtk_ui_manager_add_ui_from_file (ui_merge,
 				         ephy_file ("epiphany-bookmark-editor-ui.xml"),
 				         NULL);
-	gtk_window_add_accel_group (GTK_WINDOW (editor), ui_merge->accel_group);
-	egg_menu_merge_ensure_update (ui_merge);
+	gtk_window_add_accel_group (GTK_WINDOW (editor), 
+				    gtk_ui_manager_get_accel_group (ui_merge));
+	/* FIXME gtk_ui_manager_ensure_update (ui_merge); */
 	editor->priv->ui_merge = ui_merge;
 	editor->priv->action_group = action_group;
 
 	/* Fixme: We should implement gconf prefs for monitoring this setting */
-	action = egg_action_group_get_action (action_group, "ViewTitle");
-	egg_toggle_action_set_active (EGG_TOGGLE_ACTION (action), TRUE);
+	action = gtk_action_group_get_action (action_group, "ViewTitle");
+	gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), TRUE);
 
 	hpaned = gtk_hpaned_new ();
 	gtk_container_set_border_width (GTK_CONTAINER (hpaned), 0);
diff --git a/src/bookmarks/ephy-bookmarks-menu.c b/src/bookmarks/ephy-bookmarks-menu.c
index 9231d7a4c..b34056ac6 100644
--- a/src/bookmarks/ephy-bookmarks-menu.c
+++ b/src/bookmarks/ephy-bookmarks-menu.c
@@ -22,7 +22,6 @@
 
 #include "ephy-bookmarks-menu.h"
 #include "ephy-bookmark-action.h"
-#include "egg-menu-merge.h"
 #include "ephy-shell.h"
 #include "ephy-node-common.h"
 #include "ephy-debug.h"
@@ -31,6 +30,7 @@
 #include <stdlib.h>
 #include <libxml/entities.h>
 #include <bonobo/bonobo-i18n.h>
+#include <gtk/gtkuimanager.h>
 
 #define EMPTY_ACTION_NAME "GoBookmarkEmpty"
 
@@ -41,7 +41,7 @@ struct _EphyBookmarksMenuPrivate
 {
 	EphyWindow *window;
 	EphyBookmarks *bookmarks;
-	EggActionGroup *action_group;
+	GtkActionGroup *action_group;
 	guint ui_id;
 	guint update_tag;
 };
@@ -92,24 +92,24 @@ static void
 ephy_bookmarks_menu_clean (EphyBookmarksMenu *menu)
 {
 	EphyBookmarksMenuPrivate *p = menu->priv;
-	EggMenuMerge *merge = EGG_MENU_MERGE (p->window->ui_merge);
+	GtkUIManager *merge = GTK_UI_MANAGER (p->window->ui_merge);
 
 	if (p->ui_id > 0)
 	{
-		egg_menu_merge_remove_ui (merge, p->ui_id);
-		egg_menu_merge_ensure_update (merge);
+		gtk_ui_manager_remove_ui (merge, p->ui_id);
+		/* FIXME gtk_ui_manager_ensure_update (merge); */
 		p->ui_id = 0;
 	}
 
 	if (p->action_group != NULL)
 	{
-		egg_menu_merge_remove_action_group (merge, p->action_group);
+		gtk_ui_manager_remove_action_group (merge, p->action_group);
 		g_object_unref (p->action_group);
 	}
 }
 
 static void
-go_location_cb (EggAction *action, char *location, EphyWindow *window)
+go_location_cb (GtkAction *action, char *location, EphyWindow *window)
 {
 	ephy_window_load_url (window, location);
 }
@@ -212,7 +212,7 @@ add_bookmarks_menu (EphyBookmarksMenu *menu, EphyNode *node, GString *xml)
 
 		for (l = node_list; l != NULL; l = l->next)
 		{
-			EggAction *action;
+			GtkAction *action;
 			EphyNode *child;
 			long id;
 			char *verb;
@@ -222,7 +222,7 @@ add_bookmarks_menu (EphyBookmarksMenu *menu, EphyNode *node, GString *xml)
 			verb = g_strdup_printf ("OpenBookmark%ld", id);
 
 			action = ephy_bookmark_action_new (verb, id);
-			egg_action_group_add_action (p->action_group, action);
+			gtk_action_group_add_action (p->action_group, action);
 			g_object_unref (action);
 			g_signal_connect (action, "go_location",
 					  G_CALLBACK (go_location_cb), p->window);
@@ -252,9 +252,9 @@ ephy_bookmarks_menu_rebuild (EphyBookmarksMenu *menu)
 	EphyNode *topics;
 	EphyNode *not_categorized;
 	GPtrArray *children;
-	EggMenuMerge *merge = EGG_MENU_MERGE (p->window->ui_merge);
+	GtkUIManager *merge = GTK_UI_MANAGER (p->window->ui_merge);
 	GList *node_list = NULL, *l;
-	EggAction *empty;
+	GtkAction *empty;
 
 	LOG ("Rebuilding bookmarks menu")
 
@@ -271,16 +271,16 @@ ephy_bookmarks_menu_rebuild (EphyBookmarksMenu *menu)
 			      "<placeholder name=\"BookmarksTree\">"
 			      "<separator name=\"BookmarksSep1\"/>");
 
-	p->action_group = egg_action_group_new ("BookmarksActions");
-	egg_menu_merge_insert_action_group (merge, p->action_group, 0);
+	p->action_group = gtk_action_group_new ("BookmarksActions");
+	gtk_ui_manager_insert_action_group (merge, p->action_group, 0);
 
-	empty = g_object_new (EGG_TYPE_ACTION,
+	empty = g_object_new (GTK_TYPE_ACTION,
 			      "name", EMPTY_ACTION_NAME,
 			      /* This is the adjective, not the verb */
 			      "label", _("Empty"),
 			      "sensitive", FALSE,
 			      NULL);
-	egg_action_group_add_action (p->action_group, empty);
+	gtk_action_group_add_action (p->action_group, empty);
 	g_object_unref (empty);
 
 	for (i = 0; i < children->len; ++i)
@@ -307,17 +307,17 @@ ephy_bookmarks_menu_rebuild (EphyBookmarksMenu *menu)
 		char *verb;
 		const char *title;
 		EphyNode *child;
-		EggAction *action;
+		GtkAction *action;
 
 		child = l->data;
 		title = ephy_node_get_property_string (child, EPHY_NODE_KEYWORD_PROP_NAME);
 
 		verb = g_strdup_printf ("OpenTopic%ld", ephy_node_get_id (child));
-		action = g_object_new (EGG_TYPE_ACTION,
+		action = g_object_new (GTK_TYPE_ACTION,
 				       "name", verb,
 				       "label", title,
 				       NULL);
-		egg_action_group_add_action (p->action_group, action);
+		gtk_action_group_add_action (p->action_group, action);
 		g_object_unref (action);
 
 		g_string_append (xml, "<submenu name=\"");
@@ -345,7 +345,7 @@ ephy_bookmarks_menu_rebuild (EphyBookmarksMenu *menu)
 	{
 		GError *error = NULL;
 		LOG ("Merging ui\n%s",xml->str);
-		p->ui_id = egg_menu_merge_add_ui_from_string
+		p->ui_id = gtk_ui_manager_add_ui_from_string
 			(merge, xml->str, -1, &error);
 	}
 
@@ -459,8 +459,8 @@ ephy_bookmarks_menu_finalize (GObject *o)
 
 	if (p->action_group != NULL)
 	{
-		egg_menu_merge_remove_action_group
-			(EGG_MENU_MERGE (p->window->ui_merge),
+		gtk_ui_manager_remove_action_group
+			(GTK_UI_MANAGER (p->window->ui_merge),
 			 p->action_group);
 		g_object_unref (p->action_group);
 	}
diff --git a/src/bookmarks/ephy-topic-action.c b/src/bookmarks/ephy-topic-action.c
index 7fa6ab705..ed69d4e1c 100644
--- a/src/bookmarks/ephy-topic-action.c
+++ b/src/bookmarks/ephy-topic-action.c
@@ -22,12 +22,13 @@
 #include <config.h>
 #endif
 
-#include "ephy-node-common.h"
+#include <gtk/gtktoolitem.h>
+
 #include "ephy-topic-action.h"
+#include "ephy-node-common.h"
 #include "ephy-bookmarks.h"
 #include "ephy-favicon-cache.h"
 #include "ephy-shell.h"
-#include "eggtoolitem.h"
 #include "ephy-debug.h"
 #include "ephy-gui.h"
 #include "ephy-string.h"
@@ -76,7 +77,7 @@ ephy_topic_action_get_type (void)
 			(GInstanceInitFunc) ephy_topic_action_init,
 		};
 
-		type = g_type_register_static (EGG_TYPE_ACTION,
+		type = g_type_register_static (GTK_TYPE_ACTION,
 					       "EphyTopicAction",
 					       &type_info, 0);
 	}
@@ -84,7 +85,7 @@ ephy_topic_action_get_type (void)
 }
 
 static GtkWidget *
-create_tool_item (EggAction *action)
+create_tool_item (GtkAction *action)
 {
 	GtkWidget *item;
 	GtkWidget *button;
@@ -92,7 +93,7 @@ create_tool_item (EggAction *action)
 	GtkWidget *hbox;
 	GtkWidget *label;
 
-	item = (* EGG_ACTION_CLASS (parent_class)->create_tool_item) (action);
+	item = (* GTK_ACTION_CLASS (parent_class)->create_tool_item) (action);
 
 	hbox = gtk_hbox_new (FALSE, 0);
 	gtk_widget_show (hbox);
@@ -128,7 +129,7 @@ menu_deactivate_cb (GtkMenuShell *ms, GtkWidget *button)
 }
 
 static void
-menu_activate_cb (GtkWidget *item, EggAction *action)
+menu_activate_cb (GtkWidget *item, GtkAction *action)
 {
 	EphyNode *node;
 	const char *location;
@@ -141,13 +142,20 @@ menu_activate_cb (GtkWidget *item, EggAction *action)
 }
 
 static void
-ephy_topic_action_sync_label (EggAction *action, GParamSpec *pspec, GtkWidget *proxy)
+ephy_topic_action_sync_label (GtkAction *action, GParamSpec *pspec, GtkWidget *proxy)
 {
 	GtkWidget *label = NULL;
+	GValue value = { 0, };
+	const char *label_text;
+
+	g_value_init (&value, G_TYPE_STRING);
+	g_object_get_property (G_OBJECT (action), "label", &value);
+
+	label_text = g_value_get_string (&value);
 
 	LOG ("Set bookmark action proxy label to %s", action->label)
 
-	if (EGG_IS_TOOL_ITEM (proxy))
+	if (GTK_IS_TOOL_ITEM (proxy))
 	{
 		label = GTK_WIDGET (g_object_get_data (G_OBJECT (proxy), "label"));
 	}
@@ -163,10 +171,12 @@ ephy_topic_action_sync_label (EggAction *action, GParamSpec *pspec, GtkWidget *p
 
 	g_return_if_fail (label != NULL);
 
-	if (action->label)
+	if (label_text)
 	{
-		gtk_label_set_label (GTK_LABEL (label), action->label);
+		gtk_label_set_label (GTK_LABEL (label), label_text);
 	}
+
+	g_value_unset (&value);
 }
 
 static int
@@ -445,13 +455,22 @@ button_pressed_cb (GtkWidget *button,
 }
 
 static GtkWidget *
-create_menu_item (EggAction *action)
+create_menu_item (GtkAction *action)
 {
 	GtkWidget *menu, *menu_item;
+	GValue value = { 0, };
+	const char *label_text;
+
+	g_value_init (&value, G_TYPE_STRING);
+	g_object_get_property (G_OBJECT (action), "label", &value);
+
+	label_text = g_value_get_string (&value);
 
 	LOG ("create_menu_item action %p", action)
 
-	menu_item = gtk_menu_item_new_with_label (action->label);
+	menu_item = gtk_menu_item_new_with_label (label_text);
+
+	g_value_unset (&value);
 
 	menu = build_menu (EPHY_TOPIC_ACTION (action));
 	gtk_widget_show (menu);
@@ -462,7 +481,7 @@ create_menu_item (EggAction *action)
 }
 
 static gboolean
-create_menu_proxy (EggToolItem *item, EggAction *action)
+create_menu_proxy (GtkToolItem *item, GtkAction *action)
 {
 	GtkWidget *menu_item;
 	char *menu_id;
@@ -474,7 +493,7 @@ create_menu_proxy (EggToolItem *item, EggAction *action)
 	menu_id = g_strdup_printf ("ephy-topic-action-%d-menu-id",
 				   EPHY_TOPIC_ACTION (action)->priv->topic_id);
 
-	egg_tool_item_set_proxy_menu_item (item, menu_id, menu_item);
+	gtk_tool_item_set_proxy_menu_item (item, menu_id, menu_item);
 
 	g_free (menu_id);
 
@@ -482,19 +501,19 @@ create_menu_proxy (EggToolItem *item, EggAction *action)
 }
 
 static void
-connect_proxy (EggAction *action, GtkWidget *proxy)
+connect_proxy (GtkAction *action, GtkWidget *proxy)
 {
 	GtkWidget *button;
 
 	LOG ("connect_proxy action %p, proxy %p", action, proxy)
 
-	(* EGG_ACTION_CLASS (parent_class)->connect_proxy) (action, proxy);
+	(* GTK_ACTION_CLASS (parent_class)->connect_proxy) (action, proxy);
 
 	ephy_topic_action_sync_label (action, NULL, proxy);
 	g_signal_connect_object (action, "notify::label",
 			         G_CALLBACK (ephy_topic_action_sync_label), proxy, 0);
 
-	if (EGG_IS_TOOL_ITEM (proxy))
+	if (GTK_IS_TOOL_ITEM (proxy))
 	{
 		g_signal_connect_object (proxy, "create_menu_proxy",
 					 G_CALLBACK (create_menu_proxy),
@@ -567,13 +586,13 @@ ephy_topic_action_finalize (GObject *object)
 static void
 ephy_topic_action_class_init (EphyTopicActionClass *class)
 {
-	EggActionClass *action_class;
+	GtkActionClass *action_class;
 	GObjectClass *object_class = G_OBJECT_CLASS (class);
 
 	parent_class = g_type_class_peek_parent (class);
-	action_class = EGG_ACTION_CLASS (class);
+	action_class = GTK_ACTION_CLASS (class);
 
-	action_class->toolbar_item_type = EGG_TYPE_TOOL_ITEM;
+	action_class->toolbar_item_type = GTK_TYPE_TOOL_ITEM;
 	action_class->create_tool_item = create_tool_item;
 	action_class->create_menu_item = create_menu_item;
 	action_class->connect_proxy = connect_proxy;
@@ -605,7 +624,7 @@ ephy_topic_action_class_init (EphyTopicActionClass *class)
 }
 
 static void
-sync_topic_properties (EggAction *action, EphyNode *bmk)
+sync_topic_properties (GtkAction *action, EphyNode *bmk)
 {
 	const char *title;
 
@@ -616,7 +635,7 @@ sync_topic_properties (EggAction *action, EphyNode *bmk)
 }
 
 static void
-topic_child_changed_cb (EphyNode *node, EphyNode *child, EggAction *action)
+topic_child_changed_cb (EphyNode *node, EphyNode *child, GtkAction *action)
 {
 	gulong id;
 
@@ -643,19 +662,19 @@ ephy_topic_action_init (EphyTopicAction *action)
 				         G_OBJECT (action));
 }
 
-EggAction *
+GtkAction *
 ephy_topic_action_new (const char *name, guint id)
 {
 	EphyNode *bmk;
 	EphyBookmarks *bookmarks;
-	EggAction *action;
+	GtkAction *action;
 
 	bookmarks = ephy_shell_get_bookmarks (ephy_shell);
 
 	bmk = ephy_bookmarks_get_from_id (bookmarks, id);
 	g_return_val_if_fail (bmk != NULL, NULL);
 
-	action = EGG_ACTION (g_object_new (EPHY_TYPE_TOPIC_ACTION,
+	action = GTK_ACTION (g_object_new (EPHY_TYPE_TOPIC_ACTION,
 					   "topic_id", id,
 					   "name", name,
 					   NULL));
diff --git a/src/ephy-encoding-menu.c b/src/ephy-encoding-menu.c
index 9aa03e84a..8a45be281 100644
--- a/src/ephy-encoding-menu.c
+++ b/src/ephy-encoding-menu.c
@@ -36,7 +36,7 @@
 struct _EphyEncodingMenuPrivate
 {
 	EphyWindow *window;
-	EggActionGroup *action_group;
+	GtkActionGroup *action_group;
 };
 
 /**
@@ -127,8 +127,8 @@ ephy_encoding_menu_finalize_impl (GObject *o)
 
 	if (p->action_group != NULL)
 	{
-		egg_menu_merge_remove_action_group
-			(EGG_MENU_MERGE (p->window->ui_merge),
+		gtk_ui_manager_remove_action_group
+			(GTK_UI_MANAGER (p->window->ui_merge),
 			 p->action_group);
 		g_object_unref (p->action_group);
 	}
@@ -181,7 +181,7 @@ ephy_encoding_menu_new (EphyWindow *window)
 }
 
 static void
-ephy_encoding_menu_verb_cb (EggAction *action,
+ephy_encoding_menu_verb_cb (GtkAction *action,
 			    EphyEncodingMenu *menu)
 {
 	EphyWindow *window;
@@ -204,21 +204,21 @@ ephy_encoding_menu_verb_cb (EggAction *action,
 }
 
 static void
-build_group (EggActionGroup *action_group,
+build_group (GtkActionGroup *action_group,
 	     GString *xml_string,
 	     const LanguageGroupInfo *info)
 {
 	gchar *tmp;
 	gchar *verb;
-	EggAction *action;
+	GtkAction *action;
 
 	verb = g_strdup_printf ("EncodingGroup%d", info->group);
 
-	action = g_object_new (EGG_TYPE_ACTION,
+	action = g_object_new (GTK_TYPE_ACTION,
 			       "name", verb,
 			       "label", info->title,
 			       NULL);
-	egg_action_group_add_action (action_group, action);
+	gtk_action_group_add_action (action_group, action);
 	g_object_unref (action);
 
 	tmp = g_strdup_printf ("<submenu name=\"%sItem\" verb=\"%s\">\n",
@@ -230,16 +230,16 @@ build_group (EggActionGroup *action_group,
 
 static void
 build_encoding (EphyEncodingMenu *menu,
-		EggActionGroup *action_group,
+		GtkActionGroup *action_group,
 		GString *xml_string,
 		const EncodingInfo *info)
 {
 	char *tmp;
 	char *verb;
-	EggAction *action;
+	GtkAction *action;
 
 	verb = g_strdup_printf ("Encoding%s", info->encoding);
-	action = g_object_new (EGG_TYPE_ACTION,
+	action = g_object_new (GTK_TYPE_ACTION,
 			       "name", verb,
 			       "label", info->title,
 			       NULL);
@@ -247,7 +247,7 @@ build_encoding (EphyEncodingMenu *menu,
 			  G_CALLBACK (ephy_encoding_menu_verb_cb),
 			  menu);
 
-	egg_action_group_add_action (action_group, action);
+	gtk_action_group_add_action (action_group, action);
 	g_object_unref (action);
 
 	tmp = g_strdup_printf ("<menuitem name=\"%sItem\" verb=\"%s\"/>\n",
@@ -263,7 +263,7 @@ ephy_encoding_menu_rebuild (EphyEncodingMenu *wrhm)
 {
 	EphyEmbedSingle *single;
 	EphyEncodingMenuPrivate *p = wrhm->priv;
-	EggMenuMerge *merge = EGG_MENU_MERGE (p->window->ui_merge);
+	GtkUIManager *merge = GTK_UI_MANAGER (p->window->ui_merge);
 	GString *xml;
 	GList *groups, *lg, *encodings, *enc;
 
@@ -281,8 +281,8 @@ ephy_encoding_menu_rebuild (EphyEncodingMenu *wrhm)
 			      "<placeholder name=\"ViewEncodingsPlaceholder\">"
 			      "<submenu name=\"ViewEncodingMenu\" verb=\"ViewEncoding\">");
 
-	p->action_group = egg_action_group_new ("EncodingActions");
-	egg_menu_merge_insert_action_group (merge, p->action_group, 0);
+	p->action_group = gtk_action_group_new ("EncodingActions");
+	gtk_ui_manager_insert_action_group (merge, p->action_group, 0);
 
 	for (lg = groups; lg != NULL; lg = lg->next)
         {
@@ -311,7 +311,7 @@ ephy_encoding_menu_rebuild (EphyEncodingMenu *wrhm)
 
 	g_string_append (xml, "</submenu></placeholder></submenu></menu></Root>");
 
-	egg_menu_merge_add_ui_from_string (merge, xml->str, -1, NULL);
+	gtk_ui_manager_add_ui_from_string (merge, xml->str, -1, NULL);
 
 	g_string_free (xml, TRUE);
 }
diff --git a/src/ephy-favicon-action.c b/src/ephy-favicon-action.c
index bf1d96d36..bb9707b5d 100644
--- a/src/ephy-favicon-action.c
+++ b/src/ephy-favicon-action.c
@@ -74,7 +74,7 @@ ephy_favicon_action_get_type (void)
 			(GInstanceInitFunc) ephy_favicon_action_init,
 		};
 
-		type = g_type_register_static (EGG_TYPE_ACTION,
+		type = g_type_register_static (GTK_TYPE_ACTION,
 					       "EphyFaviconAction",
 					       &type_info, 0);
 	}
@@ -121,7 +121,7 @@ favicon_drag_data_get_cb (GtkWidget *widget,
 }
 
 static GtkWidget *
-create_tool_item (EggAction *action)
+create_tool_item (GtkAction *action)
 {
 	GtkWidget *image;
 	GtkWidget *ebox;
@@ -153,7 +153,7 @@ create_tool_item (EggAction *action)
 }
 
 static void
-ephy_favicon_action_sync_icon (EggAction *action, GParamSpec *pspec,
+ephy_favicon_action_sync_icon (GtkAction *action, GParamSpec *pspec,
 			       GtkWidget *proxy)
 {
 	EphyFaviconAction *fav_action = EPHY_FAVICON_ACTION (action);
@@ -183,14 +183,14 @@ ephy_favicon_action_sync_icon (EggAction *action, GParamSpec *pspec,
 }
 
 static void
-connect_proxy (EggAction *action, GtkWidget *proxy)
+connect_proxy (GtkAction *action, GtkWidget *proxy)
 {
 	ephy_favicon_action_sync_icon (action, NULL, proxy);
 	g_signal_connect_object (action, "notify::icon",
 				 G_CALLBACK (ephy_favicon_action_sync_icon),
 				 proxy, 0);
 
-	(* EGG_ACTION_CLASS (parent_class)->connect_proxy) (action, proxy);
+	(* GTK_ACTION_CLASS (parent_class)->connect_proxy) (action, proxy);
 }
 
 static void
@@ -240,7 +240,7 @@ ephy_favicon_action_get_property (GObject *object,
 static void
 ephy_favicon_action_class_init (EphyFaviconActionClass *class)
 {
-	EggActionClass *action_class;
+	GtkActionClass *action_class;
 	GObjectClass *object_class = G_OBJECT_CLASS (class);
 
 	object_class->set_property = ephy_favicon_action_set_property;
@@ -248,7 +248,7 @@ ephy_favicon_action_class_init (EphyFaviconActionClass *class)
         object_class->finalize = ephy_favicon_action_finalize;
 
 	parent_class = g_type_class_peek_parent (class);
-	action_class = EGG_ACTION_CLASS (class);
+	action_class = GTK_ACTION_CLASS (class);
 
 	action_class->toolbar_item_type = GTK_TYPE_IMAGE;
 	action_class->create_tool_item = create_tool_item;
diff --git a/src/ephy-favicon-action.h b/src/ephy-favicon-action.h
index 31f6c3d82..88a59cd6e 100644
--- a/src/ephy-favicon-action.h
+++ b/src/ephy-favicon-action.h
@@ -35,13 +35,13 @@ typedef struct EphyFaviconActionPrivate EphyFaviconActionPrivate;
 
 struct _EphyFaviconAction
 {
-	EggAction parent;
+	GtkAction parent;
 	EphyFaviconActionPrivate *priv;
 };
 
 struct _EphyFaviconActionClass
 {
-	EggActionClass parent_class;
+	GtkActionClass parent_class;
 };
 
 GType    ephy_favicon_action_get_type   (void);
diff --git a/src/ephy-favorites-menu.c b/src/ephy-favorites-menu.c
index 11d341062..4138098f3 100644
--- a/src/ephy-favorites-menu.c
+++ b/src/ephy-favorites-menu.c
@@ -33,7 +33,7 @@ struct _EphyFavoritesMenuPrivate
 {
 	EphyWindow *window;
 	EphyBookmarks *bookmarks;
-	EggActionGroup *action_group;
+	GtkActionGroup *action_group;
 	guint ui_id;
 };
 
@@ -83,24 +83,24 @@ static void
 ephy_favorites_menu_clean (EphyFavoritesMenu *wrhm)
 {
 	EphyFavoritesMenuPrivate *p = wrhm->priv;
-	EggMenuMerge *merge = EGG_MENU_MERGE (p->window->ui_merge);
+	GtkUIManager *merge = GTK_UI_MANAGER (p->window->ui_merge);
 
 	if (p->ui_id > 0)
 	{
-		egg_menu_merge_remove_ui (merge, p->ui_id);
-		egg_menu_merge_ensure_update (merge);
+		gtk_ui_manager_remove_ui (merge, p->ui_id);
+		gtk_ui_manager_ensure_update (merge);
 		p->ui_id = 0;
 	}
 
 	if (p->action_group != NULL)
 	{
-		egg_menu_merge_remove_action_group (merge, p->action_group);
+		gtk_ui_manager_remove_action_group (merge, p->action_group);
 		g_object_unref (p->action_group);
 	}
 }
 
 static void
-go_location_cb (EggAction *action, char *location, EphyWindow *window)
+go_location_cb (GtkAction *action, char *location, EphyWindow *window)
 {
 	ephy_window_load_url (window, location);
 }
@@ -113,7 +113,7 @@ ephy_favorites_menu_rebuild (EphyFavoritesMenu *wrhm)
 	gint i;
 	EphyNode *fav;
 	GPtrArray *children;
-	EggMenuMerge *merge = EGG_MENU_MERGE (p->window->ui_merge);
+	GtkUIManager *merge = GTK_UI_MANAGER (p->window->ui_merge);
 
 	LOG ("Rebuilding favorites menu")
 
@@ -129,14 +129,14 @@ ephy_favorites_menu_rebuild (EphyFavoritesMenu *wrhm)
 			      "<placeholder name=\"GoFavorites\">"
 			      "<separator name=\"GoSep3\"/>");
 
-	p->action_group = egg_action_group_new ("FavoritesActions");
-	egg_menu_merge_insert_action_group (merge, p->action_group, 0);
+	p->action_group = gtk_action_group_new ("FavoritesActions");
+	gtk_ui_manager_insert_action_group (merge, p->action_group, 0);
 
 	for (i = 0; i < children->len; i++)
 	{
 		char *verb;
 		EphyNode *node;
-		EggAction *action;
+		GtkAction *action;
 
 		verb = g_strdup_printf ("GoFav%d", i);
 
@@ -144,7 +144,7 @@ ephy_favorites_menu_rebuild (EphyFavoritesMenu *wrhm)
 
 		action = ephy_bookmark_action_new (verb,
 						   ephy_node_get_id (node));
-		egg_action_group_add_action (p->action_group, action);
+		gtk_action_group_add_action (p->action_group, action);
 		g_object_unref (action);
 		g_signal_connect (action, "go_location",
 				  G_CALLBACK (go_location_cb), p->window);
@@ -166,7 +166,7 @@ ephy_favorites_menu_rebuild (EphyFavoritesMenu *wrhm)
 	{
 		GError *error = NULL;
 		LOG ("Merging ui\n%s",xml->str);
-		p->ui_id = egg_menu_merge_add_ui_from_string
+		p->ui_id = gtk_ui_manager_add_ui_from_string
 			(merge, xml->str, -1, &error);
 	}
 
@@ -248,8 +248,8 @@ ephy_favorites_menu_finalize (GObject *o)
 
 	if (p->action_group != NULL)
 	{
-		egg_menu_merge_remove_action_group
-			(EGG_MENU_MERGE (p->window->ui_merge),
+		gtk_ui_manager_remove_action_group
+			(GTK_UI_MANAGER (p->window->ui_merge),
 			 p->action_group);
 		g_object_unref (p->action_group);
 	}
diff --git a/src/ephy-go-action.c b/src/ephy-go-action.c
index 2c7949ae5..5c2579a98 100644
--- a/src/ephy-go-action.c
+++ b/src/ephy-go-action.c
@@ -56,7 +56,7 @@ ephy_go_action_get_type (void)
 			(GInstanceInitFunc) ephy_go_action_init,
 		};
 
-		type = g_type_register_static (EGG_TYPE_ACTION,
+		type = g_type_register_static (GTK_TYPE_ACTION,
 					       "EphyGoAction",
 					       &type_info, 0);
 	}
@@ -64,13 +64,13 @@ ephy_go_action_get_type (void)
 }
 
 static void
-activate_cb (GtkWidget *widget, EggAction *action)
+activate_cb (GtkWidget *widget, GtkAction *action)
 {
 	g_signal_emit_by_name (action, "activate");
 }
 
 static GtkWidget *
-create_tool_item (EggAction *action)
+create_tool_item (GtkAction *action)
 {
 	GtkWidget *button;
 	GtkWidget *item;
@@ -90,7 +90,7 @@ create_tool_item (EggAction *action)
 }
 
 static GtkWidget *
-create_menu_item (EggAction *action)
+create_menu_item (GtkAction *action)
 {
 	GtkWidget *menu_item;
 
@@ -102,13 +102,13 @@ create_menu_item (EggAction *action)
 }
 
 static gboolean
-create_menu_proxy_cb (EggToolItem *item, EggAction *action)
+create_menu_proxy_cb (GtkToolItem *item, GtkAction *action)
 {
 	GtkWidget *menu_item;
 
-	menu_item = EGG_ACTION_GET_CLASS (action)->create_menu_item (action);
+	menu_item = GTK_ACTION_GET_CLASS (action)->create_menu_item (action);
 
-	EGG_ACTION_GET_CLASS (action)->connect_proxy (action, menu_item);
+	GTK_ACTION_GET_CLASS (action)->connect_proxy (action, menu_item);
 
 	egg_tool_item_set_proxy_menu_item (item, MENU_ID, menu_item);
 
@@ -116,13 +116,13 @@ create_menu_proxy_cb (EggToolItem *item, EggAction *action)
 }
 
 static void
-connect_proxy (EggAction *action, GtkWidget *proxy)
+connect_proxy (GtkAction *action, GtkWidget *proxy)
 {	
-	(* EGG_ACTION_CLASS (parent_class)->connect_proxy) (action, proxy);
+	(* GTK_ACTION_CLASS (parent_class)->connect_proxy) (action, proxy);
 
 	g_return_if_fail (EPHY_IS_GO_ACTION (action));
 
-	if (EGG_IS_TOOL_ITEM (proxy))
+	if (GTK_IS_TOOL_ITEM (proxy))
 	{
 		g_signal_connect (proxy, "create_menu_proxy",
 				  G_CALLBACK (create_menu_proxy_cb), action);
@@ -132,13 +132,13 @@ connect_proxy (EggAction *action, GtkWidget *proxy)
 static void
 ephy_go_action_class_init (EphyGoActionClass *class)
 {
-	EggActionClass *action_class;
+	GtkActionClass *action_class;
 	GObjectClass *object_class = G_OBJECT_CLASS (class);
 
 	object_class->finalize = ephy_go_action_finalize;
 
 	parent_class = g_type_class_peek_parent (class);
-	action_class = EGG_ACTION_CLASS (class);
+	action_class = GTK_ACTION_CLASS (class);
 
 	action_class->create_tool_item = create_tool_item;
 	action_class->menu_item_type = GTK_TYPE_MENU_ITEM;
diff --git a/src/ephy-go-action.h b/src/ephy-go-action.h
index aa575986d..505280a02 100644
--- a/src/ephy-go-action.h
+++ b/src/ephy-go-action.h
@@ -33,12 +33,12 @@ typedef struct _EphyGoActionClass EphyGoActionClass;
 
 struct _EphyGoAction
 {
-	EggAction parent;
+	GtkAction parent;
 };
 
 struct _EphyGoActionClass
 {
-	EggActionClass parent_class;
+	GtkActionClass parent_class;
 };
 
 GType    ephy_go_action_get_type   (void);
diff --git a/src/ephy-history-window.c b/src/ephy-history-window.c
index 03cc94467..495d0e2f1 100644
--- a/src/ephy-history-window.c
+++ b/src/ephy-history-window.c
@@ -74,27 +74,27 @@ static void ephy_history_window_get_property (GObject *object,
 					      GParamSpec *pspec);
 static void ephy_history_window_dispose      (GObject *object);
 
-static void cmd_open_bookmarks_in_tabs    (EggAction *action,
+static void cmd_open_bookmarks_in_tabs    (GtkAction *action,
 					   EphyHistoryWindow *editor);
-static void cmd_open_bookmarks_in_browser (EggAction *action,
+static void cmd_open_bookmarks_in_browser (GtkAction *action,
 					   EphyHistoryWindow *editor);
-static void cmd_delete                    (EggAction *action,
+static void cmd_delete                    (GtkAction *action,
                                            EphyHistoryWindow *editor);
-static void cmd_bookmark_link             (EggAction *action,
+static void cmd_bookmark_link             (GtkAction *action,
                                            EphyHistoryWindow *editor);
-static void cmd_clear			  (EggAction *action,
+static void cmd_clear			  (GtkAction *action,
 				           EphyHistoryWindow *editor);
-static void cmd_close			  (EggAction *action,
+static void cmd_close			  (GtkAction *action,
 					   EphyHistoryWindow *editor);
-static void cmd_cut			  (EggAction *action,
+static void cmd_cut			  (GtkAction *action,
 					   EphyHistoryWindow *editor);
-static void cmd_copy			  (EggAction *action,
+static void cmd_copy			  (GtkAction *action,
 					   EphyHistoryWindow *editor);
-static void cmd_paste			  (EggAction *action,
+static void cmd_paste			  (GtkAction *action,
 					   EphyHistoryWindow *editor);
-static void cmd_select_all		  (EggAction *action,
+static void cmd_select_all		  (GtkAction *action,
 					   EphyHistoryWindow *editor);
-static void cmd_help_contents		  (EggAction *action,
+static void cmd_help_contents		  (GtkAction *action,
 					   EphyHistoryWindow *editor);
 
 struct EphyHistoryWindowPrivate
@@ -106,8 +106,8 @@ struct EphyHistoryWindowPrivate
 	GtkWidget *search_entry;
 	GtkWidget *menu_dock;
 	GtkWidget *window;
-	EggMenuMerge *ui_merge;
-	EggActionGroup *action_group;
+	GtkUIManager *ui_merge;
+	GtkActionGroup *action_group;
 	GtkWidget *confirmation_dialog;
 };
 
@@ -119,64 +119,63 @@ enum
 
 static GObjectClass *parent_class = NULL;
 
-static EggActionGroupEntry ephy_history_ui_entries [] = {
+static GtkActionGroupEntry ephy_history_ui_entries [] = {
 	/* Toplevel */
-	{ "File", N_("_File"), NULL, NULL, NULL, NULL, NULL },
-	{ "Edit", N_("_Edit"), NULL, NULL, NULL, NULL, NULL },
-	{ "View", N_("_View"), NULL, NULL, NULL, NULL, NULL },
-	{ "Help", N_("_Help"), NULL, NULL, NULL, NULL, NULL },
-	{ "FakeToplevel", (""), NULL, NULL, NULL, NULL, NULL },
+	{ "File", NULL, N_("_File") },
+	{ "Edit", NULL, N_("_Edit") },
+	{ "View", NULL, N_("_View") },
+	{ "Help", NULL, N_("_Help") },
 
 	/* File Menu */
-	{ "OpenInWindow", N_("_Open in New Window"), GTK_STOCK_OPEN, "<control>O",
+	{ "OpenInWindow", GTK_STOCK_OPEN, N_("_Open in New Window"), "<control>O",
 	  N_("Open the selected history link in a new window"),
-	  G_CALLBACK (cmd_open_bookmarks_in_browser), NULL },
-	{ "OpenInTab", N_("Open in New _Tab"), NULL, "<shift><control>O",
+	  G_CALLBACK (cmd_open_bookmarks_in_browser) },
+	{ "OpenInTab", NULL, N_("Open in New _Tab"), "<shift><control>O",
 	  N_("Open the selected history link in a new tab"),
-	  G_CALLBACK (cmd_open_bookmarks_in_tabs), NULL },
-	{ "Delete", N_("_Delete"), GTK_STOCK_DELETE, NULL,
+	  G_CALLBACK (cmd_open_bookmarks_in_tabs) },
+	{ "Delete", GTK_STOCK_DELETE, N_("_Delete"), NULL,
 	  N_("Delete the selected history link"),
-	  G_CALLBACK (cmd_delete), NULL },
-	{ "BookmarkLink", N_("Boo_kmark Link..."), EPHY_STOCK_BOOKMARK_PAGE, "<control>D",
+	  G_CALLBACK (cmd_delete) },
+	{ "BookmarkLink", EPHY_STOCK_BOOKMARK_PAGE, N_("Boo_kmark Link..."), "<control>D",
 	  N_("Bookmark the selected history link"),
-	  G_CALLBACK (cmd_bookmark_link), NULL },
-	{ "Close", N_("_Close"), GTK_STOCK_CLOSE, "<control>W",
+	  G_CALLBACK (cmd_bookmark_link) },
+	{ "Close", GTK_STOCK_CLOSE, N_("_Close"), "<control>W",
 	  N_("Close the history window"),
 	  G_CALLBACK (cmd_close), NULL },
 
 	/* Edit Menu */
-	{ "Cut", N_("Cu_t"), GTK_STOCK_CUT, "<control>X",
+	{ "Cut", GTK_STOCK_CUT, N_("Cu_t"), "<control>X",
 	  N_("Cut the selection"),
 	  G_CALLBACK (cmd_cut), NULL },
-	{ "Copy", N_("_Copy"), GTK_STOCK_COPY, "<control>C",
+	{ "Copy", GTK_STOCK_COPY, N_("_Copy"), "<control>C",
 	  N_("Copy the selection"),
 	  G_CALLBACK (cmd_copy), NULL },
-	{ "Paste", N_("_Paste"), GTK_STOCK_PASTE, "<control>V",
+	{ "Paste", GTK_STOCK_PASTE, N_("_Paste"), "<control>V",
 	  N_("Paste the clipboard"),
 	  G_CALLBACK (cmd_paste), NULL },
-	{ "SelectAll", N_("Select _All"), NULL, "<control>A",
+	{ "SelectAll", NULL, N_("Select _All"), "<control>A",
 	  N_("Select all history links or text"),
 	  G_CALLBACK (cmd_select_all), NULL },
-	{ "Clear", N_("C_lear History"), GTK_STOCK_CLEAR, NULL,
+	{ "Clear", GTK_STOCK_CLEAR, N_("C_lear History"), NULL,
 	  N_("Clear your browsing history"),
 	  G_CALLBACK (cmd_clear), NULL },
 
 	/* View Menu */
-	{ "ViewTitle", N_("_Title"), NULL, NULL,
+/*	{ "ViewTitle", NULL, N_("_Title"), NULL,
 	  N_("Show only the title column"),
 	  NULL, NULL, RADIO_ACTION, NULL },
-	{ "ViewLocation", N_("_Address"), NULL, NULL,
+	{ "ViewLocation", NULL, N_("_Address"), NULL,
 	  N_("Show only the address column"),
 	  NULL, NULL, RADIO_ACTION, "ViewTitle" },
 	{ "ViewTitleLocation", N_("T_itle and Address"), NULL, NULL,
 	  N_("Show both the title and address columns"),
-	  NULL, NULL, RADIO_ACTION, "ViewTitle" },
+	  NULL, NULL, RADIO_ACTION, "ViewTitle" },*/
 
 	/* Help Menu */
-	{ "HelpContents", N_("_Contents"), GTK_STOCK_HELP, "F1",
+	{ "HelpContents", GTK_STOCK_HELP, N_("_Contents"), "F1",
 	  N_("Display history help"),
-	  G_CALLBACK (cmd_help_contents), NULL },
-	{ "HelpAbout", N_("_About"), GNOME_STOCK_ABOUT, NULL,
+	  G_CALLBACK (cmd_help_contents) },
+	{ "HelpAbout", GNOME_STOCK_ABOUT, N_("_About"), NULL,
 	  N_("Display credits for the web browser creators"),
 	  G_CALLBACK (window_cmd_help_about), NULL },
 };
@@ -296,7 +295,7 @@ confirmation_dialog_construct (EphyHistoryWindow *editor)
 }
 
 static void
-cmd_clear (EggAction *action,
+cmd_clear (GtkAction *action,
 	   EphyHistoryWindow *editor)
 {
 	if (editor->priv->confirmation_dialog == NULL)
@@ -310,7 +309,7 @@ cmd_clear (EggAction *action,
 }
 
 static void
-cmd_close (EggAction *action,
+cmd_close (GtkAction *action,
 	   EphyHistoryWindow *editor)
 {
 	if (editor->priv->confirmation_dialog != NULL)
@@ -334,7 +333,7 @@ get_target_window (EphyHistoryWindow *editor)
 }
 
 static void
-cmd_open_bookmarks_in_tabs (EggAction *action,
+cmd_open_bookmarks_in_tabs (GtkAction *action,
 			    EphyHistoryWindow *editor)
 {
 	EphyWindow *window;
@@ -360,7 +359,7 @@ cmd_open_bookmarks_in_tabs (EggAction *action,
 }
 
 static void
-cmd_open_bookmarks_in_browser (EggAction *action,
+cmd_open_bookmarks_in_browser (GtkAction *action,
 			       EphyHistoryWindow *editor)
 {
 	EphyWindow *window;
@@ -387,7 +386,7 @@ cmd_open_bookmarks_in_browser (EggAction *action,
 }
 
 static void
-cmd_cut (EggAction *action,
+cmd_cut (GtkAction *action,
 	 EphyHistoryWindow *editor)
 {
 	GtkWidget *widget = gtk_window_get_focus (GTK_WINDOW (editor));
@@ -399,7 +398,7 @@ cmd_cut (EggAction *action,
 }
 
 static void
-cmd_copy (EggAction *action,
+cmd_copy (GtkAction *action,
 	  EphyHistoryWindow *editor)
 {
 	GtkWidget *widget = gtk_window_get_focus (GTK_WINDOW (editor));
@@ -428,7 +427,7 @@ cmd_copy (EggAction *action,
 }
 
 static void
-cmd_paste (EggAction *action,
+cmd_paste (GtkAction *action,
 	   EphyHistoryWindow *editor)
 {
 	GtkWidget *widget = gtk_window_get_focus (GTK_WINDOW (editor));
@@ -440,7 +439,7 @@ cmd_paste (EggAction *action,
 }
 
 static void
-cmd_select_all (EggAction *action,
+cmd_select_all (GtkAction *action,
 		EphyHistoryWindow *editor)
 {
 	GtkWidget *widget = gtk_window_get_focus (GTK_WINDOW (editor));
@@ -460,7 +459,7 @@ cmd_select_all (EggAction *action,
 }
 
 static void
-cmd_delete (EggAction *action,
+cmd_delete (GtkAction *action,
             EphyHistoryWindow *editor)
 {
 	if (ephy_node_view_is_target (EPHY_NODE_VIEW (editor->priv->pages_view)))
@@ -470,7 +469,7 @@ cmd_delete (EggAction *action,
 }
 
 static void
-cmd_bookmark_link (EggAction *action,
+cmd_bookmark_link (GtkAction *action,
                    EphyHistoryWindow *editor)
 {
         GtkWindow *window;
@@ -506,7 +505,7 @@ cmd_bookmark_link (EggAction *action,
 }
 
 static void
-cmd_help_contents (EggAction *action,
+cmd_help_contents (GtkAction *action,
 		   EphyHistoryWindow *editor)
 {
 	ephy_gui_help (GTK_WINDOW (editor),
@@ -579,7 +578,7 @@ ephy_history_window_finalize (GObject *object)
 	g_object_unref (G_OBJECT (editor->priv->pages_filter));
 
 	g_object_unref (editor->priv->action_group);
-	egg_menu_merge_remove_action_group (editor->priv->ui_merge,
+	gtk_ui_manager_remove_action_group (editor->priv->ui_merge,
 					    editor->priv->action_group);
 	g_object_unref (editor->priv->ui_merge);
 
@@ -621,8 +620,8 @@ ephy_history_window_update_menu (EphyHistoryWindow *editor)
 	gboolean pages_focus, pages_selection;
 	gboolean pages_multiple_selection;
 	gboolean delete, bookmark_page;
-	EggActionGroup *action_group;
-	EggAction *action;
+	GtkActionGroup *action_group;
+	GtkAction *action;
 	char *open_in_window_label, *open_in_tab_label, *copy_label;
 	GtkWidget *focus_widget;
 
@@ -683,24 +682,24 @@ ephy_history_window_update_menu (EphyHistoryWindow *editor)
 	bookmark_page = (pages_focus && pages_selection && !pages_multiple_selection);
 
 	action_group = editor->priv->action_group;
-	action = egg_action_group_get_action (action_group, "OpenInWindow");
+	action = gtk_action_group_get_action (action_group, "OpenInWindow");
 	g_object_set (action, "sensitive", open_in_window, NULL);
 	g_object_set (action, "label", open_in_window_label, NULL);
-	action = egg_action_group_get_action (action_group, "OpenInTab");
+	action = gtk_action_group_get_action (action_group, "OpenInTab");
 	g_object_set (action, "sensitive", open_in_tab, NULL);
 	g_object_set (action, "label", open_in_tab_label, NULL);
-	action = egg_action_group_get_action (action_group, "Cut");
+	action = gtk_action_group_get_action (action_group, "Cut");
 	g_object_set (action, "sensitive", cut, NULL);
-	action = egg_action_group_get_action (action_group, "Copy");
+	action = gtk_action_group_get_action (action_group, "Copy");
 	g_object_set (action, "sensitive", copy, NULL);
 	g_object_set (action, "label", copy_label, NULL);
-	action = egg_action_group_get_action (action_group, "Paste");
+	action = gtk_action_group_get_action (action_group, "Paste");
 	g_object_set (action, "sensitive", paste, NULL);
-	action = egg_action_group_get_action (action_group, "SelectAll");
+	action = gtk_action_group_get_action (action_group, "SelectAll");
 	g_object_set (action, "sensitive", select_all, NULL);
-	action = egg_action_group_get_action (action_group, "Delete");
+	action = gtk_action_group_get_action (action_group, "Delete");
 	g_object_set (action, "sensitive", delete, NULL);
-	action = egg_action_group_get_action (action_group, "BookmarkLink");
+	action = gtk_action_group_get_action (action_group, "BookmarkLink");
 	g_object_set (action, "sensitive", bookmark_page, NULL);
 }
 
@@ -760,7 +759,7 @@ ephy_history_window_show_popup_cb (GtkWidget *view,
 {
 	GtkWidget *widget;
 
-	widget = egg_menu_merge_get_widget (editor->priv->ui_merge,
+	widget = gtk_ui_manager_get_widget (editor->priv->ui_merge,
 					    "/popups/EphyHistoryWindowPopup");
 	gtk_menu_popup (GTK_MENU (widget), NULL, NULL, NULL, NULL, 2,
 			gtk_get_current_event_time ());
@@ -889,7 +888,7 @@ build_search_box (EphyHistoryWindow *editor)
 }
 
 static void
-add_widget (EggMenuMerge *merge, GtkWidget *widget, EphyHistoryWindow *editor)
+add_widget (GtkUIManager *merge, GtkWidget *widget, EphyHistoryWindow *editor)
 {
 	gtk_box_pack_start (GTK_BOX (editor->priv->menu_dock),
 			    widget, FALSE, FALSE, 0);
@@ -942,9 +941,9 @@ ephy_history_window_construct (EphyHistoryWindow *editor)
 	GtkWidget *pages_view, *sites_view;
 	GtkWidget *scrolled_window;
 	EphyNode *node;
-	EggMenuMerge *ui_merge;
-	EggActionGroup *action_group;
-	EggAction *action;
+	GtkUIManager *ui_merge;
+	GtkActionGroup *action_group;
+	GtkAction *action;
 	GdkPixbuf *icon;
 	int i, col_id;
 
@@ -968,24 +967,24 @@ ephy_history_window_construct (EphyHistoryWindow *editor)
 	gtk_widget_show (editor->priv->menu_dock);
 	gtk_container_add (GTK_CONTAINER (editor), editor->priv->menu_dock);
 
-	ui_merge = egg_menu_merge_new ();
+	ui_merge = gtk_ui_manager_new ();
 	g_signal_connect (ui_merge, "add_widget", G_CALLBACK (add_widget), editor);
-	action_group = egg_action_group_new ("PopupActions");
-	egg_action_group_add_actions (action_group, ephy_history_ui_entries,
+	action_group = gtk_action_group_new ("PopupActions");
+	gtk_action_group_add_actions (action_group, ephy_history_ui_entries,
 				      ephy_history_ui_n_entries);
-	egg_menu_merge_insert_action_group (ui_merge,
+	gtk_ui_manager_insert_action_group (ui_merge,
 					    action_group, 0);
-	egg_menu_merge_add_ui_from_file (ui_merge,
+	gtk_ui_manager_add_ui_from_file (ui_merge,
 				         ephy_file ("epiphany-history-window-ui.xml"),
 				         NULL);
 	gtk_window_add_accel_group (GTK_WINDOW (editor), ui_merge->accel_group);
-	egg_menu_merge_ensure_update (ui_merge);
+	gtk_ui_manager_ensure_update (ui_merge);
 	editor->priv->ui_merge = ui_merge;
 	editor->priv->action_group = action_group;
 
 	/* Fixme: We should implement gconf prefs for monitoring this setting */
-	action = egg_action_group_get_action (action_group, "ViewTitle");
-	egg_toggle_action_set_active (EGG_TOGGLE_ACTION (action), TRUE);
+	action = gtk_action_group_get_action (action_group, "ViewTitle");
+	egg_toggle_action_set_active (GTK_TOGGLE_ACTION (action), TRUE);
 
 	hpaned = gtk_hpaned_new ();
 	gtk_container_set_border_width (GTK_CONTAINER (hpaned), 0);
diff --git a/src/ephy-location-action.c b/src/ephy-location-action.c
index c9e1c5903..5706f3eb3 100644
--- a/src/ephy-location-action.c
+++ b/src/ephy-location-action.c
@@ -54,7 +54,7 @@ ephy_location_action_get_type (void)
 			(GInstanceInitFunc) ephy_location_action_init,
 		};
 
-		type = g_type_register_static (EGG_TYPE_ACTION,
+		type = g_type_register_static (GTK_TYPE_ACTION,
 					       "EphyLocationAction",
 					       &type_info, 0);
 	}
@@ -96,7 +96,7 @@ location_url_activate_cb (EphyLocationEntry *entry,
 }
 
 static void
-connect_proxy (EggAction *action, GtkWidget *proxy)
+connect_proxy (GtkAction *action, GtkWidget *proxy)
 {
 	EphyAutocompletion *ac;
 	EphyLocationEntry *e = EPHY_LOCATION_ENTRY (proxy);
@@ -113,17 +113,17 @@ connect_proxy (EggAction *action, GtkWidget *proxy)
 			  GTK_SIGNAL_FUNC(location_url_activate_cb),
 			  action);
 
-	(* EGG_ACTION_CLASS (parent_class)->connect_proxy) (action, proxy);
+	(* GTK_ACTION_CLASS (parent_class)->connect_proxy) (action, proxy);
 }
 
 static void
 ephy_location_action_class_init (EphyLocationActionClass *class)
 {
-	EggActionClass *action_class;
+	GtkActionClass *action_class;
 	GObjectClass *object_class = G_OBJECT_CLASS (class);
 
 	parent_class = g_type_class_peek_parent (class);
-	action_class = EGG_ACTION_CLASS (class);
+	action_class = GTK_ACTION_CLASS (class);
 
 	action_class->toolbar_item_type = EPHY_TYPE_LOCATION_ENTRY;
 	action_class->connect_proxy = connect_proxy;
@@ -150,7 +150,7 @@ ephy_location_action_get_widget (EphyLocationAction *action)
 {
 	GSList *slist;
 
-	slist = EGG_ACTION (action)->proxies;
+	slist = GTK_ACTION (action)->proxies;
 
 	if (slist)
 	{
diff --git a/src/ephy-location-action.h b/src/ephy-location-action.h
index daa609aee..48e0e0f4f 100644
--- a/src/ephy-location-action.h
+++ b/src/ephy-location-action.h
@@ -34,12 +34,12 @@ typedef struct _EphyLocationActionClass EphyLocationActionClass;
 
 struct _EphyLocationAction
 {
-	EggAction parent;
+	GtkAction parent;
 };
 
 struct _EphyLocationActionClass
 {
-	EggActionClass parent_class;
+	GtkActionClass parent_class;
 
 	void (*go_location) (EphyLocationAction *action, char *location);
 };
diff --git a/src/ephy-navigation-action.c b/src/ephy-navigation-action.c
index 6538d1bba..3ac904aa9 100644
--- a/src/ephy-navigation-action.c
+++ b/src/ephy-navigation-action.c
@@ -60,7 +60,7 @@ ephy_navigation_action_get_type (void)
 			(GInstanceInitFunc) ephy_navigation_action_init,
 		};
 
-		type = g_type_register_static (EGG_TYPE_ACTION,
+		type = g_type_register_static (GTK_TYPE_ACTION,
 					       "EphyNavigationAction",
 					       &type_info, 0);
 	}
@@ -243,14 +243,14 @@ menu_activated_cb (EphyArrowToolButton *w, EphyNavigationAction *b)
 }
 
 static void
-connect_proxy (EggAction *action, GtkWidget *proxy)
+connect_proxy (GtkAction *action, GtkWidget *proxy)
 {
 	LOG ("Connect navigation action proxy")
 
 	g_signal_connect (proxy, "menu-activated",
 			  G_CALLBACK (menu_activated_cb), action);
 
-	(* EGG_ACTION_CLASS (parent_class)->connect_proxy) (action, proxy);
+	(* GTK_ACTION_CLASS (parent_class)->connect_proxy) (action, proxy);
 }
 
 static void
@@ -310,7 +310,7 @@ ephy_navigation_action_finalize (GObject *object)
 static void
 ephy_navigation_action_class_init (EphyNavigationActionClass *class)
 {
-	EggActionClass *action_class;
+	GtkActionClass *action_class;
 	GObjectClass *object_class = G_OBJECT_CLASS (class);
 
 	object_class->finalize = ephy_navigation_action_finalize;
@@ -318,7 +318,7 @@ ephy_navigation_action_class_init (EphyNavigationActionClass *class)
 	object_class->get_property = ephy_navigation_action_get_property;
 
 	parent_class = g_type_class_peek_parent (class);
-	action_class = EGG_ACTION_CLASS (class);
+	action_class = GTK_ACTION_CLASS (class);
 
 	action_class->toolbar_item_type = EPHY_ARROW_TOOLBUTTON_TYPE;
 	action_class->connect_proxy = connect_proxy;
diff --git a/src/ephy-navigation-action.h b/src/ephy-navigation-action.h
index 0e6c23dbe..4990e030d 100644
--- a/src/ephy-navigation-action.h
+++ b/src/ephy-navigation-action.h
@@ -42,13 +42,13 @@ typedef enum
 
 struct _EphyNavigationAction
 {
-	EggAction parent;
+	GtkAction parent;
         EphyNavigationActionPrivate *priv;
 };
 
 struct _EphyNavigationActionClass
 {
-	EggActionClass parent_class;
+	GtkActionClass parent_class;
 };
 
 GType    ephy_navigation_action_get_type   (void);
diff --git a/src/ephy-spinner-action.c b/src/ephy-spinner-action.c
index dffda619a..df5db6f9a 100644
--- a/src/ephy-spinner-action.c
+++ b/src/ephy-spinner-action.c
@@ -57,7 +57,7 @@ ephy_spinner_action_get_type (void)
 			(GInstanceInitFunc) ephy_spinner_action_init,
 		};
 
-		type = g_type_register_static (EGG_TYPE_ACTION,
+		type = g_type_register_static (GTK_TYPE_ACTION,
 					       "EphySpinnerAction",
 					       &type_info, 0);
 	}
@@ -65,7 +65,7 @@ ephy_spinner_action_get_type (void)
 }
 
 static void
-ephy_spinner_action_sync_throbbing (EggAction *action, GParamSpec *pspec,
+ephy_spinner_action_sync_throbbing (GtkAction *action, GParamSpec *pspec,
 			            GtkWidget *proxy)
 {
 	EphySpinner *spinner;
@@ -83,7 +83,7 @@ ephy_spinner_action_sync_throbbing (EggAction *action, GParamSpec *pspec,
 }
 
 static GtkWidget *
-create_tool_item (EggAction *action)
+create_tool_item (GtkAction *action)
 {
 	GtkWidget *item;
 	GtkWidget *spinner;
@@ -93,15 +93,15 @@ create_tool_item (EggAction *action)
 	spinner = ephy_spinner_new ();
 	gtk_widget_show (spinner);
 	gtk_container_add (GTK_CONTAINER (item), spinner);
-	egg_tool_item_set_pack_end (EGG_TOOL_ITEM (item), TRUE);
-	egg_tool_item_set_homogeneous (EGG_TOOL_ITEM (item), FALSE);
+	egg_tool_item_set_pack_end (GTK_TOOL_ITEM (item), TRUE);
+	egg_tool_item_set_homogeneous (GTK_TOOL_ITEM (item), FALSE);
 	g_object_set_data (G_OBJECT (item), "spinner", spinner);
 
 	return item;
 }
 
 static void
-toolbar_style_sync (EggToolbar *toolbar,
+toolbar_style_sync (GtkToolbar *toolbar,
 		    GtkToolbarStyle style,
 		    GtkWidget *proxy)
 {
@@ -117,12 +117,12 @@ toolbar_style_sync (EggToolbar *toolbar,
 static void
 item_parent_set_cb (GtkWidget *item, GtkWidget *previous_parent)
 {
-	EggToolbar *toolbar;
+	GtkToolbar *toolbar;
 	GtkToolbarStyle style;
 
 	if (item->parent == NULL) return;
 
-	toolbar = EGG_TOOLBAR (item->parent);
+	toolbar = GTK_TOOLBAR (item->parent);
 
 	g_signal_connect_object (toolbar, "style_changed",
 			         G_CALLBACK (toolbar_style_sync),
@@ -133,7 +133,7 @@ item_parent_set_cb (GtkWidget *item, GtkWidget *previous_parent)
 }
 
 static void
-connect_proxy (EggAction *action, GtkWidget *proxy)
+connect_proxy (GtkAction *action, GtkWidget *proxy)
 {
 	g_signal_connect_object (action, "notify::throbbing",
 				 G_CALLBACK (ephy_spinner_action_sync_throbbing),
@@ -142,7 +142,7 @@ connect_proxy (EggAction *action, GtkWidget *proxy)
 			         G_CALLBACK (item_parent_set_cb),
 			         proxy, 0);
 
-	(* EGG_ACTION_CLASS (parent_class)->connect_proxy) (action, proxy);
+	(* GTK_ACTION_CLASS (parent_class)->connect_proxy) (action, proxy);
 }
 
 static void
@@ -197,11 +197,11 @@ ephy_spinner_action_finalize (GObject *object)
 static void
 ephy_spinner_action_class_init (EphySpinnerActionClass *class)
 {
-	EggActionClass *action_class;
+	GtkActionClass *action_class;
 	GObjectClass *object_class = G_OBJECT_CLASS (class);
 
 	parent_class = g_type_class_peek_parent (class);
-	action_class = EGG_ACTION_CLASS (class);
+	action_class = GTK_ACTION_CLASS (class);
 
 	action_class->toolbar_item_type = EPHY_SPINNER_TYPE;
 	action_class->create_tool_item = create_tool_item;
diff --git a/src/ephy-tab.c b/src/ephy-tab.c
index e9643c56f..27df3274b 100644
--- a/src/ephy-tab.c
+++ b/src/ephy-tab.c
@@ -68,7 +68,7 @@ struct EphyTabPrivate
 	int total_requests;
 	int width;
 	int height;
-	EggAction *action;
+	GtkAction *action;
 	float zoom;
 	EmbedSecurityLevel security_level;
 	TabNavigationFlags nav_flags;
@@ -224,7 +224,7 @@ ephy_tab_get_property (GObject *object,
 }
 
 static void
-ephy_tab_action_activate_cb (EggAction *action, EphyTab *tab)
+ephy_tab_action_activate_cb (GtkAction *action, EphyTab *tab)
 {
 	g_return_if_fail (IS_EPHY_TAB (tab));
 
@@ -1007,7 +1007,7 @@ ephy_tab_init (EphyTab *tab)
 
 	id = g_strdup_printf ("Tab%lu", tab_id++);
 
-	tab->priv->action = g_object_new (EGG_TYPE_ACTION,
+	tab->priv->action = g_object_new (GTK_TYPE_ACTION,
 					  "name", id,
 					  "label", _("Blank page"),
 					  NULL);
diff --git a/src/ephy-tabs-menu.c b/src/ephy-tabs-menu.c
index c0339c897..24bed0848 100644
--- a/src/ephy-tabs-menu.c
+++ b/src/ephy-tabs-menu.c
@@ -40,7 +40,7 @@
 struct _EphyTabsMenuPrivate
 {
 	EphyWindow *window;
-	EggActionGroup *action_group;
+	GtkActionGroup *action_group;
 	guint ui_id;
 };
 
@@ -161,18 +161,18 @@ static void
 ephy_tabs_menu_clean (EphyTabsMenu *menu)
 {
 	EphyTabsMenuPrivate *p = menu->priv;
-	EggMenuMerge *merge = EGG_MENU_MERGE (p->window->ui_merge);
+	GtkUIManager *merge = GTK_UI_MANAGER (p->window->ui_merge);
 
 	if (p->ui_id > 0)
 	{
-		egg_menu_merge_remove_ui (merge, p->ui_id);
-		egg_menu_merge_ensure_update (merge);
+		gtk_ui_manager_remove_ui (merge, p->ui_id);
+		gtk_ui_manager_ensure_update (merge);
 		p->ui_id = 0;
 	}
 
 	if (p->action_group != NULL)
 	{
-		egg_menu_merge_remove_action_group (merge, p->action_group);
+		gtk_ui_manager_remove_action_group (merge, p->action_group);
 		g_object_unref (p->action_group);
 	}
 }
@@ -185,8 +185,8 @@ ephy_tabs_menu_finalize_impl (GObject *o)
 
 	if (p->action_group != NULL)
 	{
-		egg_menu_merge_remove_action_group
-			(EGG_MENU_MERGE (p->window->ui_merge),
+		gtk_ui_manager_remove_action_group
+			(GTK_UI_MANAGER (p->window->ui_merge),
 			 p->action_group);
 		g_object_unref (p->action_group);
 	}
@@ -205,14 +205,14 @@ ephy_tabs_menu_new (EphyWindow *window)
 					     NULL));
 }
 
-/* This code is from EggActionGroup:
- * Ideally either EggAction should support setting an accelerator from
- * a string or EggActionGroup would support adding single EggActionEntry's
+/* This code is from GtkActionGroup:
+ * Ideally either GtkAction should support setting an accelerator from
+ * a string or GtkActionGroup would support adding single EggActionEntry's
  * to an action group.
  */
 static void
-tab_set_action_accelerator (EggActionGroup *action_group,
-			    EggAction *action,
+tab_set_action_accelerator (GtkActionGroup *action_group,
+			    GtkAction *action,
 			    guint tab_number)
 {
 	char *accel_path = NULL;
@@ -254,9 +254,9 @@ void
 ephy_tabs_menu_update (EphyTabsMenu *menu)
 {
 	EphyTabsMenuPrivate *p;
-	EggMenuMerge *merge;
+	GtkUIManager *merge;
 	EphyTab *tab;
-	EggAction *action;
+	GtkAction *action;
 	GString *xml;
 	guint i = 0;
 	guint num = 0;
@@ -265,7 +265,7 @@ ephy_tabs_menu_update (EphyTabsMenu *menu)
 
 	g_return_if_fail (EPHY_IS_TABS_MENU (menu));
 	p = menu->priv;
-	merge = EGG_MENU_MERGE (p->window->ui_merge);
+	merge = GTK_UI_MANAGER (p->window->ui_merge);
 	
 	LOG ("Rebuilding open tabs menu")
 
@@ -278,7 +278,7 @@ ephy_tabs_menu_update (EphyTabsMenu *menu)
 	num = g_list_length (tabs);
 	if (num == 0) return;
 
-	p->action_group = egg_action_group_new ("TabsActions");
+	p->action_group = gtk_action_group_new ("TabsActions");
 
 	/* it's faster to preallocate, MIN is sanity check */
 	xml = g_string_sized_new (44 * MIN (num, 64) + 105);
@@ -289,11 +289,11 @@ ephy_tabs_menu_update (EphyTabsMenu *menu)
 	for (l = tabs; l != NULL; l = l->next)
 	{
 		tab = (EphyTab *) l->data;
-		action = EGG_ACTION (ephy_tab_get_action (tab));
+		action = GTK_ACTION (ephy_tab_get_action (tab));
 
 		tab_set_action_accelerator (p->action_group, action, i);
 
-		egg_action_group_add_action (p->action_group, action);
+		gtk_action_group_add_action (p->action_group, action);
 
 		g_string_append (xml, "<menuitem name=\"");
 		g_string_append (xml, action->name);
@@ -308,8 +308,8 @@ ephy_tabs_menu_update (EphyTabsMenu *menu)
 
 	g_string_append (xml, "</placeholder></submenu></menu></Root>");
 
-	egg_menu_merge_insert_action_group (merge, p->action_group, 0);
-	p->ui_id = egg_menu_merge_add_ui_from_string
+	gtk_ui_manager_insert_action_group (merge, p->action_group, 0);
+	p->ui_id = gtk_ui_manager_add_ui_from_string
 				(merge, xml->str, -1, &error);	
 
 	g_string_free (xml, TRUE);
diff --git a/src/ephy-window.c b/src/ephy-window.c
index 59ff4e30e..a91808532 100644
--- a/src/ephy-window.c
+++ b/src/ephy-window.c
@@ -59,206 +59,203 @@
 #include "egg-menu-merge.h"
 #include "egg-toggle-action.h"
 
-static EggActionGroupEntry ephy_menu_entries [] = {
+static GtkActionGroupEntry ephy_menu_entries [] = {
 
 	/* Toplevel */
-	{ "File", N_("_File"), NULL, NULL, NULL, NULL, NULL },
-	{ "Edit", N_("_Edit"), NULL, NULL, NULL, NULL, NULL },
-	{ "View", N_("_View"), NULL, NULL, NULL, NULL, NULL },
-	{ "Bookmarks", N_("_Bookmarks"), NULL, NULL, NULL, NULL, NULL },
-	{ "Go", N_("_Go"), NULL, NULL, NULL, NULL, NULL },
-	{ "Tabs", N_("_Tabs"), NULL, NULL, NULL, NULL, NULL },
-	{ "Help", N_("_Help"), NULL, NULL, NULL, NULL, NULL },
+	{ "File", NULL, N_("_File") },
+	{ "Edit", NULL, N_("_Edit") },
+	{ "View", NULL, N_("_View") },
+	{ "Bookmarks", NULL, N_("_Bookmarks") },
+	{ "Go", NULL, N_("_Go") },
+	{ "Tabs", NULL, N_("_Tabs") },
+	{ "Help", NULL, N_("_Help") },
 
 	/* File menu */
-	{ "FileNewWindow", N_("_New Window"), GTK_STOCK_NEW, "<control>N",
+	{ "FileNewWindow", GTK_STOCK_NEW, N_("_New Window"), "<control>N",
 	  N_("Open a new window"),
-	  G_CALLBACK (window_cmd_file_new_window), NULL },
-	{ "FileNewTab", N_("New _Tab"), EPHY_STOCK_NEW_TAB, "<control>T",
+	  G_CALLBACK (window_cmd_file_new_window) },
+	{ "FileNewTab", EPHY_STOCK_NEW_TAB, N_("New _Tab"), "<control>T",
 	  N_("Open a new tab"),
-	  G_CALLBACK (window_cmd_file_new_tab), NULL },
-	{ "FileOpen", N_("_Open..."), GTK_STOCK_OPEN, "<control>O",
+	  G_CALLBACK (window_cmd_file_new_tab) },
+	{ "FileOpen", GTK_STOCK_OPEN, N_("_Open..."), "<control>O",
 	  N_("Open a file"),
-	  G_CALLBACK (window_cmd_file_open), NULL },
-	{ "FileSaveAs", N_("Save _As..."), GTK_STOCK_SAVE_AS, "<shift><control>S",
+	  G_CALLBACK (window_cmd_file_open) },
+	{ "FileSaveAs", GTK_STOCK_SAVE_AS, N_("Save _As..."), "<shift><control>S",
 	  N_("Save the current page"),
-	  G_CALLBACK (window_cmd_file_save_as), NULL },
-	{ "FilePrint", N_("_Print..."), GTK_STOCK_PRINT, "<control>P",
+	  G_CALLBACK (window_cmd_file_save_as) },
+	{ "FilePrint", GTK_STOCK_PRINT, N_("_Print..."), "<control>P",
 	  N_("Print the current page"),
-	  G_CALLBACK (window_cmd_file_print), NULL },
-	{ "FileSendTo", N_("S_end To..."), EPHY_STOCK_SEND_LINK, NULL,
+	  G_CALLBACK (window_cmd_file_print) },
+	{ "FileSendTo", EPHY_STOCK_SEND_LINK, N_("S_end To..."), NULL,
 	  N_("Send a link of the current page"),
-	  G_CALLBACK (window_cmd_file_send_to), NULL },
-	{ "FileCloseWindow", N_("_Close"), GTK_STOCK_CLOSE, "<control>W",
+	  G_CALLBACK (window_cmd_file_send_to) },
+	{ "FileCloseWindow", GTK_STOCK_CLOSE, N_("_Close"), "<control>W",
 	  N_("Close this window"),
-	  G_CALLBACK (window_cmd_file_close_window), NULL },
+	  G_CALLBACK (window_cmd_file_close_window) },
 
 	/* Edit menu */
-	{ "EditCut", N_("Cu_t"), GTK_STOCK_CUT, "<control>X",
+	{ "EditCut", GTK_STOCK_CUT, N_("Cu_t"), "<control>X",
 	  N_("Cut the selection"),
-	  G_CALLBACK (window_cmd_edit_cut), NULL },
-	{ "EditCopy", N_("_Copy"), GTK_STOCK_COPY, "<control>C",
+	  G_CALLBACK (window_cmd_edit_cut) },
+	{ "EditCopy", GTK_STOCK_COPY, N_("_Copy"), "<control>C",
 	  N_("Copy the selection"),
-	  G_CALLBACK (window_cmd_edit_copy), NULL },
-	{ "EditPaste", N_("_Paste"), GTK_STOCK_PASTE, "<control>V",
+	  G_CALLBACK (window_cmd_edit_copy) },
+	{ "EditPaste", GTK_STOCK_PASTE, N_("_Paste"), "<control>V",
 	  N_("Paste clipboard"),
-	  G_CALLBACK (window_cmd_edit_paste), NULL },
-	{ "EditSelectAll", N_("Select _All"), NULL, "<control>A",
+	  G_CALLBACK (window_cmd_edit_paste) },
+	{ "EditSelectAll", NULL, N_("Select _All"), "<control>A",
 	  N_("Select the entire page"),
-	  G_CALLBACK (window_cmd_edit_select_all), NULL },
-	{ "EditFind", N_("_Find..."), GTK_STOCK_FIND, "<control>F",
+	  G_CALLBACK (window_cmd_edit_select_all) },
+	{ "EditFind", GTK_STOCK_FIND, N_("_Find..."), "<control>F",
 	  N_("Find a word or phrase in the page"),
-	  G_CALLBACK (window_cmd_edit_find), NULL },
-	{ "EditFindNext", N_("Find Ne_xt"), NULL, "<control>G",
+	  G_CALLBACK (window_cmd_edit_find) },
+	{ "EditFindNext", NULL, N_("Find Ne_xt"), "<control>G",
 	  N_("Find next occurrence of the word or phrase"),
-	  G_CALLBACK (window_cmd_edit_find_next), NULL },
-	{ "EditFindPrev", N_("Find Pre_vious"), NULL, "<shift><control>G",
+	  G_CALLBACK (window_cmd_edit_find_next) },
+	{ "EditFindPrev", NULL, N_("Find Pre_vious"), "<shift><control>G",
 	  N_("Find previous occurrence of the word or phrase"),
-	  G_CALLBACK (window_cmd_edit_find_prev), NULL },
-	{ "EditPersonalData", N_("P_ersonal Data"), NULL, NULL,
+	  G_CALLBACK (window_cmd_edit_find_prev) },
+	{ "EditPersonalData", NULL, N_("P_ersonal Data"), NULL,
 	  N_("View and remove cookies and passwords"),
-	  G_CALLBACK (window_cmd_edit_personal_data), NULL },
-	{ "EditToolbar", N_("T_oolbars"), NULL, NULL,
+	  G_CALLBACK (window_cmd_edit_personal_data) },
+	{ "EditToolbar", NULL, N_("T_oolbars"), NULL,
 	  N_("Customize toolbars"),
-	  G_CALLBACK (window_cmd_edit_toolbar), NULL },
-	{ "EditPrefs", N_("P_references"), GTK_STOCK_PREFERENCES, NULL,
+	  G_CALLBACK (window_cmd_edit_toolbar) },
+	{ "EditPrefs", GTK_STOCK_PREFERENCES, N_("P_references"), NULL,
 	  N_("Configure the web browser"),
-	  G_CALLBACK (window_cmd_edit_prefs), NULL },
+	  G_CALLBACK (window_cmd_edit_prefs) },
 
 	/* View menu */
-	{ "ViewStop", N_("_Stop"), GTK_STOCK_STOP, "Escape",
+	{ "ViewStop", GTK_STOCK_STOP, N_("_Stop"), "Escape",
 	  N_("Stop current data transfer"),
-	  G_CALLBACK (window_cmd_view_stop), NULL },
-	{ "ViewReload", N_("_Reload"), GTK_STOCK_REFRESH, "<control>R",
+	  G_CALLBACK (window_cmd_view_stop) },
+	{ "ViewReload", GTK_STOCK_REFRESH, N_("_Reload"), "<control>R",
 	  N_("Display the latest content of the current page"),
-	  G_CALLBACK (window_cmd_view_reload), NULL },
-	{ "ViewToolbar", N_("_Toolbar"), NULL, "<shift><control>T",
+	  G_CALLBACK (window_cmd_view_reload) },
+	{ "ViewToolbar", NULL, N_("_Toolbar"), "<shift><control>T",
 	  N_("Show or hide toolbar"),
-	  G_CALLBACK (window_cmd_view_toolbar), NULL, TOGGLE_ACTION },
-	{ "ViewBookmarksBar", N_("_Bookmarks Bar"), NULL, NULL,
+	  G_CALLBACK (window_cmd_view_toolbar), TOGGLE_ACTION },
+	{ "ViewBookmarksBar", NULL, N_("_Bookmarks Bar"), NULL,
 	  N_("Show or hide bookmarks bar"),
 	  G_CALLBACK (window_cmd_view_bookmarks_bar), NULL, TOGGLE_ACTION },
-	{ "ViewStatusbar", N_("St_atusbar"), NULL, NULL,
+	{ "ViewStatusbar", NULL, N_("St_atusbar"), NULL,
 	  N_("Show or hide statusbar"),
-	  G_CALLBACK (window_cmd_view_statusbar), NULL, TOGGLE_ACTION },
-	{ "ViewFullscreen", N_("_Fullscreen"), EPHY_STOCK_FULLSCREEN, "F11",
+	  G_CALLBACK (window_cmd_view_statusbar), TOGGLE_ACTION },
+	{ "ViewFullscreen", EPHY_STOCK_FULLSCREEN, N_("_Fullscreen"), "F11",
 	  N_("Browse at full screen"),
-	  G_CALLBACK (window_cmd_view_fullscreen), NULL, TOGGLE_ACTION},
-	{ "ViewZoomIn", N_("Zoom _In"), GTK_STOCK_ZOOM_IN, "<control>plus",
+	  G_CALLBACK (window_cmd_view_fullscreen), TOGGLE_ACTION},
+	{ "ViewZoomIn", GTK_STOCK_ZOOM_IN, N_("Zoom _In"), "<control>plus",
 	  N_("Increase the text size"),
-	  G_CALLBACK (window_cmd_view_zoom_in), NULL },
-	{ "ViewZoomOut", N_("Zoom _Out"), GTK_STOCK_ZOOM_OUT, "<control>minus",
+	  G_CALLBACK (window_cmd_view_zoom_in) },
+	{ "ViewZoomOut", GTK_STOCK_ZOOM_OUT, N_("Zoom _Out"), "<control>minus",
 	  N_("Decrease the text size"),
-	  G_CALLBACK (window_cmd_view_zoom_out), NULL },
-	{ "ViewZoomNormal", N_("_Normal Size"), GTK_STOCK_ZOOM_100, NULL,
+	  G_CALLBACK (window_cmd_view_zoom_out) },
+	{ "ViewZoomNormal", GTK_STOCK_ZOOM_100, N_("_Normal Size"), NULL,
 	  N_("Use the normal text size"),
-	  G_CALLBACK (window_cmd_view_zoom_normal), NULL },
+	  G_CALLBACK (window_cmd_view_zoom_normal) },
 	{ "ViewEncoding", N_("_Encoding"), NULL, NULL, NULL, NULL, NULL },
-	{ "ViewPageSource", N_("_Page Source"), EPHY_STOCK_VIEWSOURCE, "<control>U",
+	{ "ViewPageSource", EPHY_STOCK_VIEWSOURCE, N_("_Page Source"), "<control>U",
 	  N_("View the source code of the page"),
-	  G_CALLBACK (window_cmd_view_page_source), NULL },
+	  G_CALLBACK (window_cmd_view_page_source) },
 
 	/* Bookmarks menu */
-	{ "FileBookmarkPage", N_("_Add Bookmark..."), EPHY_STOCK_BOOKMARK_PAGE, "<control>D",
+	{ "FileBookmarkPage", EPHY_STOCK_BOOKMARK_PAGE, N_("_Add Bookmark..."), "<control>D",
 	  N_("Add a bookmark for the current page"),
-	  G_CALLBACK (window_cmd_file_bookmark_page), NULL },
-	{ "GoBookmarks", N_("_Edit Bookmarks"), EPHY_STOCK_BOOKMARKS, "<control>B",
+	  G_CALLBACK (window_cmd_file_bookmark_page) },
+	{ "GoBookmarks", EPHY_STOCK_BOOKMARKS, N_("_Edit Bookmarks"), "<control>B",
 	  N_("Open the bookmarks window"),
-	  G_CALLBACK (window_cmd_go_bookmarks), NULL },
+	  G_CALLBACK (window_cmd_go_bookmarks) },
 
 	/* Go menu */
-	{ "GoBack", N_("_Back"), GTK_STOCK_GO_BACK, "<alt>Left",
+	{ "GoBack", GTK_STOCK_GO_BACK, N_("_Back"), "<alt>Left",
 	  N_("Go to the previous visited page"),
-	  G_CALLBACK (window_cmd_go_back), NULL },
-	{ "GoForward", N_("_Forward"), GTK_STOCK_GO_FORWARD, "<alt>Right",
+	  G_CALLBACK (window_cmd_go_back) },
+	{ "GoForward", GTK_STOCK_GO_FORWARD, N_("_Forward"), "<alt>Right",
 	  N_("Go to the next visited page"),
-	  G_CALLBACK (window_cmd_go_forward), NULL },
-	{ "GoUp", N_("_Up"), GTK_STOCK_GO_UP, "<alt>Up",
+	  G_CALLBACK (window_cmd_go_forward) },
+	{ "GoUp", GTK_STOCK_GO_UP, N_("_Up"), "<alt>Up",
 	  N_("Go up one level"),
-	  G_CALLBACK (window_cmd_go_up), NULL },
-	{ "GoHome", N_("_Home"), GTK_STOCK_HOME, "<alt>Home",
+	  G_CALLBACK (window_cmd_go_up) },
+	{ "GoHome", GTK_STOCK_HOME, N_("_Home"), "<alt>Home",
 	  N_("Go to the home page"),
-	  G_CALLBACK (window_cmd_go_home), NULL },
-	{ "GoLocation", N_("_Location..."), NULL, "<control>L",
+	  G_CALLBACK (window_cmd_go_home) },
+	{ "GoLocation", NULL, N_("_Location..."), "<control>L",
 	  N_("Go to a specified location"),
-	  G_CALLBACK (window_cmd_go_location), NULL },
-	{ "GoHistory", N_("H_istory"), EPHY_STOCK_HISTORY, "<control>H",
+	  G_CALLBACK (window_cmd_go_location) },
+	{ "GoHistory", EPHY_STOCK_HISTORY, N_("H_istory"), "<control>H",
 	  N_("Open the history window"),
-	  G_CALLBACK (window_cmd_go_history), NULL },
+	  G_CALLBACK (window_cmd_go_history) },
 
 	/* Tabs menu */
-	{ "TabsPrevious", N_("_Previous Tab"), NULL, "<control>Page_Up",
+	{ "TabsPrevious", NULL, N_("_Previous Tab"), "<control>Page_Up",
 	  N_("Activate previous tab"),
-	  G_CALLBACK (window_cmd_tabs_previous), NULL },
-	{ "TabsNext", N_("_Next Tab"), NULL, "<control>Page_Down",
+	  G_CALLBACK (window_cmd_tabs_previous) },
+	{ "TabsNext", NULL, N_("_Next Tab"), "<control>Page_Down",
 	  N_("Activate next tab"),
-	  G_CALLBACK (window_cmd_tabs_next), NULL },
-	{ "TabsMoveLeft", N_("Move Tab _Left"), NULL, "<shift><control>Page_Up",
+	  G_CALLBACK (window_cmd_tabs_next) },
+	{ "TabsMoveLeft", NULL, N_("Move Tab _Left"), "<shift><control>Page_Up",
 	  N_("Move current tab to left"),
-	  G_CALLBACK (window_cmd_tabs_move_left), NULL },
-	{ "TabsMoveRight", N_("Move Tab _Right"), NULL, "<shift><control>Page_Down",
+	  G_CALLBACK (window_cmd_tabs_move_left) },
+	{ "TabsMoveRight", NULL, N_("Move Tab _Right"), "<shift><control>Page_Down",
 	  N_("Move current tab to right"),
-	  G_CALLBACK (window_cmd_tabs_move_right), NULL },
-	{ "TabsDetach", N_("_Detach Tab"), NULL, "<shift><control>M",
+	  G_CALLBACK (window_cmd_tabs_move_right) },
+	{ "TabsDetach", NULL, N_("_Detach Tab"), "<shift><control>M",
 	  N_("Detach current tab"),
-	  G_CALLBACK (window_cmd_tabs_detach), NULL },
+	  G_CALLBACK (window_cmd_tabs_detach) },
 
 	/* Help menu */
-	{"HelpContents", N_("_Contents"), GTK_STOCK_HELP, "F1",
+	{"HelpContents", GTK_STOCK_HELP, N_("_Contents"), "F1",
 	 N_("Display web browser help"),
-	 G_CALLBACK (window_cmd_help_contents), NULL },
-	{ "HelpAbout", N_("_About"), GNOME_STOCK_ABOUT, NULL,
+	 G_CALLBACK (window_cmd_help_contents) },
+	{ "HelpAbout", GNOME_STOCK_ABOUT, N_("_About"), NULL,
 	  N_("Display credits for the web browser creators"),
-	  G_CALLBACK (window_cmd_help_about), NULL },
+	  G_CALLBACK (window_cmd_help_about) },
 };
 static guint ephy_menu_n_entries = G_N_ELEMENTS (ephy_menu_entries);
 
-static EggActionGroupEntry ephy_popups_entries [] = {
-	/* Toplevel */
-	{ "FakeToplevel", (""), NULL, NULL, NULL, NULL, NULL },
-
+static GtkActionGroupEntry ephy_popups_entries [] = {
 	/* Document */
-	{ "SaveBackgroundAs", N_("_Save Background As..."), NULL, NULL,
-	  NULL, G_CALLBACK (popup_cmd_save_background_as), NULL },
-	{ "ContextBookmarkPage", N_("Add Boo_kmark..."), EPHY_STOCK_BOOKMARK_PAGE, "<control>D",
+	{ "SaveBackgroundAs", NULL, N_("_Save Background As..."), NULL,
+	  NULL, G_CALLBACK (popup_cmd_save_background_as) },
+	{ "ContextBookmarkPage", EPHY_STOCK_BOOKMARK_PAGE, N_("Add Boo_kmark..."), "<control>D",
 	  N_("Add a bookmark for the current page"),
-	  G_CALLBACK (window_cmd_file_bookmark_page), NULL },
+	  G_CALLBACK (window_cmd_file_bookmark_page) },
 
 	/* Framed document */
-	{ "OpenFrame", N_("_Open Frame"), NULL, NULL,
-	  NULL, G_CALLBACK (popup_cmd_open_frame), NULL },
-	{ "OpenFrameInNewWindow", N_("Open Frame in _New Window"), NULL, NULL,
-	  NULL, G_CALLBACK (popup_cmd_frame_in_new_window), NULL },
-	{ "OpenFrameInNewTab", N_("Open Frame in New _Tab"), NULL, NULL,
-	  NULL, G_CALLBACK (popup_cmd_frame_in_new_tab), NULL },
+	{ "OpenFrame", NULL, N_("_Open Frame"), NULL,
+	  NULL, G_CALLBACK (popup_cmd_open_frame) },
+	{ "OpenFrameInNewWindow", NULL, N_("Open Frame in _New Window"), NULL,
+	  NULL, G_CALLBACK (popup_cmd_frame_in_new_window) },
+	{ "OpenFrameInNewTab", NULL, N_("Open Frame in New _Tab"), NULL,
+	  NULL, G_CALLBACK (popup_cmd_frame_in_new_tab) },
 
 	/* Links */
-	{ "OpenLink", N_("_Open Link"), GTK_STOCK_OPEN, NULL,
-	  NULL, G_CALLBACK (popup_cmd_open_link), NULL },
-	{ "OpenLinkInNewWindow", N_("Open Link in _New Window"), NULL, NULL,
-	  NULL, G_CALLBACK (popup_cmd_link_in_new_window), NULL },
-	{ "OpenLinkInNewTab", N_("Open Link in New _Tab"), NULL, NULL,
-	  NULL, G_CALLBACK (popup_cmd_link_in_new_tab), NULL },
-	{ "DownloadLink", N_("_Download Link..."), GTK_STOCK_SAVE, NULL,
-	  NULL, G_CALLBACK (popup_cmd_download_link), NULL },
-	{ "BookmarkLink", N_("_Bookmark Link..."), EPHY_STOCK_BOOKMARK_PAGE, NULL,
+	{ "OpenLink", GTK_STOCK_OPEN, N_("_Open Link"),
+	  NULL, G_CALLBACK (popup_cmd_open_link) },
+	{ "OpenLinkInNewWindow", NULL, N_("Open Link in _New Window"), NULL,
+	  NULL, G_CALLBACK (popup_cmd_link_in_new_window) },
+	{ "OpenLinkInNewTab", NULL, N_("Open Link in New _Tab"),
+	  NULL, G_CALLBACK (popup_cmd_link_in_new_tab) },
+	{ "DownloadLink", GTK_STOCK_SAVE, N_("_Download Link..."), NULL,
+	  NULL, G_CALLBACK (popup_cmd_download_link) },
+	{ "BookmarkLink", EPHY_STOCK_BOOKMARK_PAGE, N_("_Bookmark Link..."), NULL,
 	  NULL, G_CALLBACK (popup_cmd_bookmark_link), NULL },
-	{ "CopyLinkAddress", N_("_Copy Link Address"), NULL, NULL,
+	{ "CopyLinkAddress", NULL, N_("_Copy Link Address"), NULL,
 	  NULL, G_CALLBACK (popup_cmd_copy_link_address), NULL },
 
 	/* Images */
-	{ "OpenImage", N_("Open _Image"), GTK_STOCK_OPEN, NULL,
+	{ "OpenImage", GTK_STOCK_OPEN, N_("Open _Image"), GTK_STOCK_OPEN,
 	  NULL, G_CALLBACK (popup_cmd_open_image), NULL },
-	{ "OpenImageInNewWindow", N_("Open Image in New _Window"), NULL, NULL,
-	  NULL, G_CALLBACK (popup_cmd_image_in_new_window), NULL },
-	{ "OpenImageInNewTab", N_("Open Image in New T_ab"), NULL, NULL,
-	  NULL, G_CALLBACK (popup_cmd_image_in_new_tab), NULL },
-	{ "SaveImageAs", N_("_Save Image As..."), GTK_STOCK_SAVE_AS, NULL,
-	  NULL, G_CALLBACK (popup_cmd_save_image_as), NULL },
-	{ "SetImageAsBackground", N_("_Use Image As Background"), NULL, NULL,
-	  NULL, G_CALLBACK (popup_cmd_set_image_as_background), NULL },
-	{ "CopyImageLocation", N_("Copy I_mage Address"), NULL, NULL,
-	  NULL, G_CALLBACK (popup_cmd_copy_image_location), NULL },
+	{ "OpenImageInNewWindow", NULL, N_("Open Image in New _Window"), NULL,
+	  NULL, G_CALLBACK (popup_cmd_image_in_new_window) },
+	{ "OpenImageInNewTab", NULL, N_("Open Image in New T_ab"), NULL,
+	  NULL, G_CALLBACK (popup_cmd_image_in_new_tab) },
+	{ "SaveImageAs", GTK_STOCK_SAVE_AS, N_("_Save Image As..."), NULL,
+	  NULL, G_CALLBACK (popup_cmd_save_image_as) },
+	{ "SetImageAsBackground", N_("_Use Image As Background"), NULL,
+	  NULL, G_CALLBACK (popup_cmd_set_image_as_background) },
+	{ "CopyImageLocation", N_("Copy I_mage Address"), NULL,
+	  NULL, G_CALLBACK (popup_cmd_copy_image_location) },
 };
 static guint ephy_popups_n_entries = G_N_ELEMENTS (ephy_popups_entries);
 
@@ -270,8 +267,8 @@ struct EphyWindowPrivate
 	GtkWidget *exit_fullscreen_popup;
 	Toolbar *toolbar;
 	GtkWidget *statusbar;
-	EggActionGroup *action_group;
-	EggActionGroup *popups_action_group;
+	GtkActionGroup *action_group;
+	GtkActionGroup *popups_action_group;
 	EphyFavoritesMenu *fav_menu;
 	EphyEncodingMenu *enc_menu;
 	EphyTabsMenu *tabs_menu;
@@ -397,7 +394,7 @@ ephy_window_selection_received_cb (GtkWidget *widget,
 }
 
 static void
-add_widget (EggMenuMerge *merge, GtkWidget *widget, EphyWindow *window)
+add_widget (GtkUIManager *merge, GtkWidget *widget, EphyWindow *window)
 {
 	if (GTK_IS_MENU_SHELL (widget))
 	{
@@ -416,8 +413,8 @@ menu_activate_cb (GtkWidget *widget,
    changes to do this properly */
 #if 0
 	gboolean cut, copy, paste, select_all;
-	EggActionGroup *action_group;
-	EggAction *action;
+	GtkActionGroup *action_group;
+	GtkAction *action;
 	GtkWidget *focus_widget;
 	EphyEmbed *embed;
 
@@ -456,13 +453,13 @@ menu_activate_cb (GtkWidget *widget,
 	}
 
 	action_group = window->priv->action_group;
-	action = egg_action_group_get_action (action_group, "EditCut");
+	action = gtk_action_group_get_action (action_group, "EditCut");
 	g_object_set (action, "sensitive", cut, NULL);
-	action = egg_action_group_get_action (action_group, "EditCopy");
+	action = gtk_action_group_get_action (action_group, "EditCopy");
 	g_object_set (action, "sensitive", copy, NULL);
-	action = egg_action_group_get_action (action_group, "EditPaste");
+	action = gtk_action_group_get_action (action_group, "EditPaste");
 	g_object_set (action, "sensitive", paste, NULL);
-	action = egg_action_group_get_action (action_group, "EditSelectAll");
+	action = gtk_action_group_get_action (action_group, "EditSelectAll");
 	g_object_set (action, "sensitive", select_all, NULL);
 #endif
 }
@@ -615,7 +612,7 @@ ephy_window_state_event_cb (GtkWidget *widget, GdkEventWindowState *event, EphyW
 {
 	if (event->changed_mask & GDK_WINDOW_STATE_FULLSCREEN)
 	{
-		EggAction *action;
+		GtkAction *action;
 		gboolean fullscreen;
 
 		fullscreen = event->new_window_state & GDK_WINDOW_STATE_FULLSCREEN;
@@ -629,9 +626,9 @@ ephy_window_state_event_cb (GtkWidget *widget, GdkEventWindowState *event, EphyW
 			ephy_window_unfullscreen (window);
 		}
 
-		action = egg_action_group_get_action (window->priv->action_group,
+		action = gtk_action_group_get_action (window->priv->action_group,
 						      "ViewFullscreen");
-		egg_toggle_action_set_active (EGG_TOGGLE_ACTION (action), fullscreen);
+		egg_toggle_action_set_active (GTK_TOGGLE_ACTION (action), fullscreen);
 	}
 
 	return FALSE;
@@ -640,9 +637,9 @@ ephy_window_state_event_cb (GtkWidget *widget, GdkEventWindowState *event, EphyW
 static void
 setup_window (EphyWindow *window)
 {
-	EggActionGroup *action_group;
-	EggAction *action;
-	EggMenuMerge *merge;
+	GtkActionGroup *action_group;
+	GtkAction *action;
+	GtkUIManager *merge;
 	GtkWidget *menu;
 	int i;
 
@@ -667,47 +664,47 @@ setup_window (EphyWindow *window)
 		ephy_popups_entries[i].user_data = window;
 	}
 
-	merge = egg_menu_merge_new ();
+	merge = gtk_ui_manager_new ();
 
-	action_group = egg_action_group_new ("WindowActions");
-	egg_action_group_add_actions (action_group, ephy_menu_entries,
+	action_group = gtk_action_group_new ("WindowActions");
+	gtk_action_group_add_actions (action_group, ephy_menu_entries,
 				      ephy_menu_n_entries);
-	egg_menu_merge_insert_action_group (merge, action_group, 0);
+	gtk_ui_manager_insert_action_group (merge, action_group, 0);
 	window->priv->action_group = action_group;
-	action = egg_action_group_get_action (action_group, "FileOpen");
+	action = gtk_action_group_get_action (action_group, "FileOpen");
 	g_object_set (action, "short_label", _("Open"), NULL);
-	action = egg_action_group_get_action (action_group, "FileSaveAs");
+	action = gtk_action_group_get_action (action_group, "FileSaveAs");
 	g_object_set (action, "short_label", _("Save As"), NULL);
-	action = egg_action_group_get_action (action_group, "FilePrint");
+	action = gtk_action_group_get_action (action_group, "FilePrint");
 	g_object_set (action, "short_label", _("Print"), NULL);
-	action = egg_action_group_get_action (action_group, "FileBookmarkPage");
+	action = gtk_action_group_get_action (action_group, "FileBookmarkPage");
 	g_object_set (action, "short_label", _("Bookmark"), NULL);
-	action = egg_action_group_get_action (action_group, "EditFind");
+	action = gtk_action_group_get_action (action_group, "EditFind");
 	g_object_set (action, "short_label", _("Find"), NULL);
-	action = egg_action_group_get_action (action_group, "GoBookmarks");
+	action = gtk_action_group_get_action (action_group, "GoBookmarks");
 	g_object_set (action, "short_label", _("Bookmarks"), NULL);
 
-	action = egg_action_group_get_action (action_group, "EditFind");
+	action = gtk_action_group_get_action (action_group, "EditFind");
 	g_object_set (action, "important", TRUE, NULL);
-	action = egg_action_group_get_action (action_group, "GoHome");
+	action = gtk_action_group_get_action (action_group, "GoHome");
 	g_object_set (action, "important", TRUE, NULL);
-	action = egg_action_group_get_action (action_group, "GoBookmarks");
+	action = gtk_action_group_get_action (action_group, "GoBookmarks");
 	g_object_set (action, "important", TRUE, NULL);
 
-	action_group = egg_action_group_new ("PopupsActions");
-	egg_action_group_add_actions (action_group, ephy_popups_entries,
+	action_group = gtk_action_group_new ("PopupsActions");
+	gtk_action_group_add_actions (action_group, ephy_popups_entries,
 				      ephy_popups_n_entries);
-	egg_menu_merge_insert_action_group (merge, action_group, 0);
+	gtk_ui_manager_insert_action_group (merge, action_group, 0);
 	window->priv->popups_action_group = action_group;
 
 	window->ui_merge = G_OBJECT (merge);
 	g_signal_connect (merge, "add_widget", G_CALLBACK (add_widget), window);
-	egg_menu_merge_add_ui_from_file
+	gtk_ui_manager_add_ui_from_file
 		(merge, ephy_file ("epiphany-ui.xml"), NULL);
 	gtk_window_add_accel_group (GTK_WINDOW (window), merge->accel_group);
-	egg_menu_merge_ensure_update (merge);
+	gtk_ui_manager_ensure_update (merge);
 
-	menu = egg_menu_merge_get_widget (merge, "/menu/EditMenu");
+	menu = gtk_ui_manager_get_widget (merge, "/menu/EditMenu");
 	g_signal_connect (menu, "activate", G_CALLBACK (menu_activate_cb), window);
 
 	window->priv->toolbar = toolbar_new (window);
@@ -826,8 +823,8 @@ static void
 sync_tab_navigation (EphyTab *tab, GParamSpec *pspec, EphyWindow *window)
 {
 	TabNavigationFlags flags;
-	EggActionGroup *action_group;
-	EggAction *action;
+	GtkActionGroup *action_group;
+	GtkAction *action;
 	gboolean up = FALSE, back = FALSE, forward = FALSE;
 
 	if (window->priv->closing) return;
@@ -848,11 +845,11 @@ sync_tab_navigation (EphyTab *tab, GParamSpec *pspec, EphyWindow *window)
 	}
 
 	action_group = window->priv->action_group;
-	action = egg_action_group_get_action (action_group, "GoUp");
+	action = gtk_action_group_get_action (action_group, "GoUp");
 	g_object_set (action, "sensitive", up, NULL);
-	action = egg_action_group_get_action (action_group, "GoBack");
+	action = gtk_action_group_get_action (action_group, "GoBack");
 	g_object_set (action, "sensitive", back, NULL);
-	action = egg_action_group_get_action (action_group, "GoForward");
+	action = gtk_action_group_get_action (action_group, "GoForward");
 	g_object_set (action, "sensitive", forward, NULL);
 
 	toolbar_update_navigation_actions (window->priv->toolbar,
@@ -936,11 +933,11 @@ sync_tab_security (EphyTab *tab, GParamSpec *pspec, EphyWindow *window)
 static void
 sync_tab_stop (EphyTab *tab, GParamSpec *pspec, EphyWindow *window)
 {
-	EggAction *action;
+	GtkAction *action;
 
 	if (window->priv->closing) return;
 
-	action = egg_action_group_get_action (window->priv->action_group, "ViewStop");
+	action = gtk_action_group_get_action (window->priv->action_group, "ViewStop");
 
 	g_object_set (action, "sensitive", ephy_tab_get_load_status (tab), NULL);
 }
@@ -996,8 +993,8 @@ sync_tab_visibility (EphyTab *tab, GParamSpec *pspec, EphyWindow *window)
 static void
 sync_tab_zoom (EphyTab *tab, GParamSpec *pspec, EphyWindow *window)
 {
-	EggActionGroup *action_group;
-	EggAction *action;
+	GtkActionGroup *action_group;
+	GtkAction *action;
 	gboolean can_zoom_in = TRUE, can_zoom_out = TRUE, can_zoom_normal = FALSE;
 	float zoom;
 
@@ -1021,11 +1018,11 @@ sync_tab_zoom (EphyTab *tab, GParamSpec *pspec, EphyWindow *window)
 	toolbar_update_zoom (window->priv->toolbar, zoom);
 
 	action_group = window->priv->action_group;
-	action = egg_action_group_get_action (action_group, "ViewZoomIn");
+	action = gtk_action_group_get_action (action_group, "ViewZoomIn");
 	g_object_set (action, "sensitive", can_zoom_in, NULL);
-	action = egg_action_group_get_action (action_group, "ViewZoomOut");
+	action = gtk_action_group_get_action (action_group, "ViewZoomOut");
 	g_object_set (action, "sensitive", can_zoom_out, NULL);
-	action = egg_action_group_get_action (action_group, "ViewZoomNormal");
+	action = gtk_action_group_get_action (action_group, "ViewZoomNormal");
 	g_object_set (action, "sensitive", can_zoom_normal, NULL);
 }
 
@@ -1054,8 +1051,8 @@ popup_destroy_cb (GtkWidget *widget, EphyWindow *window)
 static void
 show_embed_popup (EphyWindow *window, EphyTab *tab, EphyEmbedEvent *event)
 {
-	EggActionGroup *action_group;
-	EggAction *action;
+	GtkActionGroup *action_group;
+	GtkAction *action;
 	EmbedEventContext context;
 	const char *popup;
 	char *path;
@@ -1101,12 +1098,12 @@ show_embed_popup (EphyWindow *window, EphyTab *tab, EphyEmbedEvent *event)
 	}
 
 	action_group = window->priv->popups_action_group;
-	action = egg_action_group_get_action (action_group, "SaveBackgroundAs");
+	action = gtk_action_group_get_action (action_group, "SaveBackgroundAs");
 	g_object_set (action, "sensitive", has_background,
 			      "visible", has_background, NULL);
 
 	path = g_strconcat ("/popups/", popup, NULL);
-	widget = egg_menu_merge_get_widget (EGG_MENU_MERGE (window->ui_merge),
+	widget = gtk_ui_manager_get_widget (GTK_UI_MANAGER (window->ui_merge),
 				            path);
 	g_free (path);
 
@@ -1266,8 +1263,8 @@ static void
 update_tabs_menu_sensitivity (EphyWindow *window)
 {
 	gboolean prev_tab, next_tab, move_left, move_right, detach;
-	EggActionGroup *action_group;
-	EggAction *action;
+	GtkActionGroup *action_group;
+	GtkAction *action;
 	int current;
 	int last;
 
@@ -1281,15 +1278,15 @@ update_tabs_menu_sensitivity (EphyWindow *window)
 		(GTK_NOTEBOOK (window->priv->notebook)) > 1;
 
 	action_group = window->priv->action_group;
-	action = egg_action_group_get_action (action_group, "TabsPrevious");
+	action = gtk_action_group_get_action (action_group, "TabsPrevious");
 	g_object_set (action, "sensitive", prev_tab, NULL);
-	action = egg_action_group_get_action (action_group, "TabsNext");
+	action = gtk_action_group_get_action (action_group, "TabsNext");
 	g_object_set (action, "sensitive", next_tab, NULL);
-	action = egg_action_group_get_action (action_group, "TabsMoveLeft");
+	action = gtk_action_group_get_action (action_group, "TabsMoveLeft");
 	g_object_set (action, "sensitive", move_left, NULL);
-	action = egg_action_group_get_action (action_group, "TabsMoveRight");
+	action = gtk_action_group_get_action (action_group, "TabsMoveRight");
 	g_object_set (action, "sensitive", move_right, NULL);
-	action = egg_action_group_get_action (action_group, "TabsDetach");
+	action = gtk_action_group_get_action (action_group, "TabsDetach");
 	g_object_set (action, "sensitive", detach, NULL);
 }
 
@@ -1495,7 +1492,7 @@ ephy_window_finalize (GObject *object)
 	}
 
 	g_object_unref (window->priv->action_group);
-	egg_menu_merge_remove_action_group (EGG_MENU_MERGE (window->ui_merge),
+	gtk_ui_manager_remove_action_group (GTK_UI_MANAGER (window->ui_merge),
 					    window->priv->action_group);
 	g_object_unref (window->ui_merge);
 
@@ -1556,20 +1553,20 @@ translate_default_chrome (EmbedChromeMask *chrome_mask)
 static void
 update_layout_toggles (EphyWindow *window)
 {
-	EggActionGroup *action_group = EGG_ACTION_GROUP (window->priv->action_group);
+	GtkActionGroup *action_group = GTK_ACTION_GROUP (window->priv->action_group);
 	EmbedChromeMask mask = window->priv->chrome_mask;
-	EggAction *action;
+	GtkAction *action;
 
-	action = egg_action_group_get_action (action_group, "ViewToolbar");
-	egg_toggle_action_set_active (EGG_TOGGLE_ACTION (action),
+	action = gtk_action_group_get_action (action_group, "ViewToolbar");
+	egg_toggle_action_set_active (GTK_TOGGLE_ACTION (action),
 				      mask & EMBED_CHROME_TOOLBARON);
 
-	action = egg_action_group_get_action (action_group, "ViewBookmarksBar");
-	egg_toggle_action_set_active (EGG_TOGGLE_ACTION (action),
+	action = gtk_action_group_get_action (action_group, "ViewBookmarksBar");
+	egg_toggle_action_set_active (GTK_TOGGLE_ACTION (action),
 				      mask & EMBED_CHROME_BOOKMARKSBARON);
 
-	action = egg_action_group_get_action (action_group, "ViewStatusbar");
-	egg_toggle_action_set_active (EGG_TOGGLE_ACTION (action),
+	action = gtk_action_group_get_action (action_group, "ViewStatusbar");
+	egg_toggle_action_set_active (GTK_TOGGLE_ACTION (action),
 				      mask & EMBED_CHROME_STATUSBARON);
 }
 
diff --git a/src/popup-commands.c b/src/popup-commands.c
index 0b5d112bd..54b512722 100644
--- a/src/popup-commands.c
+++ b/src/popup-commands.c
@@ -41,7 +41,7 @@ get_event_info (EphyWindow *window)
 }
 
 void
-popup_cmd_link_in_new_window (EggAction *action,
+popup_cmd_link_in_new_window (GtkAction *action,
 		              EphyWindow *window)
 {
 	EphyEmbedEvent *info;
@@ -61,7 +61,7 @@ popup_cmd_link_in_new_window (EggAction *action,
 }
 
 void
-popup_cmd_link_in_new_tab (EggAction *action,
+popup_cmd_link_in_new_tab (GtkAction *action,
 		           EphyWindow *window)
 {
 	EphyEmbedEvent *info;
@@ -81,7 +81,7 @@ popup_cmd_link_in_new_tab (EggAction *action,
 }
 
 void
-popup_cmd_image_in_new_tab (EggAction *action,
+popup_cmd_image_in_new_tab (GtkAction *action,
 			    EphyWindow *window)
 {
 	EphyEmbedEvent *info;
@@ -101,7 +101,7 @@ popup_cmd_image_in_new_tab (EggAction *action,
 }
 
 void
-popup_cmd_image_in_new_window (EggAction *action,
+popup_cmd_image_in_new_window (GtkAction *action,
 			       EphyWindow *window)
 {
 	EphyEmbedEvent *info;
@@ -121,7 +121,7 @@ popup_cmd_image_in_new_window (EggAction *action,
 }
 
 void
-popup_cmd_bookmark_link (EggAction *action,
+popup_cmd_bookmark_link (GtkAction *action,
 			 EphyWindow *window)
 {
 	GtkWidget *new_bookmark;
@@ -179,7 +179,7 @@ popup_cmd_bookmark_link (EggAction *action,
 }
 
 void
-popup_cmd_frame_in_new_tab (EggAction *action,
+popup_cmd_frame_in_new_tab (GtkAction *action,
 			    EphyWindow *window)
 {
 	EphyTab *tab;
@@ -201,7 +201,7 @@ popup_cmd_frame_in_new_tab (EggAction *action,
 }
 
 void
-popup_cmd_frame_in_new_window (EggAction *action,
+popup_cmd_frame_in_new_window (GtkAction *action,
 			       EphyWindow *window)
 {
 	EphyTab *tab;
@@ -232,7 +232,7 @@ popup_cmd_copy_to_clipboard (EphyWindow *window, const char *text)
 }
 
 void
-popup_cmd_copy_link_address (EggAction *action,
+popup_cmd_copy_link_address (GtkAction *action,
 			     EphyWindow *window)
 {
 	EphyEmbedEvent *event;
@@ -257,7 +257,7 @@ popup_cmd_copy_link_address (EggAction *action,
 }
 
 static void
-save_property_url (EggAction *action,
+save_property_url (GtkAction *action,
 		   const char *title,
 		   EphyWindow *window,
 		   gboolean ask_dest,
@@ -298,7 +298,7 @@ save_property_url (EggAction *action,
 }
 
 void
-popup_cmd_open_link (EggAction *action,
+popup_cmd_open_link (GtkAction *action,
 		     EphyWindow *window)
 {
 	EphyEmbedEvent *info;
@@ -317,7 +317,7 @@ popup_cmd_open_link (EggAction *action,
 }
 
 void
-popup_cmd_download_link (EggAction *action,
+popup_cmd_download_link (GtkAction *action,
 			 EphyWindow *window)
 {
 	save_property_url (action, _("Download link"), window,
@@ -327,7 +327,7 @@ popup_cmd_download_link (EggAction *action,
 }
 
 void
-popup_cmd_save_image_as (EggAction *action,
+popup_cmd_save_image_as (GtkAction *action,
 			 EphyWindow *window)
 {
 	save_property_url (action, _("Save Image As"),
@@ -360,7 +360,7 @@ background_download_completed (EphyEmbedPersist *persist,
 }
 
 void
-popup_cmd_set_image_as_background (EggAction *action,
+popup_cmd_set_image_as_background (GtkAction *action,
 				   EphyWindow *window)
 {
 	EphyEmbedEvent *info;
@@ -397,7 +397,7 @@ popup_cmd_set_image_as_background (EggAction *action,
 }
 
 void
-popup_cmd_copy_image_location (EggAction *action,
+popup_cmd_copy_image_location (GtkAction *action,
 			       EphyWindow *window)
 {
 	EphyEmbedEvent *info;
@@ -415,7 +415,7 @@ popup_cmd_copy_image_location (EggAction *action,
 }
 
 void
-popup_cmd_save_background_as (EggAction *action,
+popup_cmd_save_background_as (GtkAction *action,
 			      EphyWindow *window)
 {
 	save_property_url (action, _("Save Background As"),
@@ -423,7 +423,7 @@ popup_cmd_save_background_as (EggAction *action,
 }
 
 void
-popup_cmd_open_frame (EggAction *action,
+popup_cmd_open_frame (GtkAction *action,
 		      EphyWindow *window)
 {
 	char *location;
@@ -440,7 +440,7 @@ popup_cmd_open_frame (EggAction *action,
 }
 
 void
-popup_cmd_open_image (EggAction *action,
+popup_cmd_open_image (GtkAction *action,
 		      EphyWindow *window)
 {
 	EphyEmbedEvent *info;
diff --git a/src/popup-commands.h b/src/popup-commands.h
index da14090aa..2d2da5f11 100644
--- a/src/popup-commands.h
+++ b/src/popup-commands.h
@@ -16,65 +16,66 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include "egg-action.h"
+#include <gtk/gtkaction.h>
+
 #include "ephy-window.h"
 
-void popup_cmd_link_in_new_window		(EggAction *action,
+void popup_cmd_link_in_new_window		(GtkAction *action,
 					 EphyWindow *window);
 
-void popup_cmd_link_in_new_tab		(EggAction *action,
+void popup_cmd_link_in_new_tab		(GtkAction *action,
 					 EphyWindow *window);
 
-void popup_cmd_image_in_new_tab		(EggAction *action,
+void popup_cmd_image_in_new_tab		(GtkAction *action,
 					 EphyWindow *window);
 
-void popup_cmd_image_in_new_window	(EggAction *action,
+void popup_cmd_image_in_new_window	(GtkAction *action,
 					 EphyWindow *window);
 
-void popup_cmd_bookmark_link	(EggAction *action,
+void popup_cmd_bookmark_link	(GtkAction *action,
 					 EphyWindow *window);
 
-void popup_cmd_frame_in_new_tab		(EggAction *action,
+void popup_cmd_frame_in_new_tab		(GtkAction *action,
 					 EphyWindow *window);
 
-void popup_cmd_frame_in_new_window	(EggAction *action,
+void popup_cmd_frame_in_new_window	(GtkAction *action,
 					 EphyWindow *window);
 
-void popup_cmd_add_frame_bookmark	(EggAction *action,
+void popup_cmd_add_frame_bookmark	(GtkAction *action,
 					 EphyWindow *window);
 
-void popup_cmd_view_source		(EggAction *action,
+void popup_cmd_view_source		(GtkAction *action,
 					 EphyWindow *window);
 
-void popup_cmd_copy_link_address	(EggAction *action,
+void popup_cmd_copy_link_address	(GtkAction *action,
 					 EphyWindow *window);
 
-void popup_cmd_copy_link_location       (EggAction *action,
+void popup_cmd_copy_link_location       (GtkAction *action,
 					 EphyWindow *window);
 
-void popup_cmd_open_link		(EggAction *action,
+void popup_cmd_open_link		(GtkAction *action,
 					 EphyWindow *window);
 
-void popup_cmd_download_link		(EggAction *action,
+void popup_cmd_download_link		(GtkAction *action,
 					 EphyWindow *window);
 
-void popup_cmd_set_image_as_background  (EggAction *action,
+void popup_cmd_set_image_as_background  (GtkAction *action,
 					 EphyWindow *window);
 
-void popup_cmd_copy_image_location	(EggAction *action,
+void popup_cmd_copy_image_location	(GtkAction *action,
 					 EphyWindow *window);
 
-void popup_cmd_save_background_as	(EggAction *action,
+void popup_cmd_save_background_as	(GtkAction *action,
 					 EphyWindow *window);
 
-void popup_cmd_open_frame		(EggAction *action,
+void popup_cmd_open_frame		(GtkAction *action,
 					 EphyWindow *window);
 
-void popup_cmd_open_image		(EggAction *action,
+void popup_cmd_open_image		(GtkAction *action,
 					 EphyWindow *window);
 
-void popup_cmd_download_link		(EggAction *action,
+void popup_cmd_download_link		(GtkAction *action,
 					 EphyWindow *window);
 
-void popup_cmd_save_image_as		(EggAction *action,
+void popup_cmd_save_image_as		(GtkAction *action,
 					 EphyWindow *window);
diff --git a/src/ppview-toolbar.c b/src/ppview-toolbar.c
index 26b52926e..76978414b 100755
--- a/src/ppview-toolbar.c
+++ b/src/ppview-toolbar.c
@@ -59,33 +59,33 @@ struct PPViewToolbarPrivate
 {
 	EphyWindow *window;
 	EmbedChromeMask original_mask;
-	EggMenuMerge *ui_merge;
-	EggActionGroup *action_group;
+	GtkUIManager *ui_merge;
+	GtkActionGroup *action_group;
 	guint ui_id;
 	int current_page;
 };
 
 static void
-toolbar_cmd_ppv_goto_first (EggMenuMerge *merge,
+toolbar_cmd_ppv_goto_first (GtkUIManager *merge,
 			    PPViewToolbar *t);
 
 static void
-toolbar_cmd_ppv_goto_last (EggMenuMerge *merge,
+toolbar_cmd_ppv_goto_last (GtkUIManager *merge,
 			   PPViewToolbar *t);
 
 static void
-toolbar_cmd_ppv_go_back (EggMenuMerge *merge,
+toolbar_cmd_ppv_go_back (GtkUIManager *merge,
 			 PPViewToolbar *t);
 
 static void
-toolbar_cmd_ppv_go_forward (EggMenuMerge *merge,
+toolbar_cmd_ppv_go_forward (GtkUIManager *merge,
 			    PPViewToolbar *t);
 
 static void
-toolbar_cmd_ppv_close (EggMenuMerge *merge,
+toolbar_cmd_ppv_close (GtkUIManager *merge,
 		       PPViewToolbar *t);
 
-static EggActionGroupEntry entries [] = {
+static GtkActionGroupEntry entries [] = {
 	{ "PPVGotoFirst", N_("First"),
 	  GTK_STOCK_GOTO_FIRST, NULL,
 	  N_("Go to the first page"),
@@ -208,8 +208,8 @@ toolbar_update_sensitivity (PPViewToolbar *t)
 	int pages, c_page;
 	EphyWindow *window = t->priv->window;
 	EphyEmbed *embed;
-	EggAction *action;
-	EggActionGroup *action_group = t->priv->action_group;
+	GtkAction *action;
+	GtkActionGroup *action_group = t->priv->action_group;
 
 	embed = ephy_window_get_active_embed (window);
 	g_return_if_fail (embed != NULL);
@@ -217,13 +217,13 @@ toolbar_update_sensitivity (PPViewToolbar *t)
 	ephy_embed_print_preview_num_pages (embed, &pages);
 	c_page = t->priv->current_page;
 
-	action = egg_action_group_get_action (action_group, "PPVGoBack");
+	action = gtk_action_group_get_action (action_group, "PPVGoBack");
 	g_object_set (action, "sensitive", c_page > 1, NULL);
-	action = egg_action_group_get_action (action_group, "PPVGotoFirst");
+	action = gtk_action_group_get_action (action_group, "PPVGotoFirst");
 	g_object_set (action, "sensitive", c_page > 1, NULL);
-	action = egg_action_group_get_action (action_group, "PPVGoForward");
+	action = gtk_action_group_get_action (action_group, "PPVGoForward");
 	g_object_set (action, "sensitive", c_page < pages, NULL);
-	action = egg_action_group_get_action (action_group, "PPVGotoLast");
+	action = gtk_action_group_get_action (action_group, "PPVGotoLast");
 	g_object_set (action, "sensitive", c_page < pages, NULL);
 }
 
@@ -233,15 +233,15 @@ ppview_toolbar_set_window (PPViewToolbar *t, EphyWindow *window)
 	g_return_if_fail (t->priv->window == NULL);
 
 	t->priv->window = window;
-	t->priv->ui_merge = EGG_MENU_MERGE (t->priv->window->ui_merge);
+	t->priv->ui_merge = GTK_UI_MANAGER (t->priv->window->ui_merge);
 
 	t->priv->original_mask = ephy_window_get_chrome (window);
 
-	t->priv->action_group = egg_action_group_new ("PPViewActions");
-	egg_action_group_add_actions (t->priv->action_group, entries, n_entries);
-	egg_menu_merge_insert_action_group (t->priv->ui_merge,
+	t->priv->action_group = gtk_action_group_new ("PPViewActions");
+	gtk_action_group_add_actions (t->priv->action_group, entries, n_entries);
+	gtk_ui_manager_insert_action_group (t->priv->ui_merge,
 					    t->priv->action_group, 0);
-	t->priv->ui_id = egg_menu_merge_add_ui_from_string
+	t->priv->ui_id = gtk_ui_manager_add_ui_from_string
 		(t->priv->ui_merge, ui_info, -1, NULL);
 
 	toolbar_update_sensitivity (t);
@@ -276,8 +276,8 @@ ppview_toolbar_finalize (GObject *object)
 
         g_return_if_fail (t->priv != NULL);
 
-	egg_menu_merge_remove_ui (t->priv->ui_merge, t->priv->ui_id);
-	egg_menu_merge_remove_action_group (t->priv->ui_merge,
+	gtk_ui_manager_remove_ui (t->priv->ui_merge, t->priv->ui_id);
+	gtk_ui_manager_remove_action_group (t->priv->ui_merge,
 					    t->priv->action_group);
 	g_object_unref (t->priv->action_group);
 
@@ -301,7 +301,7 @@ ppview_toolbar_new (EphyWindow *window)
 }
 
 static void
-toolbar_cmd_ppv_goto_first (EggMenuMerge *merge,
+toolbar_cmd_ppv_goto_first (GtkUIManager *merge,
 			    PPViewToolbar *t)
 {
 	EphyWindow *window = t->priv->window;
@@ -318,7 +318,7 @@ toolbar_cmd_ppv_goto_first (EggMenuMerge *merge,
 }
 
 static void
-toolbar_cmd_ppv_goto_last  (EggMenuMerge *merge,
+toolbar_cmd_ppv_goto_last  (GtkUIManager *merge,
 			    PPViewToolbar *t)
 {
 	EphyWindow *window = t->priv->window;
@@ -353,7 +353,7 @@ clamp_page_limits (PPViewToolbar *t, int page)
 }
 
 static void
-toolbar_cmd_ppv_go_back  (EggMenuMerge *merge,
+toolbar_cmd_ppv_go_back  (GtkUIManager *merge,
 			  PPViewToolbar *t)
 {
 	EphyWindow *window = t->priv->window;
@@ -372,7 +372,7 @@ toolbar_cmd_ppv_go_back  (EggMenuMerge *merge,
 }
 
 static void
-toolbar_cmd_ppv_go_forward (EggMenuMerge *merge,
+toolbar_cmd_ppv_go_forward (GtkUIManager *merge,
 			    PPViewToolbar *t)
 {
 	EphyWindow *window = t->priv->window;
@@ -391,7 +391,7 @@ toolbar_cmd_ppv_go_forward (EggMenuMerge *merge,
 }
 
 static void
-toolbar_cmd_ppv_close (EggMenuMerge *merge,
+toolbar_cmd_ppv_close (GtkUIManager *merge,
 		       PPViewToolbar *t)
 {
 	EphyWindow *window;
diff --git a/src/toolbar.c b/src/toolbar.c
index 9cfab5693..dd88179dd 100755
--- a/src/toolbar.c
+++ b/src/toolbar.c
@@ -82,8 +82,8 @@ static GObjectClass *parent_class = NULL;
 struct ToolbarPrivate
 {
 	EphyWindow *window;
-	EggMenuMerge *ui_merge;
-	EggActionGroup *action_group;
+	GtkUIManager *ui_merge;
+	GtkActionGroup *action_group;
 	gboolean visibility;
 	gboolean can_set_location;
 	GtkWidget *spinner;
@@ -121,13 +121,13 @@ toolbar_get_type (void)
 }
 
 static void
-go_location_cb (EggAction *action, char *location, EphyWindow *window)
+go_location_cb (GtkAction *action, char *location, EphyWindow *window)
 {
 	ephy_window_load_url (window, location);
 }
 
 static void
-zoom_to_level_cb (EggAction *action, float zoom, EphyWindow *window)
+zoom_to_level_cb (GtkAction *action, float zoom, EphyWindow *window)
 {
 	ephy_window_set_zoom (window, zoom);
 }
@@ -136,7 +136,7 @@ static void
 bookmark_destroy_cb (EphyNode *node,
 		     Toolbar *t)
 {
-	EggAction *action;
+	GtkAction *action;
 	char *name;
 	EphyToolbarsModel *model;
 	long id;
@@ -146,10 +146,10 @@ bookmark_destroy_cb (EphyNode *node,
 
 	id = ephy_node_get_id (node);
 	name = ephy_toolbars_model_get_action_name (model, id);
-	action = egg_action_group_get_action (t->priv->action_group, name);
+	action = gtk_action_group_get_action (t->priv->action_group, name);
 	if (action)
 	{
-		egg_action_group_remove_action (t->priv->action_group, action);
+		gtk_action_group_remove_action (t->priv->action_group, action);
 	}
 
 	g_free (name);
@@ -159,7 +159,7 @@ static void
 toolbar_ensure_action (Toolbar *t,
 		       const char *name)
 {
-	EggAction *action = NULL;
+	GtkAction *action = NULL;
 	EphyToolbarsModel *model;
 	EphyBookmarks *bookmarks;
 	EphyNode *bmks, *topics;
@@ -192,7 +192,7 @@ toolbar_ensure_action (Toolbar *t,
 
 		g_signal_connect (action, "go_location",
 				  G_CALLBACK (go_location_cb), t->priv->window);
-		egg_action_group_add_action (t->priv->action_group, action);
+		gtk_action_group_add_action (t->priv->action_group, action);
 		g_object_unref (action);
 
 		ephy_node_signal_connect_object (node,
@@ -259,9 +259,9 @@ toolbar_get_property (GObject *object,
 static void
 toolbar_setup_actions (Toolbar *t)
 {
-	EggAction *action;
+	GtkAction *action;
 
-	t->priv->action_group = egg_action_group_new ("SpecialToolbarActions");
+	t->priv->action_group = gtk_action_group_new ("SpecialToolbarActions");
 
 	action = g_object_new (EPHY_TYPE_NAVIGATION_ACTION,
 			       "name", "NavigationBack",
@@ -274,7 +274,7 @@ toolbar_setup_actions (Toolbar *t)
 			       NULL);
 	g_signal_connect (action, "activate",
 			  G_CALLBACK (window_cmd_go_back), t->priv->window);
-	egg_action_group_add_action (t->priv->action_group, action);
+	gtk_action_group_add_action (t->priv->action_group, action);
 	g_object_unref (action);
 
 	action = g_object_new (EPHY_TYPE_NAVIGATION_ACTION,
@@ -287,7 +287,7 @@ toolbar_setup_actions (Toolbar *t)
 			       NULL);
 	g_signal_connect (action, "activate",
 			  G_CALLBACK (window_cmd_go_forward), t->priv->window);
-	egg_action_group_add_action (t->priv->action_group, action);
+	gtk_action_group_add_action (t->priv->action_group, action);
 	g_object_unref (action);
 
 	action = g_object_new (EPHY_TYPE_NAVIGATION_ACTION,
@@ -300,14 +300,14 @@ toolbar_setup_actions (Toolbar *t)
 			       NULL);
 	g_signal_connect (action, "activate",
 			  G_CALLBACK (window_cmd_go_up), t->priv->window);
-	egg_action_group_add_action (t->priv->action_group, action);
+	gtk_action_group_add_action (t->priv->action_group, action);
 	g_object_unref (action);
 
 	action = g_object_new (EPHY_TYPE_SPINNER_ACTION,
 			       "name", "Spinner",
 			       "label", _("Spinner"),
 			       NULL);
-	egg_action_group_add_action (t->priv->action_group, action);
+	gtk_action_group_add_action (t->priv->action_group, action);
 	g_object_unref (action);
 
 	/* FIXME: I'm still waiting for the exact term to 
@@ -321,7 +321,7 @@ toolbar_setup_actions (Toolbar *t)
 			       NULL);
 	g_signal_connect (action, "go_location",
 			  G_CALLBACK (go_location_cb), t->priv->window);
-	egg_action_group_add_action (t->priv->action_group, action);
+	gtk_action_group_add_action (t->priv->action_group, action);
 	g_object_unref (action);
 
 	action = g_object_new (EPHY_TYPE_ZOOM_ACTION,
@@ -332,7 +332,7 @@ toolbar_setup_actions (Toolbar *t)
 			       NULL);
 	g_signal_connect (action, "zoom_to_level",
 			  G_CALLBACK (zoom_to_level_cb), t->priv->window);
-	egg_action_group_add_action (t->priv->action_group, action);
+	gtk_action_group_add_action (t->priv->action_group, action);
 	g_object_unref (action);
 
 	action = g_object_new (EPHY_TYPE_FAVICON_ACTION,
@@ -340,7 +340,7 @@ toolbar_setup_actions (Toolbar *t)
 			       "label", _("Favicon"),
 			       "window", t->priv->window,
 			       NULL);
-	egg_action_group_add_action (t->priv->action_group, action);
+	gtk_action_group_add_action (t->priv->action_group, action);
 	g_object_unref (action);
 
 	action = g_object_new (EPHY_TYPE_GO_ACTION,
@@ -351,7 +351,7 @@ toolbar_setup_actions (Toolbar *t)
 			       NULL);
 	g_signal_connect (action, "activate",
 			  G_CALLBACK (window_cmd_load_location), t->priv->window);
-	egg_action_group_add_action (t->priv->action_group, action);
+	gtk_action_group_add_action (t->priv->action_group, action);
 	g_object_unref (action);
 }
 
@@ -430,10 +430,10 @@ update_toolbar_remove_flag (EphyToolbarsModel *model, gpointer data)
 static GtkWidget *
 get_location_entry (Toolbar *t)
 {
-	EggAction *action;
+	GtkAction *action;
 	GtkWidget *location;
 
-	action = egg_action_group_get_action
+	action = gtk_action_group_get_action
 		(t->priv->action_group, "Location");
 	location = ephy_location_action_get_widget
 		(EPHY_LOCATION_ACTION (action));
@@ -465,10 +465,10 @@ toolbar_set_window (Toolbar *t, EphyWindow *window)
 	g_return_if_fail (t->priv->window == NULL);
 
 	t->priv->window = window;
-	t->priv->ui_merge = EGG_MENU_MERGE (window->ui_merge);
+	t->priv->ui_merge = GTK_UI_MANAGER (window->ui_merge);
 
 	toolbar_setup_actions (t);
-	egg_menu_merge_insert_action_group (t->priv->ui_merge,
+	gtk_ui_manager_insert_action_group (t->priv->ui_merge,
 					    t->priv->action_group, 1);
 
 	g_signal_connect (t, "action_request",
@@ -510,21 +510,21 @@ toolbar_finalize (GObject *object)
 {
 	Toolbar *t;
 	ToolbarPrivate *p;
-	EggMenuMerge *merge;
+	GtkUIManager *merge;
 
         g_return_if_fail (object != NULL);
         g_return_if_fail (IS_TOOLBAR (object));
 
 	t = TOOLBAR (object);
 	p = t->priv;
-	merge = EGG_MENU_MERGE (t->priv->window->ui_merge);
+	merge = GTK_UI_MANAGER (t->priv->window->ui_merge);
 
         g_return_if_fail (p != NULL);
 
 	G_OBJECT_CLASS (parent_class)->finalize (object);
 
 	g_object_unref (t->priv->action_group);
-	egg_menu_merge_remove_action_group (merge, t->priv->action_group);
+	gtk_ui_manager_remove_action_group (merge, t->priv->action_group);
 
         g_free (t->priv);
 
@@ -581,22 +581,22 @@ toolbar_activate_location (Toolbar *t)
 void
 toolbar_spinner_start (Toolbar *t)
 {
-	EggActionGroup *action_group;
-	EggAction *action;
+	GtkActionGroup *action_group;
+	GtkAction *action;
 
 	action_group = t->priv->action_group;
-	action = egg_action_group_get_action (action_group, "Spinner");
+	action = gtk_action_group_get_action (action_group, "Spinner");
 	g_object_set (action, "throbbing", TRUE, NULL);
 }
 
 void
 toolbar_spinner_stop (Toolbar *t)
 {
-	EggActionGroup *action_group;
-	EggAction *action;
+	GtkActionGroup *action_group;
+	GtkAction *action;
 
 	action_group = t->priv->action_group;
-	action = egg_action_group_get_action (action_group, "Spinner");
+	action = gtk_action_group_get_action (action_group, "Spinner");
 	g_object_set (action, "throbbing", FALSE, NULL);
 }
 
@@ -622,13 +622,13 @@ toolbar_update_favicon (Toolbar *t)
 {
 	EphyTab *tab;
 	const char *url;
-	EggActionGroup *action_group;
-	EggAction *action;
+	GtkActionGroup *action_group;
+	GtkAction *action;
 
 	tab = ephy_window_get_active_tab (t->priv->window);
 	url = ephy_tab_get_icon_address (tab);
 	action_group = t->priv->action_group;
-	action = egg_action_group_get_action (action_group, "Favicon");
+	action = gtk_action_group_get_action (action_group, "Favicon");
 	g_object_set (action, "icon", url, NULL);
 }
 
@@ -658,15 +658,15 @@ toolbar_clear_location_history (Toolbar *t)
 void
 toolbar_update_navigation_actions (Toolbar *t, gboolean back, gboolean forward, gboolean up)
 {
-	EggActionGroup *action_group;
-	EggAction *action;
+	GtkActionGroup *action_group;
+	GtkAction *action;
 
 	action_group = t->priv->action_group;
-	action = egg_action_group_get_action (action_group, "NavigationBack");
+	action = gtk_action_group_get_action (action_group, "NavigationBack");
 	g_object_set (action, "sensitive", back, NULL);
-	action = egg_action_group_get_action (action_group, "NavigationForward");
+	action = gtk_action_group_get_action (action_group, "NavigationForward");
 	g_object_set (action, "sensitive", forward, NULL);
-	action = egg_action_group_get_action (action_group, "NavigationUp");
+	action = gtk_action_group_get_action (action_group, "NavigationUp");
 	g_object_set (action, "sensitive", up, NULL);
 }
 
@@ -722,10 +722,10 @@ toolbar_set_visibility (Toolbar *t,
 void
 toolbar_update_zoom (Toolbar *t, float zoom)
 {
-	EggActionGroup *action_group;
-	EggAction *action;
+	GtkActionGroup *action_group;
+	GtkAction *action;
 
 	action_group = t->priv->action_group;
-	action = egg_action_group_get_action (action_group, "Zoom");
+	action = gtk_action_group_get_action (action_group, "Zoom");
 	g_object_set (action, "zoom", zoom, NULL);
 }
diff --git a/src/window-commands.c b/src/window-commands.c
index 66145daf4..a07eb7602 100644
--- a/src/window-commands.c
+++ b/src/window-commands.c
@@ -57,21 +57,21 @@ enum
 };
 
 void
-window_cmd_edit_find (EggAction *action,
+window_cmd_edit_find (GtkAction *action,
 		      EphyWindow *window)
 {
 	ephy_window_find (window);
 }
 
 void
-window_cmd_file_print (EggAction *action,
+window_cmd_file_print (GtkAction *action,
 		       EphyWindow *window)
 {
 	ephy_window_print (window);
 }
 
 void
-window_cmd_go_back (EggAction *action,
+window_cmd_go_back (GtkAction *action,
 		    EphyWindow *window)
 {
 	EphyEmbed *embed;
@@ -85,7 +85,7 @@ window_cmd_go_back (EggAction *action,
 }
 
 void
-window_cmd_go_up (EggAction *action,
+window_cmd_go_up (GtkAction *action,
 		  EphyWindow *window)
 {
 	EphyEmbed *embed;
@@ -99,7 +99,7 @@ window_cmd_go_up (EggAction *action,
 }
 
 void
-window_cmd_file_send_to	(EggAction *action,
+window_cmd_file_send_to	(GtkAction *action,
 			 EphyWindow *window)
 {
 	EphyTab *tab;
@@ -142,7 +142,7 @@ window_cmd_file_send_to	(EggAction *action,
 }
 
 void
-window_cmd_go_forward (EggAction *action,
+window_cmd_go_forward (GtkAction *action,
 		       EphyWindow *window)
 {
 	EphyEmbed *embed;
@@ -156,7 +156,7 @@ window_cmd_go_forward (EggAction *action,
 }
 
 void
-window_cmd_go_home (EggAction *action,
+window_cmd_go_home (GtkAction *action,
 		    EphyWindow *window)
 {
 	char *location;
@@ -176,14 +176,14 @@ window_cmd_go_home (EggAction *action,
 }
 
 void
-window_cmd_go_location (EggAction *action,
+window_cmd_go_location (GtkAction *action,
 		        EphyWindow *window)
 {
 	ephy_window_activate_location (window);
 }
 
 void
-window_cmd_view_stop (EggAction *action,
+window_cmd_view_stop (GtkAction *action,
 		      EphyWindow *window)
 {
 	EphyEmbed *embed;
@@ -197,7 +197,7 @@ window_cmd_view_stop (EggAction *action,
 }
 
 void
-window_cmd_view_reload (EggAction *action,
+window_cmd_view_reload (GtkAction *action,
 		        EphyWindow *window)
 {
 	EphyEmbed *embed;
@@ -235,7 +235,7 @@ window_cmd_view_reload (EggAction *action,
 }
 
 void
-window_cmd_file_new_window (EggAction *action,
+window_cmd_file_new_window (GtkAction *action,
 		            EphyWindow *window)
 {
 	EphyTab *tab;
@@ -249,7 +249,7 @@ window_cmd_file_new_window (EggAction *action,
 }
 
 void
-window_cmd_file_new_tab (EggAction *action,
+window_cmd_file_new_tab (GtkAction *action,
 		         EphyWindow *window)
 {
 	EphyTab *tab;
@@ -264,14 +264,14 @@ window_cmd_file_new_tab (EggAction *action,
 }
 
 void
-window_cmd_go_bookmarks (EggAction *action,
+window_cmd_go_bookmarks (GtkAction *action,
 			 EphyWindow *window)
 {
 	ephy_shell_show_bookmarks_editor (ephy_shell, GTK_WIDGET (window));
 }
 
 void
-window_cmd_file_bookmark_page (EggAction *action,
+window_cmd_file_bookmark_page (GtkAction *action,
 			       EphyWindow *window)
 {
 	EphyTab *tab;
@@ -315,7 +315,7 @@ window_cmd_file_bookmark_page (EggAction *action,
 }
 
 void
-window_cmd_file_open (EggAction *action,
+window_cmd_file_open (GtkAction *action,
 		      EphyWindow *window)
 {
 	gchar *dir, *retDir;
@@ -365,7 +365,7 @@ window_cmd_file_open (EggAction *action,
 }
 
 void
-window_cmd_file_save_as (EggAction *action,
+window_cmd_file_save_as (GtkAction *action,
 			 EphyWindow *window)
 {
 	EphyEmbed *embed;
@@ -389,7 +389,7 @@ window_cmd_file_save_as (EggAction *action,
 }
 
 void
-window_cmd_file_close_window (EggAction *action,
+window_cmd_file_close_window (GtkAction *action,
 		              EphyWindow *window)
 {
 	EphyTab *tab;
@@ -401,7 +401,7 @@ window_cmd_file_close_window (EggAction *action,
 }
 
 void
-window_cmd_edit_cut (EggAction *action,
+window_cmd_edit_cut (GtkAction *action,
 		     EphyWindow *window)
 {
 	GtkWidget *widget = gtk_window_get_focus (GTK_WINDOW (window));
@@ -421,7 +421,7 @@ window_cmd_edit_cut (EggAction *action,
 }
 
 void
-window_cmd_edit_copy (EggAction *action,
+window_cmd_edit_copy (GtkAction *action,
 		      EphyWindow *window)
 {
 	GtkWidget *widget = gtk_window_get_focus (GTK_WINDOW (window));
@@ -442,7 +442,7 @@ window_cmd_edit_copy (EggAction *action,
 }
 
 void
-window_cmd_edit_paste (EggAction *action,
+window_cmd_edit_paste (GtkAction *action,
 		       EphyWindow *window)
 {
 	GtkWidget *widget = gtk_window_get_focus (GTK_WINDOW (window));
@@ -463,7 +463,7 @@ window_cmd_edit_paste (EggAction *action,
 }
 
 void
-window_cmd_edit_select_all (EggAction *action,
+window_cmd_edit_select_all (GtkAction *action,
 			    EphyWindow *window)
 {
 	GtkWidget *widget = gtk_window_get_focus (GTK_WINDOW (window));
@@ -484,7 +484,7 @@ window_cmd_edit_select_all (EggAction *action,
 }
 
 void
-window_cmd_edit_find_next (EggAction *action,
+window_cmd_edit_find_next (GtkAction *action,
 			   EphyWindow *window)
 {
 	EphyEmbed *embed;
@@ -496,7 +496,7 @@ window_cmd_edit_find_next (EggAction *action,
 }
 
 void
-window_cmd_edit_find_prev (EggAction *action,
+window_cmd_edit_find_prev (GtkAction *action,
 			   EphyWindow *window)
 {
 	EphyEmbed *embed;
@@ -508,7 +508,7 @@ window_cmd_edit_find_prev (EggAction *action,
 }
 
 void
-window_cmd_view_bookmarks_bar (EggAction *action,
+window_cmd_view_bookmarks_bar (GtkAction *action,
 			       EphyWindow *window)
 {
 	EmbedChromeMask mask;
@@ -516,7 +516,7 @@ window_cmd_view_bookmarks_bar (EggAction *action,
 	gboolean current_state;
 
 	mask = ephy_window_get_chrome (window);
-	active = EGG_TOGGLE_ACTION (action)->active;
+	active = GTK_TOGGLE_ACTION (action)->active;
 	current_state = (mask & EMBED_CHROME_BOOKMARKSBARON) > 0;
 
 	if (active != current_state)
@@ -527,7 +527,7 @@ window_cmd_view_bookmarks_bar (EggAction *action,
 }
 
 void
-window_cmd_view_toolbar (EggAction *action,
+window_cmd_view_toolbar (GtkAction *action,
 			 EphyWindow *window)
 {
 	EmbedChromeMask mask;
@@ -535,7 +535,7 @@ window_cmd_view_toolbar (EggAction *action,
 	gboolean current_state;
 
 	mask = ephy_window_get_chrome (window);
-	active = EGG_TOGGLE_ACTION (action)->active;
+	active = GTK_TOGGLE_ACTION (action)->active;
 	current_state = (mask & EMBED_CHROME_TOOLBARON) > 0;
 
 	if (active != current_state)
@@ -546,7 +546,7 @@ window_cmd_view_toolbar (EggAction *action,
 }
 
 void
-window_cmd_view_statusbar (EggAction *action,
+window_cmd_view_statusbar (GtkAction *action,
 			   EphyWindow *window)
 {
 	EmbedChromeMask mask;
@@ -554,7 +554,7 @@ window_cmd_view_statusbar (EggAction *action,
 	gboolean current_state;
 
 	mask = ephy_window_get_chrome (window);
-	active = EGG_TOGGLE_ACTION (action)->active;
+	active = GTK_TOGGLE_ACTION (action)->active;
 	current_state = (mask & EMBED_CHROME_STATUSBARON) > 0;
 
 	if (active != current_state)
@@ -565,10 +565,10 @@ window_cmd_view_statusbar (EggAction *action,
 }
 
 void
-window_cmd_view_fullscreen (EggAction *action,
+window_cmd_view_fullscreen (GtkAction *action,
 			    EphyWindow *window)
 {
-	if (EGG_TOGGLE_ACTION (action)->active)
+	if (GTK_TOGGLE_ACTION (action)->active)
 	{
 		gtk_window_fullscreen (GTK_WINDOW (window));
 	}
@@ -579,28 +579,28 @@ window_cmd_view_fullscreen (EggAction *action,
 }
 
 void
-window_cmd_view_zoom_in	(EggAction *action,
+window_cmd_view_zoom_in	(GtkAction *action,
 			 EphyWindow *window)
 {
 	ephy_window_set_zoom (window, ZOOM_IN);
 }
 
 void
-window_cmd_view_zoom_out (EggAction *action,
+window_cmd_view_zoom_out (GtkAction *action,
 			  EphyWindow *window)
 {
 	ephy_window_set_zoom (window, ZOOM_OUT);
 }
 
 void
-window_cmd_view_zoom_normal (EggAction *action,
+window_cmd_view_zoom_normal (GtkAction *action,
 			     EphyWindow *window)
 {
 	ephy_window_set_zoom (window, 1.0);
 }
 
 void
-window_cmd_view_page_source (EggAction *action,
+window_cmd_view_page_source (GtkAction *action,
 			     EphyWindow *window)
 {
 	EphyTab *tab;
@@ -614,14 +614,14 @@ window_cmd_view_page_source (EggAction *action,
 }
 
 void
-window_cmd_go_history (EggAction *action,
+window_cmd_go_history (GtkAction *action,
 		       EphyWindow *window)
 {
 	ephy_shell_show_history_window (ephy_shell, GTK_WIDGET (window));
 }
 
 void
-window_cmd_edit_personal_data (EggAction *action,
+window_cmd_edit_personal_data (GtkAction *action,
 		               EphyWindow *window)
 {
 	EphyDialog *dialog;
@@ -632,7 +632,7 @@ window_cmd_edit_personal_data (EggAction *action,
 }
 
 void
-window_cmd_edit_prefs (EggAction *action,
+window_cmd_edit_prefs (GtkAction *action,
 		       EphyWindow *window)
 {
 	EphyDialog *dialog;
@@ -675,7 +675,7 @@ toolbar_editor_response_cb (GtkDialog  *dialog,
 }
 
 void
-window_cmd_edit_toolbar (EggAction *action,
+window_cmd_edit_toolbar (GtkAction *action,
 			 EphyWindow *window)
 {
 	GtkWidget *editor;
@@ -694,7 +694,7 @@ window_cmd_edit_toolbar (EggAction *action,
 				      GTK_WINDOW (window));
 
 	editor = egg_toolbar_editor_new
-		(EGG_MENU_MERGE (window->ui_merge),
+		(GTK_UI_MANAGER (window->ui_merge),
 		 EGG_TOOLBARS_MODEL (model));
 	egg_toolbar_editor_load_actions (EGG_TOOLBAR_EDITOR (editor),
 					 ephy_file ("epiphany-toolbar.xml"));
@@ -729,14 +729,14 @@ window_cmd_edit_toolbar (EggAction *action,
 }
 
 void
-window_cmd_help_contents (EggAction *action,
+window_cmd_help_contents (GtkAction *action,
 			 EphyWindow *window)
 {
 	ephy_gui_help (GTK_WINDOW (window), "epiphany", NULL);
 }
 
 void
-window_cmd_help_about (EggAction *action,
+window_cmd_help_about (GtkAction *action,
 		       GtkWidget *window)
 {
 	static GtkWidget *about = NULL;
@@ -813,7 +813,7 @@ window_cmd_help_about (EggAction *action,
 }
 
 void
-window_cmd_tabs_next (EggAction *action,
+window_cmd_tabs_next (GtkAction *action,
 		      EphyWindow *window)
 {
 	GtkNotebook *nb;
@@ -832,7 +832,7 @@ window_cmd_tabs_next (EggAction *action,
 }
 
 void
-window_cmd_tabs_previous (EggAction *action,
+window_cmd_tabs_previous (GtkAction *action,
 			  EphyWindow *window)
 {
 	GtkNotebook *nb;
@@ -851,7 +851,7 @@ window_cmd_tabs_previous (EggAction *action,
 }
 
 void
-window_cmd_tabs_move_left  (EggAction *action,
+window_cmd_tabs_move_left  (GtkAction *action,
 			    EphyWindow *window)
 {
 	GtkWidget *notebook;
@@ -869,7 +869,7 @@ window_cmd_tabs_move_left  (EggAction *action,
 	}
 }
 
-void window_cmd_tabs_move_right (EggAction *action,
+void window_cmd_tabs_move_right (GtkAction *action,
 				 EphyWindow *window)
 {
 	GtkWidget *notebook;
@@ -890,7 +890,7 @@ void window_cmd_tabs_move_right (EggAction *action,
 }
 
 void
-window_cmd_tabs_detach  (EggAction *action,
+window_cmd_tabs_detach  (GtkAction *action,
 			 EphyWindow *window)
 {
 	EphyTab *tab;
@@ -911,7 +911,7 @@ window_cmd_tabs_detach  (EggAction *action,
 }
 
 void
-window_cmd_load_location (EggAction *action,
+window_cmd_load_location (GtkAction *action,
 			  EphyWindow *window)
 {
 	Toolbar *toolbar;
diff --git a/src/window-commands.h b/src/window-commands.h
index 8b5ee56b4..2fbbd540b 100644
--- a/src/window-commands.h
+++ b/src/window-commands.h
@@ -16,145 +16,146 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include "egg-action.h"
+#include <gtk/gtkaction.h>
+
 #include "ephy-window.h"
 #include "ephy-embed-utils.h"
 
-void window_cmd_edit_find	(EggAction *action,
+void window_cmd_edit_find	(GtkAction *action,
 				 EphyWindow *window);
 
-void window_cmd_file_print	(EggAction *action,
+void window_cmd_file_print	(GtkAction *action,
 				 EphyWindow *window);
 
-void window_cmd_view_stop	(EggAction *action,
+void window_cmd_view_stop	(GtkAction *action,
 				 EphyWindow *window);
 
-void window_cmd_go_back		(EggAction *action,
+void window_cmd_go_back		(GtkAction *action,
 				 EphyWindow *window);
 
-void window_cmd_go_forward	(EggAction *action,
+void window_cmd_go_forward	(GtkAction *action,
 				 EphyWindow *window);
 
-void window_cmd_go_location	(EggAction *action,
+void window_cmd_go_location	(GtkAction *action,
 				 EphyWindow *window);
 
-void window_cmd_go_up		(EggAction *action,
+void window_cmd_go_up		(GtkAction *action,
 				 EphyWindow *window);
 
-void window_cmd_go_home		(EggAction *action,
+void window_cmd_go_home		(GtkAction *action,
 				 EphyWindow *window);
 
-void window_cmd_go_myportal	(EggAction *action,
+void window_cmd_go_myportal	(GtkAction *action,
 				 EphyWindow *window);
 
-void window_cmd_go_location	(EggAction *action,
+void window_cmd_go_location	(GtkAction *action,
 				 EphyWindow *window);
 
-void window_cmd_view_reload	(EggAction *action,
+void window_cmd_view_reload	(GtkAction *action,
 				 EphyWindow *window);
 
-void window_cmd_new		(EggAction *action,
+void window_cmd_new		(GtkAction *action,
 				 EphyWindow *window);
 
-void window_cmd_file_new_window	(EggAction *action,
+void window_cmd_file_new_window	(GtkAction *action,
 				 EphyWindow *window);
 
-void window_cmd_file_new_tab	(EggAction *action,
+void window_cmd_file_new_tab	(GtkAction *action,
 				 EphyWindow *window);
 
-void window_cmd_file_bookmark_page(EggAction *action,
+void window_cmd_file_bookmark_page(GtkAction *action,
 				  EphyWindow *window);
 
-void window_cmd_go_bookmarks	(EggAction *action,
+void window_cmd_go_bookmarks	(GtkAction *action,
 				 EphyWindow *window);
 
-void window_cmd_file_open	(EggAction *action,
+void window_cmd_file_open	(GtkAction *action,
 				 EphyWindow *window);
 
-void window_cmd_file_save_as    (EggAction *action,
+void window_cmd_file_save_as    (GtkAction *action,
 				 EphyWindow *window);
 
-void window_cmd_file_send_to	(EggAction *action,
+void window_cmd_file_send_to	(GtkAction *action,
 				 EphyWindow *window);
 
-void window_cmd_file_close_window (EggAction *action,
+void window_cmd_file_close_window (GtkAction *action,
 				    EphyWindow *window);
 
-void window_cmd_edit_cut	(EggAction *action,
+void window_cmd_edit_cut	(GtkAction *action,
 				 EphyWindow *window);
 
-void window_cmd_edit_copy	(EggAction *action,
+void window_cmd_edit_copy	(GtkAction *action,
 				 EphyWindow *window);
 
-void window_cmd_edit_paste	(EggAction *action,
+void window_cmd_edit_paste	(GtkAction *action,
 				 EphyWindow *window);
 
-void window_cmd_edit_select_all (EggAction *action,
+void window_cmd_edit_select_all (GtkAction *action,
 				 EphyWindow *window);
 
-void window_cmd_edit_find_next	(EggAction *action,
+void window_cmd_edit_find_next	(GtkAction *action,
 				 EphyWindow *window);
 
-void window_cmd_edit_find_prev	(EggAction *action,
+void window_cmd_edit_find_prev	(GtkAction *action,
 				 EphyWindow *window);
 
-void window_cmd_view_statusbar	(EggAction *action,
+void window_cmd_view_statusbar	(GtkAction *action,
 				 EphyWindow *window);
 
-void window_cmd_view_toolbar	(EggAction *action,
+void window_cmd_view_toolbar	(GtkAction *action,
 				 EphyWindow *window);
 
-void window_cmd_view_bookmarks_bar	(EggAction *action,
+void window_cmd_view_bookmarks_bar	(GtkAction *action,
 				    	 EphyWindow *window);
 
-void window_cmd_view_fullscreen	(EggAction *action,
+void window_cmd_view_fullscreen	(GtkAction *action,
 				 EphyWindow *window);
 
-void window_cmd_view_zoom_in	(EggAction *action,
+void window_cmd_view_zoom_in	(GtkAction *action,
 				 EphyWindow *window);
 
-void window_cmd_view_zoom_out	(EggAction *action,
+void window_cmd_view_zoom_out	(GtkAction *action,
 				 EphyWindow *window);
 
-void window_cmd_view_zoom_normal(EggAction *action,
+void window_cmd_view_zoom_normal(GtkAction *action,
 				 EphyWindow *window);
 
-void window_cmd_view_page_source(EggAction *action,
+void window_cmd_view_page_source(GtkAction *action,
 				 EphyWindow *window);
 
-void window_cmd_go_history	(EggAction *action,
+void window_cmd_go_history	(GtkAction *action,
 				 EphyWindow *window);
 
-void window_cmd_edit_personal_data (EggAction *action,
+void window_cmd_edit_personal_data (GtkAction *action,
 				    EphyWindow *window);
 
-void window_cmd_edit_prefs      (EggAction *action,
+void window_cmd_edit_prefs      (GtkAction *action,
 				 EphyWindow *window);
 
-void window_cmd_edit_toolbar	(EggAction *action,
+void window_cmd_edit_toolbar	(GtkAction *action,
 				 EphyWindow *window);
 
-void window_cmd_help_contents (EggAction *action,
+void window_cmd_help_contents (GtkAction *action,
 				 EphyWindow *window);
 
-void window_cmd_help_about      (EggAction *action,
+void window_cmd_help_about      (GtkAction *action,
 				 GtkWidget *window);
 
-void window_cmd_tabs_next       (EggAction *action,
+void window_cmd_tabs_next       (GtkAction *action,
 				 EphyWindow *window);
 
-void window_cmd_tabs_previous   (EggAction *action,
+void window_cmd_tabs_previous   (GtkAction *action,
 				 EphyWindow *window);
 
-void window_cmd_tabs_move_left  (EggAction *action,
+void window_cmd_tabs_move_left  (GtkAction *action,
 				 EphyWindow *window);
 
-void window_cmd_tabs_move_right (EggAction *action,
+void window_cmd_tabs_move_right (GtkAction *action,
 				 EphyWindow *window);
 
-void window_cmd_tabs_detach     (EggAction *action,
+void window_cmd_tabs_detach     (GtkAction *action,
 				 EphyWindow *window);
 
-void window_cmd_load_location   (EggAction *action,
+void window_cmd_load_location   (GtkAction *action,
 				 EphyWindow *window);