From 02c793f24aa0a967473da48c5ff207c75ec2f413 Mon Sep 17 00:00:00 2001
From: William Jon McCann <william.jon.mccann@gmail.com>
Date: Mon, 24 Jun 2013 19:28:53 -0400
Subject: [PATCH] Start migrating internals away from GtkStock

---
 gtk/deprecated/gtkcolorseldialog.c |  4 ++--
 gtk/deprecated/gtkfontsel.c        |  6 ++---
 gtk/gtkaboutdialog.c               |  2 --
 gtk/gtkaboutdialog.ui              |  7 +++---
 gtk/gtkappchooserdialog.ui         |  5 ++---
 gtk/gtkassistant.c                 |  1 -
 gtk/gtkassistant.ui                | 27 +++-------------------
 gtk/gtkbuilder.c                   |  2 +-
 gtk/gtkcolorchooserdialog.c        |  1 -
 gtk/gtkcolorchooserdialog.ui       |  3 +--
 gtk/gtkcustompaperunixdialog.c     |  2 +-
 gtk/gtkdialog.c                    | 12 +++++-----
 gtk/gtkdnd-quartz.c                |  2 +-
 gtk/gtkdnd.c                       |  6 ++---
 gtk/gtkentry.c                     | 26 ++++++++++-----------
 gtk/gtkfilechooserbutton.c         | 18 +++------------
 gtk/gtkfilechooserdefault.c        | 34 +++++++++++-----------------
 gtk/gtkfilechooserdialog.c         | 12 +++++-----
 gtk/gtkfontchooserdialog.ui        |  3 +--
 gtk/gtkiconhelper.c                | 13 +++++++----
 gtk/gtkimage.c                     | 12 +++++-----
 gtk/gtkinfobar.c                   | 19 +++++++---------
 gtk/gtklabel.c                     | 28 ++++++++---------------
 gtk/gtklinkbutton.c                |  6 +----
 gtk/gtkmessagedialog.c             | 36 +++++++++++++-----------------
 gtk/gtkmountoperation.c            | 13 +++++------
 gtk/gtkpagesetupunixdialog.ui      |  6 ++---
 gtk/gtkplacessidebar.c             |  9 ++------
 gtk/gtkprintbackend.c              |  6 ++---
 gtk/gtkprinteroptionwidget.c       |  5 ++---
 gtk/gtkprintunixdialog.c           |  9 +-------
 gtk/gtkprintunixdialog.ui          | 11 ++++-----
 gtk/gtkrecentchooserdefault.c      | 13 +++--------
 gtk/gtkrecentchooserdialog.c       |  4 ++--
 gtk/gtkscalebutton.c               |  7 +++---
 gtk/gtktextview.c                  | 25 ++++++++++-----------
 gtk/gtktoolpalette.c               |  3 ++-
 37 files changed, 151 insertions(+), 247 deletions(-)

diff --git a/gtk/deprecated/gtkcolorseldialog.c b/gtk/deprecated/gtkcolorseldialog.c
index d5e9d663d3..c97e1a8126 100644
--- a/gtk/deprecated/gtkcolorseldialog.c
+++ b/gtk/deprecated/gtkcolorseldialog.c
@@ -194,7 +194,7 @@ gtk_color_selection_dialog_init (GtkColorSelectionDialog *colorseldiag)
   gtk_widget_show (priv->colorsel);
 
   priv->cancel_button = gtk_dialog_add_button (dialog,
-                                               GTK_STOCK_CANCEL,
+                                               _("_Cancel"),
                                                GTK_RESPONSE_CANCEL);
 
   priv->ok_button = gtk_dialog_add_button (dialog,
@@ -204,7 +204,7 @@ gtk_color_selection_dialog_init (GtkColorSelectionDialog *colorseldiag)
   gtk_widget_grab_default (priv->ok_button);
 
   priv->help_button = gtk_dialog_add_button (dialog,
-                                             GTK_STOCK_HELP,
+                                             _("_Help"),
                                              GTK_RESPONSE_HELP);
 
   gtk_widget_hide (priv->help_button);
diff --git a/gtk/deprecated/gtkfontsel.c b/gtk/deprecated/gtkfontsel.c
index 0f55825b78..901f1337b6 100644
--- a/gtk/deprecated/gtkfontsel.c
+++ b/gtk/deprecated/gtkfontsel.c
@@ -1697,16 +1697,16 @@ gtk_font_selection_dialog_init (GtkFontSelectionDialog *fontseldiag)
 
   /* Create the action area */
   priv->cancel_button = gtk_dialog_add_button (dialog,
-                                               GTK_STOCK_CANCEL,
+                                               _("_Cancel"),
                                                GTK_RESPONSE_CANCEL);
 
   priv->apply_button = gtk_dialog_add_button (dialog,
-                                              GTK_STOCK_APPLY,
+                                              _("_Apply"),
                                               GTK_RESPONSE_APPLY);
   gtk_widget_hide (priv->apply_button);
 
   priv->ok_button = gtk_dialog_add_button (dialog,
-                                           GTK_STOCK_OK,
+                                           _("_OK"),
                                            GTK_RESPONSE_OK);
   gtk_widget_grab_default (priv->ok_button);
 
diff --git a/gtk/gtkaboutdialog.c b/gtk/gtkaboutdialog.c
index 6abbade039..a9a9c45c7e 100644
--- a/gtk/gtkaboutdialog.c
+++ b/gtk/gtkaboutdialog.c
@@ -43,7 +43,6 @@
 #include "gtknotebook.h"
 #include "gtkorientable.h"
 #include "gtkscrolledwindow.h"
-#include "gtkstock.h"
 #include "gtktextview.h"
 #include "gtkiconfactory.h"
 #include "gtkshow.h"
@@ -59,7 +58,6 @@
  * SECTION:gtkaboutdialog
  * @Short_description: Display information about an application
  * @Title: GtkAboutDialog
- * @See_also: #GTK_STOCK_ABOUT
  *
  * The GtkAboutDialog offers a simple way to display information about
  * a program like its logo, name, copyright, website and license. It is
diff --git a/gtk/gtkaboutdialog.ui b/gtk/gtkaboutdialog.ui
index 8174549309..887c187bdf 100644
--- a/gtk/gtkaboutdialog.ui
+++ b/gtk/gtkaboutdialog.ui
@@ -4,7 +4,7 @@
   <object class="GtkImage" id="image1">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
-    <property name="stock">gtk-about</property>
+    <property name="icon_name">help-about</property>
   </object>
   <template class="GtkAboutDialog" parent="GtkDialog">
     <property name="can_focus">False</property>
@@ -59,14 +59,13 @@
             </child>
             <child>
               <object class="GtkButton" id="close_button">
-                <property name="label">gtk-close</property>
+                <property name="label" translatable="yes">_Close</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="is_focus">True</property>
                 <property name="can_default">True</property>
                 <property name="has_default">True</property>
                 <property name="receives_default">True</property>
-                <property name="use_stock">True</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -93,7 +92,7 @@
               <object class="GtkImage" id="logo_image">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="stock">gtk-missing-image</property>
+                <property name="icon_name">image-missing</property>
               </object>
               <packing>
                 <property name="expand">False</property>
diff --git a/gtk/gtkappchooserdialog.ui b/gtk/gtkappchooserdialog.ui
index 720cde1871..105fed3e2e 100644
--- a/gtk/gtkappchooserdialog.ui
+++ b/gtk/gtkappchooserdialog.ui
@@ -16,12 +16,11 @@
             <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="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="can_default">True</property>
                 <property name="receives_default">True</property>
-                <property name="use_stock">True</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -110,7 +109,7 @@
   <object class="GtkImage" id="show_more_image">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
-    <property name="stock">gtk-add</property>
+    <property name="icon_name">list-add-symbolic</property>
   </object>
   <object class="GtkButton" id="show_more_button">
     <property name="label" translatable="yes">Show Other Applications</property>
diff --git a/gtk/gtkassistant.c b/gtk/gtkassistant.c
index 4f8581d92d..c9166f8a3c 100644
--- a/gtk/gtkassistant.c
+++ b/gtk/gtkassistant.c
@@ -69,7 +69,6 @@
 #include "gtksettings.h"
 #include "gtksizegroup.h"
 #include "gtksizerequest.h"
-#include "gtkstock.h"
 #include "gtktypebuiltins.h"
 #include "gtkintl.h"
 #include "gtkprivate.h"
diff --git a/gtk/gtkassistant.ui b/gtk/gtkassistant.ui
index 1db47979ab..05ee576abb 100644
--- a/gtk/gtkassistant.ui
+++ b/gtk/gtkassistant.ui
@@ -1,21 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface domain="gtk30">
   <!-- interface-requires gtk+ 3.10 -->
-  <object class="GtkImage" id="back_image">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="stock">gtk-go-back</property>
-  </object>
-  <object class="GtkImage" id="forward_image">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="stock">gtk-go-forward</property>
-  </object>
-  <object class="GtkImage" id="last_image">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="stock">gtk-goto-last</property>
-  </object>
   <template class="GtkAssistant" parent="GtkWindow">
     <property name="can_focus">False</property>
     <child>
@@ -94,12 +79,11 @@
                 <property name="spacing">6</property>
                 <child>
                   <object class="GtkButton" id="apply">
-                    <property name="label">gtk-apply</property>
+                    <property name="label" translatable="yes">_Apply</property>
                     <property name="can_focus">True</property>
                     <property name="can_default">True</property>
                     <property name="receives_default">True</property>
                     <property name="no_show_all">True</property>
-                    <property name="use_stock">True</property>
                     <signal name="clicked" handler="on_assistant_apply" swapped="no"/>
                   </object>
                   <packing>
@@ -117,7 +101,6 @@
                     <property name="can_default">True</property>
                     <property name="receives_default">True</property>
                     <property name="no_show_all">True</property>
-                    <property name="image">forward_image</property>
                     <property name="use_underline">True</property>
                     <signal name="clicked" handler="on_assistant_forward" swapped="no"/>
                   </object>
@@ -135,7 +118,6 @@
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
                     <property name="no_show_all">True</property>
-                    <property name="image">back_image</property>
                     <property name="use_underline">True</property>
                     <signal name="clicked" handler="on_assistant_back" swapped="no"/>
                   </object>
@@ -152,7 +134,6 @@
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
                     <property name="no_show_all">True</property>
-                    <property name="image">last_image</property>
                     <property name="use_underline">True</property>
                     <signal name="clicked" handler="on_assistant_last" swapped="no"/>
                   </object>
@@ -165,12 +146,11 @@
                 </child>
                 <child>
                   <object class="GtkButton" id="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">True</property>
                     <property name="no_show_all">True</property>
-                    <property name="use_stock">True</property>
                     <signal name="clicked" handler="on_assistant_cancel" swapped="no"/>
                   </object>
                   <packing>
@@ -182,12 +162,11 @@
                 </child>
                 <child>
                   <object class="GtkButton" id="close">
-                    <property name="label">gtk-close</property>
+                    <property name="label" translatable="yes">_Close</property>
                     <property name="can_focus">True</property>
                     <property name="can_default">True</property>
                     <property name="receives_default">True</property>
                     <property name="no_show_all">True</property>
-                    <property name="use_stock">True</property>
                     <signal name="clicked" handler="on_assistant_close" swapped="no"/>
                   </object>
                   <packing>
diff --git a/gtk/gtkbuilder.c b/gtk/gtkbuilder.c
index 081710b2c8..09045a73b8 100644
--- a/gtk/gtkbuilder.c
+++ b/gtk/gtkbuilder.c
@@ -2061,7 +2061,7 @@ gtk_builder_value_from_string_type (GtkBuilder   *builder,
               /* fall back to a missing image */
               theme = gtk_icon_theme_get_default ();
               pixbuf = gtk_icon_theme_load_icon (theme, 
-                                                 GTK_STOCK_MISSING_IMAGE,
+                                                 "image-missing",
                                                  16,
                                                  GTK_ICON_LOOKUP_USE_BUILTIN,
                                                  NULL);
diff --git a/gtk/gtkcolorchooserdialog.c b/gtk/gtkcolorchooserdialog.c
index 61c3860517..51851aa7ec 100644
--- a/gtk/gtkcolorchooserdialog.c
+++ b/gtk/gtkcolorchooserdialog.c
@@ -18,7 +18,6 @@
 #include "config.h"
 
 #include "gtkdialog.h"
-#include "gtkstock.h"
 #include "gtkbutton.h"
 #include "gtkbox.h"
 #include "gtkprivate.h"
diff --git a/gtk/gtkcolorchooserdialog.ui b/gtk/gtkcolorchooserdialog.ui
index c722c345c6..c7034f530c 100644
--- a/gtk/gtkcolorchooserdialog.ui
+++ b/gtk/gtkcolorchooserdialog.ui
@@ -17,12 +17,11 @@
             <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="cancel_button">
-                <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="can_default">True</property>
                 <property name="receives_default">True</property>
-                <property name="use_stock">True</property>
               </object>
               <packing>
                 <property name="expand">False</property>
diff --git a/gtk/gtkcustompaperunixdialog.c b/gtk/gtkcustompaperunixdialog.c
index 57494c94a3..f637e131ab 100644
--- a/gtk/gtkcustompaperunixdialog.c
+++ b/gtk/gtkcustompaperunixdialog.c
@@ -316,7 +316,7 @@ gtk_custom_paper_unix_dialog_init (GtkCustomPaperUnixDialog *dialog)
   populate_dialog (dialog);
 
   gtk_dialog_add_buttons (GTK_DIALOG (dialog),
-                          GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,
+                          _("_Close"), GTK_RESPONSE_CLOSE,
                           NULL);
 
   gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_CLOSE);
diff --git a/gtk/gtkdialog.c b/gtk/gtkdialog.c
index 2d0e289dc3..22b8525be7 100644
--- a/gtk/gtkdialog.c
+++ b/gtk/gtkdialog.c
@@ -106,7 +106,7 @@
  *    dialog = gtk_dialog_new_with_buttons ("Message",
  *                                          main_application_window,
  *                                          GTK_DIALOG_DESTROY_WITH_PARENT,
- *                                          GTK_STOCK_OK,
+ *                                          _("_OK"),
  *                                          GTK_RESPONSE_NONE,
  *                                          NULL);
  *    content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
@@ -590,9 +590,9 @@ gtk_dialog_new_empty (const gchar     *title,
  *  GtkWidget *dialog = gtk_dialog_new_with_buttons ("My dialog",
  *                                                   main_app_window,
  *                                                   GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
- *                                                   GTK_STOCK_OK,
+ *                                                   _("_OK"),
  *                                                   GTK_RESPONSE_ACCEPT,
- *                                                   GTK_STOCK_CANCEL,
+ *                                                   _("_Cancel"),
  *                                                   GTK_RESPONSE_REJECT,
  *                                                   NULL);
  * ]|
@@ -1241,17 +1241,17 @@ gtk_dialog_set_alternative_button_order_valist (GtkDialog *dialog,
  * following example shows:
  * |[
  * cancel_button = gtk_dialog_add_button (GTK_DIALOG (dialog),
- *                                        GTK_STOCK_CANCEL,
+ *                                        _("_Cancel"),
  *                                        GTK_RESPONSE_CANCEL);
  *
  * ok_button = gtk_dialog_add_button (GTK_DIALOG (dialog),
- *                                    GTK_STOCK_OK,
+ *                                    _("_OK"),
  *                                    GTK_RESPONSE_OK);
  *
  * gtk_widget_grab_default (ok_button);
  *
  * help_button = gtk_dialog_add_button (GTK_DIALOG (dialog),
- *                                      GTK_STOCK_HELP,
+ *                                      _("_Help"),
  *                                      GTK_RESPONSE_HELP);
  *
  * gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog),
diff --git a/gtk/gtkdnd-quartz.c b/gtk/gtkdnd-quartz.c
index acb9456e0a..e1a6026192 100644
--- a/gtk/gtkdnd-quartz.c
+++ b/gtk/gtkdnd-quartz.c
@@ -1942,7 +1942,7 @@ gtk_drag_set_icon_default (GdkDragContext    *context)
 {
   g_return_if_fail (GDK_IS_DRAG_CONTEXT (context));
 
-  gtk_drag_set_icon_stock (context, GTK_STOCK_DND, -2, -2);
+  gtk_drag_set_icon_name (context, "text-x-generic", -2, -2);
 }
 
 static void
diff --git a/gtk/gtkdnd.c b/gtk/gtkdnd.c
index 3cf0e5c095..aecb769927 100644
--- a/gtk/gtkdnd.c
+++ b/gtk/gtkdnd.c
@@ -2435,7 +2435,7 @@ gtk_drag_source_site_get_icon_helper (GtkDragSourceSite *site)
     helper = _gtk_icon_helper_new ();
 
   if (_gtk_icon_helper_get_is_empty (helper))
-    _gtk_icon_helper_set_stock_id (helper, GTK_STOCK_DND, GTK_ICON_SIZE_DND);
+    _gtk_icon_helper_set_icon_name (helper, "text-x-generic", GTK_ICON_SIZE_DND);
 
   return helper;
 }
@@ -3036,7 +3036,7 @@ gtk_drag_get_icon (GtkDragSourceInfo *info,
 	  info->icon_window = NULL;
 
           helper = _gtk_icon_helper_new ();
-          _gtk_icon_helper_set_stock_id (helper, GTK_STOCK_DND, GTK_ICON_SIZE_DND);
+          _gtk_icon_helper_set_icon_name (helper, "text-x-generic", GTK_ICON_SIZE_DND);
           set_icon_helper (info->context, helper, -2, -2, TRUE);
 	  info->fallback_icon = info->icon_window;
 	  
@@ -3523,7 +3523,7 @@ gtk_drag_set_icon_default (GdkDragContext *context)
 {
   g_return_if_fail (GDK_IS_DRAG_CONTEXT (context));
 
-  gtk_drag_set_icon_stock (context, GTK_STOCK_DND, -2, -2);
+  gtk_drag_set_icon_name (context, "text-x-generic", -2, -2);
 }
 
 /*************************************************************
diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c
index c4e601326a..0861fa6842 100644
--- a/gtk/gtkentry.c
+++ b/gtk/gtkentry.c
@@ -9093,11 +9093,11 @@ gtk_entry_grab_notify (GtkWidget *widget,
 static void
 append_action_signal (GtkEntry     *entry,
 		      GtkWidget    *menu,
-		      const gchar  *stock_id,
+		      const gchar  *label,
 		      const gchar  *signal,
                       gboolean      sensitive)
 {
-  GtkWidget *menuitem = gtk_image_menu_item_new_from_stock (stock_id, NULL);
+  GtkWidget *menuitem = gtk_menu_item_new_with_mnemonic (label);
 
   g_object_set_data (G_OBJECT (menuitem), I_("gtk-signal"), (char *)signal);
   g_signal_connect (menuitem, "activate",
@@ -9202,18 +9202,18 @@ popup_targets_received (GtkClipboard     *clipboard,
 				 popup_menu_detach);
 
       mode = gtk_entry_get_display_mode (entry);
-      append_action_signal (entry, info_entry_priv->popup_menu, GTK_STOCK_CUT, "cut-clipboard",
+      append_action_signal (entry, info_entry_priv->popup_menu, _("Cu_t"), "cut-clipboard",
                             info_entry_priv->editable && mode == DISPLAY_NORMAL &&
                             info_entry_priv->current_pos != info_entry_priv->selection_bound);
 
-      append_action_signal (entry, info_entry_priv->popup_menu, GTK_STOCK_COPY, "copy-clipboard",
+      append_action_signal (entry, info_entry_priv->popup_menu, _("_Copy"), "copy-clipboard",
                             mode == DISPLAY_NORMAL &&
                             info_entry_priv->current_pos != info_entry_priv->selection_bound);
 
-      append_action_signal (entry, info_entry_priv->popup_menu, GTK_STOCK_PASTE, "paste-clipboard",
+      append_action_signal (entry, info_entry_priv->popup_menu, _("_Paste"), "paste-clipboard",
                             info_entry_priv->editable && clipboard_contains_text);
 
-      menuitem = gtk_image_menu_item_new_from_stock (GTK_STOCK_DELETE, NULL);
+      menuitem = gtk_menu_item_new_with_mnemonic (_("_Delete"));
       gtk_widget_set_sensitive (menuitem, info_entry_priv->editable && info_entry_priv->current_pos != info_entry_priv->selection_bound);
       g_signal_connect_swapped (menuitem, "activate",
 			        G_CALLBACK (gtk_entry_delete_cb), entry);
@@ -9224,7 +9224,7 @@ popup_targets_received (GtkClipboard     *clipboard,
       gtk_widget_show (menuitem);
       gtk_menu_shell_append (GTK_MENU_SHELL (info_entry_priv->popup_menu), menuitem);
 
-      menuitem = gtk_image_menu_item_new_from_stock (GTK_STOCK_SELECT_ALL, NULL);
+      menuitem = gtk_menu_item_new_with_mnemonic (_("Select _All"));
       gtk_widget_set_sensitive (menuitem, gtk_entry_buffer_get_length (info_entry_priv->buffer) > 0);
       g_signal_connect_swapped (menuitem, "activate",
 			        G_CALLBACK (gtk_entry_select_all), entry);
@@ -9300,11 +9300,11 @@ activate_bubble_cb (GtkWidget *item,
 static void
 append_bubble_action (GtkEntry     *entry,
                       GtkWidget    *toolbar,
-                      const gchar  *stock_id,
+                      const gchar  *label,
                       const gchar  *signal,
                       gboolean      sensitive)
 {
-  GtkToolItem *item = gtk_tool_button_new_from_stock (stock_id);
+  GtkToolItem *item = gtk_tool_button_new (NULL, label);
   g_object_set_data (G_OBJECT (item), I_("gtk-signal"), (char *)signal);
   g_signal_connect (item, "clicked", G_CALLBACK (activate_bubble_cb), entry);
   gtk_widget_set_sensitive (GTK_WIDGET (item), sensitive);
@@ -9348,13 +9348,13 @@ bubble_targets_received (GtkClipboard     *clipboard,
   has_clipboard = gtk_selection_data_targets_include_text (data);
   mode = gtk_entry_get_display_mode (entry);
 
-  append_bubble_action (entry, toolbar, GTK_STOCK_CUT, "cut-clipboard",
+  append_bubble_action (entry, toolbar, _("Cu_t"), "cut-clipboard",
                         priv->editable && has_selection && mode == DISPLAY_NORMAL);
 
-  append_bubble_action (entry, toolbar, GTK_STOCK_COPY, "copy-clipboard",
+  append_bubble_action (entry, toolbar, _("_Copy"), "copy-clipboard",
                         has_selection && mode == DISPLAY_NORMAL);
 
-  append_bubble_action (entry, toolbar, GTK_STOCK_PASTE, "paste-clipboard",
+  append_bubble_action (entry, toolbar, _("_Paste"), "paste-clipboard",
                         priv->editable && has_clipboard);
 
   if (priv->populate_all)
@@ -10279,7 +10279,7 @@ show_capslock_feedback (GtkEntry    *entry,
 
   if (gtk_entry_get_icon_storage_type (entry, GTK_ENTRY_ICON_SECONDARY) == GTK_IMAGE_EMPTY)
     {
-      gtk_entry_set_icon_from_stock (entry, GTK_ENTRY_ICON_SECONDARY, GTK_STOCK_CAPS_LOCK_WARNING);
+      gtk_entry_set_icon_from_icon_name (entry, GTK_ENTRY_ICON_SECONDARY, "dialog-warning-symbolic");
       gtk_entry_set_icon_activatable (entry, GTK_ENTRY_ICON_SECONDARY, FALSE);
       priv->caps_lock_warning_shown = TRUE;
     }
diff --git a/gtk/gtkfilechooserbutton.c b/gtk/gtkfilechooserbutton.c
index 06bf946306..0b726c9ff0 100644
--- a/gtk/gtkfilechooserbutton.c
+++ b/gtk/gtkfilechooserbutton.c
@@ -104,7 +104,6 @@
 #define DEFAULT_TITLE		N_("Select a File")
 #define DESKTOP_DISPLAY_NAME	N_("Desktop")
 #define FALLBACK_DISPLAY_NAME	N_("(None)") /* this string is used in gtk+/gtk/tests/filechooser.c - change it there if you change it here */
-#define FALLBACK_ICON_NAME	"stock_unknown"
 #define FALLBACK_ICON_SIZE	16
 
 
@@ -806,9 +805,9 @@ gtk_file_chooser_button_constructor (GType                  type,
     {
       priv->dialog = gtk_file_chooser_dialog_new (NULL, NULL,
 						  GTK_FILE_CHOOSER_ACTION_OPEN,
-						  GTK_STOCK_CANCEL,
+						  _("_Cancel"),
 						  GTK_RESPONSE_CANCEL,
-						  GTK_STOCK_OPEN,
+						  _("_Open"),
 						  GTK_RESPONSE_ACCEPT,
 						  NULL);
 
@@ -1403,7 +1402,7 @@ change_icon_theme (GtkFileChooserButton *button)
 
   do
     {
-      GdkPixbuf *pixbuf;
+      GdkPixbuf *pixbuf = NULL;
       gchar type;
       gpointer data;
 
@@ -1451,9 +1450,6 @@ change_icon_theme (GtkFileChooserButton *button)
 		pixbuf = gtk_icon_theme_load_icon (theme, "folder-remote",
 						   priv->icon_size, 0, NULL);
 	    }
-	  else
-	    pixbuf = gtk_icon_theme_load_icon (theme, FALLBACK_ICON_NAME,
-					       priv->icon_size, 0, NULL);
 	  break;
 	case ROW_TYPE_VOLUME:
 	  if (data)
@@ -1461,9 +1457,6 @@ change_icon_theme (GtkFileChooserButton *button)
 							  GTK_WIDGET (button),
 							  priv->icon_size,
 							  NULL);
-	  else
-	    pixbuf = gtk_icon_theme_load_icon (theme, FALLBACK_ICON_NAME,
-					       priv->icon_size, 0, NULL);
 	  break;
 	default:
 	  continue;
@@ -2469,11 +2462,6 @@ update_label_get_info_cb (GCancellable *cancellable,
 
   pixbuf = _gtk_file_info_render_icon (info, GTK_WIDGET (priv->image), priv->icon_size);
 
-  if (!pixbuf)
-    pixbuf = gtk_icon_theme_load_icon (get_icon_theme (GTK_WIDGET (priv->image)),
-				       FALLBACK_ICON_NAME,
-				       priv->icon_size, 0, NULL);
-
   gtk_image_set_from_pixbuf (GTK_IMAGE (priv->image), pixbuf);
   if (pixbuf)
     g_object_unref (pixbuf);
diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c
index e0dee0e859..c9d916b756 100644
--- a/gtk/gtkfilechooserdefault.c
+++ b/gtk/gtkfilechooserdefault.c
@@ -66,7 +66,6 @@
 #include "gtksettings.h"
 #include "gtksizegroup.h"
 #include "gtksizerequest.h"
-#include "gtkstock.h"
 #include "gtktoolbar.h"
 #include "gtktoolbutton.h"
 #include "gtktooltip.h"
@@ -1671,17 +1670,14 @@ check_file_list_menu_sensitivity (GtkFileChooserDefault *impl)
 }
 
 static GtkWidget *
-file_list_add_image_menu_item (GtkFileChooserDefault *impl,
-			       const char *stock_name,
-			       const char *mnemonic_label,
-			       GCallback callback)
+file_list_add_menu_item (GtkFileChooserDefault *impl,
+                         const char *mnemonic_label,
+                         GCallback callback)
 {
   GtkFileChooserDefaultPrivate *priv = impl->priv;
   GtkWidget *item;
 
-  item = gtk_image_menu_item_new_with_mnemonic (mnemonic_label);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item),
-                                 gtk_image_new_from_stock (stock_name, GTK_ICON_SIZE_MENU));
+  item = gtk_menu_item_new_with_mnemonic (mnemonic_label);
   g_signal_connect (item, "activate", callback, impl);
   gtk_widget_show (item);
   gtk_menu_shell_append (GTK_MENU_SHELL (priv->browse_files_popup_menu), item);
@@ -1720,13 +1716,13 @@ file_list_build_popup_menu (GtkFileChooserDefault *impl)
 			     priv->browse_files_tree_view,
 			     popup_menu_detach_cb);
 
-  priv->browse_files_popup_menu_visit_file_item		= file_list_add_image_menu_item (impl, GTK_STOCK_DIRECTORY, _("_Visit File"),
+  priv->browse_files_popup_menu_visit_file_item		= file_list_add_menu_item (impl, _("_Visit File"),
 											 G_CALLBACK (visit_file_cb));
 
-  priv->browse_files_popup_menu_copy_file_location_item	= file_list_add_image_menu_item (impl, GTK_STOCK_COPY, _("_Copy Location"),
+  priv->browse_files_popup_menu_copy_file_location_item	= file_list_add_menu_item (impl, _("_Copy Location"),
 											 G_CALLBACK (copy_file_location_cb));
 
-  priv->browse_files_popup_menu_add_shortcut_item	= file_list_add_image_menu_item (impl, GTK_STOCK_ADD, _("_Add to Bookmarks"),
+  priv->browse_files_popup_menu_add_shortcut_item	= file_list_add_menu_item (impl, _("_Add to Bookmarks"),
 											 G_CALLBACK (add_to_shortcuts_cb));
 
   item = gtk_separator_menu_item_new ();
@@ -2254,9 +2250,9 @@ info_bar_set (GtkFileChooserDefault *impl, PathBarMode mode)
     }
 
   gtk_info_bar_set_message_type (GTK_INFO_BAR (priv->browse_select_a_folder_info_bar), message_type);
-  gtk_image_set_from_stock (GTK_IMAGE (priv->browse_select_a_folder_icon),
-			    (message_type == GTK_MESSAGE_WARNING) ? GTK_STOCK_DIALOG_WARNING : GTK_STOCK_DIRECTORY,
-			    GTK_ICON_SIZE_MENU);
+  gtk_image_set_from_icon_name (GTK_IMAGE (priv->browse_select_a_folder_icon),
+                                (message_type == GTK_MESSAGE_WARNING) ? "dialog-warning-symbolic" : "folder-symbolic",
+                                GTK_ICON_SIZE_MENU);
   gtk_label_set_markup (GTK_LABEL (priv->browse_select_a_folder_label), str);
 
   if (free_str)
@@ -2303,7 +2299,7 @@ path_bar_set_mode (GtkFileChooserDefault *impl, PathBarMode mode)
       break;
 
     case PATH_BAR_SEARCH:
-      gtk_image_set_from_stock (GTK_IMAGE (priv->browse_special_mode_icon), GTK_STOCK_FIND, GTK_ICON_SIZE_BUTTON);
+      gtk_image_set_from_icon_name (GTK_IMAGE (priv->browse_special_mode_icon), "edit-find-symbolic", GTK_ICON_SIZE_BUTTON);
 
       tmp = g_strdup_printf ("<b>%s</b>", _("Search:"));
       gtk_label_set_markup (GTK_LABEL (priv->browse_special_mode_label), tmp);
@@ -5450,15 +5446,12 @@ get_display_name_from_file_list (GtkFileChooserDefault *impl)
 static void
 add_custom_button_to_dialog (GtkDialog   *dialog,
 			     const gchar *mnemonic_label,
-			     const gchar *stock_id,
 			     gint         response_id)
 {
   GtkWidget *button;
 
   button = gtk_button_new_with_mnemonic (mnemonic_label);
   gtk_widget_set_can_default (button, TRUE);
-  gtk_button_set_image (GTK_BUTTON (button),
-			gtk_image_new_from_stock (stock_id, GTK_ICON_SIZE_BUTTON));
   gtk_widget_show (button);
 
   gtk_dialog_add_action_widget (GTK_DIALOG (dialog), button, response_id);
@@ -5489,9 +5482,8 @@ confirm_dialog_should_accept_filename (GtkFileChooserDefault *impl,
 					      "overwrite its contents."),
 					    folder_display_name);
 
-  gtk_dialog_add_button (GTK_DIALOG (dialog), GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
-  add_custom_button_to_dialog (GTK_DIALOG (dialog), _("_Replace"),
-                               GTK_STOCK_SAVE_AS, GTK_RESPONSE_ACCEPT);
+  gtk_dialog_add_button (GTK_DIALOG (dialog), _("_Cancel"), GTK_RESPONSE_CANCEL);
+  add_custom_button_to_dialog (GTK_DIALOG (dialog), _("_Replace"), GTK_RESPONSE_ACCEPT);
   gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog),
                                            GTK_RESPONSE_ACCEPT,
                                            GTK_RESPONSE_CANCEL,
diff --git a/gtk/gtkfilechooserdialog.c b/gtk/gtkfilechooserdialog.c
index 64d50390ba..f3e521db54 100644
--- a/gtk/gtkfilechooserdialog.c
+++ b/gtk/gtkfilechooserdialog.c
@@ -61,8 +61,8 @@
  * dialog = gtk_file_chooser_dialog_new ("Open File",
  *                                       parent_window,
  *                                       GTK_FILE_CHOOSER_ACTION_OPEN,
- *                                       GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- *                                       GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
+ *                                       _("_Cancel"), GTK_RESPONSE_CANCEL,
+ *                                       _("_Open"), GTK_RESPONSE_ACCEPT,
  *                                       NULL);
  *
  * if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT)
@@ -85,8 +85,8 @@
  * dialog = gtk_file_chooser_dialog_new ("Save File",
  *                                       parent_window,
  *                                       GTK_FILE_CHOOSER_ACTION_SAVE,
- *                                       GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- *                                       GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT,
+ *                                       _("_Cancel"), GTK_RESPONSE_CANCEL,
+ *                                       _("_Save"), GTK_RESPONSE_ACCEPT,
  *                                       NULL);
  * gtk_file_chooser_set_do_overwrite_confirmation (GTK_FILE_CHOOSER (dialog), TRUE);
  *
@@ -157,8 +157,8 @@
  * dialog = gtk_file_chooser_dialog_new ("Open File",
  *                                       parent_window,
  *                                       GTK_FILE_CHOOSER_ACTION_OPEN,
- *                                       GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- *                                       GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
+ *                                       _("_Cancel"), GTK_RESPONSE_CANCEL,
+ *                                       _("_Open"), GTK_RESPONSE_ACCEPT,
  *                                       NULL);
  * </programlisting></informalexample>
  * </para>
diff --git a/gtk/gtkfontchooserdialog.ui b/gtk/gtkfontchooserdialog.ui
index 8878052948..8175583fc5 100644
--- a/gtk/gtkfontchooserdialog.ui
+++ b/gtk/gtkfontchooserdialog.ui
@@ -17,11 +17,10 @@
             <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="cancel_button">
-                <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">True</property>
-                <property name="use_stock">True</property>
               </object>
               <packing>
                 <property name="expand">False</property>
diff --git a/gtk/gtkiconhelper.c b/gtk/gtkiconhelper.c
index 58ae8a15db..cfdbf5d8f0 100644
--- a/gtk/gtkiconhelper.c
+++ b/gtk/gtkiconhelper.c
@@ -161,11 +161,16 @@ ensure_stated_icon_from_info (GtkIconHelper *self,
 
   if (destination == NULL)
     {
-      GtkIconSet *icon_set;
-      icon_set = gtk_style_context_lookup_icon_set (context, GTK_STOCK_MISSING_IMAGE);
+      GtkIconTheme *icon_theme;
+      int width;
 
-      destination =
-        gtk_icon_set_render_icon_pixbuf (icon_set, context, self->priv->icon_size);
+      icon_theme = gtk_icon_theme_get_for_screen (gtk_style_context_get_screen (context));
+      gtk_icon_size_lookup (self->priv->icon_size, &width, NULL);
+      destination = gtk_icon_theme_load_icon (icon_theme,
+                                              "image-missing",
+                                              width,
+                                              GTK_ICON_LOOKUP_GENERIC_FALLBACK,
+                                              NULL);
     }
   else if (!symbolic)
     {
diff --git a/gtk/gtkimage.c b/gtk/gtkimage.c
index cc480bfe90..79e47db3f5 100644
--- a/gtk/gtkimage.c
+++ b/gtk/gtkimage.c
@@ -788,9 +788,9 @@ gtk_image_set_from_file   (GtkImage    *image,
 
   if (anim == NULL)
     {
-      gtk_image_set_from_stock (image,
-                                GTK_STOCK_MISSING_IMAGE,
-                                DEFAULT_ICON_SIZE);
+      gtk_image_set_from_icon_name (image,
+                                    "image-missing",
+                                    DEFAULT_ICON_SIZE);
       g_object_thaw_notify (G_OBJECT (image));
       return;
     }
@@ -845,9 +845,9 @@ gtk_image_set_from_resource (GtkImage    *image,
 
   if (animation == NULL)
     {
-      gtk_image_set_from_stock (image,
-                                GTK_STOCK_MISSING_IMAGE,
-                                DEFAULT_ICON_SIZE);
+      gtk_image_set_from_icon_name (image,
+                                    "image-missing",
+                                    DEFAULT_ICON_SIZE);
       g_object_thaw_notify (G_OBJECT (image));
       return;
     }
diff --git a/gtk/gtkinfobar.c b/gtk/gtkinfobar.c
index c086d95bc6..6c0d1d4fbb 100644
--- a/gtk/gtkinfobar.c
+++ b/gtk/gtkinfobar.c
@@ -43,7 +43,6 @@
 #include "gtkdialog.h"
 #include "gtkintl.h"
 #include "gtkprivate.h"
-#include "gtkstock.h"
 #include "gtkorientable.h"
 #include "gtktypebuiltins.h"
 
@@ -82,7 +81,7 @@
  * content_area = gtk_info_bar_get_content_area (GTK_INFO_BAR (info_bar));
  * gtk_container_add (GTK_CONTAINER (content_area), message_label);
  * gtk_info_bar_add_button (GTK_INFO_BAR (info_bar),
- *                          GTK_STOCK_OK, GTK_RESPONSE_OK);
+ *                          _("_OK"), GTK_RESPONSE_OK);
  * g_signal_connect (info_bar, "response",
  *                   G_CALLBACK (gtk_widget_hide), NULL);
  * gtk_grid_attach (GTK_GRID (grid),
@@ -1110,27 +1109,26 @@ gtk_info_bar_set_message_type (GtkInfoBar     *info_bar,
       atk_obj = gtk_widget_get_accessible (GTK_WIDGET (info_bar));
       if (GTK_IS_ACCESSIBLE (atk_obj))
         {
-          GtkStockItem item;
-          const char *stock_id = NULL;
+          const char *name = NULL;
 
           atk_object_set_role (atk_obj, ATK_ROLE_ALERT);
 
           switch (message_type)
             {
             case GTK_MESSAGE_INFO:
-              stock_id = GTK_STOCK_DIALOG_INFO;
+              name = _("Information");
               break;
 
             case GTK_MESSAGE_QUESTION:
-              stock_id = GTK_STOCK_DIALOG_QUESTION;
+              name = _("Question");
               break;
 
             case GTK_MESSAGE_WARNING:
-              stock_id = GTK_STOCK_DIALOG_WARNING;
+              name = _("Warning");
               break;
 
             case GTK_MESSAGE_ERROR:
-              stock_id = GTK_STOCK_DIALOG_ERROR;
+              name = _("Error");
               break;
 
             case GTK_MESSAGE_OTHER:
@@ -1141,10 +1139,9 @@ gtk_info_bar_set_message_type (GtkInfoBar     *info_bar,
               break;
             }
 
-          if (stock_id)
+          if (name)
             {
-              gtk_stock_lookup (stock_id, &item);
-              atk_object_set_name (atk_obj, item.label);
+              atk_object_set_name (atk_obj, name);
             }
         }
 
diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c
index 7e26c1d17b..2e758f4974 100644
--- a/gtk/gtklabel.c
+++ b/gtk/gtklabel.c
@@ -42,7 +42,6 @@
 #include "gtkmenuitem.h"
 #include "gtkmenushellprivate.h"
 #include "gtknotebook.h"
-#include "gtkstock.h"
 #include "gtkbindings.h"
 #include "gtkbuildable.h"
 #include "gtkimage.h"
@@ -6103,11 +6102,11 @@ activate_cb (GtkWidget *menuitem,
 static void
 append_action_signal (GtkLabel     *label,
 		      GtkWidget    *menu,
-		      const gchar  *stock_id,
+		      const gchar  *text,
 		      const gchar  *signal,
                       gboolean      sensitive)
 {
-  GtkWidget *menuitem = gtk_image_menu_item_new_from_stock (stock_id, NULL);
+  GtkWidget *menuitem = gtk_menu_item_new_with_mnemonic (text);
 
   g_object_set_data (G_OBJECT (menuitem), I_("gtk-signal"), (char *)signal);
   g_signal_connect (menuitem, "activate",
@@ -6210,7 +6209,6 @@ gtk_label_do_popup (GtkLabel       *label,
   GtkLabelPrivate *priv = label->priv;
   GtkWidget *menuitem;
   GtkWidget *menu;
-  GtkWidget *image;
   gboolean have_selection;
   GtkLabelLink *link;
 
@@ -6240,36 +6238,28 @@ gtk_label_do_popup (GtkLabel       *label,
   if (!have_selection && link)
     {
       /* Open Link */
-      menuitem = gtk_image_menu_item_new_with_mnemonic (_("_Open Link"));
+      menuitem = gtk_menu_item_new_with_mnemonic (_("_Open Link"));
       gtk_widget_show (menuitem);
       gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
 
       g_signal_connect (G_OBJECT (menuitem), "activate",
                         G_CALLBACK (open_link_activate_cb), label);
 
-      image = gtk_image_new_from_stock (GTK_STOCK_JUMP_TO, GTK_ICON_SIZE_MENU);
-      gtk_widget_show (image);
-      gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem), image);
-
       /* Copy Link Address */
-      menuitem = gtk_image_menu_item_new_with_mnemonic (_("Copy _Link Address"));
+      menuitem = gtk_menu_item_new_with_mnemonic (_("Copy _Link Address"));
       gtk_widget_show (menuitem);
       gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
 
       g_signal_connect (G_OBJECT (menuitem), "activate",
                         G_CALLBACK (copy_link_activate_cb), label);
-
-      image = gtk_image_new_from_stock (GTK_STOCK_COPY, GTK_ICON_SIZE_MENU);
-      gtk_widget_show (image);
-      gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem), image);
     }
   else
     {
-      append_action_signal (label, menu, GTK_STOCK_CUT, "cut-clipboard", FALSE);
-      append_action_signal (label, menu, GTK_STOCK_COPY, "copy-clipboard", have_selection);
-      append_action_signal (label, menu, GTK_STOCK_PASTE, "paste-clipboard", FALSE);
+      append_action_signal (label, menu, _("Cu_t"), "cut-clipboard", FALSE);
+      append_action_signal (label, menu, _("_Copy"), "copy-clipboard", have_selection);
+      append_action_signal (label, menu, _("_Paste"), "paste-clipboard", FALSE);
   
-      menuitem = gtk_image_menu_item_new_from_stock (GTK_STOCK_DELETE, NULL);
+      menuitem = gtk_menu_item_new_with_mnemonic (_("_Delete"));
       gtk_widget_set_sensitive (menuitem, FALSE);
       gtk_widget_show (menuitem);
       gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
@@ -6278,7 +6268,7 @@ gtk_label_do_popup (GtkLabel       *label,
       gtk_widget_show (menuitem);
       gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
 
-      menuitem = gtk_image_menu_item_new_from_stock (GTK_STOCK_SELECT_ALL, NULL);
+      menuitem = gtk_menu_item_new_with_mnemonic (_("Select _All"));
       g_signal_connect_swapped (menuitem, "activate",
 			        G_CALLBACK (gtk_label_select_all), label);
       gtk_widget_show (menuitem);
diff --git a/gtk/gtklinkbutton.c b/gtk/gtklinkbutton.c
index b5981c741f..2e0636646a 100644
--- a/gtk/gtklinkbutton.c
+++ b/gtk/gtklinkbutton.c
@@ -59,7 +59,6 @@
 #include "gtkmenu.h"
 #include "gtkmenuitem.h"
 #include "gtksizerequest.h"
-#include "gtkstock.h"
 #include "gtkshow.h"
 #include "gtktooltip.h"
 #include "gtkprivate.h"
@@ -496,10 +495,7 @@ gtk_link_button_do_popup (GtkLinkButton  *link_button,
 		      		 GTK_WIDGET (link_button),
 				 popup_menu_detach);
 
-      menu_item = gtk_image_menu_item_new_with_mnemonic (_("Copy URL"));
-      gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_item),
-		      		     gtk_image_new_from_stock (GTK_STOCK_COPY,
-							       GTK_ICON_SIZE_MENU));
+      menu_item = gtk_menu_item_new_with_mnemonic (_("Copy URL"));
       g_signal_connect (menu_item, "activate",
 		        G_CALLBACK (copy_activate_cb), link_button);
       gtk_widget_show (menu_item);
diff --git a/gtk/gtkmessagedialog.c b/gtk/gtkmessagedialog.c
index 9755c70656..a864f746d8 100644
--- a/gtk/gtkmessagedialog.c
+++ b/gtk/gtkmessagedialog.c
@@ -33,7 +33,6 @@
 #include "gtklabel.h"
 #include "gtkbox.h"
 #include "gtkimage.h"
-#include "gtkstock.h"
 #include "gtkiconfactory.h"
 #include "gtkintl.h"
 #include "gtkprivate.h"
@@ -359,7 +358,7 @@ setup_type (GtkMessageDialog *dialog,
 	    GtkMessageType    type)
 {
   GtkMessageDialogPrivate *priv = dialog->priv;
-  const gchar *stock_id = NULL;
+  const gchar *name = NULL;
   AtkObject *atk_obj;
   GIcon *gicon = NULL;
 
@@ -368,22 +367,22 @@ setup_type (GtkMessageDialog *dialog,
   switch (type)
     {
     case GTK_MESSAGE_INFO:
-      stock_id = GTK_STOCK_DIALOG_INFO;
+      name = _("Information");
       gicon = g_themed_icon_new_with_default_fallbacks ("dialog-information-symbolic");
       break;
 
     case GTK_MESSAGE_QUESTION:
-      stock_id = GTK_STOCK_DIALOG_QUESTION;
+      name = _("Question");
       gicon = g_themed_icon_new_with_default_fallbacks ("dialog-question-symbolic");
       break;
 
     case GTK_MESSAGE_WARNING:
-      stock_id = GTK_STOCK_DIALOG_WARNING;
+      name = _("Warning");
       gicon = g_themed_icon_new_with_default_fallbacks ("dialog-warning-symbolic");
       break;
 
     case GTK_MESSAGE_ERROR:
-      stock_id = GTK_STOCK_DIALOG_ERROR;
+      name = _("Error");
       gicon = g_themed_icon_new_with_default_fallbacks ("dialog-error-symbolic");
       break;
 
@@ -403,13 +402,8 @@ setup_type (GtkMessageDialog *dialog,
   if (GTK_IS_ACCESSIBLE (atk_obj))
     {
       atk_object_set_role (atk_obj, ATK_ROLE_ALERT);
-      if (stock_id)
-        {
-          GtkStockItem item;
-
-          gtk_stock_lookup (stock_id, &item);
-          atk_object_set_name (atk_obj, item.label);
-        }
+      if (name)
+        atk_object_set_name (atk_obj, name);
     }
 }
 
@@ -681,7 +675,7 @@ gtk_message_dialog_set_image (GtkMessageDialog *dialog,
 
   if (image == NULL)
     {
-      image = gtk_image_new_from_stock (NULL, GTK_ICON_SIZE_DIALOG);
+      image = gtk_image_new_from_icon_name (NULL, GTK_ICON_SIZE_DIALOG);
       gtk_widget_set_halign (image, GTK_ALIGN_CENTER);
       gtk_widget_set_valign (image, GTK_ALIGN_START);
     }
@@ -886,28 +880,28 @@ gtk_message_dialog_add_buttons (GtkMessageDialog* message_dialog,
 
     case GTK_BUTTONS_OK:
       gtk_dialog_add_button (dialog,
-                             GTK_STOCK_OK,
+                             _("_OK"),
                              GTK_RESPONSE_OK);
       break;
 
     case GTK_BUTTONS_CLOSE:
       gtk_dialog_add_button (dialog,
-                             GTK_STOCK_CLOSE,
+                             _("_Close"),
                              GTK_RESPONSE_CLOSE);
       break;
 
     case GTK_BUTTONS_CANCEL:
       gtk_dialog_add_button (dialog,
-                             GTK_STOCK_CANCEL,
+                             _("_Cancel"),
                              GTK_RESPONSE_CANCEL);
       break;
 
     case GTK_BUTTONS_YES_NO:
       gtk_dialog_add_button (dialog,
-                             GTK_STOCK_NO,
+                             _("_No"),
                              GTK_RESPONSE_NO);
       gtk_dialog_add_button (dialog,
-                             GTK_STOCK_YES,
+                             _("_Yes"),
                              GTK_RESPONSE_YES);
       gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog),
 					       GTK_RESPONSE_YES,
@@ -917,10 +911,10 @@ gtk_message_dialog_add_buttons (GtkMessageDialog* message_dialog,
 
     case GTK_BUTTONS_OK_CANCEL:
       gtk_dialog_add_button (dialog,
-                             GTK_STOCK_CANCEL,
+                             _("_Cancel"),
                              GTK_RESPONSE_CANCEL);
       gtk_dialog_add_button (dialog,
-                             GTK_STOCK_OK,
+                             _("_OK"),
                              GTK_RESPONSE_OK);
       gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog),
 					       GTK_RESPONSE_OK,
diff --git a/gtk/gtkmountoperation.c b/gtk/gtkmountoperation.c
index ed9178ae07..d1b72a51aa 100644
--- a/gtk/gtkmountoperation.c
+++ b/gtk/gtkmountoperation.c
@@ -38,7 +38,6 @@
 #include "gtkmountoperation.h"
 #include "gtkprivate.h"
 #include "gtkradiobutton.h"
-#include "gtkstock.h"
 #include "gtkgrid.h"
 #include "gtkwindow.h"
 #include "gtktreeview.h"
@@ -528,10 +527,10 @@ gtk_mount_operation_ask_password_do_gtk (GtkMountOperation *operation,
 
   gtk_window_set_resizable (window, FALSE);
   gtk_window_set_title (window, "");
-  gtk_window_set_icon_name (window, GTK_STOCK_DIALOG_AUTHENTICATION);
+  gtk_window_set_icon_name (window, "dialog-password");
 
   gtk_dialog_add_buttons (dialog,
-                          GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+                          _("_Cancel"), GTK_RESPONSE_CANCEL,
                           _("Co_nnect"), GTK_RESPONSE_OK,
                           NULL);
   gtk_dialog_set_default_response (dialog, GTK_RESPONSE_OK);
@@ -546,8 +545,8 @@ gtk_mount_operation_ask_password_do_gtk (GtkMountOperation *operation,
   gtk_container_set_border_width (GTK_CONTAINER (hbox), 5);
   gtk_box_pack_start (GTK_BOX (content_area), hbox, TRUE, TRUE, 0);
 
-  icon = gtk_image_new_from_stock (GTK_STOCK_DIALOG_AUTHENTICATION,
-                                   GTK_ICON_SIZE_DIALOG);
+  icon = gtk_image_new_from_icon_name ("dialog-password",
+                                       GTK_ICON_SIZE_DIALOG);
 
   gtk_widget_set_halign (icon, GTK_ALIGN_CENTER);
   gtk_widget_set_valign (icon, GTK_ALIGN_START);
@@ -1297,9 +1296,7 @@ do_popup_menu_for_process_tree_view (GtkWidget         *widget,
 
   menu = gtk_menu_new ();
 
-  item = gtk_image_menu_item_new_with_mnemonic (_("_End Process"));
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item),
-                                 gtk_image_new_from_stock (GTK_STOCK_CLOSE, GTK_ICON_SIZE_MENU));
+  item = gtk_menu_item_new_with_mnemonic (_("_End Process"));
   g_signal_connect (item, "activate",
                     G_CALLBACK (on_end_process_activated),
                     op);
diff --git a/gtk/gtkpagesetupunixdialog.ui b/gtk/gtkpagesetupunixdialog.ui
index 65bc44a600..08f3bf9320 100644
--- a/gtk/gtkpagesetupunixdialog.ui
+++ b/gtk/gtkpagesetupunixdialog.ui
@@ -39,11 +39,10 @@
             <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="cancel_button">
-                <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">True</property>
-                <property name="use_stock">True</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -53,13 +52,12 @@
             </child>
             <child>
               <object class="GtkButton" id="apply_button">
-                <property name="label">gtk-apply</property>
+                <property name="label" translatable="yes">_Apply</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
                 <property name="has_default">True</property>
                 <property name="receives_default">True</property>
-                <property name="use_stock">True</property>
               </object>
               <packing>
                 <property name="expand">False</property>
diff --git a/gtk/gtkplacessidebar.c b/gtk/gtkplacessidebar.c
index 63f7afe704..3ca4879c38 100644
--- a/gtk/gtkplacessidebar.c
+++ b/gtk/gtkplacessidebar.c
@@ -66,7 +66,6 @@
 #include "gtkscrolledwindow.h"
 #include "gtkseparatormenuitem.h"
 #include "gtksettings.h"
-#include "gtkstock.h"
 #include "gtktrashmonitor.h"
 #include "gtktreeselection.h"
 #include "gtktreednd.h"
@@ -3111,9 +3110,7 @@ bookmarks_build_popup_menu (GtkPlacesSidebar *sidebar)
 				   GTK_WIDGET (sidebar),
 				   bookmarks_popup_menu_detach_cb);
 
-	item = gtk_image_menu_item_new_with_mnemonic (_("_Open"));
-	gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item),
-				       gtk_image_new_from_stock (GTK_STOCK_OPEN, GTK_ICON_SIZE_MENU));
+	item = gtk_menu_item_new_with_mnemonic (_("_Open"));
 	g_signal_connect (item, "activate",
 			  G_CALLBACK (open_shortcut_cb), sidebar);
 	gtk_widget_show (item);
@@ -3143,10 +3140,8 @@ bookmarks_build_popup_menu (GtkPlacesSidebar *sidebar)
 			  G_CALLBACK (add_shortcut_cb), sidebar);
 	gtk_menu_shell_append (GTK_MENU_SHELL (sidebar->popup_menu), item);
 
-	item = gtk_image_menu_item_new_with_label (_("Remove"));
+	item = gtk_menu_item_new_with_label (_("Remove"));
 	menu_data.remove_item = item;
-	gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item),
-				       gtk_image_new_from_stock (GTK_STOCK_REMOVE, GTK_ICON_SIZE_MENU));
 	g_signal_connect (item, "activate",
 			  G_CALLBACK (remove_shortcut_cb), sidebar);
 	gtk_widget_show (item);
diff --git a/gtk/gtkprintbackend.c b/gtk/gtkprintbackend.c
index 93dcb7aa31..dcfe9a7204 100644
--- a/gtk/gtkprintbackend.c
+++ b/gtk/gtkprintbackend.c
@@ -748,8 +748,8 @@ request_password (GtkPrintBackend  *backend,
   priv->auth_info = g_new0 (gchar *, length);
 
   dialog = gtk_dialog_new_with_buttons ( _("Authentication"), NULL, GTK_DIALOG_MODAL, 
-                                         GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-                                         GTK_STOCK_OK, GTK_RESPONSE_OK,
+                                         _("_Cancel"), GTK_RESPONSE_CANCEL,
+                                         _("_OK"), GTK_RESPONSE_OK,
                                          NULL);
 
   gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
@@ -757,7 +757,7 @@ request_password (GtkPrintBackend  *backend,
   main_box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
 
   /* Left */
-  icon = gtk_image_new_from_stock (GTK_STOCK_DIALOG_AUTHENTICATION, GTK_ICON_SIZE_DIALOG);
+  icon = gtk_image_new_from_icon_name ("dialog-password-symbolic", GTK_ICON_SIZE_DIALOG);
   gtk_widget_set_halign (icon, GTK_ALIGN_CENTER);
   gtk_widget_set_valign (icon, GTK_ALIGN_START);
   g_object_set (icon, "margin", 6, NULL);
diff --git a/gtk/gtkprinteroptionwidget.c b/gtk/gtkprinteroptionwidget.c
index 36b8c9d0a3..f538607123 100644
--- a/gtk/gtkprinteroptionwidget.c
+++ b/gtk/gtkprinteroptionwidget.c
@@ -31,7 +31,6 @@
 #include "gtklabel.h"
 #include "gtkliststore.h"
 #include "gtkradiobutton.h"
-#include "gtkstock.h"
 #include "gtkgrid.h"
 #include "gtktogglebutton.h"
 #include "gtkorientable.h"
@@ -548,7 +547,7 @@ filesave_choose_cb (GtkWidget              *button,
   dialog = gtk_file_chooser_dialog_new (_("Select a filename"),
                                         toplevel,
                                         GTK_FILE_CHOOSER_ACTION_SAVE,
-                                        GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+                                        _("_Cancel"), GTK_RESPONSE_CANCEL,
                                         _("_Select"), GTK_RESPONSE_ACCEPT,
                                         NULL);
 
@@ -893,7 +892,7 @@ construct_widgets (GtkPrinterOptionWidget *widget)
       break;
     }
 
-  priv->image = gtk_image_new_from_stock (GTK_STOCK_DIALOG_WARNING, GTK_ICON_SIZE_MENU);
+  priv->image = gtk_image_new_from_icon_name ("dialog-warning", GTK_ICON_SIZE_MENU);
   gtk_box_pack_start (GTK_BOX (widget), priv->image, FALSE, FALSE, 0);
 }
 
diff --git a/gtk/gtkprintunixdialog.c b/gtk/gtkprintunixdialog.c
index 6f305791f2..c642777df0 100644
--- a/gtk/gtkprintunixdialog.c
+++ b/gtk/gtkprintunixdialog.c
@@ -36,7 +36,6 @@
 #include "gtkspinbutton.h"
 #include "gtkcellrendererpixbuf.h"
 #include "gtkcellrenderertext.h"
-#include "gtkstock.h"
 #include "gtkiconfactory.h"
 #include "gtkimage.h"
 #include "gtktreeselection.h"
@@ -610,17 +609,12 @@ set_busy_cursor (GtkPrintUnixDialog *dialog,
 static void
 add_custom_button_to_dialog (GtkDialog   *dialog,
                              const gchar *mnemonic_label,
-                             const gchar *stock_id,
                              gint         response_id)
 {
   GtkWidget *button = NULL;
 
   button = gtk_button_new_with_mnemonic (mnemonic_label);
   gtk_widget_set_can_default (button, TRUE);
-  gtk_button_set_image (GTK_BUTTON (button),
-                        gtk_image_new_from_stock (stock_id,
-                                                  GTK_ICON_SIZE_BUTTON));
-  gtk_widget_show (button);
 
   gtk_dialog_add_action_widget (GTK_DIALOG (dialog), button, response_id);
 }
@@ -689,10 +683,9 @@ error_dialogs (GtkPrintUnixDialog *print_dialog,
                                                                 dirname);
 
                       gtk_dialog_add_button (GTK_DIALOG (dialog),
-                                             GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
+                                             _("_Cancel"), GTK_RESPONSE_CANCEL);
                       add_custom_button_to_dialog (GTK_DIALOG (dialog),
                                                    _("_Replace"),
-                                                   GTK_STOCK_PRINT,
                                                    GTK_RESPONSE_ACCEPT);
                       gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog),
                                                                GTK_RESPONSE_ACCEPT,
diff --git a/gtk/gtkprintunixdialog.ui b/gtk/gtkprintunixdialog.ui
index 532a090dd5..16175780d3 100644
--- a/gtk/gtkprintunixdialog.ui
+++ b/gtk/gtkprintunixdialog.ui
@@ -64,11 +64,10 @@
             <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="preview_button">
-                <property name="label">gtk-print-preview</property>
+                <property name="label" translatable="yes">Pre_view</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="use_stock">True</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -78,11 +77,10 @@
             </child>
             <child>
               <object class="GtkButton" id="cancel_button">
-                <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">True</property>
-                <property name="use_stock">True</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -92,14 +90,13 @@
             </child>
             <child>
               <object class="GtkButton" id="print_button">
-                <property name="label">gtk-print</property>
+                <property name="label" translatable="yes">_Print</property>
                 <property name="visible">True</property>
                 <property name="sensitive">False</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
                 <property name="has_default">True</property>
                 <property name="receives_default">True</property>
-                <property name="use_stock">True</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -1686,7 +1683,7 @@
                   <object class="GtkImage" id="image1">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="stock">gtk-dialog-warning</property>
+                    <property name="icon_name">dialog-warning</property>
                     <property name="icon_size">1</property>
                   </object>
                   <packing>
diff --git a/gtk/gtkrecentchooserdefault.c b/gtk/gtkrecentchooserdefault.c
index f32ca1e32d..181ceec11b 100644
--- a/gtk/gtkrecentchooserdefault.c
+++ b/gtk/gtkrecentchooserdefault.c
@@ -27,7 +27,6 @@
 #include <unistd.h>
 #endif
 
-#include "gtkstock.h"
 #include "gtkicontheme.h"
 #include "gtkiconfactory.h"
 #include "gtksettings.h"
@@ -1694,10 +1693,8 @@ recent_view_menu_build (GtkRecentChooserDefault *impl)
   			     impl->priv->recent_view,
   			     recent_popup_menu_detach_cb);
   
-  item = gtk_image_menu_item_new_with_mnemonic (_("Copy _Location"));
+  item = gtk_menu_item_new_with_mnemonic (_("Copy _Location"));
   impl->priv->recent_popup_menu_copy_item = item;
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item),
-		  		 gtk_image_new_from_stock (GTK_STOCK_COPY, GTK_ICON_SIZE_MENU));
   g_signal_connect (item, "activate",
 		    G_CALLBACK (copy_activated_cb), impl);
   gtk_widget_show (item);
@@ -1707,19 +1704,15 @@ recent_view_menu_build (GtkRecentChooserDefault *impl)
   gtk_widget_show (item);
   gtk_menu_shell_append (GTK_MENU_SHELL (impl->priv->recent_popup_menu), item);
   
-  item = gtk_image_menu_item_new_with_mnemonic (_("_Remove From List"));
+  item = gtk_menu_item_new_with_mnemonic (_("_Remove From List"));
   impl->priv->recent_popup_menu_remove_item = item;
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item),
-  				 gtk_image_new_from_stock (GTK_STOCK_REMOVE, GTK_ICON_SIZE_MENU));
   g_signal_connect (item, "activate",
   		    G_CALLBACK (remove_item_activated_cb), impl);
   gtk_widget_show (item);
   gtk_menu_shell_append (GTK_MENU_SHELL (impl->priv->recent_popup_menu), item);
 
-  item = gtk_image_menu_item_new_with_mnemonic (_("_Clear List"));
+  item = gtk_menu_item_new_with_mnemonic (_("_Clear List"));
   impl->priv->recent_popup_menu_clear_item = item;
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item),
-  				 gtk_image_new_from_stock (GTK_STOCK_CLEAR, GTK_ICON_SIZE_MENU));
   g_signal_connect (item, "activate",
 		    G_CALLBACK (remove_all_activated_cb), impl);
   
diff --git a/gtk/gtkrecentchooserdialog.c b/gtk/gtkrecentchooserdialog.c
index 657176f6ec..e6b7db684a 100644
--- a/gtk/gtkrecentchooserdialog.c
+++ b/gtk/gtkrecentchooserdialog.c
@@ -51,8 +51,8 @@
  *
  * dialog = gtk_recent_chooser_dialog_new ("Recent Documents",
  *                                         parent_window,
- *                                         GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- *                                         GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
+ *                                         _("_Cancel"), GTK_RESPONSE_CANCEL,
+ *                                         _("_Open"), GTK_RESPONSE_ACCEPT,
  *                                         NULL);
  *
  * if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT)
diff --git a/gtk/gtkscalebutton.c b/gtk/gtkscalebutton.c
index 945e8ef596..2a5c3d69bf 100644
--- a/gtk/gtkscalebutton.c
+++ b/gtk/gtkscalebutton.c
@@ -50,7 +50,6 @@
 #include "gtkorientable.h"
 #include "gtkprivate.h"
 #include "gtkscale.h"
-#include "gtkstock.h"
 #include "gtkbox.h"
 #include "gtkwindow.h"
 #include "gtktypebuiltins.h"
@@ -1494,9 +1493,9 @@ gtk_scale_button_update_icon (GtkScaleButton *button)
 
   if (!priv->icon_list || priv->icon_list[0] == '\0')
     {
-      gtk_image_set_from_stock (GTK_IMAGE (priv->image),
-                                GTK_STOCK_MISSING_IMAGE,
-                                priv->size);
+      gtk_image_set_from_icon_name (GTK_IMAGE (priv->image),
+                                    "image-missing",
+                                    priv->size);
       return;
     }
 
diff --git a/gtk/gtktextview.c b/gtk/gtktextview.c
index f317681deb..cec9c63686 100644
--- a/gtk/gtktextview.c
+++ b/gtk/gtktextview.c
@@ -39,7 +39,6 @@
 #include "gtkseparatormenuitem.h"
 #include "gtksettings.h"
 #include "gtkselectionprivate.h"
-#include "gtkstock.h"
 #include "gtktextbufferrichtext.h"
 #include "gtktextdisplay.h"
 #include "gtktextview.h"
@@ -8417,11 +8416,11 @@ activate_cb (GtkWidget   *menuitem,
 static void
 append_action_signal (GtkTextView  *text_view,
 		      GtkWidget    *menu,
-		      const gchar  *stock_id,
+		      const gchar  *label,
 		      const gchar  *signal,
                       gboolean      sensitive)
 {
-  GtkWidget *menuitem = gtk_image_menu_item_new_from_stock (stock_id, NULL);
+  GtkWidget *menuitem = gtk_menu_item_new_with_mnemonic (label);
 
   g_object_set_data (G_OBJECT (menuitem), I_("gtk-signal"), (char *)signal);
   g_signal_connect (menuitem, "activate",
@@ -8625,16 +8624,16 @@ popup_targets_received (GtkClipboard     *clipboard,
 
       can_insert = gtk_text_iter_can_insert (&iter, priv->editable);
 
-      append_action_signal (text_view, priv->popup_menu, GTK_STOCK_CUT, "cut-clipboard",
+      append_action_signal (text_view, priv->popup_menu, _("Cu_t"), "cut-clipboard",
 			    have_selection &&
                             range_contains_editable_text (&sel_start, &sel_end,
                                                           priv->editable));
-      append_action_signal (text_view, priv->popup_menu, GTK_STOCK_COPY, "copy-clipboard",
+      append_action_signal (text_view, priv->popup_menu, _("_Copy"), "copy-clipboard",
 			    have_selection);
-      append_action_signal (text_view, priv->popup_menu, GTK_STOCK_PASTE, "paste-clipboard",
+      append_action_signal (text_view, priv->popup_menu, _("_Paste"), "paste-clipboard",
 			    can_insert && clipboard_contains_text);
 
-      menuitem = gtk_image_menu_item_new_from_stock (GTK_STOCK_DELETE, NULL);
+      menuitem = gtk_menu_item_new_with_mnemonic (_("_Delete"));
       gtk_widget_set_sensitive (menuitem,
 				have_selection &&
 				range_contains_editable_text (&sel_start, &sel_end,
@@ -8648,7 +8647,7 @@ popup_targets_received (GtkClipboard     *clipboard,
       gtk_widget_show (menuitem);
       gtk_menu_shell_append (GTK_MENU_SHELL (priv->popup_menu), menuitem);
 
-      menuitem = gtk_image_menu_item_new_from_stock (GTK_STOCK_SELECT_ALL, NULL);
+      menuitem = gtk_menu_item_new_with_mnemonic (_("Select _All"));
       gtk_widget_set_sensitive (menuitem,
                                 gtk_text_buffer_get_char_count (priv->buffer) > 0);
       g_signal_connect (menuitem, "activate",
@@ -8756,11 +8755,11 @@ activate_bubble_cb (GtkWidget   *item,
 static void
 append_bubble_action (GtkTextView  *text_view,
                       GtkWidget    *toolbar,
-                      const gchar  *stock_id,
+                      const gchar  *label,
                       const gchar  *signal,
                       gboolean      sensitive)
 {
-  GtkToolItem *item = gtk_tool_button_new_from_stock (stock_id);
+  GtkToolItem *item = gtk_tool_button_new (NULL, label);
   g_object_set_data (G_OBJECT (item), I_("gtk-signal"), (char *)signal);
   g_signal_connect (item, "clicked", G_CALLBACK (activate_bubble_cb), text_view);
   gtk_widget_set_sensitive (GTK_WIDGET (item), sensitive);
@@ -8808,13 +8807,13 @@ bubble_targets_received (GtkClipboard     *clipboard,
   can_insert = gtk_text_iter_can_insert (&iter, priv->editable);
   has_clipboard = gtk_selection_data_targets_include_text (data);
 
-  append_bubble_action (text_view, toolbar, GTK_STOCK_CUT, "cut-clipboard",
+  append_bubble_action (text_view, toolbar, _("Cu_t"), "cut-clipboard",
                         has_selection &&
                         range_contains_editable_text (&sel_start, &sel_end,
                                                       priv->editable));
-  append_bubble_action (text_view, toolbar, GTK_STOCK_COPY, "copy-clipboard",
+  append_bubble_action (text_view, toolbar, _("_Copy"), "copy-clipboard",
                         has_selection);
-  append_bubble_action (text_view, toolbar, GTK_STOCK_PASTE, "paste-clipboard",
+  append_bubble_action (text_view, toolbar, _("_Paste"), "paste-clipboard",
                         can_insert && has_clipboard);
 
   if (priv->populate_all)
diff --git a/gtk/gtktoolpalette.c b/gtk/gtktoolpalette.c
index a5790531ef..7d29f81b0a 100644
--- a/gtk/gtktoolpalette.c
+++ b/gtk/gtktoolpalette.c
@@ -61,7 +61,8 @@
  * group = gtk_tool_item_group_new (_("Test Category"));
  * gtk_container_add (GTK_CONTAINER (palette), group);
  *
- * item = gtk_tool_button_new_from_stock (GTK_STOCK_OK);
+ * item = gtk_tool_button_new_new (NULL, _("_Open"));
+ * gtk_tool_button_set_icon_name (GTK_TOOL_BUTTON (item), "document-open");
  * gtk_tool_item_group_insert (GTK_TOOL_ITEM_GROUP (group), item, -1);
  * ]|
  *