Stop using deprecated gtk-stock items

17 files changed, 95 insertions, 126 deletions

diff --git a/mail/e-mail-account-manager.c b/mail/e-mail-account-manager.c
index 0fc97dff05..6b2e0570f7 100644
--- a/mail/e-mail-account-manager.c
+++ b/mail/e-mail-account-manager.c
@@ -21,6 +21,7 @@
 #include <glib/gi18n-lib.h>
 #include <gdk/gdkkeysyms.h>
 
+#include <e-util/e-util.h>
 #include <libemail-engine/libemail-engine.h>
 
 #include <mail/e-mail-account-tree-view.h>
@@ -715,7 +716,7 @@ mail_account_manager_constructed (GObject *object)
 
 	container = widget;
 
-	widget = gtk_button_new_from_stock (GTK_STOCK_ADD);
+	widget = e_dialog_button_new_with_icon ("list-add", _("_Add"));
 	gtk_box_pack_start (GTK_BOX (container), widget, TRUE, TRUE, 0);
 	manager->priv->add_button = widget;  /* not referenced */
 	gtk_widget_show (widget);
@@ -724,7 +725,7 @@ mail_account_manager_constructed (GObject *object)
 		widget, "clicked",
 		G_CALLBACK (mail_account_manager_add_cb), manager);
 
-	widget = gtk_button_new_from_stock (GTK_STOCK_EDIT);
+	widget = gtk_button_new_with_mnemonic (_("_Edit"));
 	gtk_box_pack_start (GTK_BOX (container), widget, TRUE, TRUE, 0);
 	manager->priv->edit_button = widget;  /* not referenced */
 	gtk_widget_show (widget);
@@ -733,7 +734,7 @@ mail_account_manager_constructed (GObject *object)
 		widget, "clicked",
 		G_CALLBACK (mail_account_manager_edit_cb), manager);
 
-	widget = gtk_button_new_from_stock (GTK_STOCK_DELETE);
+	widget = e_dialog_button_new_with_icon ("edit-delete", _("_Delete"));
 	gtk_box_pack_start (GTK_BOX (container), widget, TRUE, TRUE, 0);
 	manager->priv->delete_button = widget;  /* not referenced */
 	gtk_widget_show (widget);
@@ -742,11 +743,7 @@ mail_account_manager_constructed (GObject *object)
 		widget, "clicked",
 		G_CALLBACK (mail_account_manager_remove_cb), manager);
 
-	widget = gtk_button_new_with_mnemonic (_("De_fault"));
-	gtk_button_set_image (
-		GTK_BUTTON (widget),
-		gtk_image_new_from_icon_name (
-		"emblem-default", GTK_ICON_SIZE_BUTTON));
+	widget = e_dialog_button_new_with_icon ("emblem-default", _("De_fault"));
 	gtk_box_pack_start (GTK_BOX (container), widget, TRUE, TRUE, 0);
 	manager->priv->default_button = widget;  /* not referenced */
 	gtk_widget_show (widget);
diff --git a/mail/e-mail-browser.c b/mail/e-mail-browser.c
index d9e6378cf3..580d89742d 100644
--- a/mail/e-mail-browser.c
+++ b/mail/e-mail-browser.c
@@ -122,36 +122,36 @@ action_close_cb (GtkAction *action,
 static GtkActionEntry mail_browser_entries[] = {
 
 	{ "close",
-	  GTK_STOCK_CLOSE,
-	  NULL,
+	  "window-close",
+	  N_("_Close"),
 	  NULL,
 	  N_("Close this window"),
 	  G_CALLBACK (action_close_cb) },
 
 	{ "copy-clipboard",
-	  GTK_STOCK_COPY,
-	  NULL,
+	  "edit-copy",
+	  N_("_Copy"),
 	  NULL,
 	  N_("Copy the selection"),
 	  NULL },  /* Handled by EFocusTracker */
 
 	{ "cut-clipboard",
-	  GTK_STOCK_CUT,
-	  NULL,
+	  "edit-cut",
+	  N_("Cu_t"),
 	  NULL,
 	  N_("Cut the selection"),
 	  NULL },  /* Handled by EFocusTracker */
 
 	{ "paste-clipboard",
-	  GTK_STOCK_PASTE,
-	  NULL,
+	  "edit-paste",
+	  N_("_Paste"),
 	  NULL,
 	  N_("Paste the clipboard"),
 	  NULL },  /* Handled by EFocusTracker */
 
 	{ "select-all",
-	  GTK_STOCK_SELECT_ALL,
-	  NULL,
+	  "edit-select-all",
+	  N_("Select _All"),
 	  NULL,
 	  N_("Select all text"),
 	  NULL },  /* Handled by EFocusTracker */
diff --git a/mail/e-mail-config-security-page.c b/mail/e-mail-config-security-page.c
index 744b912dd4..c6b2de3c91 100644
--- a/mail/e-mail-config-security-page.c
+++ b/mail/e-mail-config-security-page.c
@@ -20,6 +20,7 @@
 #include <config.h>
 #include <glib/gi18n-lib.h>
 
+#include <e-util/e-util.h>
 #include <libebackend/libebackend.h>
 
 #if defined (HAVE_NSS)
@@ -449,7 +450,7 @@ mail_config_security_page_constructed (GObject *object)
 		G_CALLBACK (mail_config_security_page_select_sign_cert),
 		entry);
 
-	widget = gtk_button_new_from_stock (GTK_STOCK_CLEAR);
+	widget = e_dialog_button_new_with_icon ("edit-clear", _("_Clear"));
 	gtk_grid_attach (GTK_GRID (container), widget, 3, 1, 1, 1);
 	gtk_widget_show (widget);
 
@@ -555,7 +556,7 @@ mail_config_security_page_constructed (GObject *object)
 		G_CALLBACK (mail_config_security_page_select_encrypt_cert),
 		entry);
 
-	widget = gtk_button_new_from_stock (GTK_STOCK_CLEAR);
+	widget = e_dialog_button_new_with_icon ("edit-clear", _("_Clear"));
 	gtk_grid_attach (GTK_GRID (container), widget, 3, 4, 1, 1);
 	gtk_widget_show (widget);
 
diff --git a/mail/e-mail-config-window.c b/mail/e-mail-config-window.c
index 9059618b10..1608e67867 100644
--- a/mail/e-mail-config-window.c
+++ b/mail/e-mail-config-window.c
@@ -328,8 +328,8 @@ mail_config_window_constructed (GObject *object)
 
 	gtk_dialog_add_buttons (
 		GTK_DIALOG (window),
-		GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-		GTK_STOCK_OK, GTK_RESPONSE_OK,
+		_("_Cancel"), GTK_RESPONSE_CANCEL,
+		_("_OK"), GTK_RESPONSE_OK,
 		NULL);
 
 	container = gtk_dialog_get_content_area (GTK_DIALOG (window));
diff --git a/mail/e-mail-label-dialog.c b/mail/e-mail-label-dialog.c
index 282dc882fe..eb02461baa 100644
--- a/mail/e-mail-label-dialog.c
+++ b/mail/e-mail-label-dialog.c
@@ -193,11 +193,11 @@ e_mail_label_dialog_init (EMailLabelDialog *dialog)
 
 	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_OK, GTK_RESPONSE_OK);
+		_("OK"), GTK_RESPONSE_OK);
 
 	gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
 
diff --git a/mail/e-mail-label-manager.c b/mail/e-mail-label-manager.c
index 2cfb3f5d81..ac0e0d31d6 100644
--- a/mail/e-mail-label-manager.c
+++ b/mail/e-mail-label-manager.c
@@ -25,6 +25,8 @@
 #include "e-mail-label-manager.h"
 
 #include <glib/gi18n.h>
+#include <e-util/e-util.h>
+
 #include "e-mail-label-dialog.h"
 #include "e-mail-label-tree-view.h"
 
@@ -368,7 +370,7 @@ e_mail_label_manager_init (EMailLabelManager *manager)
 
 	container = widget;
 
-	widget = gtk_button_new_from_stock (GTK_STOCK_ADD);
+	widget = e_dialog_button_new_with_icon ("list-add", _("_Add"));
 	gtk_box_pack_start (GTK_BOX (container), widget, TRUE, TRUE, 0);
 	manager->priv->add_button = g_object_ref (widget);
 	gtk_widget_show (widget);
@@ -377,7 +379,7 @@ e_mail_label_manager_init (EMailLabelManager *manager)
 		widget, "clicked",
 		G_CALLBACK (e_mail_label_manager_add_label), manager);
 
-	widget = gtk_button_new_from_stock (GTK_STOCK_EDIT);
+	widget = gtk_button_new_with_mnemonic (_("_Edit"));
 	gtk_box_pack_start (GTK_BOX (container), widget, TRUE, TRUE, 0);
 	manager->priv->edit_button = g_object_ref (widget);
 	gtk_widget_show (widget);
@@ -386,7 +388,7 @@ e_mail_label_manager_init (EMailLabelManager *manager)
 		widget, "clicked",
 		G_CALLBACK (e_mail_label_manager_edit_label), manager);
 
-	widget = gtk_button_new_from_stock (GTK_STOCK_REMOVE);
+	widget = e_dialog_button_new_with_icon ("list-remove", _("_Remove"));
 	gtk_box_pack_start (GTK_BOX (container), widget, TRUE, TRUE, 0);
 	manager->priv->remove_button = g_object_ref (widget);
 	gtk_widget_show (widget);
diff --git a/mail/e-mail-reader.c b/mail/e-mail-reader.c
index 3b6aaa30a6..815e041cf4 100644
--- a/mail/e-mail-reader.c
+++ b/mail/e-mail-reader.c
@@ -1921,7 +1921,7 @@ static GtkActionEntry mail_reader_entries[] = {
 	  G_CALLBACK (action_mail_filters_apply_cb) },
 
 	{ "mail-find",
-	  GTK_STOCK_FIND,
+	  "edit-find",
 	  N_("_Find in Message..."),
 	  "<Shift><Control>f",
 	  N_("Search for text in the body of the displayed message"),
@@ -2068,7 +2068,7 @@ static GtkActionEntry mail_reader_entries[] = {
 	  G_CALLBACK (action_mail_move_cb) },
 
 	{ "mail-next",
-	  GTK_STOCK_GO_FORWARD,
+	  "go-next",
 	  N_("_Next Message"),
 	  "<Control>Page_Down",
 	  N_("Display the next message"),
@@ -2096,7 +2096,7 @@ static GtkActionEntry mail_reader_entries[] = {
 	  G_CALLBACK (action_mail_next_unread_cb) },
 
 	{ "mail-previous",
-	  GTK_STOCK_GO_BACK,
+	  "go-previous",
 	  N_("_Previous Message"),
 	  "<Control>Page_Up",
 	  N_("Display the previous message"),
@@ -2124,15 +2124,15 @@ static GtkActionEntry mail_reader_entries[] = {
 	  G_CALLBACK (action_mail_previous_unread_cb) },
 
 	{ "mail-print",
-	  GTK_STOCK_PRINT,
-	  NULL,
+	  "document-print",
+	  N_("_Print..."),
 	  "<Control>p",
 	  N_("Print this message"),
 	  G_CALLBACK (action_mail_print_cb) },
 
 	{ "mail-print-preview",
-	  GTK_STOCK_PRINT_PREVIEW,
-	  NULL,
+	  "document-print-preview",
+	  N_("Pre_view..."),
 	  NULL,
 	  N_("Preview the message to be printed"),
 	  G_CALLBACK (action_mail_print_preview_cb) },
@@ -2145,7 +2145,7 @@ static GtkActionEntry mail_reader_entries[] = {
 	  G_CALLBACK (action_mail_redirect_cb) },
 
 	{ "mail-remove-attachments",
-	  GTK_STOCK_DELETE,
+	  "edit-delete",
 	  N_("Remo_ve Attachments"),
 	  NULL,
 	  N_("Remove attachments"),
@@ -2180,7 +2180,7 @@ static GtkActionEntry mail_reader_entries[] = {
 	  G_CALLBACK (action_mail_reply_sender_cb) },
 
 	{ "mail-save-as",
-	  GTK_STOCK_SAVE_AS,
+	  "document-save-as",
 	  N_("_Save as mbox..."),
 	  "<Control>s",
 	  N_("Save selected messages as an mbox file"),
@@ -2208,21 +2208,21 @@ static GtkActionEntry mail_reader_entries[] = {
 	  G_CALLBACK (action_mail_undelete_cb) },
 
 	{ "mail-zoom-100",
-	  GTK_STOCK_ZOOM_100,
+	  "zoom-original",
 	  N_("_Normal Size"),
 	  "<Control>0",
 	  N_("Reset the text to its original size"),
 	  G_CALLBACK (action_mail_zoom_100_cb) },
 
 	{ "mail-zoom-in",
-	  GTK_STOCK_ZOOM_IN,
+	  "zoom-in",
 	  N_("_Zoom In"),
 	  "<Control>plus",
 	  N_("Increase the text size"),
 	  G_CALLBACK (action_mail_zoom_in_cb) },
 
 	{ "mail-zoom-out",
-	  GTK_STOCK_ZOOM_OUT,
+	  "zoom-out",
 	  N_("Zoom _Out"),
 	  "<Control>minus",
 	  N_("Decrease the text size"),
@@ -2259,7 +2259,7 @@ static GtkActionEntry mail_reader_entries[] = {
 	  NULL },
 
 	{ "mail-goto-menu",
-	  GTK_STOCK_JUMP_TO,
+	  "go-jump",
 	  N_("_Go To"),
 	  NULL,
 	  NULL,
diff --git a/mail/e-mail-tag-editor.c b/mail/e-mail-tag-editor.c
index 7c24c3cacd..9a0fe04c14 100644
--- a/mail/e-mail-tag-editor.c
+++ b/mail/e-mail-tag-editor.c
@@ -237,9 +237,10 @@ e_mail_tag_editor_init (EMailTagEditor *editor)
 	gtk_window_set_title (window, _("Flag to Follow Up"));
 	gtk_window_set_icon_name (window, "stock_mail-flag-for-followup");
 
-	gtk_dialog_add_buttons (
-		dialog, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-		GTK_STOCK_OK, GTK_RESPONSE_OK, NULL);
+	gtk_dialog_add_buttons (dialog,
+		_("_Cancel"), GTK_RESPONSE_CANCEL,
+		_("_OK"), GTK_RESPONSE_OK,
+		NULL);
 
 	gtk_dialog_set_default_response (dialog, GTK_RESPONSE_OK);
 
diff --git a/mail/em-filter-rule.c b/mail/em-filter-rule.c
index 4dc6fe6404..9bfb032a7a 100644
--- a/mail/em-filter-rule.c
+++ b/mail/em-filter-rule.c
@@ -29,6 +29,8 @@
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
 
+#include <e-util/e-util.h>
+
 #include "em-filter-rule.h"
 #include "em-filter-context.h"
 
@@ -435,7 +437,7 @@ attach_rule (GtkWidget *rule,
 		GTK_TABLE (data->parts), rule, 0, 1, row, row + 1,
 		GTK_EXPAND | GTK_FILL, 0, 0, 0);
 
-	remove = gtk_button_new_from_stock (GTK_STOCK_REMOVE);
+	remove = e_dialog_button_new_with_icon ("list-remove", _("_Remove"));
 	g_object_set_data ((GObject *) remove, "rule", rule);
 	/*gtk_button_set_relief(GTK_BUTTON(remove), GTK_RELIEF_NONE);*/
 	g_signal_connect (
@@ -647,10 +649,7 @@ get_widget (EFilterRule *fr,
 	hgrid = GTK_GRID (gtk_grid_new ());
 	gtk_grid_set_column_spacing (hgrid, 3);
 
-	add = gtk_button_new_with_mnemonic (_("Add Ac_tion"));
-	gtk_button_set_image (
-		GTK_BUTTON (add), gtk_image_new_from_stock (
-		GTK_STOCK_ADD, GTK_ICON_SIZE_BUTTON));
+	add = e_dialog_button_new_with_icon ("list-add", _("Add Ac_tion"));
 	g_signal_connect (
 		add, "clicked",
 		G_CALLBACK (more_parts), data);
diff --git a/mail/em-folder-properties.c b/mail/em-folder-properties.c
index 2b3ad31ee8..ba51b64d71 100644
--- a/mail/em-folder-properties.c
+++ b/mail/em-folder-properties.c
@@ -413,7 +413,7 @@ emfp_dialog_run (AsyncContext *context)
 		_("Folder Properties"),
 		context->parent_window,
 		GTK_DIALOG_DESTROY_WITH_PARENT,
-		GTK_STOCK_CLOSE, GTK_RESPONSE_OK, NULL);
+		_("_Close"), GTK_RESPONSE_OK, NULL);
 	gtk_window_set_default_size ((GtkWindow *) dialog, 192, 160);
 
 	gtk_widget_ensure_style (dialog);
diff --git a/mail/em-folder-selector.c b/mail/em-folder-selector.c
index 1e67cefcd3..214841887f 100644
--- a/mail/em-folder-selector.c
+++ b/mail/em-folder-selector.c
@@ -266,7 +266,7 @@ folder_selector_construct (EMFolderSelector *emfs,
 	emfs->flags = flags;
 	if (flags & EM_FOLDER_SELECTOR_CAN_CREATE) {
 		gtk_dialog_add_button (
-			GTK_DIALOG (emfs), GTK_STOCK_NEW,
+			GTK_DIALOG (emfs), _("_New"),
 			EM_FOLDER_SELECTOR_RESPONSE_NEW);
 		g_signal_connect (
 			emfs, "response",
@@ -275,8 +275,8 @@ folder_selector_construct (EMFolderSelector *emfs,
 
 	gtk_dialog_add_buttons (
 		GTK_DIALOG (emfs),
-		GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-		oklabel ? oklabel : GTK_STOCK_OK, GTK_RESPONSE_OK, NULL);
+		_("_Cancel"), GTK_RESPONSE_CANCEL,
+		oklabel ? oklabel : _("_OK"), GTK_RESPONSE_OK, NULL);
 
 	gtk_dialog_set_response_sensitive (
 		GTK_DIALOG (emfs), GTK_RESPONSE_OK, FALSE);
diff --git a/mail/em-subscription-editor.c b/mail/em-subscription-editor.c
index 13526c09c7..2d816c7c9e 100644
--- a/mail/em-subscription-editor.c
+++ b/mail/em-subscription-editor.c
@@ -1711,7 +1711,7 @@ em_subscription_editor_init (EMSubscriptionEditor *editor)
 
 	gtk_dialog_add_button (
 		GTK_DIALOG (editor),
-		GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE);
+		_("_Close"), GTK_RESPONSE_CLOSE);
 
 	container = gtk_dialog_get_content_area (GTK_DIALOG (editor));
 
@@ -1748,9 +1748,9 @@ em_subscription_editor_init (EMSubscriptionEditor *editor)
 	gtk_widget_show (widget);
 
 	widget = gtk_entry_new ();
-	gtk_entry_set_icon_from_stock (
+	gtk_entry_set_icon_from_icon_name (
 		GTK_ENTRY (widget),
-		GTK_ENTRY_ICON_SECONDARY, GTK_STOCK_CLEAR);
+		GTK_ENTRY_ICON_SECONDARY, "edit-clear");
 	gtk_entry_set_icon_tooltip_text (
 		GTK_ENTRY (widget),
 		GTK_ENTRY_ICON_SECONDARY, _("Clear Search"));
@@ -1926,7 +1926,7 @@ em_subscription_editor_init (EMSubscriptionEditor *editor)
 		G_CALLBACK (subscription_editor_expand_all), editor);
 
 	tooltip = _("Refresh the folder list");
-	widget = gtk_button_new_from_stock (GTK_STOCK_REFRESH);
+	widget = e_dialog_button_new_with_icon ("view-refresh", _("_Refresh"));
 	gtk_widget_set_tooltip_text (widget, tooltip);
 	gtk_box_pack_start (GTK_BOX (container), widget, FALSE, FALSE, 0);
 	gtk_widget_set_sensitive (widget, FALSE);
@@ -1938,7 +1938,7 @@ em_subscription_editor_init (EMSubscriptionEditor *editor)
 		G_CALLBACK (subscription_editor_refresh), editor);
 
 	tooltip = _("Stop the current operation");
-	widget = gtk_button_new_from_stock (GTK_STOCK_STOP);
+	widget = e_dialog_button_new_with_icon ("process-stop", _("_Stop"));
 	gtk_widget_set_tooltip_text (widget, tooltip);
 	gtk_box_pack_start (GTK_BOX (container), widget, FALSE, FALSE, 0);
 	gtk_widget_set_sensitive (widget, FALSE);
diff --git a/mail/em-vfolder-editor-rule.c b/mail/em-vfolder-editor-rule.c
index d72becc2f9..111a74c0f2 100644
--- a/mail/em-vfolder-editor-rule.c
+++ b/mail/em-vfolder-editor-rule.c
@@ -619,12 +619,12 @@ get_widget (EFilterRule *fr,
 		NULL);
 	gtk_container_add (GTK_CONTAINER (hgrid), vgrid);
 
-	data->buttons[BUTTON_ADD] = gtk_button_new_from_stock (GTK_STOCK_ADD);
+	data->buttons[BUTTON_ADD] = e_dialog_button_new_with_icon ("list-add", _("_Add"));
 	g_signal_connect (
 		data->buttons[BUTTON_ADD], "clicked",
 		G_CALLBACK (source_add), data);
 
-	data->buttons[BUTTON_REMOVE] = gtk_button_new_from_stock (GTK_STOCK_REMOVE);
+	data->buttons[BUTTON_REMOVE] = e_dialog_button_new_with_icon ("list-remove", _("_Remove"));
 	g_signal_connect (
 		data->buttons[BUTTON_REMOVE], "clicked",
 		G_CALLBACK (source_remove), data);
diff --git a/mail/mail-config.ui b/mail/mail-config.ui
index 0611b9093d..1b7fbe3a13 100644
--- a/mail/mail-config.ui
+++ b/mail/mail-config.ui
@@ -21,12 +21,12 @@
             <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="junk-header-cancel">
-                <property name="label">gtk-cancel</property>
+                <property name="label" translatable="yes">_Cancel</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
                 <property name="use_underline">True</property>
-                <property name="use_stock">True</property>
+                <property name="use_stock">False</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -36,12 +36,12 @@
             </child>
             <child>
               <object class="GtkButton" id="junk-header-ok">
-                <property name="label">gtk-ok</property>
+                <property name="label" translatable="yes">_OK</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
                 <property name="use_underline">True</property>
-                <property name="use_stock">True</property>
+                <property name="use_stock">False</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -693,7 +693,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="yalign">0</property>
-                        <property name="stock">gtk-dialog-info</property>
+                        <property name="icon-name">dialog-information</property>
                       </object>
                       <packing>
                         <property name="left_attach">0</property>
@@ -2413,12 +2413,13 @@
                         <property name="spacing">6</property>
                         <child>
                           <object class="GtkButton" id="cmdHeadersAdd">
-                            <property name="label">gtk-add</property>
+                            <property name="label" translatable="yes">_Add</property>
                             <property name="visible">True</property>
                             <property name="sensitive">False</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
-                            <property name="use_stock">True</property>
+                            <property name="use_stock">False</property>
+                            <property name="use-underline">True</property>
                           </object>
                           <packing>
                             <property name="expand">False</property>
@@ -2428,11 +2429,12 @@
                         </child>
                         <child>
                           <object class="GtkButton" id="cmdHeadersRemove">
-                            <property name="label">gtk-remove</property>
+                            <property name="label" translatable="yes">_Remove</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
-                            <property name="use_stock">True</property>
+                            <property name="use_stock">False</property>
+                            <property name="use-underline">True</property>
                           </object>
                           <packing>
                             <property name="expand">False</property>
@@ -2716,12 +2718,13 @@
                                 <property name="layout_style">start</property>
                                 <child>
                                   <object class="GtkButton" id="junk_header_add">
-                                    <property name="label">gtk-add</property>
+                                    <property name="label" translatable="yes">_Add</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="can_default">True</property>
                                     <property name="receives_default">True</property>
-                                    <property name="use_stock">True</property>
+                                    <property name="use_stock">False</property>
+                                    <property name="use-underline">True</property>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
@@ -2731,12 +2734,13 @@
                                 </child>
                                 <child>
                                   <object class="GtkButton" id="junk_header_remove">
-                                    <property name="label">gtk-remove</property>
+                                    <property name="label" translatable="yes">_Remove</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="can_default">True</property>
                                     <property name="receives_default">True</property>
-                                    <property name="use_stock">True</property>
+                                    <property name="use_stock">False</property>
+                                    <property name="use-underline">True</property>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
@@ -2803,7 +2807,7 @@
                               <object class="GtkImage" id="image11">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="stock">gtk-info</property>
+                                <property name="icon-name">dialog-information</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
diff --git a/mail/mail-dialogs.ui b/mail/mail-dialogs.ui
index 64f5cfa93f..f41cf29310 100644
--- a/mail/mail-dialogs.ui
+++ b/mail/mail-dialogs.ui
@@ -96,11 +96,12 @@ Please select a follow up action from the "Flag" menu.</property>
         </child>
         <child>
           <object class="GtkButton" id="clear">
-            <property name="label">gtk-clear</property>
+            <property name="label" translatable="yes">_Clear</property>
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="receives_default">False</property>
-            <property name="use_stock">True</property>
+            <property name="use_stock">False</property>
+            <property name="use-underline">True</property>
           </object>
           <packing>
             <property name="left_attach">2</property>
@@ -271,12 +272,13 @@ Please select a follow up action from the "Flag" menu.</property>
             <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="lic_no_button">
-                <property name="label">gtk-no</property>
+                <property name="label" translatable="yes">_No</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
                 <property name="receives_default">False</property>
-                <property name="use_stock">True</property>
+                <property name="use_stock">False</property>
+                <property name="use-underline">True</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -290,42 +292,8 @@ Please select a follow up action from the "Flag" menu.</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
                 <property name="receives_default">False</property>
-                <child>
-                  <object class="GtkAlignment" id="alignment1">
-                    <property name="visible">True</property>
-                    <property name="xscale">0</property>
-                    <property name="yscale">0</property>
-                    <child>
-                      <object class="GtkHBox" id="hbox3">
-                        <property name="visible">True</property>
-                        <property name="spacing">2</property>
-                        <child>
-                          <object class="GtkImage" id="image1">
-                            <property name="visible">True</property>
-                            <property name="stock">gtk-yes</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkLabel" id="label2">
-                            <property name="visible">True</property>
-                            <property name="label" translatable="yes">_Accept License</property>
-                            <property name="use_underline">True</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                      </object>
-                    </child>
-                  </object>
-                </child>
+                <property name="label" translatable="yes">_Accept License</property>
+                <property name="use_underline">True</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -441,12 +409,13 @@ Please select a follow up action from the "Flag" menu.</property>
             <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="okbutton1">
-                <property name="label">gtk-ok</property>
+                <property name="label" translatable="yes">_OK</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
                 <property name="receives_default">False</property>
-                <property name="use_stock">True</property>
+                <property name="use_stock">False</property>
+                <property name="use-underline">True</property>
               </object>
               <packing>
                 <property name="expand">False</property>
diff --git a/mail/mail-send-recv.c b/mail/mail-send-recv.c
index dc5e18b621..a04c3a5c38 100644
--- a/mail/mail-send-recv.c
+++ b/mail/mail-send-recv.c
@@ -539,11 +539,7 @@ build_dialog (GtkWindow *parent,
 	container = gtk_dialog_get_content_area (gd);
 	gtk_container_set_border_width (GTK_CONTAINER (container), 0);
 
-	cancel_button = gtk_button_new_with_mnemonic (_("Cancel _All"));
-	gtk_button_set_image (
-		GTK_BUTTON (cancel_button),
-		gtk_image_new_from_stock (
-			GTK_STOCK_CANCEL, GTK_ICON_SIZE_BUTTON));
+	cancel_button = e_dialog_button_new_with_icon ("process-stop", _("Cancel _All"));
 	gtk_widget_show (cancel_button);
 	gtk_dialog_add_action_widget (gd, cancel_button, GTK_RESPONSE_CANCEL);
 
@@ -636,7 +632,7 @@ build_dialog (GtkWindow *parent,
 			_("Updating...") : _("Waiting..."));
 		gtk_widget_set_margin_bottom (progress_bar, 12);
 
-		cancel_button = gtk_button_new_from_stock (GTK_STOCK_CANCEL);
+		cancel_button = e_dialog_button_new_with_icon ("process-stop", _("_Cancel"));
 		gtk_widget_set_valign (cancel_button, GTK_ALIGN_END);
 		gtk_widget_set_margin_bottom (cancel_button, 12);
 
@@ -718,7 +714,7 @@ build_dialog (GtkWindow *parent,
 			GTK_PROGRESS_BAR (progress_bar), _("Waiting..."));
 		gtk_widget_set_margin_bottom (progress_bar, 12);
 
-		cancel_button = gtk_button_new_from_stock (GTK_STOCK_CANCEL);
+		cancel_button = e_dialog_button_new_with_icon ("process-stop", _("_Cancel"));
 		gtk_widget_set_valign (cancel_button, GTK_ALIGN_END);
 
 		gtk_misc_set_alignment (GTK_MISC (label), 0, .5);
diff --git a/mail/mail-vfolder-ui.c b/mail/mail-vfolder-ui.c
index 849295e083..7ada540777 100644
--- a/mail/mail-vfolder-ui.c
+++ b/mail/mail-vfolder-ui.c
@@ -145,8 +145,8 @@ vfolder_edit_rule (EMailSession *session,
 	dialog = gtk_dialog_new_with_buttons (
 		_("Edit Search Folder"), NULL,
 		GTK_DIALOG_DESTROY_WITH_PARENT,
-		GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-		GTK_STOCK_OK, GTK_RESPONSE_OK, NULL);
+		_("_Cancel"), GTK_RESPONSE_CANCEL,
+		_("_OK"), GTK_RESPONSE_OK, NULL);
 
 	gtk_container_set_border_width (GTK_CONTAINER (dialog), 6);
 	gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
@@ -267,8 +267,8 @@ vfolder_gui_add_rule (EMVFolderRule *rule)
 		_("New Search Folder"),
 		NULL,
 		GTK_DIALOG_DESTROY_WITH_PARENT,
-		GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-		GTK_STOCK_OK, GTK_RESPONSE_OK, NULL);
+		_("_Cancel"), GTK_RESPONSE_CANCEL,
+		_("_OK"), GTK_RESPONSE_OK, NULL);
 
 	gtk_dialog_set_default_response (gd, GTK_RESPONSE_OK);
 	gtk_container_set_border_width (GTK_CONTAINER (gd), 6);