Stop using deprecated gtk-stock items

13 files changed, 107 insertions, 301 deletions

diff --git a/calendar/gui/dialogs/alarm-dialog.ui b/calendar/gui/dialogs/alarm-dialog.ui
index c7c03106f4..5b0224577c 100644
--- a/calendar/gui/dialogs/alarm-dialog.ui
+++ b/calendar/gui/dialogs/alarm-dialog.ui
@@ -87,8 +87,9 @@
                 <property name="visible">True</property>
                 <property name="can_default">True</property>
                 <property name="can_focus">True</property>
-                <property name="label">gtk-cancel</property>
-                <property name="use_stock">True</property>
+                <property name="label" translatable="yes">_Cancel</property>
+                <property name="use_stock">False</property>
+                <property name="use_underline">True</property>
                 <property name="relief">GTK_RELIEF_NORMAL</property>
                 <property name="focus_on_click">True</property>
               </object>
@@ -98,8 +99,9 @@
                 <property name="visible">True</property>
                 <property name="can_default">True</property>
                 <property name="can_focus">True</property>
-                <property name="label">gtk-ok</property>
-                <property name="use_stock">True</property>
+                <property name="label" translatable="yes">_OK</property>
+                <property name="use_stock">False</property>
+                <property name="use_underline">True</property>
                 <property name="relief">GTK_RELIEF_NORMAL</property>
                 <property name="focus_on_click">True</property>
               </object>
diff --git a/calendar/gui/dialogs/alarm-list-dialog.ui b/calendar/gui/dialogs/alarm-list-dialog.ui
index 70fa138669..0973521b82 100644
--- a/calendar/gui/dialogs/alarm-list-dialog.ui
+++ b/calendar/gui/dialogs/alarm-list-dialog.ui
@@ -31,8 +31,9 @@
                 <property name="visible">True</property>
                 <property name="can_default">True</property>
                 <property name="can_focus">True</property>
-                <property name="label">gtk-cancel</property>
-                <property name="use_stock">True</property>
+                <property name="label" translatable="yes">_Cancel</property>
+                <property name="use_stock">False</property>
+                <property name="use_underline">True</property>
                 <property name="relief">GTK_RELIEF_NORMAL</property>
                 <property name="focus_on_click">True</property>
               </object>
@@ -42,8 +43,9 @@
                 <property name="visible">True</property>
                 <property name="can_default">True</property>
                 <property name="can_focus">True</property>
-                <property name="label">gtk-ok</property>
-                <property name="use_stock">True</property>
+                <property name="label" translatable="yes">_OK</property>
+                <property name="use_stock">False</property>
+                <property name="use_underline">True</property>
                 <property name="relief">GTK_RELIEF_NORMAL</property>
                 <property name="focus_on_click">True</property>
               </object>
@@ -100,67 +102,11 @@
                         <property name="visible">True</property>
                         <property name="can_default">True</property>
                         <property name="can_focus">True</property>
+                        <property name="label" translatable="yes">_Add</property>
+                        <property name="use_stock">False</property>
+                        <property name="use_underline">True</property>
                         <property name="relief">GTK_RELIEF_NORMAL</property>
                         <property name="focus_on_click">True</property>
-                        <child>
-                          <object class="GtkAlignment" id="alignment1">
-                            <property name="visible">True</property>
-                            <property name="xalign">0.5</property>
-                            <property name="yalign">0.5</property>
-                            <property name="xscale">0</property>
-                            <property name="yscale">0</property>
-                            <property name="top_padding">0</property>
-                            <property name="bottom_padding">0</property>
-                            <property name="left_padding">0</property>
-                            <property name="right_padding">0</property>
-                            <child>
-                              <object class="GtkHBox" id="hbox56">
-                                <property name="visible">True</property>
-                                <property name="homogeneous">False</property>
-                                <property name="spacing">2</property>
-                                <child>
-                                  <object class="GtkImage" id="image1">
-                                    <property name="visible">True</property>
-                                    <property name="stock">gtk-add</property>
-                                    <property name="icon_size">4</property>
-                                    <property name="xalign">0.5</property>
-                                    <property name="yalign">0.5</property>
-                                    <property name="xpad">0</property>
-                                    <property name="ypad">0</property>
-                                  </object>
-                                  <packing>
-                                    <property name="padding">0</property>
-                                    <property name="expand">False</property>
-                                    <property name="fill">False</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkLabel" id="label65">
-                                    <property name="visible">True</property>
-                                    <property name="label" translatable="yes">A_dd</property>
-                                    <property name="use_underline">True</property>
-                                    <property name="use_markup">False</property>
-                                    <property name="justify">GTK_JUSTIFY_LEFT</property>
-                                    <property name="wrap">False</property>
-                                    <property name="selectable">False</property>
-                                    <property name="xalign">0.5</property>
-                                    <property name="yalign">0.5</property>
-                                    <property name="xpad">0</property>
-                                    <property name="ypad">0</property>
-                                    <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                                    <property name="single_line_mode">False</property>
-                                    <property name="angle">0</property>
-                                  </object>
-                                  <packing>
-                                    <property name="padding">0</property>
-                                    <property name="expand">False</property>
-                                    <property name="fill">False</property>
-                                  </packing>
-                                </child>
-                              </object>
-                            </child>
-                          </object>
-                        </child>
                       </object>
                     </child>
                     <child>
@@ -168,8 +114,9 @@
                         <property name="visible">True</property>
                         <property name="can_default">True</property>
                         <property name="can_focus">True</property>
-                        <property name="label">gtk-remove</property>
-                        <property name="use_stock">True</property>
+                        <property name="label" translatable="yes">_Remove</property>
+                        <property name="use_stock">False</property>
+                        <property name="use_underline">True</property>
                         <property name="relief">GTK_RELIEF_NORMAL</property>
                         <property name="focus_on_click">True</property>
                       </object>
@@ -179,8 +126,9 @@
                         <property name="visible">True</property>
                         <property name="can_default">True</property>
                         <property name="can_focus">True</property>
-                        <property name="label">gtk-edit</property>
-                        <property name="use_stock">True</property>
+                        <property name="label" translatable="yes">_Edit</property>
+                        <property name="use_stock">False</property>
+                        <property name="use_underline">True</property>
                         <property name="relief">GTK_RELIEF_NORMAL</property>
                         <property name="focus_on_click">True</property>
                       </object>
diff --git a/calendar/gui/dialogs/comp-editor.c b/calendar/gui/dialogs/comp-editor.c
index f635ab739a..7653b20d82 100644
--- a/calendar/gui/dialogs/comp-editor.c
+++ b/calendar/gui/dialogs/comp-editor.c
@@ -1218,64 +1218,64 @@ action_view_type_cb (GtkToggleAction *action,
 static GtkActionEntry core_entries[] = {
 
 	{ "close",
-	  GTK_STOCK_CLOSE,
-	  NULL,
+	  "window-close",
+	  N_("_Close"),
 	  NULL,
 	  N_("Close the current 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 */
 
 	{ "delete-selection",
-	  GTK_STOCK_DELETE,
-	  NULL,
+	  "edit-delete",
+	  N_("_Delete"),
 	  NULL,
 	  N_("Delete the selection"),
 	  NULL },  /* Handled by EFocusTracker */
 
 	{ "help",
-	  GTK_STOCK_HELP,
-	  NULL,
+	  "help-browser",
+	  N_("_Help"),
 	  NULL,
 	  N_("View help"),
 	  G_CALLBACK (action_help_cb) },
 
 	{ "paste-clipboard",
-	  GTK_STOCK_PASTE,
-	  NULL,
+	  "edit-paste",
+	  N_("_Paste"),
 	  NULL,
 	  N_("Paste the clipboard"),
 	  NULL },  /* Handled by EFocusTracker */
 
 	{ "print",
-	  GTK_STOCK_PRINT,
-	  NULL,
+	  "document-print",
+	  N_("_Print..."),
 	  "<Control>p",
 	  NULL,
 	  G_CALLBACK (action_print_cb) },
 
 	{ "print-preview",
-	  GTK_STOCK_PRINT_PREVIEW,
-	  NULL,
+	  "document-print-preview",
+	  N_("Pre_view..."),
 	  NULL,
 	  NULL,
 	  G_CALLBACK (action_print_preview_cb) },
 
 	{ "save",
-	  GTK_STOCK_SAVE,
-	  NULL,
+	  "document-save",
+	  N_("_Save"),
 	  NULL,
 	  N_("Save current changes"),
 	  G_CALLBACK (action_save_cb) },
@@ -1288,21 +1288,21 @@ static GtkActionEntry core_entries[] = {
 	  G_CALLBACK (action_save_and_close_cb) },
 
 	{ "select-all",
-	  GTK_STOCK_SELECT_ALL,
-	  NULL,
+	  "edit-select-all",
+	  N_("Select _All"),
 	  "<Control>a",
 	  N_("Select all text"),
 	  NULL },  /* Handled by EFocusTracker */
 
 	{ "undo",
-	  GTK_STOCK_UNDO,
+	  "edit-undo",
 	  NULL,
 	  "<Control>z",
 	  N_("Undo"),
 	  NULL },  /* Handled by EFocusTracker */
 
 	{ "redo",
-	  GTK_STOCK_REDO,
+	  "edit-redo",
 	  NULL,
 	  "<Control>y",
 	  N_("Redo"),
@@ -2149,8 +2149,8 @@ comp_editor_init (CompEditor *editor)
 		GIcon *emblemed_icon;
 		GEmblem *emblem;
 
-		icon = g_themed_icon_new (GTK_STOCK_CLOSE);
-		emblemed_icon = g_themed_icon_new (GTK_STOCK_SAVE);
+		icon = g_themed_icon_new ("window-close");
+		emblemed_icon = g_themed_icon_new ("document-save");
 		emblem = g_emblem_new (emblemed_icon);
 		g_object_unref (emblemed_icon);
 
diff --git a/calendar/gui/dialogs/e-delegate-dialog.ui b/calendar/gui/dialogs/e-delegate-dialog.ui
index 95356d95cb..e50cfe3f60 100644
--- a/calendar/gui/dialogs/e-delegate-dialog.ui
+++ b/calendar/gui/dialogs/e-delegate-dialog.ui
@@ -22,8 +22,9 @@
                 <property name="visible">True</property>
                 <property name="can_default">True</property>
                 <property name="can_focus">True</property>
-                <property name="label">gtk-cancel</property>
-                <property name="use_stock">True</property>
+                <property name="label" translatable="yes">_Cancel</property>
+                <property name="use_stock">False</property>
+                <property name="use_underline">True</property>
                 <property name="relief">GTK_RELIEF_NORMAL</property>
               </object>
             </child>
@@ -33,8 +34,9 @@
                 <property name="can_default">True</property>
                 <property name="has_default">True</property>
                 <property name="can_focus">True</property>
-                <property name="label">gtk-ok</property>
-                <property name="use_stock">True</property>
+                <property name="label" translatable="yes">_OK</property>
+                <property name="use_stock">False</property>
+                <property name="use_underline">True</property>
                 <property name="relief">GTK_RELIEF_NORMAL</property>
               </object>
             </child>
diff --git a/calendar/gui/dialogs/event-editor.c b/calendar/gui/dialogs/event-editor.c
index 2f54dcc054..10970892a9 100644
--- a/calendar/gui/dialogs/event-editor.c
+++ b/calendar/gui/dialogs/event-editor.c
@@ -113,7 +113,7 @@ create_schedule_page (CompEditor *editor)
 
 	priv->sched_window = gtk_dialog_new_with_buttons (
 		_("Free/Busy"), GTK_WINDOW (editor), 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 (priv->sched_window));
@@ -210,7 +210,7 @@ static GtkActionEntry editable_entries[] = {
 static GtkToggleActionEntry editable_toggle_entries[] = {
 
 	{ "show-time-busy",
-	  GTK_STOCK_DIALOG_ERROR,
+	  "dialog-error",
 	  N_("Show Time as _Busy"),
 	  NULL,
 	  N_("Toggles whether to show time as busy"),
@@ -307,7 +307,7 @@ event_editor_constructor (GType type,
 
 	priv->recur_window = gtk_dialog_new_with_buttons (
 		_("Recurrence"), GTK_WINDOW (editor), GTK_DIALOG_MODAL,
-		GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE, NULL);
+		_("_Close"), GTK_RESPONSE_CLOSE, NULL);
 	g_signal_connect (
 		priv->recur_window, "response",
 		G_CALLBACK (gtk_widget_hide), NULL);
diff --git a/calendar/gui/dialogs/event-page.c b/calendar/gui/dialogs/event-page.c
index 0eafc08a9b..a8d8a6667c 100644
--- a/calendar/gui/dialogs/event-page.c
+++ b/calendar/gui/dialogs/event-page.c
@@ -153,7 +153,6 @@ struct _EventPagePrivate {
 	GtkWidget *edit;
 	GtkWidget *invite;
 	GtkWidget *invite_label;
-	GtkWidget *attendees_label;
 
 	/* ListView stuff */
 	EMeetingStore *meeting_store;
@@ -556,7 +555,7 @@ check_starts_in_the_past (EventPage *epage)
 
 	if (comp_editor_test_time_in_the_past (start_tt)) {
 		gchar *tmp = g_strconcat ("<b>", _("Event's start time is in the past"), "</b>", NULL);
-		event_page_set_info_string (epage, GTK_STOCK_DIALOG_WARNING, tmp);
+		event_page_set_info_string (epage, "dialog-warning", tmp);
 		g_free (tmp);
 	} else {
 		event_page_set_info_string (epage, NULL, NULL);
@@ -633,11 +632,11 @@ sensitize_widgets (EventPage *epage)
 
 	if (read_only) {
 		gchar *tmp = g_strconcat ("<b>", _("Event cannot be edited, because the selected calendar is read only"), "</b>", NULL);
-		event_page_set_info_string (epage, GTK_STOCK_DIALOG_INFO, tmp);
+		event_page_set_info_string (epage, "dialog-information", tmp);
 		g_free (tmp);
 	} else if (!sens) {
 		gchar *tmp = g_strconcat ("<b>", _("Event cannot be fully edited, because you are not the organizer"), "</b>", NULL);
-		event_page_set_info_string (epage, GTK_STOCK_DIALOG_INFO, tmp);
+		event_page_set_info_string (epage, "dialog-information", tmp);
 		g_free (tmp);
 	} else if (!check_starts_in_the_past (epage)) {
 		event_page_set_info_string (epage, NULL, NULL);
@@ -1929,9 +1928,9 @@ event_page_set_delegate (EventPage *page,
 	g_return_if_fail (IS_EVENT_PAGE (page));
 
 	if (set)
-		gtk_label_set_text_with_mnemonic ((GtkLabel *) page->priv->attendees_label, _("_Delegatees"));
+		gtk_button_set_label (GTK_BUTTON (page->priv->invite), _("_Delegatees"));
 	else
-		gtk_label_set_text_with_mnemonic ((GtkLabel *) page->priv->attendees_label, _("Atte_ndees"));
+		gtk_button_set_label (GTK_BUTTON (page->priv->invite), _("Atte_ndees"));
 }
 
 static void
@@ -2530,7 +2529,7 @@ event_page_set_info_string (EventPage *epage,
 
 	priv = epage->priv;
 
-	gtk_image_set_from_stock (GTK_IMAGE (priv->info_icon), icon, GTK_ICON_SIZE_BUTTON);
+	gtk_image_set_from_icon_name (GTK_IMAGE (priv->info_icon), icon, GTK_ICON_SIZE_BUTTON);
 	gtk_label_set_markup (GTK_LABEL (priv->info_string), msg);
 
 	if (msg && icon)
@@ -2592,7 +2591,6 @@ get_widgets (EventPage *epage)
 		gtk_widget_show (priv->timezone_label);
 		gtk_widget_show_all (priv->start_timezone);
 	}
-	priv->attendees_label = GW ("attendees-label");
 
 	g_object_ref (priv->main);
 	parent = gtk_widget_get_parent (priv->main);
diff --git a/calendar/gui/dialogs/event-page.ui b/calendar/gui/dialogs/event-page.ui
index 804457575f..8b8dda1381 100644
--- a/calendar/gui/dialogs/event-page.ui
+++ b/calendar/gui/dialogs/event-page.ui
@@ -681,8 +681,9 @@
                             <property name="visible">True</property>
                             <property name="can_default">True</property>
                             <property name="can_focus">True</property>
-                            <property name="label">gtk-add</property>
-                            <property name="use_stock">True</property>
+                            <property name="label" translatable="yes">_Add</property>
+                            <property name="use_stock">False</property>
+                            <property name="use_underline">True</property>
                             <property name="relief">GTK_RELIEF_NORMAL</property>
                             <property name="focus_on_click">True</property>
                           </object>
@@ -692,8 +693,9 @@
                             <property name="visible">True</property>
                             <property name="can_default">True</property>
                             <property name="can_focus">True</property>
-                            <property name="label">gtk-remove</property>
-                            <property name="use_stock">True</property>
+                            <property name="label" translatable="yes">_Remove</property>
+                            <property name="use_stock">False</property>
+                            <property name="use_underline">True</property>
                             <property name="relief">GTK_RELIEF_NORMAL</property>
                             <property name="focus_on_click">True</property>
                           </object>
@@ -703,8 +705,9 @@
                             <property name="visible">True</property>
                             <property name="can_default">True</property>
                             <property name="can_focus">True</property>
-                            <property name="label">gtk-edit</property>
-                            <property name="use_stock">True</property>
+                            <property name="label" translatable="yes">_Edit</property>
+                            <property name="use_stock">False</property>
+                            <property name="use_underline">True</property>
                             <property name="relief">GTK_RELIEF_NORMAL</property>
                             <property name="focus_on_click">True</property>
                           </object>
@@ -818,66 +821,9 @@
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="relief">GTK_RELIEF_NORMAL</property>
+                        <property name="label" translatable="yes">Atte_ndees...</property>
+                        <property name="use_underline">True</property>
                         <property name="focus_on_click">True</property>
-                        <child>
-                          <object class="GtkAlignment" id="alignment3">
-                            <property name="visible">True</property>
-                            <property name="xalign">0.5</property>
-                            <property name="yalign">0.5</property>
-                            <property name="xscale">0</property>
-                            <property name="yscale">0</property>
-                            <property name="top_padding">0</property>
-                            <property name="bottom_padding">0</property>
-                            <property name="left_padding">0</property>
-                            <property name="right_padding">0</property>
-                            <child>
-                              <object class="GtkHBox" id="hbox62">
-                                <property name="visible">True</property>
-                                <property name="homogeneous">False</property>
-                                <property name="spacing">2</property>
-                                <child>
-                                  <object class="GtkImage" id="image2">
-                                    <property name="visible">True</property>
-                                    <property name="stock">gtk-jump-to</property>
-                                    <property name="icon_size">4</property>
-                                    <property name="xalign">0.5</property>
-                                    <property name="yalign">0.5</property>
-                                    <property name="xpad">0</property>
-                                    <property name="ypad">0</property>
-                                  </object>
-                                  <packing>
-                                    <property name="padding">0</property>
-                                    <property name="expand">False</property>
-                                    <property name="fill">False</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkLabel" id="attendees-label">
-                                    <property name="visible">True</property>
-                                    <property name="label" translatable="yes">Atte_ndees...</property>
-                                    <property name="use_underline">True</property>
-                                    <property name="use_markup">False</property>
-                                    <property name="justify">GTK_JUSTIFY_LEFT</property>
-                                    <property name="wrap">False</property>
-                                    <property name="selectable">False</property>
-                                    <property name="xalign">0.5</property>
-                                    <property name="yalign">0.5</property>
-                                    <property name="xpad">0</property>
-                                    <property name="ypad">0</property>
-                                    <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                                    <property name="single_line_mode">False</property>
-                                    <property name="angle">0</property>
-                                  </object>
-                                  <packing>
-                                    <property name="padding">0</property>
-                                    <property name="expand">False</property>
-                                    <property name="fill">False</property>
-                                  </packing>
-                                </child>
-                              </object>
-                            </child>
-                          </object>
-                        </child>
                       </object>
                       <packing>
                         <property name="padding">0</property>
@@ -997,8 +943,9 @@
                 <property name="visible">True</property>
                 <property name="can_default">True</property>
                 <property name="can_focus">True</property>
-                <property name="label">gtk-close</property>
-                <property name="use_stock">True</property>
+                <property name="label" translatable="yes">_Close</property>
+                <property name="use_stock">False</property>
+                <property name="use_underline">True</property>
                 <property name="relief">GTK_RELIEF_NORMAL</property>
                 <property name="focus_on_click">True</property>
               </object>
diff --git a/calendar/gui/dialogs/goto-dialog.ui b/calendar/gui/dialogs/goto-dialog.ui
index 4bcb1da863..51d2702e24 100644
--- a/calendar/gui/dialogs/goto-dialog.ui
+++ b/calendar/gui/dialogs/goto-dialog.ui
@@ -92,8 +92,9 @@
                 <property name="visible">True</property>
                 <property name="can_default">True</property>
                 <property name="can_focus">True</property>
-                <property name="label">gtk-cancel</property>
-                <property name="use_stock">True</property>
+                <property name="label" translatable="yes">_Cancel</property>
+                <property name="use_stock">False</property>
+                <property name="use_underline">True</property>
                 <property name="relief">GTK_RELIEF_NORMAL</property>
                 <property name="focus_on_click">True</property>
               </object>
diff --git a/calendar/gui/dialogs/memo-page.c b/calendar/gui/dialogs/memo-page.c
index 28921bb44a..bb8884d752 100644
--- a/calendar/gui/dialogs/memo-page.c
+++ b/calendar/gui/dialogs/memo-page.c
@@ -422,7 +422,7 @@ check_starts_in_the_past (MemoPage *mpage)
 	if (e_date_edit_get_date (E_DATE_EDIT (priv->start_date), &start_tt.year, &start_tt.month, &start_tt.day) &&
 	    comp_editor_test_time_in_the_past (start_tt)) {
 		gchar *tmp = g_strconcat ("<b>", _("Memo's start date is in the past"), "</b>", NULL);
-		memo_page_set_info_string (mpage, GTK_STOCK_DIALOG_WARNING, tmp);
+		memo_page_set_info_string (mpage, "dialog-warning", tmp);
 		g_free (tmp);
 	} else {
 		memo_page_set_info_string (mpage, NULL, NULL);
@@ -458,11 +458,11 @@ sensitize_widgets (MemoPage *mpage)
 
 	if (read_only) {
 		gchar *tmp = g_strconcat ("<b>", _("Memo cannot be edited, because the selected memo list is read only"), "</b>", NULL);
-		memo_page_set_info_string (mpage, GTK_STOCK_DIALOG_INFO, tmp);
+		memo_page_set_info_string (mpage, "dialog-information", tmp);
 		g_free (tmp);
 	} else if (!sens) {
 		gchar *tmp = g_strconcat ("<b>", _("Memo cannot be fully edited, because you are not the organizer"), "</b>", NULL);
-		memo_page_set_info_string (mpage, GTK_STOCK_DIALOG_INFO, tmp);
+		memo_page_set_info_string (mpage, "dialog-information", tmp);
 		g_free (tmp);
 	} else if (!check_starts_in_the_past (mpage)) {
 		memo_page_set_info_string (mpage, NULL, NULL);
@@ -832,7 +832,7 @@ memo_page_set_info_string (MemoPage *mpage,
 
 	priv = mpage->priv;
 
-	gtk_image_set_from_stock (GTK_IMAGE (priv->info_icon), icon, GTK_ICON_SIZE_BUTTON);
+	gtk_image_set_from_icon_name (GTK_IMAGE (priv->info_icon), icon, GTK_ICON_SIZE_BUTTON);
 	gtk_label_set_markup (GTK_LABEL (priv->info_string), msg);
 
 	if (msg && icon)
diff --git a/calendar/gui/dialogs/recurrence-page.c b/calendar/gui/dialogs/recurrence-page.c
index de6e3395b3..35fafe4d54 100644
--- a/calendar/gui/dialogs/recurrence-page.c
+++ b/calendar/gui/dialogs/recurrence-page.c
@@ -2319,8 +2319,8 @@ create_exception_dialog (RecurrencePage *rpage,
 	dialog = gtk_dialog_new_with_buttons (
 		title, GTK_WINDOW (toplevel),
 		GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
-		GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT,
-		GTK_STOCK_OK, GTK_RESPONSE_ACCEPT,
+		_("_Cancel"), GTK_RESPONSE_REJECT,
+		_("_OK"), GTK_RESPONSE_ACCEPT,
 		NULL);
 
 	*date_edit = comp_editor_new_date_edit (TRUE, FALSE, TRUE);
diff --git a/calendar/gui/dialogs/recurrence-page.ui b/calendar/gui/dialogs/recurrence-page.ui
index 6f0d175520..11afb674da 100644
--- a/calendar/gui/dialogs/recurrence-page.ui
+++ b/calendar/gui/dialogs/recurrence-page.ui
@@ -415,8 +415,9 @@
                         <property name="visible">True</property>
                         <property name="can_default">True</property>
                         <property name="can_focus">True</property>
-                        <property name="label">gtk-add</property>
-                        <property name="use_stock">True</property>
+                        <property name="label" translatable="yes">_Add</property>
+                        <property name="use_stock">False</property>
+                        <property name="use_underline">True</property>
                         <property name="relief">GTK_RELIEF_NORMAL</property>
                         <property name="focus_on_click">True</property>
                       </object>
@@ -428,65 +429,8 @@
                         <property name="can_focus">True</property>
                         <property name="relief">GTK_RELIEF_NORMAL</property>
                         <property name="focus_on_click">True</property>
-                        <child>
-                          <object class="GtkAlignment" id="alignment1">
-                            <property name="visible">True</property>
-                            <property name="xalign">0.5</property>
-                            <property name="yalign">0.5</property>
-                            <property name="xscale">0</property>
-                            <property name="yscale">0</property>
-                            <property name="top_padding">0</property>
-                            <property name="bottom_padding">0</property>
-                            <property name="left_padding">0</property>
-                            <property name="right_padding">0</property>
-                            <child>
-                              <object class="GtkHBox" id="hbox64">
-                                <property name="visible">True</property>
-                                <property name="homogeneous">False</property>
-                                <property name="spacing">2</property>
-                                <child>
-                                  <object class="GtkImage" id="image1">
-                                    <property name="visible">True</property>
-                                    <property name="stock">gtk-preferences</property>
-                                    <property name="icon_size">4</property>
-                                    <property name="xalign">0.5</property>
-                                    <property name="yalign">0.5</property>
-                                    <property name="xpad">0</property>
-                                    <property name="ypad">0</property>
-                                  </object>
-                                  <packing>
-                                    <property name="padding">0</property>
-                                    <property name="expand">False</property>
-                                    <property name="fill">False</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkLabel" id="label76">
-                                    <property name="visible">True</property>
-                                    <property name="label" translatable="yes">_Edit</property>
-                                    <property name="use_underline">True</property>
-                                    <property name="use_markup">False</property>
-                                    <property name="justify">GTK_JUSTIFY_LEFT</property>
-                                    <property name="wrap">False</property>
-                                    <property name="selectable">False</property>
-                                    <property name="xalign">0.5</property>
-                                    <property name="yalign">0.5</property>
-                                    <property name="xpad">0</property>
-                                    <property name="ypad">0</property>
-                                    <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                                    <property name="single_line_mode">False</property>
-                                    <property name="angle">0</property>
-                                  </object>
-                                  <packing>
-                                    <property name="padding">0</property>
-                                    <property name="expand">False</property>
-                                    <property name="fill">False</property>
-                                  </packing>
-                                </child>
-                              </object>
-                            </child>
-                          </object>
-                        </child>
+                        <property name="label" translatable="yes">_Edit</property>
+                        <property name="use_underline">True</property>
                       </object>
                     </child>
                     <child>
@@ -494,8 +438,9 @@
                         <property name="visible">True</property>
                         <property name="can_default">True</property>
                         <property name="can_focus">True</property>
-                        <property name="label">gtk-remove</property>
-                        <property name="use_stock">True</property>
+                        <property name="label" translatable="yes">_Remove</property>
+                        <property name="use_stock">False</property>
+                        <property name="use_underline">True</property>
                         <property name="relief">GTK_RELIEF_NORMAL</property>
                         <property name="focus_on_click">True</property>
                       </object>
diff --git a/calendar/gui/dialogs/task-page.c b/calendar/gui/dialogs/task-page.c
index 1acc93f538..f4f76d6fc9 100644
--- a/calendar/gui/dialogs/task-page.c
+++ b/calendar/gui/dialogs/task-page.c
@@ -104,7 +104,6 @@ struct _TaskPagePrivate {
 	GtkWidget *remove;
 	GtkWidget *edit;
 	GtkWidget *invite;
-	GtkWidget *attendees_label;
 
 	/* ListView stuff */
 	ECalClient *client;
@@ -330,7 +329,7 @@ check_starts_in_the_past (TaskPage *tpage)
 		gchar *tmp = g_strconcat (
 			"<b>", start_in_past ? _("Task's start date is in the past") : "",
 			start_in_past && due_in_past ? "\n" : "", due_in_past ? _("Task's due date is in the past") : "", "</b>", NULL);
-		task_page_set_info_string (tpage, GTK_STOCK_DIALOG_WARNING, tmp);
+		task_page_set_info_string (tpage, "dialog-warning", tmp);
 		g_free (tmp);
 	} else {
 		task_page_set_info_string (tpage, NULL, NULL);
@@ -363,15 +362,15 @@ sensitize_widgets (TaskPage *tpage)
 
 	if (read_only) {
 		gchar *tmp = g_strconcat ("<b>", _("Task cannot be edited, because the selected task list is read only"), "</b>", NULL);
-		task_page_set_info_string (tpage, GTK_STOCK_DIALOG_INFO, tmp);
+		task_page_set_info_string (tpage, "dialog-information", tmp);
 		g_free (tmp);
 	} else if (!sens) {
 		gchar *tmp = g_strconcat ("<b>", _("Task cannot be fully edited, because you are not the organizer"), "</b>", NULL);
-		task_page_set_info_string (tpage, GTK_STOCK_DIALOG_INFO, tmp);
+		task_page_set_info_string (tpage, "dialog-information", tmp);
 		g_free (tmp);
 	} else if ((flags & COMP_EDITOR_IS_ASSIGNED) != 0 && e_client_check_capability (E_CLIENT (client), CAL_STATIC_CAPABILITY_NO_TASK_ASSIGNMENT)) {
 		gchar *tmp = g_strconcat ("<b>", _("Task cannot be edited, because the selected task list does not support assigned tasks"), "</b>", NULL);
-		task_page_set_info_string (tpage, GTK_STOCK_DIALOG_INFO, tmp);
+		task_page_set_info_string (tpage, "dialog-information", tmp);
 		g_free (tmp);
 		sens = FALSE;
 		read_only = TRUE;
@@ -1695,7 +1694,7 @@ task_page_set_info_string (TaskPage *tpage,
 
 	priv = tpage->priv;
 
-	gtk_image_set_from_stock (GTK_IMAGE (priv->info_icon), icon, GTK_ICON_SIZE_BUTTON);
+	gtk_image_set_from_icon_name (GTK_IMAGE (priv->info_icon), icon, GTK_ICON_SIZE_BUTTON);
 	gtk_label_set_markup (GTK_LABEL (priv->info_string), msg);
 
 	if (msg && icon)
@@ -1763,7 +1762,6 @@ get_widgets (TaskPage *tpage)
 
 	priv->timezone = e_builder_get_widget (priv->builder, "timezone");
 	priv->timezone_label = e_builder_get_widget (priv->builder, "timezone-label");
-	priv->attendees_label = e_builder_get_widget (priv->builder, "attendees-label");
 	priv->description = e_builder_get_widget (priv->builder, "description");
 	priv->categories_btn = e_builder_get_widget (priv->builder, "categories-button");
 	priv->categories = e_builder_get_widget (priv->builder, "categories");
diff --git a/calendar/gui/dialogs/task-page.ui b/calendar/gui/dialogs/task-page.ui
index 8269f09ef7..a97c9ce384 100644
--- a/calendar/gui/dialogs/task-page.ui
+++ b/calendar/gui/dialogs/task-page.ui
@@ -354,12 +354,13 @@
                         <property name="layout_style">start</property>
                         <child>
                           <object class="GtkButton" id="add-attendee">
-                            <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">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>
@@ -369,12 +370,13 @@
                         </child>
                         <child>
                           <object class="GtkButton" id="remove-attendee">
-                            <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">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>
@@ -384,12 +386,13 @@
                         </child>
                         <child>
                           <object class="GtkButton" id="edit-attendee">
-                            <property name="label">gtk-edit</property>
+                            <property name="label" translatable="yes">_Edit</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>
@@ -425,46 +428,8 @@
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
-                        <child>
-                          <object class="GtkAlignment" id="alignment1">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="xscale">0</property>
-                            <property name="yscale">0</property>
-                            <child>
-                              <object class="GtkHBox" id="hbox14">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="spacing">2</property>
-                                <child>
-                                  <object class="GtkImage" id="image1">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="stock">gtk-jump-to</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="attendees-label">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="label" translatable="yes">Atte_ndees...</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">Atte_ndees...</property>
+                        <property name="use_underline">True</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>