avoid deprecated GtkStock

4 files changed, 104 insertions, 104 deletions

diff --git a/src/file-manager/fm-directory-view.c b/src/file-manager/fm-directory-view.c
index 75e42397..63efef81 100644
--- a/src/file-manager/fm-directory-view.c
+++ b/src/file-manager/fm-directory-view.c
@@ -659,7 +659,7 @@ fm_directory_view_confirm_multiple (GtkWindow *parent_window,
 						   "This will open %'d separate windows.", count), count);
 	}
 	dialog = eel_show_yes_no_dialog (prompt, detail,
-					 GTK_STOCK_OK, GTK_STOCK_CANCEL,
+					 "gtk-ok", "gtk-cancel",
 					 parent_window);
 	g_free (detail);
 
@@ -1197,11 +1197,11 @@ select_pattern (FMDirectoryView *view)
 	dialog = gtk_dialog_new_with_buttons (_("Select Items Matching"),
 			fm_directory_view_get_containing_window (view),
 			GTK_DIALOG_DESTROY_WITH_PARENT,
-			GTK_STOCK_HELP,
+			"gtk-help",
 			GTK_RESPONSE_HELP,
-			GTK_STOCK_CANCEL,
+			"gtk-cancel",
 			GTK_RESPONSE_CANCEL,
-			GTK_STOCK_OK,
+			"gtk-ok",
 			GTK_RESPONSE_OK,
 			NULL);
 	gtk_dialog_set_default_response (GTK_DIALOG (dialog),
@@ -1335,10 +1335,10 @@ action_save_search_as_callback (GtkAction *action,
 		dialog = gtk_dialog_new_with_buttons (_("Save Search as"),
 						      fm_directory_view_get_containing_window (directory_view),
 						      0,
-						      GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+						      "gtk-cancel", GTK_RESPONSE_CANCEL,
 						      NULL);
 		save_button = gtk_dialog_add_button (GTK_DIALOG (dialog),
-						     GTK_STOCK_SAVE, GTK_RESPONSE_OK);
+						     "gtk-save", GTK_RESPONSE_OK);
 		gtk_dialog_set_default_response (GTK_DIALOG (dialog),
 						 GTK_RESPONSE_OK);
 		gtk_container_set_border_width (GTK_CONTAINER (dialog), 5);
@@ -6985,7 +6985,7 @@ action_connect_to_server_link_callback (GtkAction *action,
 		dialog = gtk_dialog_new_with_buttons (title,
 						      fm_directory_view_get_containing_window (view),
 						      0,
-						      GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+						      "gtk-cancel", GTK_RESPONSE_CANCEL,
 						      _("_Connect"), GTK_RESPONSE_OK,
 						      NULL);
 
@@ -7239,132 +7239,132 @@ fm_directory_view_init_show_hidden_files (FMDirectoryView *view)
 }
 
 static const GtkActionEntry directory_view_entries[] = {
-  /* name, stock id, label */  { "New Documents", "document-new", N_("Create _Document") },
-  /* name, stock id, label */  { "Open With", NULL, N_("Open Wit_h"),
+  /* name, icon name, label */ { "New Documents", "document-new", N_("Create _Document") },
+  /* name, icon name, label */ { "Open With", NULL, N_("Open Wit_h"),
                                  NULL, N_("Choose a program with which to open the selected item") },
-  /* name, stock id */         { "Properties", GTK_STOCK_PROPERTIES,
+  /* name, icon name */        { "Properties", "document-properties",
   /* label, accelerator */       N_("_Properties"), "<alt>Return",
   /* tooltip */                  N_("View or modify the properties of each selected item"),
                                  G_CALLBACK (action_properties_callback) },
-  /* name, stock id */         { "PropertiesAccel", NULL,
+  /* name, icon name */        { "PropertiesAccel", NULL,
   /* label, accelerator */       "PropertiesAccel", "<control>I",
   /* tooltip */                  NULL,
                                  G_CALLBACK (action_properties_callback) },
-  /* name, stock id */         { "New Folder", "folder-new",
+  /* name, icon name */        { "New Folder", "folder-new",
   /* label, accelerator */       N_("Create _Folder"), "<control><shift>N",
   /* tooltip */                  N_("Create a new empty folder inside this folder"),
                                  G_CALLBACK (action_new_folder_callback) },
-  /* name, stock id, label */  { "No Templates", NULL, N_("No templates installed") },
-  /* name, stock id */         { "New Empty File", NULL,
+  /* name, icon name, label */ { "No Templates", NULL, N_("No templates installed") },
+  /* name, icon name */        { "New Empty File", NULL,
     /* translators: this is used to indicate that a file doesn't contain anything */
   /* label, accelerator */       N_("_Empty File"), NULL,
   /* tooltip */                  N_("Create a new empty file inside this folder"),
                                  G_CALLBACK (action_new_empty_file_callback) },
-  /* name, stock id */         { "New Launcher", NULL,
+  /* name, icon name */        { "New Launcher", NULL,
   /* label, accelerator */       N_("Create L_auncher..."), NULL,
   /* tooltip */                  N_("Create a new launcher"),
                                  G_CALLBACK (action_new_launcher_callback) },
-  /* name, stock id */         { "Open", NULL,
+  /* name, icon name */        { "Open", NULL,
   /* label, accelerator */       N_("_Open"), "<control>o",
   /* tooltip */                  N_("Open the selected item in this window"),
                                  G_CALLBACK (action_open_callback) },
-  /* name, stock id */         { "OpenAccel", NULL,
+  /* name, icon name */        { "OpenAccel", NULL,
   /* label, accelerator */       "OpenAccel", "<alt>Down",
   /* tooltip */                  NULL,
                                  G_CALLBACK (action_open_callback) },
-  /* name, stock id */         { "OpenAlternate", NULL,
+  /* name, icon name */        { "OpenAlternate", NULL,
   /* label, accelerator */       N_("Open in Navigation Window"), "<control><shift>w",
   /* tooltip */                  N_("Open each selected item in a navigation window"),
                                  G_CALLBACK (action_open_alternate_callback) },
-  /* name, stock id */         { "OpenInNewTab", NULL,
+  /* name, icon name */        { "OpenInNewTab", NULL,
   /* label, accelerator */       N_("Open in New _Tab"), "<control><shift>o",
   /* tooltip */                  N_("Open each selected item in a new tab"),
                                  G_CALLBACK (action_open_new_tab_callback) },
-  /* name, stock id */         { "OpenFolderWindow", NULL,
+  /* name, icon name */        { "OpenFolderWindow", NULL,
   /* label, accelerator */       N_("Open in _Folder Window"), NULL,
   /* tooltip */                  N_("Open each selected item in a folder window"),
                                  G_CALLBACK (action_open_folder_window_callback) },
-  /* name, stock id */         { "OtherApplication1", NULL,
+  /* name, icon name */        { "OtherApplication1", NULL,
   /* label, accelerator */       N_("Other _Application..."), NULL,
   /* tooltip */                  N_("Choose another application with which to open the selected item"),
                                  G_CALLBACK (action_other_application_callback) },
-  /* name, stock id */         { "OtherApplication2", NULL,
+  /* name, icon name */        { "OtherApplication2", NULL,
   /* label, accelerator */       N_("Open With Other _Application..."), NULL,
   /* tooltip */                  N_("Choose another application with which to open the selected item"),
                                  G_CALLBACK (action_other_application_callback) },
-  /* name, stock id */         { "Open Scripts Folder", NULL,
+  /* name, icon name */        { "Open Scripts Folder", NULL,
   /* label, accelerator */       N_("_Open Scripts Folder"), NULL,
    /* tooltip */                 N_("Show the folder containing the scripts that appear in this menu"),
                                  G_CALLBACK (action_open_scripts_folder_callback) },
-  /* name, stock id */         { "Empty Trash", NULL,
+  /* name, icon name */        { "Empty Trash", NULL,
   /* label, accelerator */       N_("E_mpty Trash"), NULL,
   /* tooltip */                  N_("Delete all items in the Trash"),
                                  G_CALLBACK (action_empty_trash_callback) },
-  /* name, stock id */         { "Cut", GTK_STOCK_CUT,
-  /* label, accelerator */       NULL, NULL,
+  /* name, icon name */        { "Cut", "edit-cut",
+  /* label, accelerator */       N_("Cu_t"), "<control>X",
   /* tooltip */                  N_("Prepare the selected files to be moved with a Paste command"),
                                  G_CALLBACK (action_cut_files_callback) },
-  /* name, stock id */         { "Copy", GTK_STOCK_COPY,
-  /* label, accelerator */       NULL, NULL,
+  /* name, icon name */        { "Copy", "edit-copy",
+  /* label, accelerator */       N_("_Copy"), "<control>C",
   /* tooltip */                  N_("Prepare the selected files to be copied with a Paste command"),
                                  G_CALLBACK (action_copy_files_callback) },
-  /* name, stock id */         { "Paste", GTK_STOCK_PASTE,
-  /* label, accelerator */       NULL, NULL,
+  /* name, icon name */        { "Paste", "edit-paste",
+  /* label, accelerator */       N_("_Paste"), "<control>V",
   /* tooltip */                  N_("Move or copy files previously selected by a Cut or Copy command"),
                                  G_CALLBACK (action_paste_files_callback) },
   /* We make accelerator "" instead of null here to not inherit the stock
      accelerator for paste */
-  /* name, stock id */         { "Paste Files Into", GTK_STOCK_PASTE,
+  /* name, icon name */        { "Paste Files Into", "edit-paste",
   /* label, accelerator */       N_("_Paste Into Folder"), "",
   /* tooltip */                  N_("Move or copy files previously selected by a Cut or Copy command into the selected folder"),
                                  G_CALLBACK (action_paste_files_into_callback) },
-  /* name, stock id, label */  { "CopyToMenu", NULL, N_("Cop_y to") },
-  /* name, stock id, label */  { "MoveToMenu", NULL, N_("M_ove to") },
-  /* name, stock id */         { "Select All", NULL,
+  /* name, icon name, label */ { "CopyToMenu", NULL, N_("Cop_y to") },
+  /* name, icon name, label */ { "MoveToMenu", NULL, N_("M_ove to") },
+  /* name, icon name */        { "Select All", NULL,
   /* label, accelerator */       N_("Select _All"), "<control>A",
   /* tooltip */                  N_("Select all items in this window"),
                                  G_CALLBACK (action_select_all_callback) },
-  /* name, stock id */         { "Select Pattern", NULL,
+  /* name, icon name */        { "Select Pattern", NULL,
   /* label, accelerator */       N_("Select I_tems Matching..."), "<control>S",
   /* tooltip */                  N_("Select items in this window matching a given pattern"),
                                  G_CALLBACK (action_select_pattern_callback) },
-  /* name, stock id */         { "Invert Selection", NULL,
+  /* name, icon name */        { "Invert Selection", NULL,
   /* label, accelerator */       N_("_Invert Selection"), "<control><shift>I",
   /* tooltip */                  N_("Select all and only the items that are not currently selected"),
                                  G_CALLBACK (action_invert_selection_callback) },
-  /* name, stock id */         { "Duplicate", NULL,
+  /* name, icon name */        { "Duplicate", NULL,
   /* label, accelerator */       N_("D_uplicate"), NULL,
   /* tooltip */                  N_("Duplicate each selected item"),
                                  G_CALLBACK (action_duplicate_callback) },
-  /* name, stock id */         { "Create Link", NULL,
+  /* name, icon name */        { "Create Link", NULL,
   /* label, accelerator */       N_("Ma_ke Link"), "<control>M",
   /* tooltip */                  N_("Create a symbolic link for each selected item"),
                                  G_CALLBACK (action_create_link_callback) },
-  /* name, stock id */         { "Rename", NULL,
+  /* name, icon name */        { "Rename", NULL,
   /* label, accelerator */       N_("_Rename..."), "F2",
   /* tooltip */                  N_("Rename selected item"),
                                  G_CALLBACK (action_rename_callback) },
-  /* name, stock id */         { "RenameSelectAll", NULL,
+  /* name, icon name */        { "RenameSelectAll", NULL,
   /* label, accelerator */       "RenameSelectAll", "<shift>F2",
   /* tooltip */                  NULL,
                                  G_CALLBACK (action_rename_select_all_callback) },
-  /* name, stock id */         { "Trash", NULL,
+  /* name, icon name */        { "Trash", NULL,
   /* label, accelerator */       N_("Mo_ve to Trash"), NULL,
   /* tooltip */                  N_("Move each selected item to the Trash"),
                                  G_CALLBACK (action_trash_callback) },
-  /* name, stock id */         { "Delete", NULL,
+  /* name, icon name */        { "Delete", NULL,
   /* label, accelerator */       N_("_Delete"), NULL,
   /* tooltip */                  N_("Delete each selected item, without moving to the Trash"),
                                  G_CALLBACK (action_delete_callback) },
-  /* name, stock id */         { "Restore From Trash", NULL,
+  /* name, icon name */        { "Restore From Trash", NULL,
   /* label, accelerator */       N_("_Restore"), NULL,
 				 NULL,
                                  G_CALLBACK (action_restore_from_trash_callback) },
-  /* name, stock id */		   { FM_ACTION_UNDO, GTK_STOCK_UNDO,
+  /* name, icon name */		  { FM_ACTION_UNDO, "edit-undo",
   /* label, accelerator */		 N_("_Undo"), "<control>Z",
   /* tooltip */ 				 	 N_("Undo the last action"),
 								 G_CALLBACK (action_undo_callback) },
-  /* name, stock id */		   { FM_ACTION_REDO, GTK_STOCK_REDO,
+  /* name, icon name */		  { FM_ACTION_REDO, "edit-redo",
   /* label, accelerator */	     N_("_Redo"), "<control>Y",
   /* tooltip */     			 	 N_("Redo the last undone action"),
 								 G_CALLBACK (action_redo_callback) },
@@ -7375,176 +7375,176 @@ static const GtkActionEntry directory_view_entries[] = {
    * Since this also resets the "Show hidden files" mode,
    * it is a mixture of both ATM.
    */
-  /* name, stock id */         { "Reset to Defaults", NULL,
+  /* name, icon name */        { "Reset to Defaults", NULL,
   /* label, accelerator */       N_("Reset View to _Defaults"), NULL,
   /* tooltip */                  N_("Reset sorting order and zoom level to match preferences for this view"),
                                  G_CALLBACK (action_reset_to_defaults_callback) },
-  /* name, stock id */         { "Connect To Server Link", NULL,
+  /* name, icon name */        { "Connect To Server Link", NULL,
   /* label, accelerator */       N_("Connect To This Server"), NULL,
   /* tooltip */                  N_("Make a permanent connection to this server"),
                                  G_CALLBACK (action_connect_to_server_link_callback) },
-  /* name, stock id */         { "Mount Volume", NULL,
+  /* name, icon name */        { "Mount Volume", NULL,
   /* label, accelerator */       N_("_Mount"), NULL,
   /* tooltip */                  N_("Mount the selected volume"),
                                  G_CALLBACK (action_mount_volume_callback) },
-  /* name, stock id */         { "Unmount Volume", NULL,
+  /* name, icon name */        { "Unmount Volume", NULL,
   /* label, accelerator */       N_("_Unmount"), NULL,
   /* tooltip */                  N_("Unmount the selected volume"),
                                  G_CALLBACK (action_unmount_volume_callback) },
-  /* name, stock id */         { "Eject Volume", NULL,
+  /* name, icon name */        { "Eject Volume", NULL,
   /* label, accelerator */       N_("_Eject"), NULL,
   /* tooltip */                  N_("Eject the selected volume"),
                                  G_CALLBACK (action_eject_volume_callback) },
-  /* name, stock id */         { "Format Volume", NULL,
+  /* name, icon name */        { "Format Volume", NULL,
   /* label, accelerator */       N_("_Format"), NULL,
   /* tooltip */                  N_("Format the selected volume"),
                                  G_CALLBACK (action_format_volume_callback) },
-  /* name, stock id */         { "Start Volume", NULL,
+  /* name, icon name */        { "Start Volume", NULL,
   /* label, accelerator */       N_("_Start"), NULL,
   /* tooltip */                  N_("Start the selected volume"),
                                  G_CALLBACK (action_start_volume_callback) },
-  /* name, stock id */         { "Stop Volume", NULL,
+  /* name, icon name */        { "Stop Volume", NULL,
   /* label, accelerator */       N_("_Stop"), NULL,
   /* tooltip */                  N_("Stop the selected volume"),
                                  G_CALLBACK (action_stop_volume_callback) },
-  /* name, stock id */         { "Poll", NULL,
+  /* name, icon name */        { "Poll", NULL,
   /* label, accelerator */       N_("_Detect Media"), NULL,
   /* tooltip */                  N_("Detect media in the selected drive"),
                                  G_CALLBACK (action_detect_media_callback) },
-  /* name, stock id */         { "Self Mount Volume", NULL,
+  /* name, icon name */        { "Self Mount Volume", NULL,
   /* label, accelerator */       N_("_Mount"), NULL,
   /* tooltip */                  N_("Mount the volume associated with the open folder"),
                                  G_CALLBACK (action_self_mount_volume_callback) },
-  /* name, stock id */         { "Self Unmount Volume", NULL,
+  /* name, icon name */        { "Self Unmount Volume", NULL,
   /* label, accelerator */       N_("_Unmount"), NULL,
   /* tooltip */                  N_("Unmount the volume associated with the open folder"),
                                  G_CALLBACK (action_self_unmount_volume_callback) },
-  /* name, stock id */         { "Self Eject Volume", NULL,
+  /* name, icon name */        { "Self Eject Volume", NULL,
   /* label, accelerator */       N_("_Eject"), NULL,
   /* tooltip */                  N_("Eject the volume associated with the open folder"),
                                  G_CALLBACK (action_self_eject_volume_callback) },
-  /* name, stock id */         { "Self Format Volume", NULL,
+  /* name, icon name */        { "Self Format Volume", NULL,
   /* label, accelerator */       N_("_Format"), NULL,
   /* tooltip */                  N_("Format the volume associated with the open folder"),
                                  G_CALLBACK (action_self_format_volume_callback) },
-  /* name, stock id */         { "Self Start Volume", NULL,
+  /* name, icon name */        { "Self Start Volume", NULL,
   /* label, accelerator */       N_("_Start"), NULL,
   /* tooltip */                  N_("Start the volume associated with the open folder"),
                                  G_CALLBACK (action_self_start_volume_callback) },
-  /* name, stock id */         { "Self Stop Volume", NULL,
+  /* name, icon name */        { "Self Stop Volume", NULL,
   /* label, accelerator */       N_("_Stop"), NULL,
   /* tooltip */                  N_("Stop the volume associated with the open folder"),
                                  G_CALLBACK (action_self_stop_volume_callback) },
-  /* name, stock id */         { "Self Poll", NULL,
+  /* name, icon name */        { "Self Poll", NULL,
   /* label, accelerator */       N_("_Detect Media"), NULL,
   /* tooltip */                  N_("Detect media in the selected drive"),
                                  G_CALLBACK (action_self_detect_media_callback) },
-  /* name, stock id */         { "OpenCloseParent", NULL,
+  /* name, icon name */        { "OpenCloseParent", NULL,
   /* label, accelerator */       N_("Open File and Close window"), "<alt><shift>Down",
   /* tooltip */                  NULL,
                                  G_CALLBACK (action_open_close_parent_callback) },
-  /* name, stock id */         { "Save Search", NULL,
+  /* name, icon name */        { "Save Search", NULL,
   /* label, accelerator */       N_("Sa_ve Search"), NULL,
   /* tooltip */                  N_("Save the edited search"),
                                  G_CALLBACK (action_save_search_callback) },
-  /* name, stock id */         { "Save Search As", NULL,
+  /* name, icon name */        { "Save Search As", NULL,
   /* label, accelerator */       N_("Sa_ve Search As..."), NULL,
   /* tooltip */                  N_("Save the current search as a file"),
                                  G_CALLBACK (action_save_search_as_callback) },
 
   /* Location-specific actions */
-  /* name, stock id */         { FM_ACTION_LOCATION_OPEN_ALTERNATE, NULL,
+  /* name, icon name */        { FM_ACTION_LOCATION_OPEN_ALTERNATE, NULL,
   /* label, accelerator */       N_("Open in Navigation Window"), "",
   /* tooltip */                  N_("Open this folder in a navigation window"),
                                  G_CALLBACK (action_location_open_alternate_callback) },
-  /* name, stock id */         { FM_ACTION_LOCATION_OPEN_IN_NEW_TAB, NULL,
+  /* name, icon name */        { FM_ACTION_LOCATION_OPEN_IN_NEW_TAB, NULL,
   /* label, accelerator */       N_("Open in New _Tab"), "",
   /* tooltip */                  N_("Open this folder in a new tab"),
                                  G_CALLBACK (action_location_open_in_new_tab_callback) },
 
-  /* name, stock id */         { FM_ACTION_LOCATION_OPEN_FOLDER_WINDOW, NULL,
+  /* name, icon name */        { FM_ACTION_LOCATION_OPEN_FOLDER_WINDOW, NULL,
   /* label, accelerator */       N_("Open in _Folder Window"), "",
   /* tooltip */                  N_("Open this folder in a folder window"),
                                  G_CALLBACK (action_location_open_folder_window_callback) },
 
-  /* name, stock id */         { FM_ACTION_LOCATION_CUT, GTK_STOCK_CUT,
-  /* label, accelerator */       NULL, "",
+  /* name, icon name */        { FM_ACTION_LOCATION_CUT, "edit-cut",
+  /* label, accelerator */       N_("Cu_t"), "",
   /* tooltip */                  N_("Prepare this folder to be moved with a Paste command"),
                                  G_CALLBACK (action_location_cut_callback) },
-  /* name, stock id */         { FM_ACTION_LOCATION_COPY, GTK_STOCK_COPY,
-  /* label, accelerator */       NULL, "",
+  /* name, icon name */        { FM_ACTION_LOCATION_COPY, "edit-copy",
+  /* label, accelerator */       N_("_Copy"), "",
   /* tooltip */                  N_("Prepare this folder to be copied with a Paste command"),
                                  G_CALLBACK (action_location_copy_callback) },
-  /* name, stock id */         { FM_ACTION_LOCATION_PASTE_FILES_INTO, GTK_STOCK_PASTE,
+  /* name, icon name */        { FM_ACTION_LOCATION_PASTE_FILES_INTO, "edit-paste",
   /* label, accelerator */       N_("_Paste Into Folder"), "",
   /* tooltip */                  N_("Move or copy files previously selected by a Cut or Copy command into this folder"),
                                  G_CALLBACK (action_location_paste_files_into_callback) },
 
-  /* name, stock id */         { FM_ACTION_LOCATION_TRASH, NULL,
+  /* name, icon name */        { FM_ACTION_LOCATION_TRASH, NULL,
   /* label, accelerator */       N_("Mo_ve to Trash"), "",
   /* tooltip */                  N_("Move this folder to the Trash"),
                                  G_CALLBACK (action_location_trash_callback) },
-  /* name, stock id */         { FM_ACTION_LOCATION_DELETE, CAJA_ICON_DELETE,
+  /* name, icon name */        { FM_ACTION_LOCATION_DELETE, CAJA_ICON_DELETE,
   /* label, accelerator */       N_("_Delete"), "",
   /* tooltip */                  N_("Delete this folder, without moving to the Trash"),
                                  G_CALLBACK (action_location_delete_callback) },
-  /* name, stock id */         { FM_ACTION_LOCATION_RESTORE_FROM_TRASH, NULL,
+  /* name, icon name */        { FM_ACTION_LOCATION_RESTORE_FROM_TRASH, NULL,
   /* label, accelerator */       N_("_Restore"), NULL, NULL,
                                  G_CALLBACK (action_location_restore_from_trash_callback) },
 
-  /* name, stock id */         { "Location Mount Volume", NULL,
+  /* name, icon name */        { "Location Mount Volume", NULL,
   /* label, accelerator */       N_("_Mount"), NULL,
   /* tooltip */                  N_("Mount the volume associated with this folder"),
                                  G_CALLBACK (action_location_mount_volume_callback) },
-  /* name, stock id */         { "Location Unmount Volume", NULL,
+  /* name, icon name */        { "Location Unmount Volume", NULL,
   /* label, accelerator */       N_("_Unmount"), NULL,
   /* tooltip */                  N_("Unmount the volume associated with this folder"),
                                  G_CALLBACK (action_location_unmount_volume_callback) },
-  /* name, stock id */         { "Location Eject Volume", NULL,
+  /* name, icon name */        { "Location Eject Volume", NULL,
   /* label, accelerator */       N_("_Eject"), NULL,
   /* tooltip */                  N_("Eject the volume associated with this folder"),
                                  G_CALLBACK (action_location_eject_volume_callback) },
-  /* name, stock id */         { "Location Format Volume", NULL,
+  /* name, icon name */        { "Location Format Volume", NULL,
   /* label, accelerator */       N_("_Format"), NULL,
   /* tooltip */                  N_("Format the volume associated with this folder"),
                                  G_CALLBACK (action_location_format_volume_callback) },
-  /* name, stock id */         { "Location Start Volume", NULL,
+  /* name, icon name */        { "Location Start Volume", NULL,
   /* label, accelerator */       N_("_Start"), NULL,
   /* tooltip */                  N_("Start the volume associated with this folder"),
                                  G_CALLBACK (action_location_start_volume_callback) },
-  /* name, stock id */         { "Location Stop Volume", NULL,
+  /* name, icon name */        { "Location Stop Volume", NULL,
   /* label, accelerator */       N_("_Stop"), NULL,
   /* tooltip */                  N_("Stop the volume associated with this folder"),
                                  G_CALLBACK (action_location_stop_volume_callback) },
-  /* name, stock id */         { "Location Poll", NULL,
+  /* name, icon name */        { "Location Poll", NULL,
   /* label, accelerator */       N_("_Detect Media"), NULL,
   /* tooltip */                  N_("Detect media in the selected drive"),
                                  G_CALLBACK (action_location_detect_media_callback) },
 
-  /* name, stock id */         { "LocationProperties", GTK_STOCK_PROPERTIES,
+  /* name, icon name */        { "LocationProperties", "document-properties",
   /* label, accelerator */       N_("_Properties"), NULL,
   /* tooltip */                  N_("View or modify the properties of this folder"),
                                  G_CALLBACK (action_location_properties_callback) },
 
-  /* name, stock id, label */  {FM_ACTION_COPY_TO_NEXT_PANE, NULL, N_("_Other pane"),
+  /* name, icon name, label */ {FM_ACTION_COPY_TO_NEXT_PANE, NULL, N_("_Other pane"),
 				NULL, N_("Copy the current selection to the other pane in the window"),
 				G_CALLBACK (action_copy_to_next_pane_callback) },
-  /* name, stock id, label */  {FM_ACTION_MOVE_TO_NEXT_PANE, NULL, N_("_Other pane"),
+  /* name, icon name, label */ {FM_ACTION_MOVE_TO_NEXT_PANE, NULL, N_("_Other pane"),
 				NULL, N_("Move the current selection to the other pane in the window"),
 				G_CALLBACK (action_move_to_next_pane_callback) },
-  /* name, stock id, label */  {FM_ACTION_COPY_TO_HOME, CAJA_ICON_HOME,
+  /* name, icon name, label */ {FM_ACTION_COPY_TO_HOME, CAJA_ICON_HOME,
 				N_("_Home Folder"), NULL,
 				N_("Copy the current selection to the home folder"),
 				G_CALLBACK (action_copy_to_home_callback) },
-  /* name, stock id, label */  {FM_ACTION_MOVE_TO_HOME, CAJA_ICON_HOME,
+  /* name, icon name, label */ {FM_ACTION_MOVE_TO_HOME, CAJA_ICON_HOME,
 				N_("_Home Folder"), NULL,
 				N_("Move the current selection to the home folder"),
 				G_CALLBACK (action_move_to_home_callback) },
-  /* name, stock id, label */  {FM_ACTION_COPY_TO_DESKTOP, CAJA_ICON_DESKTOP,
+  /* name, icon name, label */ {FM_ACTION_COPY_TO_DESKTOP, CAJA_ICON_DESKTOP,
 				N_("_Desktop"), NULL,
 				N_("Copy the current selection to the desktop"),
 				G_CALLBACK (action_copy_to_desktop_callback) },
-  /* name, stock id, label */  {FM_ACTION_MOVE_TO_DESKTOP, CAJA_ICON_DESKTOP,
+  /* name, icon name, label */ {FM_ACTION_MOVE_TO_DESKTOP, CAJA_ICON_DESKTOP,
 				N_("_Desktop"), NULL,
 				N_("Move the current selection to the desktop"),
 				G_CALLBACK (action_move_to_desktop_callback) },
@@ -8794,7 +8794,7 @@ real_update_menus (FMDirectoryView *view)
 		GTK_IMAGE_MENU_ITEM (menuitem), app_icon != NULL);
 
 	if (app_icon == NULL) {
-		app_icon = g_themed_icon_new (GTK_STOCK_OPEN);
+		app_icon = g_themed_icon_new ("gtk-open");
 	}
 
 	gtk_action_set_gicon (action, app_icon);
@@ -10270,7 +10270,7 @@ ask_link_action (FMDirectoryView *view)
 	gtk_dialog_add_button (GTK_DIALOG (dialog),
 			       _("Make a _Link"), 0);
 	gtk_dialog_add_button (GTK_DIALOG (dialog),
-			       GTK_STOCK_CANCEL, 1);
+			       "gtk-cancel", 1);
 	gtk_dialog_add_button (GTK_DIALOG (dialog),
 			       _("_Download"), 2);
 
diff --git a/src/file-manager/fm-list-view.c b/src/file-manager/fm-list-view.c
index 32d965a1..48d783e5 100644
--- a/src/file-manager/fm-list-view.c
+++ b/src/file-manager/fm-list-view.c
@@ -2534,7 +2534,7 @@ create_column_editor (FMListView *view)
     window = gtk_dialog_new_with_buttons (str,
                                           GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (view))),
                                           GTK_DIALOG_DESTROY_WITH_PARENT,
-                                          GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,
+                                          "gtk-close", GTK_RESPONSE_CLOSE,
                                           NULL);
     g_free (str);
     g_signal_connect (window, "response",
diff --git a/src/file-manager/fm-properties-window.c b/src/file-manager/fm-properties-window.c
index 7bfa219b..acea165a 100644
--- a/src/file-manager/fm-properties-window.c
+++ b/src/file-manager/fm-properties-window.c
@@ -5169,8 +5169,8 @@ create_properties_window (StartupData *startup_data)
 	append_extension_pages (window);
 
 	gtk_dialog_add_buttons (GTK_DIALOG (window),
-				GTK_STOCK_HELP, GTK_RESPONSE_HELP,
-				GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,
+				"gtk-help", GTK_RESPONSE_HELP,
+				"gtk-close", GTK_RESPONSE_CLOSE,
 				NULL);
 
 	/* FIXME - HIGificiation, should be done inside GTK+ */
@@ -5670,9 +5670,9 @@ select_image_button_callback (GtkWidget *widget,
 	if (dialog == NULL) {
 		dialog = gtk_file_chooser_dialog_new (_("Select Custom Icon"), GTK_WINDOW (window),
 						      GTK_FILE_CHOOSER_ACTION_OPEN,
-						      GTK_STOCK_REVERT_TO_SAVED, GTK_RESPONSE_NO,
-						      GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-						      GTK_STOCK_OPEN, GTK_RESPONSE_OK,
+						      "gtk-revert-to-saved", GTK_RESPONSE_NO,
+						      "gtk-cancel", GTK_RESPONSE_CANCEL,
+						      "gtk-open", GTK_RESPONSE_OK,
 						      NULL);
 		gtk_file_chooser_add_shortcut_folder (GTK_FILE_CHOOSER (dialog), "/usr/share/icons", NULL);
 		gtk_file_chooser_add_shortcut_folder (GTK_FILE_CHOOSER (dialog), "/usr/share/pixmaps", NULL);
diff --git a/src/file-manager/fm-tree-view.c b/src/file-manager/fm-tree-view.c
index 643ae185..b29c97c7 100644
--- a/src/file-manager/fm-tree-view.c
+++ b/src/file-manager/fm-tree-view.c
@@ -1261,8 +1261,8 @@ create_popup_menu (FMTreeView *view)
 
 
     /* add the "open" menu item */
-    menu_image = gtk_image_new_from_stock (GTK_STOCK_OPEN,
-                                           GTK_ICON_SIZE_MENU);
+    menu_image = gtk_image_new_from_icon_name ("document-open",
+                                               GTK_ICON_SIZE_MENU);
     gtk_widget_show (menu_image);
     menu_item = gtk_image_menu_item_new_with_mnemonic (_("_Open"));
     gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_item),
@@ -1306,7 +1306,7 @@ create_popup_menu (FMTreeView *view)
     eel_gtk_menu_append_separator (GTK_MENU (popup));
 
     /* add the "cut folder" menu item */
-    menu_item = gtk_image_menu_item_new_from_stock (GTK_STOCK_CUT, NULL);
+    menu_item = gtk_image_menu_item_new_from_stock ("gtk-cut", NULL);
     g_signal_connect (menu_item, "activate",
                       G_CALLBACK (fm_tree_view_cut_cb),
                       view);
@@ -1315,7 +1315,7 @@ create_popup_menu (FMTreeView *view)
     view->details->popup_cut = menu_item;
 
     /* add the "copy folder" menu item */
-    menu_item = gtk_image_menu_item_new_from_stock (GTK_STOCK_COPY, NULL);
+    menu_item = gtk_image_menu_item_new_from_stock ("gtk-copy", NULL);
     g_signal_connect (menu_item, "activate",
                       G_CALLBACK (fm_tree_view_copy_cb),
                       view);
@@ -1324,8 +1324,8 @@ create_popup_menu (FMTreeView *view)
     view->details->popup_copy = menu_item;
 
     /* add the "paste files into folder" menu item */
-    menu_image = gtk_image_new_from_stock (GTK_STOCK_PASTE,
-                                           GTK_ICON_SIZE_MENU);
+    menu_image = gtk_image_new_from_icon_name ("edit-paste",
+                                               GTK_ICON_SIZE_MENU);
     gtk_widget_show (menu_image);
     menu_item = gtk_image_menu_item_new_with_mnemonic (_("_Paste Into Folder"));
     gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_item),
@@ -1392,7 +1392,7 @@ create_popup_menu (FMTreeView *view)
         GTK_WIDGET (eel_gtk_menu_append_separator (GTK_MENU (popup)));
 
     /* add the "properties" menu item */
-    menu_item = gtk_image_menu_item_new_from_stock (GTK_STOCK_PROPERTIES, NULL);
+    menu_item = gtk_image_menu_item_new_from_stock ("gtk-properties", NULL);
     g_signal_connect (menu_item, "activate",
                       G_CALLBACK (fm_tree_view_properties_cb),
                       view);