Stop using deprecated gtk-stock items

17 files changed, 119 insertions, 128 deletions

diff --git a/modules/addressbook/e-book-shell-view-actions.c b/modules/addressbook/e-book-shell-view-actions.c
index c0a8af7ea4..22efb4520c 100644
--- a/modules/addressbook/e-book-shell-view-actions.c
+++ b/modules/addressbook/e-book-shell-view-actions.c
@@ -874,14 +874,14 @@ action_contact_view_cb (GtkRadioAction *action,
 static GtkActionEntry contact_entries[] = {
 
 	{ "address-book-copy",
-	  GTK_STOCK_COPY,
+	  "edit-copy",
 	  N_("Co_py All Contacts To..."),
 	  NULL,
 	  N_("Copy the contacts of the selected address book to another"),
 	  G_CALLBACK (action_address_book_copy_cb) },
 
 	{ "address-book-delete",
-	  GTK_STOCK_DELETE,
+	  "edit-delete",
 	  N_("D_elete Address Book"),
 	  NULL,
 	  N_("Delete the selected address book"),
@@ -902,14 +902,14 @@ static GtkActionEntry contact_entries[] = {
 	  G_CALLBACK (action_address_book_new_cb) },
 
 	{ "address-book-properties",
-	  GTK_STOCK_PROPERTIES,
+	  "document-properties",
 	  N_("Address _Book Properties"),
 	  NULL,
 	  N_("Show properties of the selected address book"),
 	  G_CALLBACK (action_address_book_properties_cb) },
 
 	{ "address-book-refresh",
-	  GTK_STOCK_REFRESH,
+	  "view-refresh",
 	  N_("Re_fresh"),
 	  NULL,
 	  N_("Refresh the selected address book"),
@@ -930,8 +930,8 @@ static GtkActionEntry contact_entries[] = {
 	  G_CALLBACK (action_address_book_rename_cb) },
 
 	{ "address-book-stop",
-	  GTK_STOCK_STOP,
-	  NULL,
+	  "process-stop",
+	  N_("_Stop"),
 	  NULL,
 	  N_("Stop loading"),
 	  G_CALLBACK (action_address_book_stop_cb) },
@@ -944,14 +944,14 @@ static GtkActionEntry contact_entries[] = {
 	  G_CALLBACK (action_contact_copy_cb) },
 
 	{ "contact-delete",
-	  GTK_STOCK_DELETE,
+	  "edit-delete",
 	  N_("_Delete Contact"),
 	  "<Control>d",
 	  N_("Delete selected contacts"),
 	  G_CALLBACK (action_contact_delete_cb) },
 
 	{ "contact-find",
-	  GTK_STOCK_FIND,
+	  "edit-find",
 	  N_("_Find in Contact..."),
 	  "<Shift><Control>f",
 	  N_("Search for text in the displayed contact"),
@@ -1156,22 +1156,22 @@ static GtkRadioActionEntry contact_search_entries[] = {
 static GtkActionEntry lockdown_printing_entries[] = {
 
 	{ "address-book-print",
-	  GTK_STOCK_PRINT,
-	  NULL,
+	  "document-print",
+	  N_("_Print..."),
 	  "<Control>p",
 	  N_("Print all shown contacts"),
 	  G_CALLBACK (action_address_book_print_cb) },
 
 	{ "address-book-print-preview",
-	  GTK_STOCK_PRINT_PREVIEW,
-	  NULL,
+	  "document-print-preview",
+	  N_("Pre_view..."),
 	  NULL,
 	  N_("Preview the contacts to be printed"),
 	  G_CALLBACK (action_address_book_print_preview_cb) },
 
 	{ "contact-print",
-	  GTK_STOCK_PRINT,
-	  NULL,
+	  "document-print",
+	  N_("_Print..."),
 	  NULL,
 	  N_("Print selected contacts"),
 	  G_CALLBACK (action_contact_print_cb) }
@@ -1187,14 +1187,14 @@ static EPopupActionEntry lockdown_printing_popup_entries[] = {
 static GtkActionEntry lockdown_save_to_disk_entries[] = {
 
 	{ "address-book-save-as",
-	  GTK_STOCK_SAVE_AS,
+	  "document-save-as",
 	  N_("S_ave Address Book as vCard"),
 	  NULL,
 	  N_("Save the contacts of the selected address book as a vCard"),
 	  G_CALLBACK (action_address_book_save_as_cb) },
 
 	{ "contact-save-as",
-	  GTK_STOCK_SAVE_AS,
+	  "document-save-as",
 	  /* Translators: This is an action label */
 	  N_("_Save as vCard..."),
 	  NULL,
diff --git a/modules/backup-restore/evolution-backup-tool.c b/modules/backup-restore/evolution-backup-tool.c
index e94a3fff31..65e525c696 100644
--- a/modules/backup-restore/evolution-backup-tool.c
+++ b/modules/backup-restore/evolution-backup-tool.c
@@ -946,8 +946,7 @@ main (gint argc,
 		progress_dialog = gtk_dialog_new_with_buttons (
 			title, NULL,
 			GTK_DIALOG_MODAL,
-			GTK_STOCK_CANCEL,
-			GTK_RESPONSE_REJECT,
+			_("_Cancel"), GTK_RESPONSE_REJECT,
 			NULL);
 
 		gtk_container_set_border_width (
@@ -975,8 +974,8 @@ main (gint argc,
 		gtk_box_pack_start (
 			GTK_BOX (content_area), container, FALSE, TRUE, 0);
 
-		widget = gtk_image_new_from_stock (
-			GTK_STOCK_COPY, GTK_ICON_SIZE_DIALOG);
+		widget = gtk_image_new_from_icon_name (
+			"edit-copy", GTK_ICON_SIZE_DIALOG);
 		gtk_misc_set_alignment (GTK_MISC (widget), 0.0, 0.0);
 		gtk_widget_show (widget);
 
diff --git a/modules/book-config-ldap/evolution-book-config-ldap.c b/modules/book-config-ldap/evolution-book-config-ldap.c
index dd25429b0c..7e6880b42b 100644
--- a/modules/book-config-ldap/evolution-book-config-ldap.c
+++ b/modules/book-config-ldap/evolution-book-config-ldap.c
@@ -744,11 +744,7 @@ book_config_ldap_insert_widgets (ESourceConfigBackend *backend,
 	context->search_base_combo = g_object_ref (widget);
 	gtk_widget_show (widget);
 
-	widget = gtk_button_new_with_label (
-		_("Find Possible Search Bases"));
-	gtk_button_set_image (
-		GTK_BUTTON (widget), gtk_image_new_from_stock (
-		GTK_STOCK_FIND, GTK_ICON_SIZE_BUTTON));
+	widget = e_dialog_button_new_with_icon ("edit-find", _("Find Possible Search Bases"));
 	book_config_ldap_insert_notebook_widget (
 		container, size_group, NULL, widget);
 	context->search_base_button = g_object_ref (widget);
diff --git a/modules/cal-config-caldav/e-caldav-chooser-dialog.c b/modules/cal-config-caldav/e-caldav-chooser-dialog.c
index 09a77b6b9a..b01c100d88 100644
--- a/modules/cal-config-caldav/e-caldav-chooser-dialog.c
+++ b/modules/cal-config-caldav/e-caldav-chooser-dialog.c
@@ -275,11 +275,11 @@ caldav_chooser_dialog_constructed (GObject *object)
 
 	gtk_dialog_add_button (
 		GTK_DIALOG (dialog),
-		GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
+		_("_Cancel"), GTK_RESPONSE_CANCEL);
 
 	gtk_dialog_add_button (
 		GTK_DIALOG (dialog),
-		GTK_STOCK_APPLY, GTK_RESPONSE_APPLY);
+		_("_Apply"), GTK_RESPONSE_APPLY);
 
 	gtk_dialog_set_default_response (
 		GTK_DIALOG (dialog), GTK_RESPONSE_APPLY);
@@ -337,8 +337,7 @@ caldav_chooser_dialog_constructed (GObject *object)
 
 	container = widget;
 
-	widget = gtk_image_new_from_stock (
-		GTK_STOCK_DIALOG_WARNING, GTK_ICON_SIZE_MENU);
+	widget = gtk_image_new_from_icon_name ("dialog-warning", GTK_ICON_SIZE_MENU);
 	gtk_box_pack_start (GTK_BOX (container), widget, FALSE, FALSE, 0);
 	gtk_widget_show (widget);
 
diff --git a/modules/cal-config-google/e-google-chooser-dialog.c b/modules/cal-config-google/e-google-chooser-dialog.c
index 4324885595..64d24d9112 100644
--- a/modules/cal-config-google/e-google-chooser-dialog.c
+++ b/modules/cal-config-google/e-google-chooser-dialog.c
@@ -185,11 +185,11 @@ google_chooser_dialog_constructed (GObject *object)
 
 	gtk_dialog_add_button (
 		GTK_DIALOG (dialog),
-		GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
+		_("_Cancel"), GTK_RESPONSE_CANCEL);
 
 	gtk_dialog_add_button (
 		GTK_DIALOG (dialog),
-		GTK_STOCK_APPLY, GTK_RESPONSE_APPLY);
+		_("_Apply"), GTK_RESPONSE_APPLY);
 
 	gtk_dialog_set_default_response (
 		GTK_DIALOG (dialog), GTK_RESPONSE_APPLY);
@@ -248,8 +248,7 @@ google_chooser_dialog_constructed (GObject *object)
 
 	container = widget;
 
-	widget = gtk_image_new_from_stock (
-		GTK_STOCK_DIALOG_WARNING, GTK_ICON_SIZE_MENU);
+	widget = gtk_image_new_from_icon_name ("dialog-warning", GTK_ICON_SIZE_MENU);
 	gtk_box_pack_start (GTK_BOX (container), widget, FALSE, FALSE, 0);
 	gtk_widget_show (widget);
 
diff --git a/modules/calendar/e-cal-attachment-handler.c b/modules/calendar/e-cal-attachment-handler.c
index 28aa93d6b2..2aed1483a1 100644
--- a/modules/calendar/e-cal-attachment-handler.c
+++ b/modules/calendar/e-cal-attachment-handler.c
@@ -314,7 +314,7 @@ attachment_handler_run_dialog (GtkWindow *parent,
 
 	dialog = gtk_dialog_new_with_buttons (
 		title, parent, GTK_DIALOG_DESTROY_WITH_PARENT,
-		GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, NULL);
+		_("_Cancel"), GTK_RESPONSE_CANCEL, NULL);
 
 	widget = gtk_button_new_with_mnemonic (_("I_mport"));
 	gtk_button_set_image (
diff --git a/modules/calendar/e-cal-shell-view-actions.c b/modules/calendar/e-cal-shell-view-actions.c
index 30604d9ee8..1dd1b332e9 100644
--- a/modules/calendar/e-cal-shell-view-actions.c
+++ b/modules/calendar/e-cal-shell-view-actions.c
@@ -1346,28 +1346,28 @@ action_event_schedule_appointment_cb (GtkAction *action,
 static GtkActionEntry calendar_entries[] = {
 
 	{ "calendar-copy",
-	  GTK_STOCK_COPY,
+	  "edit-copy",
 	  N_("_Copy..."),
 	  NULL,
 	  NULL,  /* XXX Add a tooltip! */
 	  G_CALLBACK (action_calendar_copy_cb) },
 
 	{ "calendar-delete",
-	  GTK_STOCK_DELETE,
+	  "edit-delete",
 	  N_("D_elete Calendar"),
 	  NULL,
 	  N_("Delete the selected calendar"),
 	  G_CALLBACK (action_calendar_delete_cb) },
 
 	{ "calendar-go-back",
-	  GTK_STOCK_GO_BACK,
+	  "go-previous",
 	  N_("Previous"),
 	  NULL,
 	  N_("Go Back"),
 	  G_CALLBACK (action_calendar_go_back_cb) },
 
 	{ "calendar-go-forward",
-	  GTK_STOCK_GO_FORWARD,
+	  "go-next",
 	  N_("Next"),
 	  NULL,
 	  N_("Go Forward"),
@@ -1381,7 +1381,7 @@ static GtkActionEntry calendar_entries[] = {
 	  G_CALLBACK (action_calendar_go_today_cb) },
 
 	{ "calendar-jump-to",
-	  GTK_STOCK_JUMP_TO,
+	  "go-jump",
 	  N_("Select _Date"),
 	  "<Control>g",
 	  N_("Select a specific date"),
@@ -1395,8 +1395,8 @@ static GtkActionEntry calendar_entries[] = {
 	  G_CALLBACK (action_calendar_new_cb) },
 
 	{ "calendar-properties",
-	  GTK_STOCK_PROPERTIES,
-	  NULL,
+	  "document-properties",
+	  N_("_Properties"),
 	  NULL,
 	  NULL,  /* XXX Add a tooltip! */
 	  G_CALLBACK (action_calendar_properties_cb) },
@@ -1409,7 +1409,7 @@ static GtkActionEntry calendar_entries[] = {
 	  G_CALLBACK (action_calendar_purge_cb) },
 
 	{ "calendar-refresh",
-	  GTK_STOCK_REFRESH,
+	  "view-refresh",
 	  N_("Re_fresh"),
 	  NULL,
 	  N_("Refresh the selected calendar"),
@@ -1423,21 +1423,21 @@ static GtkActionEntry calendar_entries[] = {
 	  G_CALLBACK (action_calendar_rename_cb) },
 
 	{ "calendar-search-next",
-	  GTK_STOCK_GO_FORWARD,
+	  "go-next",
 	  N_("Find _Next"),
 	  "<Control><Shift>n",
 	  N_("Find next occurrence of the current search string"),
 	  G_CALLBACK (action_calendar_search_next_cb) },
 
 	{ "calendar-search-prev",
-	  GTK_STOCK_GO_BACK,
+	  "go-previous",
 	  N_("Find _Previous"),
 	  "<Control><Shift>p",
 	  N_("Find previous occurrence of the current search string"),
 	  G_CALLBACK (action_calendar_search_prev_cb) },
 
 	{ "calendar-search-stop",
-	  GTK_STOCK_STOP,
+	  "process-stop",
 	  N_("Stop _Running Search"),
 	  NULL,
 	  N_("Stop currently running search"),
@@ -1465,21 +1465,21 @@ static GtkActionEntry calendar_entries[] = {
 	  G_CALLBACK (action_event_delegate_cb) },
 
 	{ "event-delete",
-	  GTK_STOCK_DELETE,
+	  "edit-delete",
 	  N_("_Delete Appointment"),
 	  "<Control>d",
 	  N_("Delete selected appointments"),
 	  G_CALLBACK (action_event_delete_cb) },
 
 	{ "event-delete-occurrence",
-	  GTK_STOCK_DELETE,
+	  "edit-delete",
 	  N_("Delete This _Occurrence"),
 	  NULL,
 	  N_("Delete this occurrence"),
 	  G_CALLBACK (action_event_delete_occurrence_cb) },
 
 	{ "event-delete-occurrence-all",
-	  GTK_STOCK_DELETE,
+	  "edit-delete",
 	  N_("Delete All Occ_urrences"),
 	  NULL,
 	  N_("Delete all occurrences"),
@@ -1528,7 +1528,7 @@ static GtkActionEntry calendar_entries[] = {
 	  G_CALLBACK (action_event_occurrence_movable_cb) },
 
 	{ "event-open",
-	  GTK_STOCK_OPEN,
+	  "document-open",
 	  N_("_Open Appointment"),
 	  "<Control>o",
 	  N_("View the current appointment"),
@@ -1563,7 +1563,7 @@ static GtkActionEntry calendar_entries[] = {
 	  G_CALLBACK (action_event_schedule_appointment_cb) },
 
 	{ "quit-calendar",
-	  GTK_STOCK_CLOSE,
+	  "window-close",
 	  N_("Quit"),
 	  NULL,
 	  NULL,  /* XXX Add a tooltip! */
@@ -1790,22 +1790,22 @@ static GtkRadioActionEntry calendar_search_entries[] = {
 static GtkActionEntry lockdown_printing_entries[] = {
 
 	{ "calendar-print",
-	  GTK_STOCK_PRINT,
-	  NULL,
+	  "document-print",
+	  N_("Print..."),
 	  "<Control>p",
 	  N_("Print this calendar"),
 	  G_CALLBACK (action_calendar_print_cb) },
 
 	{ "calendar-print-preview",
-	  GTK_STOCK_PRINT_PREVIEW,
-	  NULL,
+	  "document-print-preview",
+	  N_("Pre_view..."),
 	  NULL,
 	  N_("Preview the calendar to be printed"),
 	  G_CALLBACK (action_calendar_print_preview_cb) },
 
 	{ "event-print",
-	  GTK_STOCK_PRINT,
-	  NULL,
+	  "document-print",
+	  N_("Print..."),
 	  NULL,
 	  NULL,  /* XXX Add a tooltip! */
 	  G_CALLBACK (action_event_print_cb) }
@@ -1821,7 +1821,7 @@ static EPopupActionEntry lockdown_printing_popup_entries[] = {
 static GtkActionEntry lockdown_save_to_disk_entries[] = {
 
 	{ "event-save-as",
-	  GTK_STOCK_SAVE_AS,
+	  "document-save-as",
 	  N_("_Save as iCalendar..."),
 	  NULL,
 	  NULL,  /* XXX Add a tooltip! */
diff --git a/modules/calendar/e-cal-shell-view-memopad.c b/modules/calendar/e-cal-shell-view-memopad.c
index f14519bc7e..c7917eaf43 100644
--- a/modules/calendar/e-cal-shell-view-memopad.c
+++ b/modules/calendar/e-cal-shell-view-memopad.c
@@ -274,7 +274,7 @@ static GtkActionEntry calendar_memopad_entries[] = {
 	  G_CALLBACK (action_calendar_memopad_new_cb) },
 
 	{ "calendar-memopad-open",
-	  GTK_STOCK_OPEN,
+	  "document-open",
 	  N_("_Open Memo"),
 	  NULL,
 	  N_("View the selected memo"),
@@ -291,8 +291,8 @@ static GtkActionEntry calendar_memopad_entries[] = {
 static GtkActionEntry lockdown_printing_entries[] = {
 
 	{ "calendar-memopad-print",
-	  GTK_STOCK_PRINT,
-	  NULL,
+	  "document-print",
+	  N_("Print..."),
 	  NULL,
 	  N_("Print the selected memo"),
 	  G_CALLBACK (action_calendar_memopad_print_cb) }
@@ -301,7 +301,7 @@ static GtkActionEntry lockdown_printing_entries[] = {
 static GtkActionEntry lockdown_save_to_disk_entries[] = {
 
 	{ "calendar-memopad-save-as",
-	  GTK_STOCK_SAVE_AS,
+	  "document-save-as",
 	  N_("_Save as iCalendar..."),
 	  NULL,
 	  NULL,  /* XXX Add a tooltip! */
diff --git a/modules/calendar/e-cal-shell-view-taskpad.c b/modules/calendar/e-cal-shell-view-taskpad.c
index d5c8b21a43..6b881bb39b 100644
--- a/modules/calendar/e-cal-shell-view-taskpad.c
+++ b/modules/calendar/e-cal-shell-view-taskpad.c
@@ -361,7 +361,7 @@ static GtkActionEntry calendar_taskpad_entries[] = {
 	  G_CALLBACK (action_calendar_taskpad_new_cb) },
 
 	{ "calendar-taskpad-open",
-	  GTK_STOCK_OPEN,
+	  "document-open",
 	  N_("_Open Task"),
 	  NULL,
 	  N_("View the selected task"),
@@ -378,8 +378,8 @@ static GtkActionEntry calendar_taskpad_entries[] = {
 static GtkActionEntry lockdown_printing_entries[] = {
 
 	{ "calendar-taskpad-print",
-	  GTK_STOCK_PRINT,
-	  NULL,
+	  "document-print",
+	  N_("Print..."),
 	  NULL,
 	  N_("Print the selected task"),
 	  G_CALLBACK (action_calendar_taskpad_print_cb) }
@@ -388,7 +388,7 @@ static GtkActionEntry lockdown_printing_entries[] = {
 static GtkActionEntry lockdown_save_to_disk_entries[] = {
 
 	{ "calendar-taskpad-save-as",
-	  GTK_STOCK_SAVE_AS,
+	  "document-save-as",
 	  N_("_Save as iCalendar..."),
 	  NULL,
 	  NULL,  /* XXX Add a tooltip! */
diff --git a/modules/calendar/e-memo-shell-view-actions.c b/modules/calendar/e-memo-shell-view-actions.c
index e1cc3cb748..251eb39c59 100644
--- a/modules/calendar/e-memo-shell-view-actions.c
+++ b/modules/calendar/e-memo-shell-view-actions.c
@@ -582,14 +582,14 @@ action_memo_view_cb (GtkRadioAction *action,
 static GtkActionEntry memo_entries[] = {
 
 	{ "memo-delete",
-	  GTK_STOCK_DELETE,
+	  "edit-delete",
 	  N_("_Delete Memo"),
 	  NULL,
 	  N_("Delete selected memos"),
 	  G_CALLBACK (action_memo_delete_cb) },
 
 	{ "memo-find",
-	  GTK_STOCK_FIND,
+	  "edit-find",
 	  N_("_Find in Memo..."),
 	  "<Shift><Control>f",
 	  N_("Search for text in the displayed memo"),
@@ -603,14 +603,14 @@ static GtkActionEntry memo_entries[] = {
 	  G_CALLBACK (action_memo_forward_cb) },
 
 	{ "memo-list-copy",
-	  GTK_STOCK_COPY,
+	  "edit-copy",
 	  N_("_Copy..."),
 	  NULL,
 	  NULL,  /* XXX Add a tooltip! */
 	  G_CALLBACK (action_memo_list_copy_cb) },
 
 	{ "memo-list-delete",
-	  GTK_STOCK_DELETE,
+	  "edit-delete",
 	  N_("D_elete Memo List"),
 	  NULL,
 	  N_("Delete the selected memo list"),
@@ -624,14 +624,14 @@ static GtkActionEntry memo_entries[] = {
 	  G_CALLBACK (action_memo_list_new_cb) },
 
 	{ "memo-list-properties",
-	  GTK_STOCK_PROPERTIES,
-	  NULL,
+	  "document-properties",
+	  N_("_Properties"),
 	  NULL,
 	  NULL,  /* XXX Add a tooltip! */
 	  G_CALLBACK (action_memo_list_properties_cb) },
 
 	{ "memo-list-refresh",
-	  GTK_STOCK_REFRESH,
+	  "view-refresh",
 	  N_("Re_fresh"),
 	  NULL,
 	  N_("Refresh the selected memo list"),
@@ -659,7 +659,7 @@ static GtkActionEntry memo_entries[] = {
 	  G_CALLBACK (action_memo_new_cb) },
 
 	{ "memo-open",
-	  GTK_STOCK_OPEN,
+	  "document-open",
 	  N_("_Open Memo"),
 	  "<Control>o",
 	  N_("View the selected memo"),
@@ -810,22 +810,22 @@ static GtkRadioActionEntry memo_search_entries[] = {
 static GtkActionEntry lockdown_printing_entries[] = {
 
 	{ "memo-list-print",
-	  GTK_STOCK_PRINT,
-	  NULL,
+	  "document-print",
+	  N_("Print..."),
 	  "<Control>p",
 	  N_("Print the list of memos"),
 	  G_CALLBACK (action_memo_list_print_cb) },
 
 	{ "memo-list-print-preview",
-	  GTK_STOCK_PRINT_PREVIEW,
-	  NULL,
+	  "document-print-preview",
+	  N_("Pre_view..."),
 	  NULL,
 	  N_("Preview the list of memos to be printed"),
 	  G_CALLBACK (action_memo_list_print_preview_cb) },
 
 	{ "memo-print",
-	  GTK_STOCK_PRINT,
-	  NULL,
+	  "document-print",
+	  N_("Print..."),
 	  NULL,
 	  N_("Print the selected memo"),
 	  G_CALLBACK (action_memo_print_cb) }
@@ -841,7 +841,7 @@ static EPopupActionEntry lockdown_printing_popup_entries[] = {
 static GtkActionEntry lockdown_save_to_disk_entries[] = {
 
 	{ "memo-save-as",
-	  GTK_STOCK_SAVE_AS,
+	  "document-save-as",
 	  N_("_Save as iCalendar..."),
 	  NULL,
 	  NULL,  /* XXX Add a tooltip! */
diff --git a/modules/calendar/e-task-shell-view-actions.c b/modules/calendar/e-task-shell-view-actions.c
index 63a4e6e312..b5e34797ca 100644
--- a/modules/calendar/e-task-shell-view-actions.c
+++ b/modules/calendar/e-task-shell-view-actions.c
@@ -706,14 +706,14 @@ static GtkActionEntry task_entries[] = {
 	  G_CALLBACK (action_task_assign_cb) },
 
 	{ "task-delete",
-	  GTK_STOCK_DELETE,
+	  "edit-delete",
 	  N_("_Delete Task"),
 	  NULL,
 	  N_("Delete selected tasks"),
 	  G_CALLBACK (action_task_delete_cb) },
 
 	{ "task-find",
-	  GTK_STOCK_FIND,
+	  "edit-find",
 	  N_("_Find in Task..."),
 	  "<Shift><Control>f",
 	  N_("Search for text in the displayed task"),
@@ -727,14 +727,14 @@ static GtkActionEntry task_entries[] = {
 	  G_CALLBACK (action_task_forward_cb) },
 
 	{ "task-list-copy",
-	  GTK_STOCK_COPY,
+	  "edit-copy",
 	  N_("Copy..."),
 	  NULL,
 	  NULL,  /* XXX Add a tooltip! */
 	  G_CALLBACK (action_task_list_copy_cb) },
 
 	{ "task-list-delete",
-	  GTK_STOCK_DELETE,
+	  "edit-delete",
 	  N_("D_elete Task List"),
 	  NULL,
 	  N_("Delete the selected task list"),
@@ -748,14 +748,14 @@ static GtkActionEntry task_entries[] = {
 	  G_CALLBACK (action_task_list_new_cb) },
 
 	{ "task-list-properties",
-	  GTK_STOCK_PROPERTIES,
-	  NULL,
+	  "document-properties",
+	  N_("_Properties"),
 	  NULL,
 	  NULL,  /* XXX Add a tooltip! */
 	  G_CALLBACK (action_task_list_properties_cb) },
 
 	{ "task-list-refresh",
-	  GTK_STOCK_REFRESH,
+	  "view-refresh",
 	  N_("Re_fresh"),
 	  NULL,
 	  N_("Refresh the selected task list"),
@@ -797,7 +797,7 @@ static GtkActionEntry task_entries[] = {
 	  G_CALLBACK (action_task_new_cb) },
 
 	{ "task-open",
-	  GTK_STOCK_OPEN,
+	  "document-open",
 	  N_("_Open Task"),
 	  "<Control>o",
 	  N_("View the selected task"),
@@ -1009,22 +1009,22 @@ static GtkRadioActionEntry task_search_entries[] = {
 static GtkActionEntry lockdown_printing_entries[] = {
 
 	{ "task-list-print",
-	  GTK_STOCK_PRINT,
-	  NULL,
+	  "document-print",
+	  N_("Print..."),
 	  "<Control>p",
 	  N_("Print the list of tasks"),
 	  G_CALLBACK (action_task_list_print_cb) },
 
 	{ "task-list-print-preview",
-	  GTK_STOCK_PRINT_PREVIEW,
-	  NULL,
+	  "document-print-preview",
+	  N_("Pre_view..."),
 	  NULL,
 	  N_("Preview the list of tasks to be printed"),
 	  G_CALLBACK (action_task_list_print_preview_cb) },
 
 	{ "task-print",
-	  GTK_STOCK_PRINT,
-	  NULL,
+	  "document-print",
+	  N_("Print..."),
 	  NULL,
 	  N_("Print the selected task"),
 	  G_CALLBACK (action_task_print_cb) }
@@ -1040,7 +1040,7 @@ static EPopupActionEntry lockdown_printing_popup_entries[] = {
 static GtkActionEntry lockdown_save_to_disk_entries[] = {
 
 	{ "task-save-as",
-	  GTK_STOCK_SAVE_AS,
+	  "document-save-as",
 	  N_("_Save as iCalendar..."),
 	  NULL,
 	  NULL,  /* XXX Add a tooltip! */
diff --git a/modules/itip-formatter/itip-view.c b/modules/itip-formatter/itip-view.c
index 8c0813411c..b33d85ba14 100644
--- a/modules/itip-formatter/itip-view.c
+++ b/modules/itip-formatter/itip-view.c
@@ -915,16 +915,16 @@ append_info_item_row (ItipView *view,
 
 	switch (item->type) {
 		case ITIP_VIEW_INFO_ITEM_TYPE_INFO:
-			icon_name = GTK_STOCK_DIALOG_INFO;
+			icon_name = "dialog-information";
 			break;
 		case ITIP_VIEW_INFO_ITEM_TYPE_WARNING:
-			icon_name = GTK_STOCK_DIALOG_WARNING;
+			icon_name = "dialog-warning";
 			break;
 		case ITIP_VIEW_INFO_ITEM_TYPE_ERROR:
-			icon_name = GTK_STOCK_DIALOG_ERROR;
+			icon_name = "dialog-error";
 			break;
 		case ITIP_VIEW_INFO_ITEM_TYPE_PROGRESS:
-			icon_name = GTK_STOCK_FIND;
+			icon_name = "edit-find";
 			break;
 		case ITIP_VIEW_INFO_ITEM_TYPE_NONE:
 			default:
@@ -1019,34 +1019,34 @@ append_buttons_table (GString *buffer)
         /* Everything gets the open button */
 	buttons_table_write_button (
 		buffer, BUTTON_OPEN_CALENDAR, _("Ope_n Calendar"),
-		GTK_STOCK_JUMP_TO, ITIP_VIEW_RESPONSE_OPEN);
+		"go-jump", ITIP_VIEW_RESPONSE_OPEN);
 	buttons_table_write_button (
 		buffer, BUTTON_DECLINE_ALL, _("_Decline all"),
-		GTK_STOCK_CANCEL, ITIP_VIEW_RESPONSE_DECLINE);
+		"process-stop", ITIP_VIEW_RESPONSE_DECLINE);
 	buttons_table_write_button (
 		buffer, BUTTON_DECLINE, _("_Decline"),
-		GTK_STOCK_CANCEL, ITIP_VIEW_RESPONSE_DECLINE);
+		"process-stop", ITIP_VIEW_RESPONSE_DECLINE);
 	buttons_table_write_button (
 		buffer, BUTTON_TENTATIVE_ALL, _("_Tentative all"),
-		GTK_STOCK_DIALOG_QUESTION, ITIP_VIEW_RESPONSE_TENTATIVE);
+		"dialog-question", ITIP_VIEW_RESPONSE_TENTATIVE);
 	buttons_table_write_button (
 		buffer, BUTTON_TENTATIVE, _("_Tentative"),
-		GTK_STOCK_DIALOG_QUESTION, ITIP_VIEW_RESPONSE_TENTATIVE);
+		"dialog-question", ITIP_VIEW_RESPONSE_TENTATIVE);
 	buttons_table_write_button (
 		buffer, BUTTON_ACCEPT_ALL, _("Acce_pt all"),
-		GTK_STOCK_APPLY, ITIP_VIEW_RESPONSE_ACCEPT);
+		"dialog-apply", ITIP_VIEW_RESPONSE_ACCEPT);
 	buttons_table_write_button (
 		buffer, BUTTON_ACCEPT, _("Acce_pt"),
-		GTK_STOCK_APPLY, ITIP_VIEW_RESPONSE_ACCEPT);
+		"dialog-apply", ITIP_VIEW_RESPONSE_ACCEPT);
 	buttons_table_write_button (
 		buffer, BUTTON_SEND_INFORMATION, _("Send _Information"),
-		GTK_STOCK_REFRESH, ITIP_VIEW_RESPONSE_REFRESH);
+		"view-refresh", ITIP_VIEW_RESPONSE_REFRESH);
 	buttons_table_write_button (
 		buffer, BUTTON_UPDATE_ATTENDEE_STATUS, _("_Update Attendee Status"),
-		GTK_STOCK_REFRESH, ITIP_VIEW_RESPONSE_UPDATE);
+		"view-refresh", ITIP_VIEW_RESPONSE_UPDATE);
 	buttons_table_write_button (
 		buffer, BUTTON_UPDATE,  _("_Update"),
-		GTK_STOCK_REFRESH, ITIP_VIEW_RESPONSE_CANCEL);
+		"view-refresh", ITIP_VIEW_RESPONSE_CANCEL);
 
 	g_string_append (buffer, "</tr></table>");
 }
@@ -3114,7 +3114,7 @@ itip_view_set_error (ItipView *view,
 
 		buttons_table_write_button (
 			str, BUTTON_SAVE, _("Sa_ve"),
-			GTK_STOCK_SAVE, ITIP_VIEW_RESPONSE_SAVE);
+			"document-save", ITIP_VIEW_RESPONSE_SAVE);
 
 		g_string_append (str, "</tr></table>");
 	}
diff --git a/modules/mail/e-mail-shell-view-actions.c b/modules/mail/e-mail-shell-view-actions.c
index 2be3f59265..a93191cf7c 100644
--- a/modules/mail/e-mail-shell-view-actions.c
+++ b/modules/mail/e-mail-shell-view-actions.c
@@ -1522,14 +1522,14 @@ static GtkActionEntry mail_entries[] = {
 	  G_CALLBACK (action_mail_folder_expunge_cb) },
 
 	{ "mail-account-properties",
-	  GTK_STOCK_PROPERTIES,
+	  "document-properties",
 	  N_("_Properties"),
 	  NULL,
 	  N_("Edit properties of this account"),
 	  G_CALLBACK (action_mail_account_properties_cb) },
 
 	{ "mail-account-refresh",
-	  GTK_STOCK_REFRESH,
+	  "view-refresh",
 	  N_("_Refresh"),
 	  NULL,
 	  N_("Refresh list of folders of this account"),
@@ -1557,8 +1557,8 @@ static GtkActionEntry mail_entries[] = {
 	  G_CALLBACK (action_mail_folder_copy_cb) },
 
 	{ "mail-folder-delete",
-	  GTK_STOCK_DELETE,
-	  NULL,
+	  "edit-delete",
+	  N_("_Delete"),
 	  NULL,
 	  N_("Permanently remove this folder"),
 	  G_CALLBACK (action_mail_folder_delete_cb) },
@@ -1592,15 +1592,15 @@ static GtkActionEntry mail_entries[] = {
 	  G_CALLBACK (action_mail_folder_new_cb) },
 
 	{ "mail-folder-properties",
-	  GTK_STOCK_PROPERTIES,
-	  NULL,
+	  "document-properties",
+	  N_("_Properties"),
 	  NULL,
 	  N_("Change the properties of this folder"),
 	  G_CALLBACK (action_mail_folder_properties_cb) },
 
 	{ "mail-folder-refresh",
-	  GTK_STOCK_REFRESH,
-	  NULL,
+	  "view-refresh",
+	  N_("_Refresh"),
 	  "F5",
 	  N_("Refresh the folder"),
 	  G_CALLBACK (action_mail_folder_refresh_cb) },
@@ -1720,7 +1720,7 @@ static GtkActionEntry mail_entries[] = {
 	  G_CALLBACK (action_mail_smart_forward_cb) },
 
 	{ "mail-stop",
-	  GTK_STOCK_STOP,
+	  "process-stop",
 	  N_("Cancel"),
 	  NULL,
 	  N_("Cancel the current mail operation"),
diff --git a/modules/mail/em-composer-prefs.c b/modules/mail/em-composer-prefs.c
index 090dc2e482..495274d648 100644
--- a/modules/mail/em-composer-prefs.c
+++ b/modules/mail/em-composer-prefs.c
@@ -1198,9 +1198,9 @@ em_composer_prefs_construct (EMComposerPrefs *prefs,
 	selection = gtk_tree_view_get_selection (view);
 	gtk_tree_selection_set_mode (selection, GTK_SELECTION_NONE);
 	info_pixmap = e_builder_get_widget (prefs->builder, "pixmapSpellInfo");
-	gtk_image_set_from_stock (
+	gtk_image_set_from_icon_name (
 		GTK_IMAGE (info_pixmap),
-		GTK_STOCK_DIALOG_INFO, GTK_ICON_SIZE_BUTTON);
+		"dialog-information", GTK_ICON_SIZE_BUTTON);
 
 	widget = e_builder_get_widget (prefs->builder, "colorButtonSpellCheckColor");
 	g_settings_bind_with_mapping (
diff --git a/modules/mailto-handler/evolution-mailto-handler.c b/modules/mailto-handler/evolution-mailto-handler.c
index d86bd5b22b..3da4b58c80 100644
--- a/modules/mailto-handler/evolution-mailto-handler.c
+++ b/modules/mailto-handler/evolution-mailto-handler.c
@@ -111,8 +111,8 @@ mailto_handler_prompt (EMailtoHandler *extension)
 
 	dialog = gtk_dialog_new_with_buttons (
 		"", NULL, 0,
-		GTK_STOCK_NO, GTK_RESPONSE_NO,
-		GTK_STOCK_YES, GTK_RESPONSE_YES,
+		_("_No"), GTK_RESPONSE_NO,
+		_("_Yes"), GTK_RESPONSE_YES,
 		NULL);
 
 	gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_YES);
@@ -127,8 +127,7 @@ mailto_handler_prompt (EMailtoHandler *extension)
 
 	container = widget;
 
-	widget = gtk_image_new_from_stock (
-		GTK_STOCK_DIALOG_QUESTION, GTK_ICON_SIZE_DIALOG);
+	widget = gtk_image_new_from_icon_name ("dialog-question", GTK_ICON_SIZE_DIALOG);
 	gtk_box_pack_start (GTK_BOX (container), widget, FALSE, FALSE, 0);
 	gtk_widget_show (widget);
 
diff --git a/modules/plugin-manager/evolution-plugin-manager.c b/modules/plugin-manager/evolution-plugin-manager.c
index 52eb91c32c..a042481f3c 100644
--- a/modules/plugin-manager/evolution-plugin-manager.c
+++ b/modules/plugin-manager/evolution-plugin-manager.c
@@ -253,7 +253,7 @@ action_plugin_manager_cb (GtkAction *action,
 		_("Plugin Manager"),
 		GTK_WINDOW (extensible),
 		GTK_DIALOG_DESTROY_WITH_PARENT,
-		GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE, NULL);
+		_("_Close"), GTK_RESPONSE_CLOSE, NULL);
 
 	content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
 
diff --git a/modules/startup-wizard/e-mail-config-import-progress-page.c b/modules/startup-wizard/e-mail-config-import-progress-page.c
index 22febddf98..6dbc4b7f1c 100644
--- a/modules/startup-wizard/e-mail-config-import-progress-page.c
+++ b/modules/startup-wizard/e-mail-config-import-progress-page.c
@@ -252,8 +252,7 @@ mail_config_import_progress_page_constructed (GObject *object)
 
 	container = widget;
 
-	widget = gtk_image_new_from_stock (
-		GTK_STOCK_CANCEL, GTK_ICON_SIZE_MENU);
+	widget = gtk_image_new_from_icon_name ("process-stop", GTK_ICON_SIZE_MENU);
 	gtk_box_pack_start (GTK_BOX (container), widget, FALSE, FALSE, 0);
 	gtk_widget_show (widget);