diff --git a/src/main.c b/src/main.c
index 93724d10..6d4f03e8 100644
--- a/src/main.c
+++ b/src/main.c
@@ -44,9 +44,9 @@ static void stock_items_init(void)
         { STOCK_USER_TRASH },
 
         { STOCK_BOOKMARK,       N_("Bookmark"), 0, 0, NULL },
-        { STOCK_BOOKMARK_NEW,   N_("New Bookmark"), 0, 0, NULL },
+        { STOCK_BOOKMARK_ADD,   N_("_Add Bookmark"), 0, 0, NULL },
         { STOCK_FORM_FILL,      N_("_Form Fill"), 0, 0, NULL },
-        { STOCK_HOMEPAGE,       N_("Homepage"), 0, 0, NULL },
+        { STOCK_HOMEPAGE,       N_("_Homepage"), 0, 0, NULL },
         { STOCK_TAB_NEW,        N_("New _Tab"), 0, 0, NULL },
         { STOCK_WINDOW_NEW,     N_("New _Window"), 0, 0, NULL },
         #if !GTK_CHECK_VERSION(2, 10, 0)
@@ -54,7 +54,7 @@ static void stock_items_init(void)
         #endif
         #if !GTK_CHECK_VERSION(2, 8, 0)
         { GTK_STOCK_FULLSCREEN, N_("_Fullscreen"), 0, 0, NULL },
-        { GTK_STOCK_FULLSCREEN, N_("_Leave Fullscreen"), 0, 0, NULL },
+        { GTK_STOCK_LEAVE_FULLSCREEN, N_("_Leave Fullscreen"), 0, 0, NULL },
         #endif
     };
     GtkIconFactory* factory = gtk_icon_factory_new();
@@ -157,7 +157,7 @@ settings_new_from_file (const gchar* filename)
             g_type_class_unref (enum_class);
         }
         else
-            g_warning (_("Unhandled settings property '%s'"), property);
+            g_warning (_("Unhandled settings value '%s'"), property);
     }
     return settings;
 }
diff --git a/src/main.h b/src/main.h
index c820fe5b..3eab9b70 100644
--- a/src/main.h
+++ b/src/main.h
@@ -37,7 +37,7 @@ KatzeXbelItem* bookmarks;
 
 // We assume that these legacy icon names are usually present
 
-#define STOCK_BOOKMARK_NEW       "stock_add-bookmark"
+#define STOCK_BOOKMARK_ADD       "stock_add-bookmark"
 #define STOCK_HOMEPAGE           GTK_STOCK_HOME
 #define STOCK_IMAGE              "gnome-mime-image"
 #define STOCK_LOCK_OPEN          "stock_lock-open"
diff --git a/src/midori-browser.c b/src/midori-browser.c
index ee242312..459818f5 100644
--- a/src/midori-browser.c
+++ b/src/midori-browser.c
@@ -436,7 +436,7 @@ midori_web_view_populate_popup_cb (GtkWidget*     web_view,
         menuitem = gtk_separator_menu_item_new ();
         gtk_widget_show (menuitem);
         gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
-        action = _action_by_name (browser, "BookmarkNew");
+        action = _action_by_name (browser, "BookmarkAdd");
         menuitem = gtk_action_create_menu_item (action);
         gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
         action = _action_by_name (browser, "SaveAs");
@@ -1858,7 +1858,7 @@ _midori_browser_create_bookmark_menu (MidoriBrowser* browser,
 }
 
 static void
-_action_bookmark_new_activate (GtkAction*     action,
+_action_bookmark_add_activate (GtkAction*     action,
                                MidoriBrowser* browser)
 {
     midori_browser_edit_bookmark_dialog_new (browser, NULL);
@@ -2308,9 +2308,9 @@ static const GtkActionEntry entries[] = {
    N_("Open the last closed tab"), G_CALLBACK (_action_undo_tab_close_activate) },
 
  { "Bookmarks", NULL, N_("_Bookmarks") },
- { "BookmarkNew", STOCK_BOOKMARK_NEW,
+ { "BookmarkAdd", STOCK_BOOKMARK_ADD,
    NULL, "<Ctrl>d",
-   N_("Add a new bookmark"), G_CALLBACK (_action_bookmark_new_activate) },
+   N_("Add a new bookmark"), G_CALLBACK (_action_bookmark_add_activate) },
  { "BookmarksManage", NULL,
    N_("_Manage Bookmarks"), "<Ctrl>b",
    N_("Add, edit and remove bookmarks..."), NULL/*G_CALLBACK (_action_bookmarks_manage_activate)*/ },
@@ -2518,7 +2518,7 @@ static const gchar* ui_markup =
     "<menuitem action='FindPrevious'/>"
    "</menu>"
    "<menu action='Bookmarks'>"
-    "<menuitem action='BookmarkNew'/>"
+    "<menuitem action='BookmarkAdd'/>"
     "<menuitem action='BookmarksManage'/>"
     "<separator/>"
     // Bookmarks shall be appended here
@@ -2550,7 +2550,7 @@ static const gchar* ui_markup =
    "<placeholder name='TabTrash'/>"
   "</toolbar>"
   "<toolbar name='toolbar_bookmarks'>"
-   "<toolitem action='BookmarkNew'/>"
+   "<toolitem action='BookmarkAdd'/>"
    "<toolitem action='BookmarkEdit'/>"
    "<toolitem action='BookmarkDelete'/>"
   "</toolbar>"