[gimp] Deprecate stock items for good and change all icon defines to GIMP_ICON_*



commit dda54c1df8e55f05126473037d267bb2e54b2b54
Author: Michael Natterer <mitch gimp org>
Date:   Sun Mar 5 16:01:59 2017 +0100

    Deprecate stock items for good and change all icon defines to GIMP_ICON_*
    
    Try to sort all GIMP_ICON_* defines into FDO categories like in
    https://specifications.freedesktop.org/icon-naming-spec/latest/ar01s04.html
    
    Add defines for all icons we override, rename some icons to their FDO
    standard names, and mark the ones we duplicate with a comment so we
    don't forget to rename those to standard names in 3.0.

 app/actions/actions.c                              |   68 +-
 app/actions/brush-editor-actions.c                 |    4 +-
 app/actions/brushes-actions.c                      |   16 +-
 app/actions/buffers-actions.c                      |   12 +-
 app/actions/channels-actions.c                     |   40 +-
 app/actions/channels-commands.c                    |    4 +-
 app/actions/colormap-actions.c                     |   16 +-
 app/actions/colormap-commands.c                    |    2 +-
 app/actions/context-actions.c                      |  500 +++---
 app/actions/cursor-info-actions.c                  |    2 +-
 app/actions/dialogs-actions.c                      |   72 +-
 app/actions/dock-actions.c                         |   10 +-
 app/actions/dockable-actions.c                     |    2 +-
 app/actions/documents-actions.c                    |   10 +-
 app/actions/drawable-actions.c                     |   28 +-
 app/actions/dynamics-actions.c                     |   14 +-
 app/actions/dynamics-editor-actions.c              |    4 +-
 app/actions/edit-actions.c                         |   40 +-
 app/actions/edit-commands.c                        |    3 +-
 app/actions/error-console-actions.c                |    8 +-
 app/actions/file-actions.c                         |   14 +-
 app/actions/file-commands.c                        |    2 +-
 app/actions/filters-actions.c                      |  200 ++--
 app/actions/fonts-actions.c                        |    4 +-
 app/actions/gradient-editor-actions.c              |   24 +-
 app/actions/gradient-editor-commands.c             |    8 +-
 app/actions/gradients-actions.c                    |   16 +-
 app/actions/image-actions.c                        |   32 +-
 app/actions/images-actions.c                       |    8 +-
 app/actions/layers-actions.c                       |  116 +-
 app/actions/layers-commands.c                      |    4 +-
 app/actions/mypaint-brushes-actions.c              |   12 +-
 app/actions/palette-editor-actions.c               |   18 +-
 app/actions/palette-editor-commands.c              |    2 +-
 app/actions/palettes-actions.c                     |   14 +-
 app/actions/patterns-actions.c                     |   16 +-
 app/actions/plug-in-actions.c                      |    2 +-
 app/actions/plug-in-commands.c                     |    2 +-
 app/actions/quick-mask-actions.c                   |    2 +-
 app/actions/quick-mask-commands.c                  |    2 +-
 app/actions/sample-points-actions.c                |    2 +-
 app/actions/select-actions.c                       |   26 +-
 app/actions/select-commands.c                      |    4 +-
 app/actions/templates-actions.c                    |   12 +-
 app/actions/templates-commands.c                   |    4 +-
 app/actions/text-editor-actions.c                  |   10 +-
 app/actions/text-tool-actions.c                    |   20 +-
 app/actions/tool-options-actions.c                 |   16 +-
 app/actions/tool-options-commands.c                |    2 +-
 app/actions/tool-preset-editor-actions.c           |    8 +-
 app/actions/tool-presets-actions.c                 |   18 +-
 app/actions/tools-actions.c                        |  216 ++--
 app/actions/vectors-actions.c                      |   66 +-
 app/actions/vectors-commands.c                     |    8 +-
 app/actions/view-actions.c                         |   62 +-
 app/actions/view-commands.c                        |    2 +-
 app/actions/window-actions.c                       |    2 +-
 app/actions/window-commands.c                      |    2 +-
 app/actions/windows-actions.c                      |   10 +-
 app/dialogs/channel-options-dialog.c               |    2 +-
 app/dialogs/color-profile-dialog.c                 |    6 +-
 app/dialogs/convert-indexed-dialog.c               |    2 +-
 app/dialogs/dialogs.c                              |   60 +-
 app/dialogs/file-open-location-dialog.c            |    2 +-
 app/dialogs/file-save-dialog.c                     |    4 +-
 app/dialogs/grid-dialog.c                          |    2 +-
 app/dialogs/image-merge-layers-dialog.c            |    2 +-
 app/dialogs/image-new-dialog.c                     |    2 +-
 app/dialogs/image-scale-dialog.c                   |    2 +-
 app/dialogs/item-options-dialog.c                  |    8 +-
 app/dialogs/layer-add-mask-dialog.c                |    2 +-
 app/dialogs/layer-options-dialog.c                 |    6 +-
 app/dialogs/module-dialog.c                        |    3 +-
 app/dialogs/offset-dialog.c                        |    2 +-
 app/dialogs/preferences-dialog.c                   |   50 +-
 app/dialogs/print-size-dialog.c                    |    2 +-
 app/dialogs/quit-dialog.c                          |    2 +-
 app/dialogs/resize-dialog.c                        |    4 +-
 app/dialogs/scale-dialog.c                         |    4 +-
 app/dialogs/tips-dialog.c                          |    7 +-
 app/dialogs/user-install-dialog.c                  |    2 +-
 app/dialogs/vectors-options-dialog.c               |    2 +-
 app/display/gimpdisplayshell-close.c               |    2 +-
 app/display/gimpdisplayshell-filter-dialog.c       |    2 +-
 app/display/gimpdisplayshell-handlers.c            |   10 +-
 app/display/gimpdisplayshell-rotate-dialog.c       |    2 +-
 app/display/gimpdisplayshell.c                     |    8 +-
 app/display/gimpimagewindow.c                      |    2 +-
 app/display/gimpnavigationeditor.c                 |    2 +-
 app/gui/gui.c                                      |    2 +-
 app/tools/gimpairbrushtool.c                       |    2 +-
 app/tools/gimpalignoptions.c                       |   28 +-
 app/tools/gimpaligntool.c                          |    2 +-
 app/tools/gimpblendtool.c                          |    4 +-
 app/tools/gimpbrightnesscontrasttool.c             |    4 +-
 app/tools/gimpbucketfilltool.c                     |    2 +-
 app/tools/gimpbycolorselecttool.c                  |    2 +-
 app/tools/gimpcagetool.c                           |    4 +-
 app/tools/gimpclonetool.c                          |    2 +-
 app/tools/gimpcolorbalancetool.c                   |    2 +-
 app/tools/gimpcolorizetool.c                       |    4 +-
 app/tools/gimpcolorpickertool.c                    |    2 +-
 app/tools/gimpconvolvetool.c                       |    2 +-
 app/tools/gimpcroptool.c                           |    2 +-
 app/tools/gimpcurvestool.c                         |    2 +-
 app/tools/gimpdodgeburntool.c                      |    2 +-
 app/tools/gimpellipseselecttool.c                  |    2 +-
 app/tools/gimperasertool.c                         |    2 +-
 app/tools/gimpfliptool.c                           |    2 +-
 app/tools/gimpforegroundselectoptions.c            |    4 +-
 app/tools/gimpforegroundselecttool.c               |    2 +-
 app/tools/gimpfreeselecttool.c                     |    2 +-
 app/tools/gimpfuzzyselecttool.c                    |    2 +-
 app/tools/gimpgegltool.c                           |    6 +-
 app/tools/gimphealtool.c                           |    2 +-
 app/tools/gimphuesaturationtool.c                  |    2 +-
 app/tools/gimpinktool.c                            |    2 +-
 app/tools/gimpiscissorstool.c                      |    2 +-
 app/tools/gimplevelstool.c                         |   10 +-
 app/tools/gimpmagnifytool.c                        |    2 +-
 app/tools/gimpmeasuretool.c                        |    2 +-
 app/tools/gimpmovetool.c                           |    2 +-
 app/tools/gimpoperationtool.c                      |    2 +-
 app/tools/gimppaintbrushtool.c                     |    2 +-
 app/tools/gimppaintoptions-gui.c                   |    6 +-
 app/tools/gimppenciltool.c                         |    2 +-
 app/tools/gimpperspectiveclonetool.c               |    2 +-
 app/tools/gimpperspectivetool.c                    |    2 +-
 app/tools/gimprectangleselecttool.c                |    2 +-
 app/tools/gimprotatetool.c                         |    2 +-
 app/tools/gimpscaletool.c                          |    2 +-
 app/tools/gimpsheartool.c                          |    2 +-
 app/tools/gimpsmudgetool.c                         |    2 +-
 app/tools/gimptextoptions.c                        |   11 +-
 app/tools/gimptexttool.c                           |    4 +-
 app/tools/gimpthresholdtool.c                      |    2 +-
 app/tools/gimpvectortool.c                         |    4 +-
 app/widgets/gimpactionview.c                       |    2 +-
 app/widgets/gimpcolordisplayeditor.c               |   12 +-
 app/widgets/gimpcolorselectorpalette.c             |    2 +-
 app/widgets/gimpcombotagentry.c                    |    4 +-
 app/widgets/gimpcomponenteditor.c                  |    4 +-
 app/widgets/gimpcontrollereditor.c                 |    6 +-
 app/widgets/gimpcontrollerinfo.c                   |    2 +-
 app/widgets/gimpcontrollerkeyboard.c               |    2 +-
 app/widgets/gimpcontrollerlist.c                   |   12 +-
 app/widgets/gimpcontrollermouse.c                  |    2 +-
 app/widgets/gimpcontrollerwheel.c                  |    2 +-
 app/widgets/gimpdeviceeditor.c                     |    2 +-
 app/widgets/gimpdeviceinfo.c                       |   10 +-
 app/widgets/gimpdevicestatus.c                     |    2 +-
 app/widgets/gimpdnd-xds.c                          |    3 +-
 app/widgets/gimpdockbook.c                         |    6 +-
 app/widgets/gimpdrawabletreeview.c                 |    4 +-
 app/widgets/gimperrordialog.c                      |    2 +-
 app/widgets/gimpfgbgeditor.c                       |    4 +-
 app/widgets/gimphelp.c                             |    4 +-
 app/widgets/gimpitemtreeview.c                     |    8 +-
 app/widgets/gimplayertreeview.c                    |    2 +-
 app/widgets/gimpoverlaydialog.c                    |    4 +-
 app/widgets/gimpprefsbox.c                         |    2 +-
 app/widgets/gimppropgui-constructors.c             |   10 +-
 app/widgets/gimppropgui.c                          |    6 +-
 app/widgets/gimpselectioneditor.c                  |    2 +-
 app/widgets/gimpsettingsbox.c                      |   12 +-
 app/widgets/gimpsettingseditor.c                   |    6 +-
 app/widgets/gimptextstyleeditor.c                  |    8 +-
 app/widgets/gimptooleditor.c                       |   10 +-
 app/widgets/gimptooloptionseditor.c                |    9 +-
 app/widgets/gimpvectorstreeview.c                  |    4 +-
 app/widgets/gimpviewablebox.c                      |   18 +-
 app/widgets/gimpviewrenderer-frame.c               |    2 +-
 app/widgets/gimpviewrendererimage.c                |   12 +-
 app/widgets/gimpviewrendererlayer.c                |    2 +-
 app/widgets/gimpwidgets-utils.c                    |   10 +-
 ...ustify-center.png => format-justify-center.png} |  Bin 224 -> 224 bytes
 ...tk-justify-fill.png => format-justify-fill.png} |  Bin 208 -> 208 bytes
 ...tk-justify-left.png => format-justify-left.png} |  Bin 218 -> 218 bytes
 ...-justify-right.png => format-justify-right.png} |  Bin 165 -> 165 bytes
 ...ustify-center.png => format-justify-center.png} |  Bin 327 -> 327 bytes
 ...tk-justify-fill.png => format-justify-fill.png} |  Bin 245 -> 245 bytes
 ...tk-justify-left.png => format-justify-left.png} |  Bin 295 -> 295 bytes
 ...-justify-right.png => format-justify-right.png} |  Bin 298 -> 298 bytes
 icons/icon-list.mk                                 | 1869 ++++++++++----------
 libgimp/gimpfontselectbutton.c                     |    3 +-
 libgimp/gimppaletteselectbutton.c                  |    3 +-
 libgimpwidgets/gimpchainbutton.c                   |    8 +-
 libgimpwidgets/gimpcolordisplay.c                  |    2 +-
 libgimpwidgets/gimpcolorscales.c                   |    2 +-
 libgimpwidgets/gimpcolorselect.c                   |    2 +-
 libgimpwidgets/gimpcolorselector.c                 |    3 +-
 libgimpwidgets/gimpcontroller.c                    |    2 +-
 libgimpwidgets/gimphintbox.c                       |    4 +-
 libgimpwidgets/gimpicons.c                         |    1 +
 libgimpwidgets/gimpicons.h                         |  371 ++++-
 libgimpwidgets/gimppageselector.c                  |    2 +-
 libgimpwidgets/gimppatheditor.c                    |   12 +-
 libgimpwidgets/gimppickbutton.c                    |    2 +-
 libgimpwidgets/gimpscrolledpreview.c               |    2 +-
 libgimpwidgets/gimpwidgets-private.c               |    2 +-
 modules/color-selector-cmyk.c                      |    2 +-
 modules/color-selector-water.c                     |    2 +-
 modules/color-selector-wheel.c                     |    2 +-
 modules/controller-dx-dinput.c                     |    2 +-
 modules/controller-linux-input.c                   |    2 +-
 modules/controller-midi.c                          |    2 +-
 modules/display-filter-color-blind.c               |    2 +-
 modules/display-filter-gamma.c                     |    2 +-
 modules/display-filter-high-contrast.c             |    2 +-
 modules/display-filter-lcms.c                      |    2 +-
 modules/display-filter-proof.c                     |    2 +-
 plug-ins/common/animation-play.c                   |    4 +-
 plug-ins/common/cml-explorer.c                     |    4 +-
 plug-ins/common/colormap-remap.c                   |    4 +-
 plug-ins/common/compose.c                          |   14 +-
 plug-ins/common/curve-bend.c                       |    6 +-
 plug-ins/common/file-gbr.c                         |    4 +-
 plug-ins/common/file-gih.c                         |    4 +-
 plug-ins/common/file-html-table.c                  |    2 +-
 plug-ins/common/file-pat.c                         |    4 +-
 plug-ins/common/file-pdf-save.c                    |    7 +-
 plug-ins/common/file-png.c                         |    2 +-
 plug-ins/common/film.c                             |    6 +-
 plug-ins/common/mail.c                             |    2 +-
 plug-ins/common/plugin-browser.c                   |    2 +-
 plug-ins/common/qbist.c                            |    6 +-
 plug-ins/common/sample-colorize.c                  |   12 +-
 plug-ins/common/sphere-designer.c                  |   10 +-
 plug-ins/common/tile-small.c                       |    4 +-
 plug-ins/common/unit-editor.c                      |    6 +-
 plug-ins/common/web-page.c                         |    3 +-
 plug-ins/file-ico/ico-dialog.c                     |    2 +-
 plug-ins/flame/flame.c                             |   12 +-
 .../fractal-explorer/fractal-explorer-dialogs.c    |   14 +-
 plug-ins/fractal-explorer/fractal-explorer.c       |   10 +-
 plug-ins/gfig/gfig-dialog.c                        |   48 +-
 plug-ins/gimpressionist/brush.c                    |    2 +-
 plug-ins/gimpressionist/orientation.c              |    2 +-
 plug-ins/gimpressionist/presets.c                  |    8 +-
 plug-ins/gimpressionist/preview.c                  |    2 +-
 plug-ins/gimpressionist/size.c                     |    2 +-
 plug-ins/gradient-flare/gradient-flare.c           |   14 +-
 plug-ins/help-browser/dialog.c                     |   46 +-
 plug-ins/ifs-compose/ifs-compose.c                 |   32 +-
 plug-ins/imagemap/imap_browse.c                    |    3 +-
 plug-ins/imagemap/imap_edit_area_info.c            |    2 +-
 plug-ins/imagemap/imap_menu.c                      |   68 +-
 plug-ins/lighting/lighting-ui.c                    |    4 +-
 plug-ins/pagecurl/pagecurl.c                       |   18 +-
 plug-ins/print/print.c                             |    4 +-
 plug-ins/script-fu/script-fu-server.c              |    2 +-
 251 files changed, 2748 insertions(+), 2389 deletions(-)
---
diff --git a/app/actions/actions.c b/app/actions/actions.c
index 51075d0..9144eb7 100644
--- a/app/actions/actions.c
+++ b/app/actions/actions.c
@@ -107,22 +107,22 @@ GimpActionFactory *global_action_factory = NULL;
 
 static const GimpActionFactoryEntry action_groups[] =
 {
-  { "brush-editor", N_("Brush Editor"), GIMP_STOCK_BRUSH,
+  { "brush-editor", N_("Brush Editor"), GIMP_ICON_BRUSH,
     brush_editor_actions_setup,
     brush_editor_actions_update },
-  { "brushes", N_("Brushes"), GIMP_STOCK_BRUSH,
+  { "brushes", N_("Brushes"), GIMP_ICON_BRUSH,
     brushes_actions_setup,
     brushes_actions_update },
-  { "buffers", N_("Buffers"), GIMP_STOCK_BUFFER,
+  { "buffers", N_("Buffers"), GIMP_ICON_BUFFER,
     buffers_actions_setup,
     buffers_actions_update },
-  { "channels", N_("Channels"), GIMP_STOCK_CHANNEL,
+  { "channels", N_("Channels"), GIMP_ICON_CHANNEL,
     channels_actions_setup,
     channels_actions_update },
-  { "colormap", N_("Colormap"), GIMP_STOCK_COLORMAP,
+  { "colormap", N_("Colormap"), GIMP_ICON_COLORMAP,
     colormap_actions_setup,
     colormap_actions_update },
-  { "context", N_("Context"), GIMP_STOCK_TOOL_OPTIONS /* well... */,
+  { "context", N_("Context"), GIMP_ICON_DIALOG_TOOL_OPTIONS /* well... */,
     context_actions_setup,
     context_actions_update },
   { "cursor-info", N_("Pointer Information"), NULL,
@@ -143,97 +143,97 @@ static const GimpActionFactoryEntry action_groups[] =
   { "documents", N_("Document History"), NULL,
     documents_actions_setup,
     documents_actions_update },
-  { "drawable", N_("Drawable"), GIMP_STOCK_LAYER,
+  { "drawable", N_("Drawable"), GIMP_ICON_LAYER,
     drawable_actions_setup,
     drawable_actions_update },
-  { "dynamics", N_("Paint Dynamics"), GIMP_STOCK_DYNAMICS,
+  { "dynamics", N_("Paint Dynamics"), GIMP_ICON_DYNAMICS,
     dynamics_actions_setup,
     dynamics_actions_update },
-  { "dynamics-editor", N_("Paint Dynamics Editor"), GIMP_STOCK_DYNAMICS,
+  { "dynamics-editor", N_("Paint Dynamics Editor"), GIMP_ICON_DYNAMICS,
     dynamics_editor_actions_setup,
     dynamics_editor_actions_update },
-  { "edit", N_("Edit"), "gtk-edit",
+  { "edit", N_("Edit"), GIMP_ICON_EDIT,
     edit_actions_setup,
     edit_actions_update },
-  { "error-console", N_("Error Console"), GIMP_STOCK_WARNING,
+  { "error-console", N_("Error Console"), GIMP_ICON_DIALOG_WARNING,
     error_console_actions_setup,
     error_console_actions_update },
   { "file", N_("File"), "text-x-generic",
     file_actions_setup,
     file_actions_update },
-  { "filters", N_("Filters"), GIMP_STOCK_GEGL,
+  { "filters", N_("Filters"), GIMP_ICON_GEGL,
     filters_actions_setup,
     filters_actions_update },
-  { "fonts", N_("Fonts"), "gtk-select-font",
+  { "fonts", N_("Fonts"), GIMP_ICON_FONT,
     fonts_actions_setup,
     fonts_actions_update },
-  { "gradient-editor", N_("Gradient Editor"), GIMP_STOCK_GRADIENT,
+  { "gradient-editor", N_("Gradient Editor"), GIMP_ICON_GRADIENT,
     gradient_editor_actions_setup,
     gradient_editor_actions_update },
-  { "gradients", N_("Gradients"), GIMP_STOCK_GRADIENT,
+  { "gradients", N_("Gradients"), GIMP_ICON_GRADIENT,
     gradients_actions_setup,
     gradients_actions_update },
-  { "tool-presets", N_("Tool Presets"), GIMP_STOCK_TOOL_PRESET,
+  { "tool-presets", N_("Tool Presets"), GIMP_ICON_TOOL_PRESET,
     tool_presets_actions_setup,
     tool_presets_actions_update },
-  { "tool-preset-editor", N_("Tool Preset Editor"), GIMP_STOCK_TOOL_PRESET,
+  { "tool-preset-editor", N_("Tool Preset Editor"), GIMP_ICON_TOOL_PRESET,
     tool_preset_editor_actions_setup,
     tool_preset_editor_actions_update },
   { "help", N_("Help"), "help-browser",
     help_actions_setup,
     help_actions_update },
-  { "image", N_("Image"), GIMP_STOCK_IMAGE,
+  { "image", N_("Image"), GIMP_ICON_IMAGE,
     image_actions_setup,
     image_actions_update },
-  { "images", N_("Images"), GIMP_STOCK_IMAGE,
+  { "images", N_("Images"), GIMP_ICON_IMAGE,
     images_actions_setup,
     images_actions_update },
-  { "layers", N_("Layers"), GIMP_STOCK_LAYER,
+  { "layers", N_("Layers"), GIMP_ICON_LAYER,
     layers_actions_setup,
     layers_actions_update },
   { "mypaint-brushes", N_("MyPaint Brushes"), GIMP_ICON_MYPAINT_BRUSH,
     mypaint_brushes_actions_setup,
     mypaint_brushes_actions_update },
-  { "palette-editor", N_("Palette Editor"), GIMP_STOCK_PALETTE,
+  { "palette-editor", N_("Palette Editor"), GIMP_ICON_PALETTE,
     palette_editor_actions_setup,
     palette_editor_actions_update },
-  { "palettes", N_("Palettes"), GIMP_STOCK_PALETTE,
+  { "palettes", N_("Palettes"), GIMP_ICON_PALETTE,
     palettes_actions_setup,
     palettes_actions_update },
-  { "patterns", N_("Patterns"), GIMP_STOCK_PATTERN,
+  { "patterns", N_("Patterns"), GIMP_ICON_PATTERN,
     patterns_actions_setup,
     patterns_actions_update },
-  { "plug-in", N_("Plug-Ins"), GIMP_STOCK_PLUGIN,
+  { "plug-in", N_("Plug-Ins"), GIMP_ICON_PLUGIN,
     plug_in_actions_setup,
     plug_in_actions_update },
-  { "quick-mask", N_("Quick Mask"), GIMP_STOCK_QUICK_MASK_ON,
+  { "quick-mask", N_("Quick Mask"), GIMP_ICON_QUICK_MASK_ON,
     quick_mask_actions_setup,
     quick_mask_actions_update },
-  { "sample-points", N_("Sample Points"), GIMP_STOCK_SAMPLE_POINT,
+  { "sample-points", N_("Sample Points"), GIMP_ICON_SAMPLE_POINT,
     sample_points_actions_setup,
     sample_points_actions_update },
-  { "select", N_("Select"), GIMP_STOCK_SELECTION,
+  { "select", N_("Select"), GIMP_ICON_SELECTION,
     select_actions_setup,
     select_actions_update },
-  { "templates", N_("Templates"), GIMP_STOCK_TEMPLATE,
+  { "templates", N_("Templates"), GIMP_ICON_TEMPLATE,
     templates_actions_setup,
     templates_actions_update },
-  { "text-tool", N_("Text Tool"), "gtk-edit",
+  { "text-tool", N_("Text Tool"), GIMP_ICON_EDIT,
     text_tool_actions_setup,
     text_tool_actions_update },
-  { "text-editor", N_("Text Editor"), "gtk-edit",
+  { "text-editor", N_("Text Editor"), GIMP_ICON_EDIT,
     text_editor_actions_setup,
     text_editor_actions_update },
-  { "tool-options", N_("Tool Options"), GIMP_STOCK_TOOL_OPTIONS,
+  { "tool-options", N_("Tool Options"), GIMP_ICON_DIALOG_TOOL_OPTIONS,
     tool_options_actions_setup,
     tool_options_actions_update },
-  { "tools", N_("Tools"), GIMP_STOCK_TOOLS,
+  { "tools", N_("Tools"), GIMP_ICON_DIALOG_TOOLS,
     tools_actions_setup,
     tools_actions_update },
-  { "vectors", N_("Paths"), GIMP_STOCK_PATH,
+  { "vectors", N_("Paths"), GIMP_ICON_PATH,
     vectors_actions_setup,
     vectors_actions_update },
-  { "view", N_("View"), GIMP_STOCK_VISIBLE,
+  { "view", N_("View"), GIMP_ICON_VISIBLE,
     view_actions_setup,
     view_actions_update },
   { "windows", N_("Windows"), NULL,
diff --git a/app/actions/brush-editor-actions.c b/app/actions/brush-editor-actions.c
index 23071ce..35a3cab 100644
--- a/app/actions/brush-editor-actions.c
+++ b/app/actions/brush-editor-actions.c
@@ -39,14 +39,14 @@
 
 static const GimpActionEntry brush_editor_actions[] =
 {
-  { "brush-editor-popup", GIMP_STOCK_BRUSH,
+  { "brush-editor-popup", GIMP_ICON_BRUSH,
     NC_("brush-editor-action", "Brush Editor Menu"), NULL, NULL, NULL,
     GIMP_HELP_BRUSH_EDITOR_DIALOG }
 };
 
 static const GimpToggleActionEntry brush_editor_toggle_actions[] =
 {
-  { "brush-editor-edit-active", GIMP_STOCK_LINKED,
+  { "brush-editor-edit-active", GIMP_ICON_LINKED,
     NC_("brush-editor-action", "Edit Active Brush"), NULL, NULL,
     G_CALLBACK (data_editor_edit_active_cmd_callback),
     FALSE,
diff --git a/app/actions/brushes-actions.c b/app/actions/brushes-actions.c
index ccb1446..d0e3acd 100644
--- a/app/actions/brushes-actions.c
+++ b/app/actions/brushes-actions.c
@@ -39,29 +39,29 @@
 
 static const GimpActionEntry brushes_actions[] =
 {
-  { "brushes-popup", GIMP_STOCK_BRUSH,
+  { "brushes-popup", GIMP_ICON_BRUSH,
     NC_("brushes-action", "Brushes Menu"), NULL, NULL, NULL,
     GIMP_HELP_BRUSH_DIALOG },
 
-  { "brushes-open-as-image", "document-open",
+  { "brushes-open-as-image", GIMP_ICON_DOCUMENT_OPEN,
     NC_("brushes-action", "_Open Brush as Image"), NULL,
     NC_("brushes-action", "Open brush as image"),
     G_CALLBACK (data_open_as_image_cmd_callback),
     GIMP_HELP_BRUSH_OPEN_AS_IMAGE },
 
-  { "brushes-new", "document-new",
+  { "brushes-new", GIMP_ICON_DOCUMENT_NEW,
     NC_("brushes-action", "_New Brush"), NULL,
     NC_("brushes-action", "Create a new brush"),
     G_CALLBACK (data_new_cmd_callback),
     GIMP_HELP_BRUSH_NEW },
 
-  { "brushes-duplicate", GIMP_STOCK_DUPLICATE,
+  { "brushes-duplicate", GIMP_ICON_OBJECT_DUPLICATE,
     NC_("brushes-action", "D_uplicate Brush"), NULL,
     NC_("brushes-action", "Duplicate this brush"),
     G_CALLBACK (data_duplicate_cmd_callback),
     GIMP_HELP_BRUSH_DUPLICATE },
 
-  { "brushes-copy-location", "edit-copy",
+  { "brushes-copy-location", GIMP_ICON_EDIT_COPY,
     NC_("brushes-action", "Copy Brush _Location"), NULL,
     NC_("brushes-action", "Copy brush file location to clipboard"),
     G_CALLBACK (data_copy_location_cmd_callback),
@@ -73,13 +73,13 @@ static const GimpActionEntry brushes_actions[] =
     G_CALLBACK (data_show_in_file_manager_cmd_callback),
     GIMP_HELP_BRUSH_SHOW_IN_FILE_MANAGER },
 
-  { "brushes-delete", "edit-delete",
+  { "brushes-delete", GIMP_ICON_EDIT_DELETE,
     NC_("brushes-action", "_Delete Brush"), NULL,
     NC_("brushes-action", "Delete this brush"),
     G_CALLBACK (data_delete_cmd_callback),
     GIMP_HELP_BRUSH_DELETE },
 
-  { "brushes-refresh", "view-refresh",
+  { "brushes-refresh", GIMP_ICON_VIEW_REFRESH,
     NC_("brushes-action", "_Refresh Brushes"), NULL,
     NC_("brushes-action", "Refresh brushes"),
     G_CALLBACK (data_refresh_cmd_callback),
@@ -88,7 +88,7 @@ static const GimpActionEntry brushes_actions[] =
 
 static const GimpStringActionEntry brushes_edit_actions[] =
 {
-  { "brushes-edit", "gtk-edit",
+  { "brushes-edit", GIMP_ICON_EDIT,
     NC_("brushes-action", "_Edit Brush..."), NULL,
     NC_("brushes-action", "Edit this brush"),
     "gimp-brush-editor",
diff --git a/app/actions/buffers-actions.c b/app/actions/buffers-actions.c
index a356f07..1321d80 100644
--- a/app/actions/buffers-actions.c
+++ b/app/actions/buffers-actions.c
@@ -38,35 +38,35 @@
 
 static const GimpActionEntry buffers_actions[] =
 {
-  { "buffers-popup", GIMP_STOCK_BUFFER,
+  { "buffers-popup", GIMP_ICON_BUFFER,
     NC_("buffers-action", "Buffers Menu"), NULL, NULL, NULL,
     GIMP_HELP_BUFFER_DIALOG },
 
-  { "buffers-paste", "edit-paste",
+  { "buffers-paste", GIMP_ICON_EDIT_PASTE,
     NC_("buffers-action", "_Paste Buffer"), NULL,
     NC_("buffers-action", "Paste the selected buffer"),
     G_CALLBACK (buffers_paste_cmd_callback),
     GIMP_HELP_BUFFER_PASTE },
 
-  { "buffers-paste-into", GIMP_STOCK_PASTE_INTO,
+  { "buffers-paste-into", GIMP_ICON_EDIT_PASTE_INTO,
     NC_("buffers-action", "Paste Buffer _Into"), NULL,
     NC_("buffers-action", "Paste the selected buffer into the selection"),
     G_CALLBACK (buffers_paste_into_cmd_callback),
     GIMP_HELP_BUFFER_PASTE_INTO },
 
-  { "buffers-paste-as-new-layer", GIMP_STOCK_PASTE_AS_NEW,
+  { "buffers-paste-as-new-layer", GIMP_ICON_EDIT_PASTE_AS_NEW,
     NC_("buffers-action", "Paste Buffer as New _Layer"), NULL,
     NC_("buffers-action", "Paste the selected buffer as a new layer"),
     G_CALLBACK (buffers_paste_as_new_layer_cmd_callback),
     GIMP_HELP_BUFFER_PASTE_AS_NEW_LAYER },
 
-  { "buffers-paste-as-new-image", GIMP_STOCK_PASTE_AS_NEW,
+  { "buffers-paste-as-new-image", GIMP_ICON_EDIT_PASTE_AS_NEW,
     NC_("buffers-action", "Paste Buffer as _New Image"), NULL,
     NC_("buffers-action", "Paste the selected buffer as a new image"),
     G_CALLBACK (buffers_paste_as_new_image_cmd_callback),
     GIMP_HELP_BUFFER_PASTE_AS_NEW_IMAGE },
 
-  { "buffers-delete", "edit-delete",
+  { "buffers-delete", GIMP_ICON_EDIT_DELETE,
     NC_("buffers-action", "_Delete Buffer"), NULL,
     NC_("buffers-action", "Delete the selected buffer"),
     G_CALLBACK (buffers_delete_cmd_callback),
diff --git a/app/actions/channels-actions.c b/app/actions/channels-actions.c
index a74e613..048ad7e 100644
--- a/app/actions/channels-actions.c
+++ b/app/actions/channels-actions.c
@@ -41,65 +41,65 @@
 
 static const GimpActionEntry channels_actions[] =
 {
-  { "channels-popup", GIMP_STOCK_CHANNELS,
+  { "channels-popup", GIMP_ICON_DIALOG_CHANNELS,
     NC_("channels-action", "Channels Menu"), NULL, NULL, NULL,
     GIMP_HELP_CHANNEL_DIALOG },
 
-  { "channels-color-tag-menu", GIMP_STOCK_CLOSE /* abused */,
+  { "channels-color-tag-menu", GIMP_ICON_CLOSE /* abused */,
     NC_("channels-action", "Color Tag"), NULL, NULL, NULL,
     GIMP_HELP_CHANNEL_COLOR_TAG },
 
-  { "channels-edit-attributes", "gtk-edit",
+  { "channels-edit-attributes", GIMP_ICON_EDIT,
     NC_("channels-action", "_Edit Channel Attributes..."), NULL,
     NC_("channels-action", "Edit the channel's name, color and opacity"),
     G_CALLBACK (channels_edit_attributes_cmd_callback),
     GIMP_HELP_CHANNEL_EDIT },
 
-  { "channels-new", "document-new",
+  { "channels-new", GIMP_ICON_DOCUMENT_NEW,
     NC_("channels-action", "_New Channel..."), NULL,
     NC_("channels-action", "Create a new channel"),
     G_CALLBACK (channels_new_cmd_callback),
     GIMP_HELP_CHANNEL_NEW },
 
-  { "channels-new-last-values", "document-new",
+  { "channels-new-last-values", GIMP_ICON_DOCUMENT_NEW,
     NC_("channels-action", "_New Channel"), NULL,
     NC_("channels-action", "Create a new channel with last used values"),
     G_CALLBACK (channels_new_last_vals_cmd_callback),
     GIMP_HELP_CHANNEL_NEW },
 
-  { "channels-duplicate", GIMP_STOCK_DUPLICATE,
+  { "channels-duplicate", GIMP_ICON_OBJECT_DUPLICATE,
     NC_("channels-action", "D_uplicate Channel"), NULL,
     NC_("channels-action",
         "Create a duplicate of this channel and add it to the image"),
     G_CALLBACK (channels_duplicate_cmd_callback),
     GIMP_HELP_CHANNEL_DUPLICATE },
 
-  { "channels-delete", "edit-delete",
+  { "channels-delete", GIMP_ICON_EDIT_DELETE,
     NC_("channels-action", "_Delete Channel"), NULL,
     NC_("channels-action", "Delete this channel"),
     G_CALLBACK (channels_delete_cmd_callback),
     GIMP_HELP_CHANNEL_DELETE },
 
-  { "channels-raise", "go-up",
+  { "channels-raise", GIMP_ICON_GO_UP,
     NC_("channels-action", "_Raise Channel"), NULL,
     NC_("channels-action", "Raise this channel one step in the channel stack"),
     G_CALLBACK (channels_raise_cmd_callback),
     GIMP_HELP_CHANNEL_RAISE },
 
-  { "channels-raise-to-top", "go-top",
+  { "channels-raise-to-top", GIMP_ICON_GO_TOP,
     NC_("channels-action", "Raise Channel to _Top"), NULL,
     NC_("channels-action",
         "Raise this channel to the top of the channel stack"),
     G_CALLBACK (channels_raise_to_top_cmd_callback),
     GIMP_HELP_CHANNEL_RAISE_TO_TOP },
 
-  { "channels-lower", "go-down",
+  { "channels-lower", GIMP_ICON_GO_DOWN,
     NC_("channels-action", "_Lower Channel"), NULL,
     NC_("channels-action", "Lower this channel one step in the channel stack"),
     G_CALLBACK (channels_lower_cmd_callback),
     GIMP_HELP_CHANNEL_LOWER },
 
-  { "channels-lower-to-bottom", "go-bottom",
+  { "channels-lower-to-bottom", GIMP_ICON_GO_BOTTOM,
     NC_("channels-action", "Lower Channel to _Bottom"), NULL,
     NC_("channels-action",
         "Lower this channel to the bottom of the channel stack"),
@@ -109,25 +109,25 @@ static const GimpActionEntry channels_actions[] =
 
 static const GimpToggleActionEntry channels_toggle_actions[] =
 {
-  { "channels-visible", GIMP_STOCK_VISIBLE,
+  { "channels-visible", GIMP_ICON_VISIBLE,
     NC_("channels-action", "_Visible"), NULL, NULL,
     G_CALLBACK (channels_visible_cmd_callback),
     FALSE,
     GIMP_HELP_CHANNEL_VISIBLE },
 
-  { "channels-linked", GIMP_STOCK_LINKED,
+  { "channels-linked", GIMP_ICON_LINKED,
     NC_("channels-action", "_Linked"), NULL, NULL,
     G_CALLBACK (channels_linked_cmd_callback),
     FALSE,
     GIMP_HELP_CHANNEL_LINKED },
 
-  { "channels-lock-content", NULL /* GIMP_STOCK_LOCK */,
+  { "channels-lock-content", NULL /* GIMP_ICON_LOCK */,
     NC_("channels-action", "L_ock pixels"), NULL, NULL,
     G_CALLBACK (channels_lock_content_cmd_callback),
     FALSE,
     GIMP_HELP_CHANNEL_LOCK_PIXELS },
 
-  { "channels-lock-position", GIMP_STOCK_TOOL_MOVE,
+  { "channels-lock-position", GIMP_ICON_TOOL_MOVE,
     NC_("channels-action", "L_ock position"), NULL, NULL,
     G_CALLBACK (channels_lock_position_cmd_callback),
     FALSE,
@@ -136,7 +136,7 @@ static const GimpToggleActionEntry channels_toggle_actions[] =
 
 static const GimpEnumActionEntry channels_color_tag_actions[] =
 {
-  { "channels-color-tag-none", GIMP_STOCK_CLOSE /* abused */,
+  { "channels-color-tag-none", GIMP_ICON_CLOSE /* abused */,
     NC_("channels-action", "None"), NULL,
     NC_("channels-action", "Clear color tag"),
     GIMP_COLOR_TAG_NONE, FALSE,
@@ -193,25 +193,25 @@ static const GimpEnumActionEntry channels_color_tag_actions[] =
 
 static const GimpEnumActionEntry channels_to_selection_actions[] =
 {
-  { "channels-selection-replace", GIMP_STOCK_SELECTION_REPLACE,
+  { "channels-selection-replace", GIMP_ICON_SELECTION_REPLACE,
     NC_("channels-action", "Channel to Sele_ction"), NULL,
     NC_("channels-action", "Replace the selection with this channel"),
     GIMP_CHANNEL_OP_REPLACE, FALSE,
     GIMP_HELP_CHANNEL_SELECTION_REPLACE },
 
-  { "channels-selection-add", GIMP_STOCK_SELECTION_ADD,
+  { "channels-selection-add", GIMP_ICON_SELECTION_ADD,
     NC_("channels-action", "_Add to Selection"), NULL,
     NC_("channels-action", "Add this channel to the current selection"),
     GIMP_CHANNEL_OP_ADD, FALSE,
     GIMP_HELP_CHANNEL_SELECTION_ADD },
 
-  { "channels-selection-subtract", GIMP_STOCK_SELECTION_SUBTRACT,
+  { "channels-selection-subtract", GIMP_ICON_SELECTION_SUBTRACT,
     NC_("channels-action", "_Subtract from Selection"), NULL,
     NC_("channels-action", "Subtract this channel from the current selection"),
     GIMP_CHANNEL_OP_SUBTRACT, FALSE,
     GIMP_HELP_CHANNEL_SELECTION_SUBTRACT },
 
-  { "channels-selection-intersect", GIMP_STOCK_SELECTION_INTERSECT,
+  { "channels-selection-intersect", GIMP_ICON_SELECTION_INTERSECT,
     NC_("channels-action", "_Intersect with Selection"), NULL,
     NC_("channels-action", "Intersect this channel with the current selection"),
     GIMP_CHANNEL_OP_INTERSECT, FALSE,
diff --git a/app/actions/channels-commands.c b/app/actions/channels-commands.c
index e34b165..3d4e89e 100644
--- a/app/actions/channels-commands.c
+++ b/app/actions/channels-commands.c
@@ -110,7 +110,7 @@ channels_edit_attributes_cmd_callback (GtkAction *action,
                                            widget,
                                            _("Channel Attributes"),
                                            "gimp-channel-edit",
-                                           "gtk-edit",
+                                           GIMP_ICON_EDIT,
                                            _("Edit Channel Attributes"),
                                            GIMP_HELP_CHANNEL_EDIT,
                                            _("Edit Channel Color"),
@@ -155,7 +155,7 @@ channels_new_cmd_callback (GtkAction *action,
                                            widget,
                                            _("New Channel"),
                                            "gimp-channel-new",
-                                           GIMP_STOCK_CHANNEL,
+                                           GIMP_ICON_CHANNEL,
                                            _("Create a New Channel"),
                                            GIMP_HELP_CHANNEL_NEW,
                                            _("New Channel Color"),
diff --git a/app/actions/colormap-actions.c b/app/actions/colormap-actions.c
index 5e1f860..6756d9a 100644
--- a/app/actions/colormap-actions.c
+++ b/app/actions/colormap-actions.c
@@ -41,11 +41,11 @@
 
 static const GimpActionEntry colormap_actions[] =
 {
-  { "colormap-popup", GIMP_STOCK_COLORMAP,
+  { "colormap-popup", GIMP_ICON_COLORMAP,
     NC_("colormap-action", "Colormap Menu"), NULL, NULL, NULL,
     GIMP_HELP_INDEXED_PALETTE_DIALOG },
 
-  { "colormap-edit-color", "gtk-edit",
+  { "colormap-edit-color", GIMP_ICON_EDIT,
     NC_("colormap-action", "_Edit Color..."), NULL,
     NC_("colormap-action", "Edit this color"),
     G_CALLBACK (colormap_edit_color_cmd_callback),
@@ -54,13 +54,13 @@ static const GimpActionEntry colormap_actions[] =
 
 static const GimpEnumActionEntry colormap_add_color_actions[] =
 {
-  { "colormap-add-color-from-fg", "list-add",
+  { "colormap-add-color-from-fg", GIMP_ICON_LIST_ADD,
     NC_("colormap-action", "_Add Color from FG"), "",
     NC_("colormap-action", "Add current foreground color"),
     FALSE, FALSE,
     GIMP_HELP_INDEXED_PALETTE_ADD },
 
-  { "colormap-add-color-from-bg", "list-add",
+  { "colormap-add-color-from-bg", GIMP_ICON_LIST_ADD,
     NC_("colormap-action", "_Add Color from BG"), "",
     NC_("colormap-action", "Add current background color"),
     TRUE, FALSE,
@@ -69,25 +69,25 @@ static const GimpEnumActionEntry colormap_add_color_actions[] =
 
 static const GimpEnumActionEntry colormap_to_selection_actions[] =
 {
-  { "colormap-selection-replace", GIMP_STOCK_SELECTION_REPLACE,
+  { "colormap-selection-replace", GIMP_ICON_SELECTION_REPLACE,
     NC_("colormap-action", "_Select this Color"), NULL,
     NC_("colormap-action", "Select all pixels with this color"),
     GIMP_CHANNEL_OP_REPLACE, FALSE,
     GIMP_HELP_INDEXED_PALETTE_SELECTION_REPLACE },
 
-  { "colormap-selection-add", GIMP_STOCK_SELECTION_ADD,
+  { "colormap-selection-add", GIMP_ICON_SELECTION_ADD,
     NC_("colormap-action", "_Add to Selection"), NULL,
     NC_("colormap-action", "Add all pixels with this color to the current selection"),
     GIMP_CHANNEL_OP_ADD, FALSE,
     GIMP_HELP_INDEXED_PALETTE_SELECTION_ADD },
 
-  { "colormap-selection-subtract", GIMP_STOCK_SELECTION_SUBTRACT,
+  { "colormap-selection-subtract", GIMP_ICON_SELECTION_SUBTRACT,
     NC_("colormap-action", "_Subtract from Selection"), NULL,
     NC_("colormap-action", "Subtract all pixels with this color from the current selection"),
     GIMP_CHANNEL_OP_SUBTRACT, FALSE,
     GIMP_HELP_INDEXED_PALETTE_SELECTION_SUBTRACT },
 
-  { "colormap-selection-intersect", GIMP_STOCK_SELECTION_INTERSECT,
+  { "colormap-selection-intersect", GIMP_ICON_SELECTION_INTERSECT,
     NC_("colormap-action", "_Intersect with Selection"), NULL,
     NC_("colormap-action", "Intersect all pixels with this color with the current selection"),
     GIMP_CHANNEL_OP_INTERSECT, FALSE,
diff --git a/app/actions/colormap-commands.c b/app/actions/colormap-commands.c
index aeceb57..b996927 100644
--- a/app/actions/colormap-commands.c
+++ b/app/actions/colormap-commands.c
@@ -79,7 +79,7 @@ colormap_edit_color_cmd_callback (GtkAction *action,
         gimp_color_dialog_new (GIMP_VIEWABLE (image),
                                action_data_get_context (data),
                                _("Edit Colormap Entry"),
-                               GIMP_STOCK_COLORMAP,
+                               GIMP_ICON_COLORMAP,
                                desc,
                                GTK_WIDGET (editor),
                                gimp_dialog_factory_get_singleton (),
diff --git a/app/actions/context-actions.c b/app/actions/context-actions.c
index c4ab779..575ce6d 100644
--- a/app/actions/context-actions.c
+++ b/app/actions/context-actions.c
@@ -43,48 +43,48 @@
 
 static const GimpActionEntry context_actions[] =
 {
-  { "context-menu",            NULL,                      NC_("context-action",
-                                                              "_Context")    },
-  { "context-colors-menu",     GIMP_STOCK_DEFAULT_COLORS, NC_("context-action",
-                                                              "_Colors")     },
-  { "context-opacity-menu",    GIMP_STOCK_TRANSPARENCY,   NC_("context-action",
-                                                              "_Opacity")    },
-  { "context-paint-mode-menu", GIMP_STOCK_TOOL_PENCIL,    NC_("context-action",
-                                                              "Paint _Mode") },
-  { "context-tool-menu",       GIMP_STOCK_TOOLS,          NC_("context-action",
-                                                              "_Tool")       },
-  { "context-brush-menu",      GIMP_STOCK_BRUSH,          NC_("context-action",
-                                                              "_Brush")      },
-  { "context-pattern-menu",    GIMP_STOCK_PATTERN,        NC_("context-action",
-                                                              "_Pattern")    },
-  { "context-palette-menu",    GIMP_STOCK_PALETTE,        NC_("context-action",
-                                                              "_Palette")    },
-  { "context-gradient-menu",   GIMP_STOCK_GRADIENT,       NC_("context-action",
-                                                              "_Gradient")   },
-  { "context-font-menu",       "gtk-select-font",         NC_("context-action",
-                                                              "_Font")       },
-
-  { "context-brush-shape-menu",    NULL,                  NC_("context-action",
-                                                              "_Shape")      },
-  { "context-brush-radius-menu",   NULL,                  NC_("context-action",
-                                                              "_Radius")     },
-  { "context-brush-spikes-menu",   NULL,                  NC_("context-action",
-                                                              "S_pikes")     },
-  { "context-brush-hardness-menu", NULL,                  NC_("context-action",
-                                                              "_Hardness")   },
-  { "context-brush-aspect-menu",   NULL,                  NC_("context-action",
-                                                              "_Aspect Ratio")},
-  { "context-brush-angle-menu",    NULL,                  NC_("context-action",
-                                                              "A_ngle")      },
-
-  { "context-colors-default", GIMP_STOCK_DEFAULT_COLORS,
+  { "context-menu",            NULL,                     NC_("context-action",
+                                                             "_Context")    },
+  { "context-colors-menu",     GIMP_ICON_COLORS_DEFAULT, NC_("context-action",
+                                                             "_Colors")     },
+  { "context-opacity-menu",    GIMP_ICON_TRANSPARENCY,   NC_("context-action",
+                                                             "_Opacity")    },
+  { "context-paint-mode-menu", GIMP_ICON_TOOL_PENCIL,    NC_("context-action",
+                                                             "Paint _Mode") },
+  { "context-tool-menu",       GIMP_ICON_DIALOG_TOOLS,   NC_("context-action",
+                                                             "_Tool")       },
+  { "context-brush-menu",      GIMP_ICON_BRUSH,          NC_("context-action",
+                                                             "_Brush")      },
+  { "context-pattern-menu",    GIMP_ICON_PATTERN,        NC_("context-action",
+                                                             "_Pattern")    },
+  { "context-palette-menu",    GIMP_ICON_PALETTE,        NC_("context-action",
+                                                             "_Palette")    },
+  { "context-gradient-menu",   GIMP_ICON_GRADIENT,       NC_("context-action",
+                                                             "_Gradient")   },
+  { "context-font-menu",       GIMP_ICON_FONT,           NC_("context-action",
+                                                             "_Font")       },
+
+  { "context-brush-shape-menu",    NULL,                 NC_("context-action",
+                                                             "_Shape")      },
+  { "context-brush-radius-menu",   NULL,                 NC_("context-action",
+                                                             "_Radius")     },
+  { "context-brush-spikes-menu",   NULL,                 NC_("context-action",
+                                                             "S_pikes")     },
+  { "context-brush-hardness-menu", NULL,                 NC_("context-action",
+                                                             "_Hardness")   },
+  { "context-brush-aspect-menu",   NULL,                 NC_("context-action",
+                                                             "_Aspect Ratio")},
+  { "context-brush-angle-menu",    NULL,                 NC_("context-action",
+                                                             "A_ngle")      },
+
+  { "context-colors-default", GIMP_ICON_COLORS_DEFAULT,
     NC_("context-action", "_Default Colors"), "D",
     NC_("context-action",
         "Set foreground color to black, background color to white"),
     G_CALLBACK (context_colors_default_cmd_callback),
     GIMP_HELP_TOOLBOX_DEFAULT_COLORS },
 
-  { "context-colors-swap", GIMP_STOCK_SWAP_COLORS,
+  { "context-colors-swap", GIMP_ICON_COLORS_SWAP,
     NC_("context-action", "S_wap Colors"), "X",
     NC_("context-action", "Exchange foreground and background colors"),
     G_CALLBACK (context_colors_swap_cmd_callback),
@@ -93,31 +93,31 @@ static const GimpActionEntry context_actions[] =
 
 static GimpEnumActionEntry context_palette_foreground_actions[] =
 {
-  { "context-palette-foreground-set", GIMP_STOCK_PALETTE,
+  { "context-palette-foreground-set", GIMP_ICON_PALETTE,
     "Foreground Palette Color Set", NULL, NULL,
     GIMP_ACTION_SELECT_SET, FALSE,
     NULL },
-  { "context-palette-foreground-first", GIMP_STOCK_PALETTE,
+  { "context-palette-foreground-first", GIMP_ICON_PALETTE,
     "Foreground Palette Color First", NULL, NULL,
     GIMP_ACTION_SELECT_FIRST, FALSE,
     NULL },
-  { "context-palette-foreground-last", GIMP_STOCK_PALETTE,
+  { "context-palette-foreground-last", GIMP_ICON_PALETTE,
     "Foreground Palette Color Last", NULL, NULL,
     GIMP_ACTION_SELECT_LAST, FALSE,
     NULL },
-  { "context-palette-foreground-previous", GIMP_STOCK_PALETTE,
+  { "context-palette-foreground-previous", GIMP_ICON_PALETTE,
     "Foreground Palette Color Previous", NULL, NULL,
     GIMP_ACTION_SELECT_PREVIOUS, FALSE,
     NULL },
-  { "context-palette-foreground-next", GIMP_STOCK_PALETTE,
+  { "context-palette-foreground-next", GIMP_ICON_PALETTE,
     "Foreground Palette Color Next", NULL, NULL,
     GIMP_ACTION_SELECT_NEXT, FALSE,
     NULL },
-  { "context-palette-foreground-previous-skip", GIMP_STOCK_PALETTE,
+  { "context-palette-foreground-previous-skip", GIMP_ICON_PALETTE,
     "Foreground Palette Color Skip Back", NULL, NULL,
     GIMP_ACTION_SELECT_SKIP_PREVIOUS, FALSE,
     NULL },
-  { "context-palette-foreground-next-skip", GIMP_STOCK_PALETTE,
+  { "context-palette-foreground-next-skip", GIMP_ICON_PALETTE,
     "Foreground Palette Color Skip Forward", NULL, NULL,
     GIMP_ACTION_SELECT_SKIP_NEXT, FALSE,
     NULL }
@@ -125,31 +125,31 @@ static GimpEnumActionEntry context_palette_foreground_actions[] =
 
 static GimpEnumActionEntry context_palette_background_actions[] =
 {
-  { "context-palette-background-set", GIMP_STOCK_PALETTE,
+  { "context-palette-background-set", GIMP_ICON_PALETTE,
     "Background Palette Color Set", NULL, NULL,
     GIMP_ACTION_SELECT_SET, FALSE,
     NULL },
-  { "context-palette-background-first", GIMP_STOCK_PALETTE,
+  { "context-palette-background-first", GIMP_ICON_PALETTE,
     "Background Palette Color First", NULL, NULL,
     GIMP_ACTION_SELECT_FIRST, FALSE,
     NULL },
-  { "context-palette-background-last", GIMP_STOCK_PALETTE,
+  { "context-palette-background-last", GIMP_ICON_PALETTE,
     "Background Palette Color Last", NULL, NULL,
     GIMP_ACTION_SELECT_LAST, FALSE,
     NULL },
-  { "context-palette-background-previous", GIMP_STOCK_PALETTE,
+  { "context-palette-background-previous", GIMP_ICON_PALETTE,
     "Background Palette Color Previous", NULL, NULL,
     GIMP_ACTION_SELECT_PREVIOUS, FALSE,
     NULL },
-  { "context-palette-background-next", GIMP_STOCK_PALETTE,
+  { "context-palette-background-next", GIMP_ICON_PALETTE,
     "Background Palette Color Next", NULL, NULL,
     GIMP_ACTION_SELECT_NEXT, FALSE,
     NULL },
-  { "context-palette-background-previous-skip", GIMP_STOCK_PALETTE,
+  { "context-palette-background-previous-skip", GIMP_ICON_PALETTE,
     "Background Palette Color Skip Back", NULL, NULL,
     GIMP_ACTION_SELECT_SKIP_PREVIOUS, FALSE,
     NULL },
-  { "context-palette-background-next-skip", GIMP_STOCK_PALETTE,
+  { "context-palette-background-next-skip", GIMP_ICON_PALETTE,
     "Background Palette Color Skip Forward", NULL, NULL,
     GIMP_ACTION_SELECT_SKIP_NEXT, FALSE,
     NULL }
@@ -157,31 +157,31 @@ static GimpEnumActionEntry context_palette_background_actions[] =
 
 static GimpEnumActionEntry context_colormap_foreground_actions[] =
 {
-  { "context-colormap-foreground-set", GIMP_STOCK_COLORMAP,
+  { "context-colormap-foreground-set", GIMP_ICON_COLORMAP,
     "Foreground Colormap Color Set", NULL, NULL,
     GIMP_ACTION_SELECT_SET, FALSE,
     NULL },
-  { "context-colormap-foreground-first", GIMP_STOCK_COLORMAP,
+  { "context-colormap-foreground-first", GIMP_ICON_COLORMAP,
     "Foreground Colormap Color First", NULL, NULL,
     GIMP_ACTION_SELECT_FIRST, FALSE,
     NULL },
-  { "context-colormap-foreground-last", GIMP_STOCK_COLORMAP,
+  { "context-colormap-foreground-last", GIMP_ICON_COLORMAP,
     "Foreground Colormap Color Last", NULL, NULL,
     GIMP_ACTION_SELECT_LAST, FALSE,
     NULL },
-  { "context-colormap-foreground-previous", GIMP_STOCK_COLORMAP,
+  { "context-colormap-foreground-previous", GIMP_ICON_COLORMAP,
     "Foreground Colormap Color Previous", NULL, NULL,
     GIMP_ACTION_SELECT_PREVIOUS, FALSE,
     NULL },
-  { "context-colormap-foreground-next", GIMP_STOCK_COLORMAP,
+  { "context-colormap-foreground-next", GIMP_ICON_COLORMAP,
     "Foreground Colormap Color Next", NULL, NULL,
     GIMP_ACTION_SELECT_NEXT, FALSE,
     NULL },
-  { "context-colormap-foreground-previous-skip", GIMP_STOCK_COLORMAP,
+  { "context-colormap-foreground-previous-skip", GIMP_ICON_COLORMAP,
     "Foreground Colormap Color Skip Back", NULL, NULL,
     GIMP_ACTION_SELECT_SKIP_PREVIOUS, FALSE,
     NULL },
-  { "context-colormap-foreground-next-skip", GIMP_STOCK_COLORMAP,
+  { "context-colormap-foreground-next-skip", GIMP_ICON_COLORMAP,
     "Foreground Colormap Color Skip Forward", NULL, NULL,
     GIMP_ACTION_SELECT_SKIP_NEXT, FALSE,
     NULL }
@@ -189,31 +189,31 @@ static GimpEnumActionEntry context_colormap_foreground_actions[] =
 
 static GimpEnumActionEntry context_colormap_background_actions[] =
 {
-  { "context-colormap-background-set", GIMP_STOCK_COLORMAP,
+  { "context-colormap-background-set", GIMP_ICON_COLORMAP,
     "Background Colormap Color Set", NULL, NULL,
     GIMP_ACTION_SELECT_SET, FALSE,
     NULL },
-  { "context-colormap-background-first", GIMP_STOCK_COLORMAP,
+  { "context-colormap-background-first", GIMP_ICON_COLORMAP,
     "Background Colormap Color First", NULL, NULL,
     GIMP_ACTION_SELECT_FIRST, FALSE,
     NULL },
-  { "context-colormap-background-last", GIMP_STOCK_COLORMAP,
+  { "context-colormap-background-last", GIMP_ICON_COLORMAP,
     "Background Colormap Color Last", NULL, NULL,
     GIMP_ACTION_SELECT_LAST, FALSE,
     NULL },
-  { "context-colormap-background-previous", GIMP_STOCK_COLORMAP,
+  { "context-colormap-background-previous", GIMP_ICON_COLORMAP,
     "Background Colormap Color Previous", NULL, NULL,
     GIMP_ACTION_SELECT_PREVIOUS, FALSE,
     NULL },
-  { "context-colormap-background-next", GIMP_STOCK_COLORMAP,
+  { "context-colormap-background-next", GIMP_ICON_COLORMAP,
     "Background Colormap Color Next", NULL, NULL,
     GIMP_ACTION_SELECT_NEXT, FALSE,
     NULL },
-  { "context-colormap-background-previous-skip", GIMP_STOCK_COLORMAP,
+  { "context-colormap-background-previous-skip", GIMP_ICON_COLORMAP,
     "Background Colormap Color Skip Back", NULL, NULL,
     GIMP_ACTION_SELECT_SKIP_PREVIOUS, FALSE,
     NULL },
-  { "context-colormap-background-next-skip", GIMP_STOCK_COLORMAP,
+  { "context-colormap-background-next-skip", GIMP_ICON_COLORMAP,
     "Background Colormap Color Skip Forward", NULL, NULL,
     GIMP_ACTION_SELECT_SKIP_NEXT, FALSE,
     NULL }
@@ -221,31 +221,31 @@ static GimpEnumActionEntry context_colormap_background_actions[] =
 
 static GimpEnumActionEntry context_swatch_foreground_actions[] =
 {
-  { "context-swatch-foreground-set", GIMP_STOCK_PALETTE,
+  { "context-swatch-foreground-set", GIMP_ICON_PALETTE,
     "Foreground Swatch Color Set", NULL, NULL,
     GIMP_ACTION_SELECT_SET, FALSE,
     NULL },
-  { "context-swatch-foreground-first", GIMP_STOCK_PALETTE,
+  { "context-swatch-foreground-first", GIMP_ICON_PALETTE,
     "Foreground Swatch Color First", NULL, NULL,
     GIMP_ACTION_SELECT_FIRST, FALSE,
     NULL },
-  { "context-swatch-foreground-last", GIMP_STOCK_PALETTE,
+  { "context-swatch-foreground-last", GIMP_ICON_PALETTE,
     "Foreground Swatch Color Last", NULL, NULL,
     GIMP_ACTION_SELECT_LAST, FALSE,
     NULL },
-  { "context-swatch-foreground-previous", GIMP_STOCK_PALETTE,
+  { "context-swatch-foreground-previous", GIMP_ICON_PALETTE,
     "Foreground Swatch Color Previous", "9", NULL,
     GIMP_ACTION_SELECT_PREVIOUS, FALSE,
     NULL },
-  { "context-swatch-foreground-next", GIMP_STOCK_PALETTE,
+  { "context-swatch-foreground-next", GIMP_ICON_PALETTE,
     "Foreground Swatch Color Next", "0", NULL,
     GIMP_ACTION_SELECT_NEXT, FALSE,
     NULL },
-  { "context-swatch-foreground-previous-skip", GIMP_STOCK_PALETTE,
+  { "context-swatch-foreground-previous-skip", GIMP_ICON_PALETTE,
     "Foreground Swatch Color Skip Back", NULL, NULL,
     GIMP_ACTION_SELECT_SKIP_PREVIOUS, FALSE,
     NULL },
-  { "context-swatch-foreground-next-skip", GIMP_STOCK_PALETTE,
+  { "context-swatch-foreground-next-skip", GIMP_ICON_PALETTE,
     "Foreground Swatch Color Skip Forward", NULL, NULL,
     GIMP_ACTION_SELECT_SKIP_NEXT, FALSE,
     NULL }
@@ -253,31 +253,31 @@ static GimpEnumActionEntry context_swatch_foreground_actions[] =
 
 static GimpEnumActionEntry context_swatch_background_actions[] =
 {
-  { "context-swatch-background-set", GIMP_STOCK_PALETTE,
+  { "context-swatch-background-set", GIMP_ICON_PALETTE,
     "Background Swatch Color Set", NULL, NULL,
     GIMP_ACTION_SELECT_SET, FALSE,
     NULL },
-  { "context-swatch-background-first", GIMP_STOCK_PALETTE,
+  { "context-swatch-background-first", GIMP_ICON_PALETTE,
     "Background Swatch Color First", NULL, NULL,
     GIMP_ACTION_SELECT_FIRST, FALSE,
     NULL },
-  { "context-swatch-background-last", GIMP_STOCK_PALETTE,
+  { "context-swatch-background-last", GIMP_ICON_PALETTE,
     "Background Swatch Color Last", NULL, NULL,
     GIMP_ACTION_SELECT_LAST, FALSE,
     NULL },
-  { "context-swatch-background-previous", GIMP_STOCK_PALETTE,
+  { "context-swatch-background-previous", GIMP_ICON_PALETTE,
     "Background Swatch Color Previous", NULL, NULL,
     GIMP_ACTION_SELECT_PREVIOUS, FALSE,
     NULL },
-  { "context-swatch-background-next", GIMP_STOCK_PALETTE,
+  { "context-swatch-background-next", GIMP_ICON_PALETTE,
     "Background Swatch Color Next", NULL, NULL,
     GIMP_ACTION_SELECT_NEXT, FALSE,
     NULL },
-  { "context-swatch-background-previous-skip", GIMP_STOCK_PALETTE,
+  { "context-swatch-background-previous-skip", GIMP_ICON_PALETTE,
     "Background Swatch Color Skip Back", NULL, NULL,
     GIMP_ACTION_SELECT_SKIP_PREVIOUS, FALSE,
     NULL },
-  { "context-swatch-background-next-skip", GIMP_STOCK_PALETTE,
+  { "context-swatch-background-next-skip", GIMP_ICON_PALETTE,
     "Background Swatch Color Skip Forward", NULL, NULL,
     GIMP_ACTION_SELECT_SKIP_NEXT, FALSE,
     NULL }
@@ -285,31 +285,31 @@ static GimpEnumActionEntry context_swatch_background_actions[] =
 
 static const GimpEnumActionEntry context_foreground_red_actions[] =
 {
-  { "context-foreground-red-set", GIMP_STOCK_CHANNEL_RED,
+  { "context-foreground-red-set", GIMP_ICON_CHANNEL_RED,
     "Foreground Red Set", NULL, NULL,
     GIMP_ACTION_SELECT_SET, TRUE,
     NULL },
-  { "context-foreground-red-minimum", GIMP_STOCK_CHANNEL_RED,
+  { "context-foreground-red-minimum", GIMP_ICON_CHANNEL_RED,
     "Foreground Red Minimum", NULL, NULL,
     GIMP_ACTION_SELECT_FIRST, FALSE,
     NULL },
-  { "context-foreground-red-maximum", GIMP_STOCK_CHANNEL_RED,
+  { "context-foreground-red-maximum", GIMP_ICON_CHANNEL_RED,
     "Foreground Red Maximum", NULL, NULL,
     GIMP_ACTION_SELECT_LAST, FALSE,
     NULL },
-  { "context-foreground-red-decrease", GIMP_STOCK_CHANNEL_RED,
+  { "context-foreground-red-decrease", GIMP_ICON_CHANNEL_RED,
     "Foreground Red Decrease", NULL, NULL,
     GIMP_ACTION_SELECT_PREVIOUS, FALSE,
     NULL },
-  { "context-foreground-red-increase", GIMP_STOCK_CHANNEL_RED,
+  { "context-foreground-red-increase", GIMP_ICON_CHANNEL_RED,
     "Foreground Red Increase", NULL, NULL,
     GIMP_ACTION_SELECT_NEXT, FALSE,
     NULL },
-  { "context-foreground-red-decrease-skip", GIMP_STOCK_CHANNEL_RED,
+  { "context-foreground-red-decrease-skip", GIMP_ICON_CHANNEL_RED,
     "Foreground Red Decrease 10%", NULL, NULL,
     GIMP_ACTION_SELECT_SKIP_PREVIOUS, FALSE,
     NULL },
-  { "context-foreground-red-increase-skip", GIMP_STOCK_CHANNEL_RED,
+  { "context-foreground-red-increase-skip", GIMP_ICON_CHANNEL_RED,
     "Foreground Red Increase 10%", NULL, NULL,
     GIMP_ACTION_SELECT_SKIP_NEXT, FALSE,
     NULL }
@@ -317,31 +317,31 @@ static const GimpEnumActionEntry context_foreground_red_actions[] =
 
 static const GimpEnumActionEntry context_foreground_green_actions[] =
 {
-  { "context-foreground-green-set", GIMP_STOCK_CHANNEL_GREEN,
+  { "context-foreground-green-set", GIMP_ICON_CHANNEL_GREEN,
     "Foreground Green Set", NULL, NULL,
     GIMP_ACTION_SELECT_SET, TRUE,
     NULL },
-  { "context-foreground-green-minimum", GIMP_STOCK_CHANNEL_GREEN,
+  { "context-foreground-green-minimum", GIMP_ICON_CHANNEL_GREEN,
     "Foreground Green Minimum", NULL, NULL,
     GIMP_ACTION_SELECT_FIRST, FALSE,
     NULL },
-  { "context-foreground-green-maximum", GIMP_STOCK_CHANNEL_GREEN,
+  { "context-foreground-green-maximum", GIMP_ICON_CHANNEL_GREEN,
     "Foreground Green Maximum", NULL, NULL,
     GIMP_ACTION_SELECT_LAST, FALSE,
     NULL },
-  { "context-foreground-green-decrease", GIMP_STOCK_CHANNEL_GREEN,
+  { "context-foreground-green-decrease", GIMP_ICON_CHANNEL_GREEN,
     "Foreground Green Decrease", NULL, NULL,
     GIMP_ACTION_SELECT_PREVIOUS, FALSE,
     NULL },
-  { "context-foreground-green-increase", GIMP_STOCK_CHANNEL_GREEN,
+  { "context-foreground-green-increase", GIMP_ICON_CHANNEL_GREEN,
     "Foreground Green Increase", NULL, NULL,
     GIMP_ACTION_SELECT_NEXT, FALSE,
     NULL },
-  { "context-foreground-green-decrease-skip", GIMP_STOCK_CHANNEL_GREEN,
+  { "context-foreground-green-decrease-skip", GIMP_ICON_CHANNEL_GREEN,
     "Foreground Green Decrease 10%", NULL, NULL,
     GIMP_ACTION_SELECT_SKIP_PREVIOUS, FALSE,
     NULL },
-  { "context-foreground-green-increase-skip", GIMP_STOCK_CHANNEL_GREEN,
+  { "context-foreground-green-increase-skip", GIMP_ICON_CHANNEL_GREEN,
     "Foreground Green Increase 10%", NULL, NULL,
     GIMP_ACTION_SELECT_SKIP_NEXT, FALSE,
     NULL }
@@ -349,31 +349,31 @@ static const GimpEnumActionEntry context_foreground_green_actions[] =
 
 static const GimpEnumActionEntry context_foreground_blue_actions[] =
 {
-  { "context-foreground-blue-set", GIMP_STOCK_CHANNEL_BLUE,
+  { "context-foreground-blue-set", GIMP_ICON_CHANNEL_BLUE,
     "Foreground Blue Set", NULL, NULL,
     GIMP_ACTION_SELECT_SET, TRUE,
     NULL },
-  { "context-foreground-blue-minimum", GIMP_STOCK_CHANNEL_BLUE,
+  { "context-foreground-blue-minimum", GIMP_ICON_CHANNEL_BLUE,
     "Foreground Blue Minimum", NULL, NULL,
     GIMP_ACTION_SELECT_FIRST, FALSE,
     NULL },
-  { "context-foreground-blue-maximum", GIMP_STOCK_CHANNEL_BLUE,
+  { "context-foreground-blue-maximum", GIMP_ICON_CHANNEL_BLUE,
     "Foreground Blue Maximum", NULL, NULL,
     GIMP_ACTION_SELECT_LAST, FALSE,
     NULL },
-  { "context-foreground-blue-decrease", GIMP_STOCK_CHANNEL_BLUE,
+  { "context-foreground-blue-decrease", GIMP_ICON_CHANNEL_BLUE,
     "Foreground Blue Decrease", NULL, NULL,
     GIMP_ACTION_SELECT_PREVIOUS, FALSE,
     NULL },
-  { "context-foreground-blue-increase", GIMP_STOCK_CHANNEL_BLUE,
+  { "context-foreground-blue-increase", GIMP_ICON_CHANNEL_BLUE,
     "Foreground Blue Increase", NULL, NULL,
     GIMP_ACTION_SELECT_NEXT, FALSE,
     NULL },
-  { "context-foreground-blue-decrease-skip", GIMP_STOCK_CHANNEL_BLUE,
+  { "context-foreground-blue-decrease-skip", GIMP_ICON_CHANNEL_BLUE,
     "Foreground Blue Decrease 10%", NULL, NULL,
     GIMP_ACTION_SELECT_SKIP_PREVIOUS, FALSE,
     NULL },
-  { "context-foreground-blue-increase-skip", GIMP_STOCK_CHANNEL_BLUE,
+  { "context-foreground-blue-increase-skip", GIMP_ICON_CHANNEL_BLUE,
     "Foreground Blue Increase 10%", NULL, NULL,
     GIMP_ACTION_SELECT_SKIP_NEXT, FALSE,
     NULL }
@@ -381,31 +381,31 @@ static const GimpEnumActionEntry context_foreground_blue_actions[] =
 
 static const GimpEnumActionEntry context_background_red_actions[] =
 {
-  { "context-background-red-set", GIMP_STOCK_CHANNEL_RED,
+  { "context-background-red-set", GIMP_ICON_CHANNEL_RED,
     "Background Red Set", NULL, NULL,
     GIMP_ACTION_SELECT_SET, TRUE,
     NULL },
-  { "context-background-red-minimum", GIMP_STOCK_CHANNEL_RED,
+  { "context-background-red-minimum", GIMP_ICON_CHANNEL_RED,
     "Background Red Minimum", NULL, NULL,
     GIMP_ACTION_SELECT_FIRST, FALSE,
     NULL },
-  { "context-background-red-maximum", GIMP_STOCK_CHANNEL_RED,
+  { "context-background-red-maximum", GIMP_ICON_CHANNEL_RED,
     "Background Red Maximum", NULL, NULL,
     GIMP_ACTION_SELECT_LAST, FALSE,
     NULL },
-  { "context-background-red-decrease", GIMP_STOCK_CHANNEL_RED,
+  { "context-background-red-decrease", GIMP_ICON_CHANNEL_RED,
     "Background Red Decrease", NULL, NULL,
     GIMP_ACTION_SELECT_PREVIOUS, FALSE,
     NULL },
-  { "context-background-red-increase", GIMP_STOCK_CHANNEL_RED,
+  { "context-background-red-increase", GIMP_ICON_CHANNEL_RED,
     "Background Red Increase", NULL, NULL,
     GIMP_ACTION_SELECT_NEXT, FALSE,
     NULL },
-  { "context-background-red-decrease-skip", GIMP_STOCK_CHANNEL_RED,
+  { "context-background-red-decrease-skip", GIMP_ICON_CHANNEL_RED,
     "Background Red Decrease 10%", NULL, NULL,
     GIMP_ACTION_SELECT_SKIP_PREVIOUS, FALSE,
     NULL },
-  { "context-background-red-increase-skip", GIMP_STOCK_CHANNEL_RED,
+  { "context-background-red-increase-skip", GIMP_ICON_CHANNEL_RED,
     "Background Red Increase 10%", NULL, NULL,
     GIMP_ACTION_SELECT_SKIP_NEXT, FALSE,
     NULL }
@@ -413,31 +413,31 @@ static const GimpEnumActionEntry context_background_red_actions[] =
 
 static const GimpEnumActionEntry context_background_green_actions[] =
 {
-  { "context-background-green-set", GIMP_STOCK_CHANNEL_GREEN,
+  { "context-background-green-set", GIMP_ICON_CHANNEL_GREEN,
     "Background Green Set", NULL, NULL,
     GIMP_ACTION_SELECT_SET, TRUE,
     NULL },
-  { "context-background-green-minimum", GIMP_STOCK_CHANNEL_GREEN,
+  { "context-background-green-minimum", GIMP_ICON_CHANNEL_GREEN,
     "Background Green Minimum", NULL, NULL,
     GIMP_ACTION_SELECT_FIRST, FALSE,
     NULL },
-  { "context-background-green-maximum", GIMP_STOCK_CHANNEL_GREEN,
+  { "context-background-green-maximum", GIMP_ICON_CHANNEL_GREEN,
     "Background Green Maximum", NULL, NULL,
     GIMP_ACTION_SELECT_LAST, FALSE,
     NULL },
-  { "context-background-green-decrease", GIMP_STOCK_CHANNEL_GREEN,
+  { "context-background-green-decrease", GIMP_ICON_CHANNEL_GREEN,
     "Background Green Decrease", NULL, NULL,
     GIMP_ACTION_SELECT_PREVIOUS, FALSE,
     NULL },
-  { "context-background-green-increase", GIMP_STOCK_CHANNEL_GREEN,
+  { "context-background-green-increase", GIMP_ICON_CHANNEL_GREEN,
     "Background Green Increase", NULL, NULL,
     GIMP_ACTION_SELECT_NEXT, FALSE,
     NULL },
-  { "context-background-green-decrease-skip", GIMP_STOCK_CHANNEL_GREEN,
+  { "context-background-green-decrease-skip", GIMP_ICON_CHANNEL_GREEN,
     "Background Green Decrease 10%", NULL, NULL,
     GIMP_ACTION_SELECT_SKIP_PREVIOUS, FALSE,
     NULL },
-  { "context-background-green-increase-skip", GIMP_STOCK_CHANNEL_GREEN,
+  { "context-background-green-increase-skip", GIMP_ICON_CHANNEL_GREEN,
     "Background Green Increase 10%", NULL, NULL,
     GIMP_ACTION_SELECT_SKIP_NEXT, FALSE,
     NULL }
@@ -445,31 +445,31 @@ static const GimpEnumActionEntry context_background_green_actions[] =
 
 static const GimpEnumActionEntry context_background_blue_actions[] =
 {
-  { "context-background-blue-set", GIMP_STOCK_CHANNEL_BLUE,
+  { "context-background-blue-set", GIMP_ICON_CHANNEL_BLUE,
     "Background Blue Set", NULL, NULL,
     GIMP_ACTION_SELECT_SET, TRUE,
     NULL },
-  { "context-background-blue-minimum", GIMP_STOCK_CHANNEL_BLUE,
+  { "context-background-blue-minimum", GIMP_ICON_CHANNEL_BLUE,
     "Background Blue Minimum", NULL, NULL,
     GIMP_ACTION_SELECT_FIRST, FALSE,
     NULL },
-  { "context-background-blue-maximum", GIMP_STOCK_CHANNEL_BLUE,
+  { "context-background-blue-maximum", GIMP_ICON_CHANNEL_BLUE,
     "Background Blue Maximum", NULL, NULL,
     GIMP_ACTION_SELECT_LAST, FALSE,
     NULL },
-  { "context-background-blue-decrease", GIMP_STOCK_CHANNEL_BLUE,
+  { "context-background-blue-decrease", GIMP_ICON_CHANNEL_BLUE,
     "Background Blue Decrease", NULL, NULL,
     GIMP_ACTION_SELECT_PREVIOUS, FALSE,
     NULL },
-  { "context-background-blue-increase", GIMP_STOCK_CHANNEL_BLUE,
+  { "context-background-blue-increase", GIMP_ICON_CHANNEL_BLUE,
     "Background Blue Increase", NULL, NULL,
     GIMP_ACTION_SELECT_NEXT, FALSE,
     NULL },
-  { "context-background-blue-decrease-skip", GIMP_STOCK_CHANNEL_BLUE,
+  { "context-background-blue-decrease-skip", GIMP_ICON_CHANNEL_BLUE,
     "Background Blue Decrease 10%", NULL, NULL,
     GIMP_ACTION_SELECT_SKIP_PREVIOUS, FALSE,
     NULL },
-  { "context-background-blue-increase-skip", GIMP_STOCK_CHANNEL_BLUE,
+  { "context-background-blue-increase-skip", GIMP_ICON_CHANNEL_BLUE,
     "Background Blue Increase 10%", NULL, NULL,
     GIMP_ACTION_SELECT_SKIP_NEXT, FALSE,
     NULL }
@@ -477,31 +477,31 @@ static const GimpEnumActionEntry context_background_blue_actions[] =
 
 static const GimpEnumActionEntry context_foreground_hue_actions[] =
 {
-  { "context-foreground-hue-set", GIMP_STOCK_TOOL_HUE_SATURATION,
+  { "context-foreground-hue-set", GIMP_ICON_TOOL_HUE_SATURATION,
     "Foreground Hue Set", NULL, NULL,
     GIMP_ACTION_SELECT_SET, TRUE,
     NULL },
-  { "context-foreground-hue-minimum", GIMP_STOCK_TOOL_HUE_SATURATION,
+  { "context-foreground-hue-minimum", GIMP_ICON_TOOL_HUE_SATURATION,
     "Foreground Hue Minimum", NULL, NULL,
     GIMP_ACTION_SELECT_FIRST, FALSE,
     NULL },
-  { "context-foreground-hue-maximum", GIMP_STOCK_TOOL_HUE_SATURATION,
+  { "context-foreground-hue-maximum", GIMP_ICON_TOOL_HUE_SATURATION,
     "Foreground Hue Maximum", NULL, NULL,
     GIMP_ACTION_SELECT_LAST, FALSE,
     NULL },
-  { "context-foreground-hue-decrease", GIMP_STOCK_TOOL_HUE_SATURATION,
+  { "context-foreground-hue-decrease", GIMP_ICON_TOOL_HUE_SATURATION,
     "Foreground Hue Decrease", NULL, NULL,
     GIMP_ACTION_SELECT_PREVIOUS, FALSE,
     NULL },
-  { "context-foreground-hue-increase", GIMP_STOCK_TOOL_HUE_SATURATION,
+  { "context-foreground-hue-increase", GIMP_ICON_TOOL_HUE_SATURATION,
     "Foreground Hue Increase", NULL, NULL,
     GIMP_ACTION_SELECT_NEXT, FALSE,
     NULL },
-  { "context-foreground-hue-decrease-skip", GIMP_STOCK_TOOL_HUE_SATURATION,
+  { "context-foreground-hue-decrease-skip", GIMP_ICON_TOOL_HUE_SATURATION,
     "Foreground Hue Decrease 10%", NULL, NULL,
     GIMP_ACTION_SELECT_SKIP_PREVIOUS, FALSE,
     NULL },
-  { "context-foreground-hue-increase-skip", GIMP_STOCK_TOOL_HUE_SATURATION,
+  { "context-foreground-hue-increase-skip", GIMP_ICON_TOOL_HUE_SATURATION,
     "Foreground Hue Increase 10%", NULL, NULL,
     GIMP_ACTION_SELECT_SKIP_NEXT, FALSE,
     NULL }
@@ -509,31 +509,31 @@ static const GimpEnumActionEntry context_foreground_hue_actions[] =
 
 static const GimpEnumActionEntry context_foreground_saturation_actions[] =
 {
-  { "context-foreground-saturation-set", GIMP_STOCK_TOOL_HUE_SATURATION,
+  { "context-foreground-saturation-set", GIMP_ICON_TOOL_HUE_SATURATION,
     "Foreground Saturation Set", NULL, NULL,
     GIMP_ACTION_SELECT_SET, TRUE,
     NULL },
-  { "context-foreground-saturation-minimum", GIMP_STOCK_TOOL_HUE_SATURATION,
+  { "context-foreground-saturation-minimum", GIMP_ICON_TOOL_HUE_SATURATION,
     "Foreground Saturation Minimum", NULL, NULL,
     GIMP_ACTION_SELECT_FIRST, FALSE,
     NULL },
-  { "context-foreground-saturation-maximum", GIMP_STOCK_TOOL_HUE_SATURATION,
+  { "context-foreground-saturation-maximum", GIMP_ICON_TOOL_HUE_SATURATION,
     "Foreground Saturation Maximum", NULL, NULL,
     GIMP_ACTION_SELECT_LAST, FALSE,
     NULL },
-  { "context-foreground-saturation-decrease", GIMP_STOCK_TOOL_HUE_SATURATION,
+  { "context-foreground-saturation-decrease", GIMP_ICON_TOOL_HUE_SATURATION,
     "Foreground Saturation Decrease", NULL, NULL,
     GIMP_ACTION_SELECT_PREVIOUS, FALSE,
     NULL },
-  { "context-foreground-saturation-increase", GIMP_STOCK_TOOL_HUE_SATURATION,
+  { "context-foreground-saturation-increase", GIMP_ICON_TOOL_HUE_SATURATION,
     "Foreground Saturation Increase", NULL, NULL,
     GIMP_ACTION_SELECT_NEXT, FALSE,
     NULL },
-  { "context-foreground-saturation-decrease-skip", GIMP_STOCK_TOOL_HUE_SATURATION,
+  { "context-foreground-saturation-decrease-skip", GIMP_ICON_TOOL_HUE_SATURATION,
     "Foreground Saturation Decrease 10%", NULL, NULL,
     GIMP_ACTION_SELECT_SKIP_PREVIOUS, FALSE,
     NULL },
-  { "context-foreground-saturation-increase-skip", GIMP_STOCK_TOOL_HUE_SATURATION,
+  { "context-foreground-saturation-increase-skip", GIMP_ICON_TOOL_HUE_SATURATION,
     "Foreground Saturation Increase 10%", NULL, NULL,
     GIMP_ACTION_SELECT_SKIP_NEXT, FALSE,
     NULL }
@@ -541,31 +541,31 @@ static const GimpEnumActionEntry context_foreground_saturation_actions[] =
 
 static const GimpEnumActionEntry context_foreground_value_actions[] =
 {
-  { "context-foreground-value-set", GIMP_STOCK_TOOL_HUE_SATURATION,
+  { "context-foreground-value-set", GIMP_ICON_TOOL_HUE_SATURATION,
     "Foreground Value Set", NULL, NULL,
     GIMP_ACTION_SELECT_SET, TRUE,
     NULL },
-  { "context-foreground-value-minimum", GIMP_STOCK_TOOL_HUE_SATURATION,
+  { "context-foreground-value-minimum", GIMP_ICON_TOOL_HUE_SATURATION,
     "Foreground Value Minimum", NULL, NULL,
     GIMP_ACTION_SELECT_FIRST, FALSE,
     NULL },
-  { "context-foreground-value-maximum", GIMP_STOCK_TOOL_HUE_SATURATION,
+  { "context-foreground-value-maximum", GIMP_ICON_TOOL_HUE_SATURATION,
     "Foreground Value Maximum", NULL, NULL,
     GIMP_ACTION_SELECT_LAST, FALSE,
     NULL },
-  { "context-foreground-value-decrease", GIMP_STOCK_TOOL_HUE_SATURATION,
+  { "context-foreground-value-decrease", GIMP_ICON_TOOL_HUE_SATURATION,
     "Foreground Value Decrease", NULL, NULL,
     GIMP_ACTION_SELECT_PREVIOUS, FALSE,
     NULL },
-  { "context-foreground-value-increase", GIMP_STOCK_TOOL_HUE_SATURATION,
+  { "context-foreground-value-increase", GIMP_ICON_TOOL_HUE_SATURATION,
     "Foreground Value Increase", NULL, NULL,
     GIMP_ACTION_SELECT_NEXT, FALSE,
     NULL },
-  { "context-foreground-value-decrease-skip", GIMP_STOCK_TOOL_HUE_SATURATION,
+  { "context-foreground-value-decrease-skip", GIMP_ICON_TOOL_HUE_SATURATION,
     "Foreground Value Decrease 10%", NULL, NULL,
     GIMP_ACTION_SELECT_SKIP_PREVIOUS, FALSE,
     NULL },
-  { "context-foreground-value-increase-skip", GIMP_STOCK_TOOL_HUE_SATURATION,
+  { "context-foreground-value-increase-skip", GIMP_ICON_TOOL_HUE_SATURATION,
     "Foreground Value Increase 10%", NULL, NULL,
     GIMP_ACTION_SELECT_SKIP_NEXT, FALSE,
     NULL }
@@ -573,31 +573,31 @@ static const GimpEnumActionEntry context_foreground_value_actions[] =
 
 static const GimpEnumActionEntry context_background_hue_actions[] =
 {
-  { "context-background-hue-set", GIMP_STOCK_TOOL_HUE_SATURATION,
+  { "context-background-hue-set", GIMP_ICON_TOOL_HUE_SATURATION,
     "Background Hue Set", NULL, NULL,
     GIMP_ACTION_SELECT_SET, TRUE,
     NULL },
-  { "context-background-hue-minimum", GIMP_STOCK_TOOL_HUE_SATURATION,
+  { "context-background-hue-minimum", GIMP_ICON_TOOL_HUE_SATURATION,
     "Background Hue Minimum", NULL, NULL,
     GIMP_ACTION_SELECT_FIRST, FALSE,
     NULL },
-  { "context-background-hue-maximum", GIMP_STOCK_TOOL_HUE_SATURATION,
+  { "context-background-hue-maximum", GIMP_ICON_TOOL_HUE_SATURATION,
     "Background Hue Maximum", NULL, NULL,
     GIMP_ACTION_SELECT_LAST, FALSE,
     NULL },
-  { "context-background-hue-decrease", GIMP_STOCK_TOOL_HUE_SATURATION,
+  { "context-background-hue-decrease", GIMP_ICON_TOOL_HUE_SATURATION,
     "Background Hue Decrease", NULL, NULL,
     GIMP_ACTION_SELECT_PREVIOUS, FALSE,
     NULL },
-  { "context-background-hue-increase", GIMP_STOCK_TOOL_HUE_SATURATION,
+  { "context-background-hue-increase", GIMP_ICON_TOOL_HUE_SATURATION,
     "Background Hue Increase", NULL, NULL,
     GIMP_ACTION_SELECT_NEXT, FALSE,
     NULL },
-  { "context-background-hue-decrease-skip", GIMP_STOCK_TOOL_HUE_SATURATION,
+  { "context-background-hue-decrease-skip", GIMP_ICON_TOOL_HUE_SATURATION,
     "Background Hue Decrease 10%", NULL, NULL,
     GIMP_ACTION_SELECT_SKIP_PREVIOUS, FALSE,
     NULL },
-  { "context-background-hue-increase-skip", GIMP_STOCK_TOOL_HUE_SATURATION,
+  { "context-background-hue-increase-skip", GIMP_ICON_TOOL_HUE_SATURATION,
     "Background Hue Increase 10%", NULL, NULL,
     GIMP_ACTION_SELECT_SKIP_NEXT, FALSE,
     NULL }
@@ -605,31 +605,31 @@ static const GimpEnumActionEntry context_background_hue_actions[] =
 
 static const GimpEnumActionEntry context_background_saturation_actions[] =
 {
-  { "context-background-saturation-set", GIMP_STOCK_TOOL_HUE_SATURATION,
+  { "context-background-saturation-set", GIMP_ICON_TOOL_HUE_SATURATION,
     "Background Saturation Set", NULL, NULL,
     GIMP_ACTION_SELECT_SET, TRUE,
     NULL },
-  { "context-background-saturation-minimum", GIMP_STOCK_TOOL_HUE_SATURATION,
+  { "context-background-saturation-minimum", GIMP_ICON_TOOL_HUE_SATURATION,
     "Background Saturation Minimum", NULL, NULL,
     GIMP_ACTION_SELECT_FIRST, FALSE,
     NULL },
-  { "context-background-saturation-maximum", GIMP_STOCK_TOOL_HUE_SATURATION,
+  { "context-background-saturation-maximum", GIMP_ICON_TOOL_HUE_SATURATION,
     "Background Saturation Maximum", NULL, NULL,
     GIMP_ACTION_SELECT_LAST, FALSE,
     NULL },
-  { "context-background-saturation-decrease", GIMP_STOCK_TOOL_HUE_SATURATION,
+  { "context-background-saturation-decrease", GIMP_ICON_TOOL_HUE_SATURATION,
     "Background Saturation Decrease", NULL, NULL,
     GIMP_ACTION_SELECT_PREVIOUS, FALSE,
     NULL },
-  { "context-background-saturation-increase", GIMP_STOCK_TOOL_HUE_SATURATION,
+  { "context-background-saturation-increase", GIMP_ICON_TOOL_HUE_SATURATION,
     "Background Saturation Increase", NULL, NULL,
     GIMP_ACTION_SELECT_NEXT, FALSE,
     NULL },
-  { "context-background-saturation-decrease-skip", GIMP_STOCK_TOOL_HUE_SATURATION,
+  { "context-background-saturation-decrease-skip", GIMP_ICON_TOOL_HUE_SATURATION,
     "Background Saturation Decrease 10%", NULL, NULL,
     GIMP_ACTION_SELECT_SKIP_PREVIOUS, FALSE,
     NULL },
-  { "context-background-saturation-increase-skip", GIMP_STOCK_TOOL_HUE_SATURATION,
+  { "context-background-saturation-increase-skip", GIMP_ICON_TOOL_HUE_SATURATION,
     "Background Saturation Increase 10%", NULL, NULL,
     GIMP_ACTION_SELECT_SKIP_NEXT, FALSE,
     NULL }
@@ -637,31 +637,31 @@ static const GimpEnumActionEntry context_background_saturation_actions[] =
 
 static const GimpEnumActionEntry context_background_value_actions[] =
 {
-  { "context-background-value-set", GIMP_STOCK_TOOL_HUE_SATURATION,
+  { "context-background-value-set", GIMP_ICON_TOOL_HUE_SATURATION,
     "Background Value Set", NULL, NULL,
     GIMP_ACTION_SELECT_SET, TRUE,
     NULL },
-  { "context-background-value-minimum", GIMP_STOCK_TOOL_HUE_SATURATION,
+  { "context-background-value-minimum", GIMP_ICON_TOOL_HUE_SATURATION,
     "Background Value Minimum", NULL, NULL,
     GIMP_ACTION_SELECT_FIRST, FALSE,
     NULL },
-  { "context-background-value-maximum", GIMP_STOCK_TOOL_HUE_SATURATION,
+  { "context-background-value-maximum", GIMP_ICON_TOOL_HUE_SATURATION,
     "Background Value Maximum", NULL, NULL,
     GIMP_ACTION_SELECT_LAST, FALSE,
     NULL },
-  { "context-background-value-decrease", GIMP_STOCK_TOOL_HUE_SATURATION,
+  { "context-background-value-decrease", GIMP_ICON_TOOL_HUE_SATURATION,
     "Background Value Decrease", NULL, NULL,
     GIMP_ACTION_SELECT_PREVIOUS, FALSE,
     NULL },
-  { "context-background-value-increase", GIMP_STOCK_TOOL_HUE_SATURATION,
+  { "context-background-value-increase", GIMP_ICON_TOOL_HUE_SATURATION,
     "Background Value Increase", NULL, NULL,
     GIMP_ACTION_SELECT_NEXT, FALSE,
     NULL },
-  { "context-background-value-decrease-skip", GIMP_STOCK_TOOL_HUE_SATURATION,
+  { "context-background-value-decrease-skip", GIMP_ICON_TOOL_HUE_SATURATION,
     "Background Value Decrease 10%", NULL, NULL,
     GIMP_ACTION_SELECT_SKIP_PREVIOUS, FALSE,
     NULL },
-  { "context-background-value-increase-skip", GIMP_STOCK_TOOL_HUE_SATURATION,
+  { "context-background-value-increase-skip", GIMP_ICON_TOOL_HUE_SATURATION,
     "Background Value Increase 10%", NULL, NULL,
     GIMP_ACTION_SELECT_SKIP_NEXT, FALSE,
     NULL }
@@ -669,31 +669,31 @@ static const GimpEnumActionEntry context_background_value_actions[] =
 
 static const GimpEnumActionEntry context_opacity_actions[] =
 {
-  { "context-opacity-set", GIMP_STOCK_TRANSPARENCY,
+  { "context-opacity-set", GIMP_ICON_TRANSPARENCY,
     "Set Transparency", NULL, NULL,
     GIMP_ACTION_SELECT_SET, TRUE,
     NULL },
-  { "context-opacity-transparent", GIMP_STOCK_TRANSPARENCY,
+  { "context-opacity-transparent", GIMP_ICON_TRANSPARENCY,
     "Completely Transparent", NULL, NULL,
     GIMP_ACTION_SELECT_FIRST, FALSE,
     NULL },
-  { "context-opacity-opaque", GIMP_STOCK_TRANSPARENCY,
+  { "context-opacity-opaque", GIMP_ICON_TRANSPARENCY,
     "Completely Opaque", NULL, NULL,
     GIMP_ACTION_SELECT_LAST, FALSE,
     NULL },
-  { "context-opacity-decrease", GIMP_STOCK_TRANSPARENCY,
+  { "context-opacity-decrease", GIMP_ICON_TRANSPARENCY,
     "More Transparent", NULL, NULL,
     GIMP_ACTION_SELECT_PREVIOUS, FALSE,
     NULL },
-  { "context-opacity-increase", GIMP_STOCK_TRANSPARENCY,
+  { "context-opacity-increase", GIMP_ICON_TRANSPARENCY,
     "More Opaque", NULL, NULL,
     GIMP_ACTION_SELECT_NEXT, FALSE,
     NULL },
-  { "context-opacity-decrease-skip", GIMP_STOCK_TRANSPARENCY,
+  { "context-opacity-decrease-skip", GIMP_ICON_TRANSPARENCY,
     "10% More Transparent", NULL, NULL,
     GIMP_ACTION_SELECT_SKIP_PREVIOUS, FALSE,
     NULL },
-  { "context-opacity-increase-skip", GIMP_STOCK_TRANSPARENCY,
+  { "context-opacity-increase-skip", GIMP_ICON_TRANSPARENCY,
     "10% More Opaque", NULL, NULL,
     GIMP_ACTION_SELECT_SKIP_NEXT, FALSE,
     NULL }
@@ -701,19 +701,19 @@ static const GimpEnumActionEntry context_opacity_actions[] =
 
 static const GimpEnumActionEntry context_paint_mode_actions[] =
 {
-  { "context-paint-mode-first", GIMP_STOCK_TOOL_PENCIL,
+  { "context-paint-mode-first", GIMP_ICON_TOOL_PENCIL,
     "First Paint Mode", NULL, NULL,
     GIMP_ACTION_SELECT_FIRST, FALSE,
     NULL },
-  { "context-paint-mode-last", GIMP_STOCK_TOOL_PENCIL,
+  { "context-paint-mode-last", GIMP_ICON_TOOL_PENCIL,
     "Last Paint Mode", NULL, NULL,
     GIMP_ACTION_SELECT_LAST, FALSE,
     NULL },
-  { "context-paint-mode-previous", GIMP_STOCK_TOOL_PENCIL,
+  { "context-paint-mode-previous", GIMP_ICON_TOOL_PENCIL,
     "Previous Paint Mode", NULL, NULL,
     GIMP_ACTION_SELECT_PREVIOUS, FALSE,
     NULL },
-  { "context-paint-mode-next", GIMP_STOCK_TOOL_PENCIL,
+  { "context-paint-mode-next", GIMP_ICON_TOOL_PENCIL,
     "Next Paint Mode", NULL, NULL,
     GIMP_ACTION_SELECT_NEXT, FALSE,
     NULL }
@@ -721,23 +721,23 @@ static const GimpEnumActionEntry context_paint_mode_actions[] =
 
 static const GimpEnumActionEntry context_tool_select_actions[] =
 {
-  { "context-tool-select-set", GIMP_STOCK_TOOLS,
+  { "context-tool-select-set", GIMP_ICON_DIALOG_TOOLS,
     "Select Tool by Index", NULL, NULL,
     GIMP_ACTION_SELECT_SET, TRUE,
     NULL },
-  { "context-tool-select-first", GIMP_STOCK_TOOLS,
+  { "context-tool-select-first", GIMP_ICON_DIALOG_TOOLS,
     "First Tool", NULL, NULL,
     GIMP_ACTION_SELECT_FIRST, FALSE,
     NULL },
-  { "context-tool-select-last", GIMP_STOCK_TOOLS,
+  { "context-tool-select-last", GIMP_ICON_DIALOG_TOOLS,
     "Last Tool", NULL, NULL,
     GIMP_ACTION_SELECT_LAST, FALSE,
     NULL },
-  { "context-tool-select-previous", GIMP_STOCK_TOOLS,
+  { "context-tool-select-previous", GIMP_ICON_DIALOG_TOOLS,
     "Previous Tool", NULL, NULL,
     GIMP_ACTION_SELECT_PREVIOUS, FALSE,
     NULL },
-  { "context-tool-select-next", GIMP_STOCK_TOOLS,
+  { "context-tool-select-next", GIMP_ICON_DIALOG_TOOLS,
     "Next Tool", NULL, NULL,
     GIMP_ACTION_SELECT_NEXT, FALSE,
     NULL }
@@ -745,23 +745,23 @@ static const GimpEnumActionEntry context_tool_select_actions[] =
 
 static const GimpEnumActionEntry context_brush_select_actions[] =
 {
-  { "context-brush-select-set", GIMP_STOCK_BRUSH,
+  { "context-brush-select-set", GIMP_ICON_BRUSH,
     "Select Brush by Index", NULL, NULL,
     GIMP_ACTION_SELECT_SET, TRUE,
     NULL },
-  { "context-brush-select-first", GIMP_STOCK_BRUSH,
+  { "context-brush-select-first", GIMP_ICON_BRUSH,
     "First Brush", NULL, NULL,
     GIMP_ACTION_SELECT_FIRST, FALSE,
     NULL },
-  { "context-brush-select-last", GIMP_STOCK_BRUSH,
+  { "context-brush-select-last", GIMP_ICON_BRUSH,
     "Last Brush", NULL, NULL,
     GIMP_ACTION_SELECT_LAST, FALSE,
     NULL },
-  { "context-brush-select-previous", GIMP_STOCK_BRUSH,
+  { "context-brush-select-previous", GIMP_ICON_BRUSH,
     "Previous Brush", NULL, NULL,
     GIMP_ACTION_SELECT_PREVIOUS, FALSE,
     NULL },
-  { "context-brush-select-next", GIMP_STOCK_BRUSH,
+  { "context-brush-select-next", GIMP_ICON_BRUSH,
     "Next Brush", NULL, NULL,
     GIMP_ACTION_SELECT_NEXT, FALSE,
     NULL }
@@ -769,23 +769,23 @@ static const GimpEnumActionEntry context_brush_select_actions[] =
 
 static const GimpEnumActionEntry context_pattern_select_actions[] =
 {
-  { "context-pattern-select-set", GIMP_STOCK_PATTERN,
+  { "context-pattern-select-set", GIMP_ICON_PATTERN,
     "Select Pattern by Index", NULL, NULL,
     GIMP_ACTION_SELECT_SET, TRUE,
     NULL },
-  { "context-pattern-select-first", GIMP_STOCK_PATTERN,
+  { "context-pattern-select-first", GIMP_ICON_PATTERN,
     "First Pattern", NULL, NULL,
     GIMP_ACTION_SELECT_FIRST, FALSE,
     NULL },
-  { "context-pattern-select-last", GIMP_STOCK_PATTERN,
+  { "context-pattern-select-last", GIMP_ICON_PATTERN,
     "Last Pattern", NULL, NULL,
     GIMP_ACTION_SELECT_LAST, FALSE,
     NULL },
-  { "context-pattern-select-previous", GIMP_STOCK_PATTERN,
+  { "context-pattern-select-previous", GIMP_ICON_PATTERN,
     "Previous Pattern", NULL, NULL,
     GIMP_ACTION_SELECT_PREVIOUS, FALSE,
     NULL },
-  { "context-pattern-select-next", GIMP_STOCK_PATTERN,
+  { "context-pattern-select-next", GIMP_ICON_PATTERN,
     "Next Pattern", NULL, NULL,
     GIMP_ACTION_SELECT_NEXT, FALSE,
     NULL }
@@ -793,23 +793,23 @@ static const GimpEnumActionEntry context_pattern_select_actions[] =
 
 static const GimpEnumActionEntry context_palette_select_actions[] =
 {
-  { "context-palette-select-set", GIMP_STOCK_PALETTE,
+  { "context-palette-select-set", GIMP_ICON_PALETTE,
     "Select Palette by Index", NULL, NULL,
     GIMP_ACTION_SELECT_SET, TRUE,
     NULL },
-  { "context-palette-select-first", GIMP_STOCK_PALETTE,
+  { "context-palette-select-first", GIMP_ICON_PALETTE,
     "First Palette", NULL, NULL,
     GIMP_ACTION_SELECT_FIRST, FALSE,
     NULL },
-  { "context-palette-select-last", GIMP_STOCK_PALETTE,
+  { "context-palette-select-last", GIMP_ICON_PALETTE,
     "Last Palette", NULL, NULL,
     GIMP_ACTION_SELECT_LAST, FALSE,
     NULL },
-  { "context-palette-select-previous", GIMP_STOCK_PALETTE,
+  { "context-palette-select-previous", GIMP_ICON_PALETTE,
     "Previous Palette", NULL, NULL,
     GIMP_ACTION_SELECT_PREVIOUS, FALSE,
     NULL },
-  { "context-palette-select-next", GIMP_STOCK_PALETTE,
+  { "context-palette-select-next", GIMP_ICON_PALETTE,
     "Next Palette", NULL, NULL,
     GIMP_ACTION_SELECT_NEXT, FALSE,
     NULL }
@@ -817,23 +817,23 @@ static const GimpEnumActionEntry context_palette_select_actions[] =
 
 static const GimpEnumActionEntry context_gradient_select_actions[] =
 {
-  { "context-gradient-select-set", GIMP_STOCK_GRADIENT,
+  { "context-gradient-select-set", GIMP_ICON_GRADIENT,
     "Select Gradient by Index", NULL, NULL,
     GIMP_ACTION_SELECT_SET, TRUE,
     NULL },
-  { "context-gradient-select-first", GIMP_STOCK_GRADIENT,
+  { "context-gradient-select-first", GIMP_ICON_GRADIENT,
     "First Gradient", NULL, NULL,
     GIMP_ACTION_SELECT_FIRST, FALSE,
     NULL },
-  { "context-gradient-select-last", GIMP_STOCK_GRADIENT,
+  { "context-gradient-select-last", GIMP_ICON_GRADIENT,
     "Last Gradient", NULL, NULL,
     GIMP_ACTION_SELECT_LAST, FALSE,
     NULL },
-  { "context-gradient-select-previous", GIMP_STOCK_GRADIENT,
+  { "context-gradient-select-previous", GIMP_ICON_GRADIENT,
     "Previous Gradient", NULL, NULL,
     GIMP_ACTION_SELECT_PREVIOUS, FALSE,
     NULL },
-  { "context-gradient-select-next", GIMP_STOCK_GRADIENT,
+  { "context-gradient-select-next", GIMP_ICON_GRADIENT,
     "Next Gradient", NULL, NULL,
     GIMP_ACTION_SELECT_NEXT, FALSE,
     NULL }
@@ -841,23 +841,23 @@ static const GimpEnumActionEntry context_gradient_select_actions[] =
 
 static const GimpEnumActionEntry context_font_select_actions[] =
 {
-  { "context-font-select-set", "gtk-select-font",
+  { "context-font-select-set", GIMP_ICON_FONT,
     "Select Font by Index", NULL, NULL,
     GIMP_ACTION_SELECT_SET, TRUE,
     NULL },
-  { "context-font-select-first", "gtk-select-font",
+  { "context-font-select-first", GIMP_ICON_FONT,
     "First Font", NULL, NULL,
     GIMP_ACTION_SELECT_FIRST, FALSE,
     NULL },
-  { "context-font-select-last", "gtk-select-font",
+  { "context-font-select-last", GIMP_ICON_FONT,
     "Last Font", NULL, NULL,
     GIMP_ACTION_SELECT_LAST, FALSE,
     NULL },
-  { "context-font-select-previous", "gtk-select-font",
+  { "context-font-select-previous", GIMP_ICON_FONT,
     "Previous Font", NULL, NULL,
     GIMP_ACTION_SELECT_PREVIOUS, FALSE,
     NULL },
-  { "context-font-select-next", "gtk-select-font",
+  { "context-font-select-next", GIMP_ICON_FONT,
     "Next Font", NULL, NULL,
     GIMP_ACTION_SELECT_NEXT, FALSE,
     NULL }
@@ -865,31 +865,31 @@ static const GimpEnumActionEntry context_font_select_actions[] =
 
 static const GimpEnumActionEntry context_brush_spacing_actions[] =
 {
-  { "context-brush-spacing-set", GIMP_STOCK_BRUSH,
+  { "context-brush-spacing-set", GIMP_ICON_BRUSH,
     "Set Brush Spacing", NULL, NULL,
     GIMP_ACTION_SELECT_SET, TRUE,
     NULL },
-  { "context-brush-spacing-minimum", GIMP_STOCK_BRUSH,
+  { "context-brush-spacing-minimum", GIMP_ICON_BRUSH,
     "Minimum Spacing", NULL, NULL,
     GIMP_ACTION_SELECT_FIRST, FALSE,
     NULL },
-  { "context-brush-spacing-maximum", GIMP_STOCK_BRUSH,
+  { "context-brush-spacing-maximum", GIMP_ICON_BRUSH,
     "Maximum Spacing", NULL, NULL,
     GIMP_ACTION_SELECT_LAST, FALSE,
     NULL },
-  { "context-brush-spacing-decrease", GIMP_STOCK_BRUSH,
+  { "context-brush-spacing-decrease", GIMP_ICON_BRUSH,
     "Decrease Spacing", NULL, NULL,
     GIMP_ACTION_SELECT_PREVIOUS, FALSE,
     NULL },
-  { "context-brush-spacing-increase", GIMP_STOCK_BRUSH,
+  { "context-brush-spacing-increase", GIMP_ICON_BRUSH,
     "Increase Spacing", NULL, NULL,
     GIMP_ACTION_SELECT_NEXT, FALSE,
     NULL },
-  { "context-brush-spacing-decrease-skip", GIMP_STOCK_BRUSH,
+  { "context-brush-spacing-decrease-skip", GIMP_ICON_BRUSH,
     "Decrease Spacing More", NULL, NULL,
     GIMP_ACTION_SELECT_SKIP_PREVIOUS, FALSE,
     NULL },
-  { "context-brush-spacing-increase-skip", GIMP_STOCK_BRUSH,
+  { "context-brush-spacing-increase-skip", GIMP_ICON_BRUSH,
     "Increase Spacing More", NULL, NULL,
     GIMP_ACTION_SELECT_SKIP_NEXT, FALSE,
     NULL }
@@ -897,15 +897,15 @@ static const GimpEnumActionEntry context_brush_spacing_actions[] =
 
 static const GimpEnumActionEntry context_brush_shape_actions[] =
 {
-  { "context-brush-shape-circle", GIMP_STOCK_BRUSH,
+  { "context-brush-shape-circle", GIMP_ICON_BRUSH,
     "Circular Brush", NULL, NULL,
     GIMP_BRUSH_GENERATED_CIRCLE, FALSE,
     NULL },
-  { "context-brush-shape-square", GIMP_STOCK_BRUSH,
+  { "context-brush-shape-square", GIMP_ICON_BRUSH,
     "Square Brush", NULL, NULL,
     GIMP_BRUSH_GENERATED_SQUARE, FALSE,
     NULL },
-  { "context-brush-shape-diamond", GIMP_STOCK_BRUSH,
+  { "context-brush-shape-diamond", GIMP_ICON_BRUSH,
     "Diamond Brush", NULL, NULL,
     GIMP_BRUSH_GENERATED_DIAMOND, FALSE,
     NULL }
@@ -913,47 +913,47 @@ static const GimpEnumActionEntry context_brush_shape_actions[] =
 
 static const GimpEnumActionEntry context_brush_radius_actions[] =
 {
-  { "context-brush-radius-set", GIMP_STOCK_BRUSH,
+  { "context-brush-radius-set", GIMP_ICON_BRUSH,
     "Set Brush Radius", NULL, NULL,
     GIMP_ACTION_SELECT_SET, TRUE,
     NULL },
-  { "context-brush-radius-minimum", GIMP_STOCK_BRUSH,
+  { "context-brush-radius-minimum", GIMP_ICON_BRUSH,
     "Minimum Radius", NULL, NULL,
     GIMP_ACTION_SELECT_FIRST, FALSE,
     NULL },
-  { "context-brush-radius-maximum", GIMP_STOCK_BRUSH,
+  { "context-brush-radius-maximum", GIMP_ICON_BRUSH,
     "Maximum Radius", NULL, NULL,
     GIMP_ACTION_SELECT_LAST, FALSE,
     NULL },
-  { "context-brush-radius-decrease-less", GIMP_STOCK_BRUSH,
+  { "context-brush-radius-decrease-less", GIMP_ICON_BRUSH,
     "Decrease Radius Less", NULL, NULL,
     GIMP_ACTION_SELECT_SMALL_PREVIOUS, FALSE,
     NULL },
-  { "context-brush-radius-increase-less", GIMP_STOCK_BRUSH,
+  { "context-brush-radius-increase-less", GIMP_ICON_BRUSH,
     "Increase Radius Less", NULL, NULL,
     GIMP_ACTION_SELECT_SMALL_NEXT, FALSE,
     NULL },
-  { "context-brush-radius-decrease", GIMP_STOCK_BRUSH,
+  { "context-brush-radius-decrease", GIMP_ICON_BRUSH,
     "Decrease Radius", NULL, NULL,
     GIMP_ACTION_SELECT_PREVIOUS, FALSE,
     NULL },
-  { "context-brush-radius-increase", GIMP_STOCK_BRUSH,
+  { "context-brush-radius-increase", GIMP_ICON_BRUSH,
     "Increase Radius", NULL, NULL,
     GIMP_ACTION_SELECT_NEXT, FALSE,
     NULL },
-  { "context-brush-radius-decrease-skip", GIMP_STOCK_BRUSH,
+  { "context-brush-radius-decrease-skip", GIMP_ICON_BRUSH,
     "Decrease Radius More", NULL, NULL,
     GIMP_ACTION_SELECT_SKIP_PREVIOUS, FALSE,
     NULL },
-  { "context-brush-radius-increase-skip", GIMP_STOCK_BRUSH,
+  { "context-brush-radius-increase-skip", GIMP_ICON_BRUSH,
     "Increase Radius More", NULL, NULL,
     GIMP_ACTION_SELECT_SKIP_NEXT, FALSE,
     NULL },
-  { "context-brush-radius-decrease-percent", GIMP_STOCK_BRUSH,
+  { "context-brush-radius-decrease-percent", GIMP_ICON_BRUSH,
     "Decrease Radius Relative", NULL, NULL,
     GIMP_ACTION_SELECT_PERCENT_PREVIOUS, FALSE,
     NULL },
-  { "context-brush-radius-increase-percent", GIMP_STOCK_BRUSH,
+  { "context-brush-radius-increase-percent", GIMP_ICON_BRUSH,
     "Increase Radius Relative", NULL, NULL,
     GIMP_ACTION_SELECT_PERCENT_NEXT, FALSE,
     NULL }
@@ -961,31 +961,31 @@ static const GimpEnumActionEntry context_brush_radius_actions[] =
 
 static const GimpEnumActionEntry context_brush_spikes_actions[] =
 {
-  { "context-brush-spikes-set", GIMP_STOCK_BRUSH,
+  { "context-brush-spikes-set", GIMP_ICON_BRUSH,
     "Set Brush Spikes", NULL, NULL,
     GIMP_ACTION_SELECT_SET, TRUE,
     NULL },
-  { "context-brush-spikes-minimum", GIMP_STOCK_BRUSH,
+  { "context-brush-spikes-minimum", GIMP_ICON_BRUSH,
     "Minimum Spikes", NULL, NULL,
     GIMP_ACTION_SELECT_FIRST, FALSE,
     NULL },
-  { "context-brush-spikes-maximum", GIMP_STOCK_BRUSH,
+  { "context-brush-spikes-maximum", GIMP_ICON_BRUSH,
     "Maximum Spikes", NULL, NULL,
     GIMP_ACTION_SELECT_LAST, FALSE,
     NULL },
-  { "context-brush-spikes-decrease", GIMP_STOCK_BRUSH,
+  { "context-brush-spikes-decrease", GIMP_ICON_BRUSH,
     "Decrease Spikes", NULL, NULL,
     GIMP_ACTION_SELECT_PREVIOUS, FALSE,
     NULL },
-  { "context-brush-spikes-increase", GIMP_STOCK_BRUSH,
+  { "context-brush-spikes-increase", GIMP_ICON_BRUSH,
     "Increase Spikes", NULL, NULL,
     GIMP_ACTION_SELECT_NEXT, FALSE,
     NULL },
-  { "context-brush-spikes-decrease-skip", GIMP_STOCK_BRUSH,
+  { "context-brush-spikes-decrease-skip", GIMP_ICON_BRUSH,
     "Decrease Spikes More", NULL, NULL,
     GIMP_ACTION_SELECT_SKIP_PREVIOUS, FALSE,
     NULL },
-  { "context-brush-spikes-increase-skip", GIMP_STOCK_BRUSH,
+  { "context-brush-spikes-increase-skip", GIMP_ICON_BRUSH,
     "Increase Spikes More", NULL, NULL,
     GIMP_ACTION_SELECT_SKIP_NEXT, FALSE,
     NULL }
@@ -993,31 +993,31 @@ static const GimpEnumActionEntry context_brush_spikes_actions[] =
 
 static const GimpEnumActionEntry context_brush_hardness_actions[] =
 {
-  { "context-brush-hardness-set", GIMP_STOCK_BRUSH,
+  { "context-brush-hardness-set", GIMP_ICON_BRUSH,
     "Set Brush Hardness", NULL, NULL,
     GIMP_ACTION_SELECT_SET, TRUE,
     NULL },
-  { "context-brush-hardness-minimum", GIMP_STOCK_BRUSH,
+  { "context-brush-hardness-minimum", GIMP_ICON_BRUSH,
     "Minimum Hardness", NULL, NULL,
     GIMP_ACTION_SELECT_FIRST, FALSE,
     NULL },
-  { "context-brush-hardness-maximum", GIMP_STOCK_BRUSH,
+  { "context-brush-hardness-maximum", GIMP_ICON_BRUSH,
     "Maximum Hardness", NULL, NULL,
     GIMP_ACTION_SELECT_LAST, FALSE,
     NULL },
-  { "context-brush-hardness-decrease", GIMP_STOCK_BRUSH,
+  { "context-brush-hardness-decrease", GIMP_ICON_BRUSH,
     "Decrease Hardness", NULL, NULL,
     GIMP_ACTION_SELECT_PREVIOUS, FALSE,
     NULL },
-  { "context-brush-hardness-increase", GIMP_STOCK_BRUSH,
+  { "context-brush-hardness-increase", GIMP_ICON_BRUSH,
     "Increase Hardness", NULL, NULL,
     GIMP_ACTION_SELECT_NEXT, FALSE,
     NULL },
-  { "context-brush-hardness-decrease-skip", GIMP_STOCK_BRUSH,
+  { "context-brush-hardness-decrease-skip", GIMP_ICON_BRUSH,
     "Decrease Hardness More", NULL, NULL,
     GIMP_ACTION_SELECT_SKIP_PREVIOUS, FALSE,
     NULL },
-  { "context-brush-hardness-increase-skip", GIMP_STOCK_BRUSH,
+  { "context-brush-hardness-increase-skip", GIMP_ICON_BRUSH,
     "Increase Hardness More", NULL, NULL,
     GIMP_ACTION_SELECT_SKIP_NEXT, FALSE,
     NULL }
@@ -1025,31 +1025,31 @@ static const GimpEnumActionEntry context_brush_hardness_actions[] =
 
 static const GimpEnumActionEntry context_brush_aspect_actions[] =
 {
-  { "context-brush-aspect-set", GIMP_STOCK_BRUSH,
+  { "context-brush-aspect-set", GIMP_ICON_BRUSH,
     "Set Brush Aspect", NULL, NULL,
     GIMP_ACTION_SELECT_SET, TRUE,
     NULL },
-  { "context-brush-aspect-minimum", GIMP_STOCK_BRUSH,
+  { "context-brush-aspect-minimum", GIMP_ICON_BRUSH,
     "Minimum Aspect", NULL, NULL,
     GIMP_ACTION_SELECT_FIRST, FALSE,
     NULL },
-  { "context-brush-aspect-maximum", GIMP_STOCK_BRUSH,
+  { "context-brush-aspect-maximum", GIMP_ICON_BRUSH,
     "Maximum Aspect", NULL, NULL,
     GIMP_ACTION_SELECT_LAST, FALSE,
     NULL },
-  { "context-brush-aspect-decrease", GIMP_STOCK_BRUSH,
+  { "context-brush-aspect-decrease", GIMP_ICON_BRUSH,
     "Decrease Aspect", NULL, NULL,
     GIMP_ACTION_SELECT_PREVIOUS, FALSE,
     NULL },
-  { "context-brush-aspect-increase", GIMP_STOCK_BRUSH,
+  { "context-brush-aspect-increase", GIMP_ICON_BRUSH,
     "Increase Aspect", NULL, NULL,
     GIMP_ACTION_SELECT_NEXT, FALSE,
     NULL },
-  { "context-brush-aspect-decrease-skip", GIMP_STOCK_BRUSH,
+  { "context-brush-aspect-decrease-skip", GIMP_ICON_BRUSH,
     "Decrease Aspect More", NULL, NULL,
     GIMP_ACTION_SELECT_SKIP_PREVIOUS, FALSE,
     NULL },
-  { "context-brush-aspect-increase-skip", GIMP_STOCK_BRUSH,
+  { "context-brush-aspect-increase-skip", GIMP_ICON_BRUSH,
     "Increase Aspect More", NULL, NULL,
     GIMP_ACTION_SELECT_SKIP_NEXT, FALSE,
     NULL }
@@ -1057,31 +1057,31 @@ static const GimpEnumActionEntry context_brush_aspect_actions[] =
 
 static const GimpEnumActionEntry context_brush_angle_actions[] =
 {
-  { "context-brush-angle-set", GIMP_STOCK_BRUSH,
+  { "context-brush-angle-set", GIMP_ICON_BRUSH,
     "Set Brush Angle", NULL, NULL,
     GIMP_ACTION_SELECT_SET, TRUE,
     NULL },
-  { "context-brush-angle-minimum", GIMP_STOCK_BRUSH,
+  { "context-brush-angle-minimum", GIMP_ICON_BRUSH,
     "Horizontal", NULL, NULL,
     GIMP_ACTION_SELECT_FIRST, FALSE,
     NULL },
-  { "context-brush-angle-maximum", GIMP_STOCK_BRUSH,
+  { "context-brush-angle-maximum", GIMP_ICON_BRUSH,
     "Vertical", NULL, NULL,
     GIMP_ACTION_SELECT_LAST, FALSE,
     NULL },
-  { "context-brush-angle-decrease", GIMP_STOCK_BRUSH,
+  { "context-brush-angle-decrease", GIMP_ICON_BRUSH,
     "Rotate Right", NULL, NULL,
     GIMP_ACTION_SELECT_PREVIOUS, FALSE,
     NULL },
-  { "context-brush-angle-increase", GIMP_STOCK_BRUSH,
+  { "context-brush-angle-increase", GIMP_ICON_BRUSH,
     "Rotate Left", NULL, NULL,
     GIMP_ACTION_SELECT_NEXT, FALSE,
     NULL },
-  { "context-brush-angle-decrease-skip", GIMP_STOCK_BRUSH,
+  { "context-brush-angle-decrease-skip", GIMP_ICON_BRUSH,
     "Rotate Right 15°", NULL, NULL,
     GIMP_ACTION_SELECT_SKIP_PREVIOUS, FALSE,
     NULL },
-  { "context-brush-angle-increase-skip", GIMP_STOCK_BRUSH,
+  { "context-brush-angle-increase-skip", GIMP_ICON_BRUSH,
     "Rotate Left 15°", NULL, NULL,
     GIMP_ACTION_SELECT_SKIP_NEXT, FALSE,
     NULL }
diff --git a/app/actions/cursor-info-actions.c b/app/actions/cursor-info-actions.c
index f25ba43..3ecd3c5 100644
--- a/app/actions/cursor-info-actions.c
+++ b/app/actions/cursor-info-actions.c
@@ -37,7 +37,7 @@
 
 static const GimpActionEntry cursor_info_actions[] =
 {
-  { "cursor-info-popup", GIMP_STOCK_CURSOR,
+  { "cursor-info-popup", GIMP_ICON_CURSOR,
     NC_("cursor-info-action", "Pointer Information Menu"), NULL, NULL, NULL,
     GIMP_HELP_POINTER_INFO_DIALOG }
 };
diff --git a/app/actions/dialogs-actions.c b/app/actions/dialogs-actions.c
index eeb2541..08aa426 100644
--- a/app/actions/dialogs-actions.c
+++ b/app/actions/dialogs-actions.c
@@ -49,13 +49,13 @@ const GimpStringActionEntry dialogs_dockable_actions[] =
     "gimp-toolbox",
     GIMP_HELP_TOOLBOX },
 
-  { "dialogs-tool-options", GIMP_STOCK_TOOL_OPTIONS,
+  { "dialogs-tool-options", GIMP_ICON_DIALOG_TOOL_OPTIONS,
     NC_("dialogs-action", "Tool _Options"), NULL,
     NC_("dialogs-action", "Open the tool options dialog"),
     "gimp-tool-options",
     GIMP_HELP_TOOL_OPTIONS_DIALOG },
 
-  { "dialogs-device-status", GIMP_STOCK_DEVICE_STATUS,
+  { "dialogs-device-status", GIMP_ICON_DIALOG_DEVICE_STATUS,
     NC_("dialogs-action", "_Device Status"), NULL,
     NC_("dialogs-action", "Open the device status dialog"),
     "gimp-device-status",
@@ -67,91 +67,91 @@ const GimpStringActionEntry dialogs_dockable_actions[] =
     "gimp-symmetry-editor",
     GIMP_HELP_SYMMETRY_DIALOG },
 
-  { "dialogs-layers", GIMP_STOCK_LAYERS,
+  { "dialogs-layers", GIMP_ICON_DIALOG_LAYERS,
     NC_("dialogs-action", "_Layers"), "<primary>L",
     NC_("dialogs-action", "Open the layers dialog"),
     "gimp-layer-list",
     GIMP_HELP_LAYER_DIALOG },
 
-  { "dialogs-channels", GIMP_STOCK_CHANNELS,
+  { "dialogs-channels", GIMP_ICON_DIALOG_CHANNELS,
     NC_("dialogs-action", "_Channels"), NULL,
     NC_("dialogs-action", "Open the channels dialog"),
     "gimp-channel-list",
     GIMP_HELP_CHANNEL_DIALOG },
 
-  { "dialogs-vectors", GIMP_STOCK_PATHS,
+  { "dialogs-vectors", GIMP_ICON_DIALOG_PATHS,
     NC_("dialogs-action", "_Paths"), NULL,
     NC_("dialogs-action", "Open the paths dialog"),
     "gimp-vectors-list",
     GIMP_HELP_PATH_DIALOG },
 
-  { "dialogs-indexed-palette", GIMP_STOCK_COLORMAP,
+  { "dialogs-indexed-palette", GIMP_ICON_COLORMAP,
     NC_("dialogs-action", "Color_map"), NULL,
     NC_("dialogs-action", "Open the colormap dialog"),
     "gimp-indexed-palette",
     GIMP_HELP_INDEXED_PALETTE_DIALOG },
 
-  { "dialogs-histogram", GIMP_STOCK_HISTOGRAM,
+  { "dialogs-histogram", GIMP_ICON_HISTOGRAM,
     NC_("dialogs-action", "Histogra_m"), NULL,
     NC_("dialogs-action", "Open the histogram dialog"),
     "gimp-histogram-editor",
     GIMP_HELP_HISTOGRAM_DIALOG },
 
-  { "dialogs-selection-editor", GIMP_STOCK_SELECTION,
+  { "dialogs-selection-editor", GIMP_ICON_SELECTION,
     NC_("dialogs-action", "_Selection Editor"), NULL,
     NC_("dialogs-action", "Open the selection editor"),
     "gimp-selection-editor",
     GIMP_HELP_SELECTION_DIALOG },
 
-  { "dialogs-navigation", GIMP_STOCK_NAVIGATION,
+  { "dialogs-navigation", GIMP_ICON_DIALOG_NAVIGATION,
     NC_("dialogs-action", "Na_vigation"), NULL,
     NC_("dialogs-action", "Open the display navigation dialog"),
     "gimp-navigation-view",
     GIMP_HELP_NAVIGATION_DIALOG },
 
-  { "dialogs-undo-history", GIMP_STOCK_UNDO_HISTORY,
+  { "dialogs-undo-history", GIMP_ICON_DIALOG_UNDO_HISTORY,
     NC_("dialogs-action", "Undo _History"), NULL,
     NC_("dialogs-action", "Open the undo history dialog"),
     "gimp-undo-history",
     GIMP_HELP_UNDO_DIALOG },
 
-  { "dialogs-cursor", GIMP_STOCK_CURSOR,
+  { "dialogs-cursor", GIMP_ICON_CURSOR,
     NC_("dialogs-action", "Pointer"), NULL,
     NC_("dialogs-action", "Open the pointer information dialog"),
     "gimp-cursor-view",
     GIMP_HELP_POINTER_INFO_DIALOG },
 
-  { "dialogs-sample-points", GIMP_STOCK_SAMPLE_POINT,
+  { "dialogs-sample-points", GIMP_ICON_SAMPLE_POINT,
     NC_("dialogs-action", "_Sample Points"), NULL,
     NC_("dialogs-action", "Open the sample points dialog"),
     "gimp-sample-point-editor",
     GIMP_HELP_SAMPLE_POINT_DIALOG },
 
-  { "dialogs-colors", GIMP_STOCK_DEFAULT_COLORS,
+  { "dialogs-colors", GIMP_ICON_COLORS_DEFAULT,
     NC_("dialogs-action", "Colo_rs"), NULL,
     NC_("dialogs-action", "Open the FG/BG color dialog"),
     "gimp-color-editor",
     GIMP_HELP_COLOR_DIALOG },
 
-  { "dialogs-brushes", GIMP_STOCK_BRUSH,
+  { "dialogs-brushes", GIMP_ICON_BRUSH,
     NC_("dialogs-action", "_Brushes"), "<primary><shift>B",
     NC_("dialogs-action", "Open the brushes dialog"),
     "gimp-brush-grid|gimp-brush-list",
     GIMP_HELP_BRUSH_DIALOG },
 
-  { "dialogs-brush-editor", GIMP_STOCK_BRUSH,
+  { "dialogs-brush-editor", GIMP_ICON_BRUSH,
     NC_("dialogs-action", "Brush Editor"), NULL,
     NC_("dialogs-action", "Open the brush editor"),
     "gimp-brush-editor",
     GIMP_HELP_BRUSH_EDIT },
 
-  { "dialogs-dynamics", GIMP_STOCK_DYNAMICS,
+  { "dialogs-dynamics", GIMP_ICON_DYNAMICS,
     NC_("dialogs-action", "Paint Dynamics"), NULL,
     NC_("dialogs-action", "Open paint dynamics dialog"),
     "gimp-dynamics-list|gimp-dynamics-grid",
     GIMP_HELP_DYNAMICS_DIALOG },
 
-  { "dialogs-dynamics-editor", GIMP_STOCK_DYNAMICS,
+  { "dialogs-dynamics-editor", GIMP_ICON_DYNAMICS,
     NC_("dialogs-action", "Paint Dynamics Editor"), NULL,
     NC_("dialogs-action", "Open the paint dynamics editor"),
     "gimp-dynamics-editor",
@@ -163,73 +163,73 @@ const GimpStringActionEntry dialogs_dockable_actions[] =
     "gimp-mypaint-brush-grid|gimp-mapyint-brush-list",
     GIMP_HELP_MYPAINT_BRUSH_DIALOG },
 
-  { "dialogs-patterns", GIMP_STOCK_PATTERN,
+  { "dialogs-patterns", GIMP_ICON_PATTERN,
     NC_("dialogs-action", "P_atterns"), "<primary><shift>P",
     NC_("dialogs-action", "Open the patterns dialog"),
     "gimp-pattern-grid|gimp-pattern-list",
     GIMP_HELP_PATTERN_DIALOG },
 
-  { "dialogs-gradients", GIMP_STOCK_GRADIENT,
+  { "dialogs-gradients", GIMP_ICON_GRADIENT,
     NC_("dialogs-action", "_Gradients"), "<primary>G",
     NC_("dialogs-action", "Open the gradients dialog"),
     "gimp-gradient-list|gimp-gradient-grid",
     GIMP_HELP_GRADIENT_DIALOG },
 
-  { "dialogs-gradient-editor", GIMP_STOCK_GRADIENT,
+  { "dialogs-gradient-editor", GIMP_ICON_GRADIENT,
     NC_("dialogs-action", "Gradient Editor"), NULL,
     NC_("dialogs-action", "Open the gradient editor"),
     "gimp-gradient-editor",
     GIMP_HELP_GRADIENT_EDIT },
 
-  { "dialogs-palettes", GIMP_STOCK_PALETTE,
+  { "dialogs-palettes", GIMP_ICON_PALETTE,
     NC_("dialogs-action", "Pal_ettes"), NULL,
     NC_("dialogs-action", "Open the palettes dialog"),
     "gimp-palette-list|gimp-palette-grid",
     GIMP_HELP_PALETTE_DIALOG },
 
-  { "dialogs-palette-editor", GIMP_STOCK_PALETTE,
+  { "dialogs-palette-editor", GIMP_ICON_PALETTE,
     NC_("dialogs-action", "Palette Editor"), NULL,
     NC_("dialogs-action", "Open the palette editor"),
     "gimp-palette-editor",
     GIMP_HELP_PALETTE_EDIT },
 
-  { "dialogs-tool-presets", GIMP_STOCK_TOOL_PRESET,
+  { "dialogs-tool-presets", GIMP_ICON_TOOL_PRESET,
     NC_("dialogs-action", "Tool presets"), NULL,
     NC_("dialogs-action", "Open tool presets dialog"),
     "gimp-tool-preset-list|gimp-tool-preset-grid",
     GIMP_HELP_TOOL_PRESET_DIALOG },
 
-  { "dialogs-fonts", "gtk-select-font",
+  { "dialogs-fonts", GIMP_ICON_FONT,
     NC_("dialogs-action", "_Fonts"), NULL,
     NC_("dialogs-action", "Open the fonts dialog"),
     "gimp-font-list|gimp-font-grid",
     GIMP_HELP_FONT_DIALOG },
 
-  { "dialogs-buffers", GIMP_STOCK_BUFFER,
+  { "dialogs-buffers", GIMP_ICON_BUFFER,
     NC_("dialogs-action", "B_uffers"), "",
     NC_("dialogs-action", "Open the named buffers dialog"),
     "gimp-buffer-list|gimp-buffer-grid",
     GIMP_HELP_BUFFER_DIALOG },
 
-  { "dialogs-images", GIMP_STOCK_IMAGES,
+  { "dialogs-images", GIMP_ICON_DIALOG_IMAGES,
     NC_("dialogs-action", "_Images"), NULL,
     NC_("dialogs-action", "Open the images dialog"),
     "gimp-image-list|gimp-image-grid",
     GIMP_HELP_IMAGE_DIALOG },
 
-  { "dialogs-document-history", "document-open-recent",
+  { "dialogs-document-history", GIMP_ICON_DOCUMENT_OPEN_RECENT,
     NC_("dialogs-action", "Document Histor_y"), "",
     NC_("dialogs-action", "Open the document history dialog"),
     "gimp-document-list|gimp-document-grid",
     GIMP_HELP_DOCUMENT_DIALOG },
 
-  { "dialogs-templates", GIMP_STOCK_TEMPLATE,
+  { "dialogs-templates", GIMP_ICON_TEMPLATE,
     NC_("dialogs-action", "_Templates"), "",
     NC_("dialogs-action", "Open the image templates dialog"),
     "gimp-template-list|gimp-template-grid",
     GIMP_HELP_TEMPLATE_DIALOG },
 
-  { "dialogs-error-console", GIMP_STOCK_WARNING,
+  { "dialogs-error-console", GIMP_ICON_DIALOG_WARNING,
     NC_("dialogs-action", "Error Co_nsole"), NULL,
     NC_("dialogs-action", "Open the error console"),
     "gimp-error-console",
@@ -240,37 +240,37 @@ gint n_dialogs_dockable_actions = G_N_ELEMENTS (dialogs_dockable_actions);
 
 static const GimpStringActionEntry dialogs_toplevel_actions[] =
 {
-  { "dialogs-preferences", "preferences-system",
+  { "dialogs-preferences", GIMP_ICON_PREFERENCES_SYSTEM,
     NC_("dialogs-action", "_Preferences"), NULL,
     NC_("dialogs-action", "Open the preferences dialog"),
     "gimp-preferences-dialog",
     GIMP_HELP_PREFS_DIALOG },
 
-  { "dialogs-input-devices", GIMP_STOCK_INPUT_DEVICE,
+  { "dialogs-input-devices", GIMP_ICON_INPUT_DEVICE,
     NC_("dialogs-action", "_Input Devices"), NULL,
     NC_("dialogs-action", "Open the input devices editor"),
     "gimp-input-devices-dialog",
     GIMP_HELP_INPUT_DEVICES },
 
-  { "dialogs-keyboard-shortcuts", GIMP_STOCK_CHAR_PICKER,
+  { "dialogs-keyboard-shortcuts", GIMP_ICON_CHAR_PICKER,
     NC_("dialogs-action", "_Keyboard Shortcuts"), NULL,
     NC_("dialogs-action", "Open the keyboard shortcuts editor"),
     "gimp-keyboard-shortcuts-dialog",
     GIMP_HELP_KEYBOARD_SHORTCUTS },
 
-  { "dialogs-module-dialog", "system-run",
+  { "dialogs-module-dialog", GIMP_ICON_SYSTEM_RUN,
     NC_("dialogs-action", "_Modules"), NULL,
     NC_("dialogs-action", "Open the module manager dialog"),
     "gimp-module-dialog",
     GIMP_HELP_MODULE_DIALOG },
 
-  { "dialogs-tips", GIMP_STOCK_INFO,
+  { "dialogs-tips", GIMP_ICON_DIALOG_INFORMATION,
     NC_("dialogs-action", "_Tip of the Day"), NULL,
     NC_("dialogs-action", "Show some helpful tips on using GIMP"),
     "gimp-tips-dialog",
     GIMP_HELP_TIPS_DIALOG },
 
-  { "dialogs-about", "help-about",
+  { "dialogs-about", GIMP_ICON_HELP_ABOUT,
 #if defined(G_OS_WIN32)
     NC_("dialogs-action", "About GIMP"),
 #elif defined(PLATFORM_OSX)
@@ -283,7 +283,7 @@ static const GimpStringActionEntry dialogs_toplevel_actions[] =
     "gimp-about-dialog",
       GIMP_HELP_ABOUT_DIALOG },
 
-  { "dialogs-action-search", "edit-find",
+  { "dialogs-action-search", GIMP_ICON_EDIT_FIND,
     NC_("dialogs-action", "_Search and Run a Command"), "slash",
     NC_("dialogs-action", "Search commands by keyword, and run them"),
     "gimp-action-search-dialog",
diff --git a/app/actions/dock-actions.c b/app/actions/dock-actions.c
index dfc41d6..9f251c2 100644
--- a/app/actions/dock-actions.c
+++ b/app/actions/dock-actions.c
@@ -42,11 +42,11 @@
 
 static const GimpActionEntry dock_actions[] =
 {
-  { "dock-move-to-screen-menu", GIMP_STOCK_MOVE_TO_SCREEN,
+  { "dock-move-to-screen-menu", GIMP_ICON_WINDOW_MOVE_TO_SCREEN,
     NC_("dock-action", "M_ove to Screen"), NULL, NULL, NULL,
     GIMP_HELP_DOCK_CHANGE_SCREEN },
 
-  { "dock-close", "window-close",
+  { "dock-close", GIMP_ICON_WINDOW_CLOSE,
     NC_("dock-action", "Close Dock"), "", NULL,
     G_CALLBACK (window_close_cmd_callback),
     GIMP_HELP_DOCK_CLOSE },
@@ -113,8 +113,10 @@ dock_actions_update (GimpActionGroup *group,
           SET_VISIBLE ("dock-show-image-menu",    TRUE);
           SET_VISIBLE ("dock-auto-follow-active", TRUE);
 
-          SET_ACTIVE ("dock-show-image-menu",    gimp_dock_window_get_show_image_menu (dock_window));
-          SET_ACTIVE ("dock-auto-follow-active", gimp_dock_window_get_auto_follow_active (dock_window));
+          SET_ACTIVE ("dock-show-image-menu",
+                      gimp_dock_window_get_show_image_menu (dock_window));
+          SET_ACTIVE ("dock-auto-follow-active",
+                      gimp_dock_window_get_auto_follow_active (dock_window));
         }
       else
         {
diff --git a/app/actions/dockable-actions.c b/app/actions/dockable-actions.c
index e0e2064..29a959a 100644
--- a/app/actions/dockable-actions.c
+++ b/app/actions/dockable-actions.c
@@ -62,7 +62,7 @@ static const GimpActionEntry dockable_actions[] =
     G_CALLBACK (dockable_close_tab_cmd_callback),
     GIMP_HELP_DOCK_TAB_CLOSE },
 
-  { "dockable-detach-tab", GIMP_STOCK_DETACH,
+  { "dockable-detach-tab", GIMP_ICON_DETACH,
     NC_("dockable-action", "_Detach Tab"), "", NULL,
     G_CALLBACK (dockable_detach_tab_cmd_callback),
     GIMP_HELP_DOCK_TAB_DETACH }
diff --git a/app/actions/documents-actions.c b/app/actions/documents-actions.c
index 42571c9..f381d19 100644
--- a/app/actions/documents-actions.c
+++ b/app/actions/documents-actions.c
@@ -38,11 +38,11 @@
 
 static const GimpActionEntry documents_actions[] =
 {
-  { "documents-popup", "document-open-recent",
+  { "documents-popup", GIMP_ICON_DOCUMENT_OPEN_RECENT,
     NC_("documents-action", "Documents Menu"), NULL, NULL, NULL,
     GIMP_HELP_DOCUMENT_DIALOG },
 
-  { "documents-open", "document-open",
+  { "documents-open", GIMP_ICON_DOCUMENT_OPEN,
     NC_("documents-action", "_Open Image"), NULL,
     NC_("documents-action", "Open the selected entry"),
     G_CALLBACK (documents_open_cmd_callback),
@@ -60,7 +60,7 @@ static const GimpActionEntry documents_actions[] =
     G_CALLBACK (documents_file_open_dialog_cmd_callback),
     GIMP_HELP_DOCUMENT_OPEN },
 
-  { "documents-copy-location", "edit-copy",
+  { "documents-copy-location", GIMP_ICON_EDIT_COPY,
     NC_("documents-action", "Copy Image _Location"), NULL,
     NC_("documents-action", "Copy image location to clipboard"),
     G_CALLBACK (documents_copy_location_cmd_callback),
@@ -72,7 +72,7 @@ static const GimpActionEntry documents_actions[] =
     G_CALLBACK (documents_show_in_file_manager_cmd_callback),
     GIMP_HELP_DOCUMENT_SHOW_IN_FILE_MANAGER },
 
-  { "documents-remove", "list-remove",
+  { "documents-remove", GIMP_ICON_LIST_REMOVE,
     NC_("documents-action", "Remove _Entry"), NULL,
     NC_("documents-action", "Remove the selected entry"),
     G_CALLBACK (documents_remove_cmd_callback),
@@ -84,7 +84,7 @@ static const GimpActionEntry documents_actions[] =
     G_CALLBACK (documents_clear_cmd_callback),
     GIMP_HELP_DOCUMENT_CLEAR },
 
-  { "documents-recreate-preview", "view-refresh",
+  { "documents-recreate-preview", GIMP_ICON_VIEW_REFRESH,
     NC_("documents-action", "Recreate _Preview"), NULL,
     NC_("documents-action", "Recreate preview"),
     G_CALLBACK (documents_recreate_preview_cmd_callback),
diff --git a/app/actions/drawable-actions.c b/app/actions/drawable-actions.c
index e288dbb..98ada9e 100644
--- a/app/actions/drawable-actions.c
+++ b/app/actions/drawable-actions.c
@@ -47,19 +47,19 @@ static const GimpActionEntry drawable_actions[] =
     G_CALLBACK (drawable_equalize_cmd_callback),
     GIMP_HELP_LAYER_EQUALIZE },
 
-  { "drawable-invert", GIMP_STOCK_INVERT,
+  { "drawable-invert", GIMP_ICON_INVERT,
     NC_("drawable-action", "In_vert"), NULL,
     NC_("drawable-action", "Invert the colors perceptually"),
     G_CALLBACK (drawable_invert_cmd_callback),
     GIMP_HELP_LAYER_INVERT },
 
-  { "drawable-linear-invert", GIMP_STOCK_INVERT,
+  { "drawable-linear-invert", GIMP_ICON_INVERT,
     NC_("drawable-action", "_Linear Invert"), NULL,
     NC_("drawable-action", "Invert the colors in linear light"),
     G_CALLBACK (drawable_linear_invert_cmd_callback),
     GIMP_HELP_LAYER_INVERT },
 
-  { "drawable-value-invert", GIMP_STOCK_GEGL,
+  { "drawable-value-invert", GIMP_ICON_GEGL,
     NC_("drawable-action", "_Value Invert"), NULL,
     NC_("drawable-action",
         "Invert the brightness of each pixel, keeping the color"),
@@ -72,13 +72,13 @@ static const GimpActionEntry drawable_actions[] =
     G_CALLBACK (drawable_levels_stretch_cmd_callback),
     GIMP_HELP_LAYER_WHITE_BALANCE },
 
-  { "drawable-dilate", GIMP_STOCK_GEGL,
+  { "drawable-dilate", GIMP_ICON_GEGL,
     NC_("drawable-action", "_Dilate"), NULL,
     NC_("drawable-action", "Grow lighter areas of the image"),
     G_CALLBACK (drawable_dilate_cmd_callback),
     GIMP_HELP_LAYER_DILATE },
 
-  { "drawable-erode", GIMP_STOCK_GEGL,
+  { "drawable-erode", GIMP_ICON_GEGL,
     NC_("drawable-action", "E_rode"), NULL,
     NC_("drawable-action", "Grow darker areas of the image"),
     G_CALLBACK (drawable_erode_cmd_callback),
@@ -94,21 +94,21 @@ static const GimpActionEntry drawable_actions[] =
 
 static const GimpToggleActionEntry drawable_toggle_actions[] =
 {
-  { "drawable-visible", GIMP_STOCK_VISIBLE,
+  { "drawable-visible", GIMP_ICON_VISIBLE,
     NC_("drawable-action", "_Visible"), NULL,
     NC_("drawable-action", "Toggle visibility"),
     G_CALLBACK (drawable_visible_cmd_callback),
     FALSE,
     GIMP_HELP_LAYER_VISIBLE },
 
-  { "drawable-linked", GIMP_STOCK_LINKED,
+  { "drawable-linked", GIMP_ICON_LINKED,
     NC_("drawable-action", "_Linked"), NULL,
     NC_("drawable-action", "Toggle the linked state"),
     G_CALLBACK (drawable_linked_cmd_callback),
     FALSE,
     GIMP_HELP_LAYER_LINKED },
 
-  { "drawable-lock-content", NULL /* GIMP_STOCK_LOCK */,
+  { "drawable-lock-content", NULL /* GIMP_ICON_LOCK */,
     NC_("drawable-action", "L_ock pixels"), NULL,
     NC_("drawable-action",
         "Keep the pixels on this drawable from being modified"),
@@ -116,7 +116,7 @@ static const GimpToggleActionEntry drawable_toggle_actions[] =
     FALSE,
     GIMP_HELP_LAYER_LOCK_PIXELS },
 
-  { "drawable-lock-position", GIMP_STOCK_TOOL_MOVE,
+  { "drawable-lock-position", GIMP_ICON_TOOL_MOVE,
     NC_("drawable-action", "L_ock position of channel"), NULL,
     NC_("drawable-action",
         "Keep the position on this drawable from being modified"),
@@ -127,13 +127,13 @@ static const GimpToggleActionEntry drawable_toggle_actions[] =
 
 static const GimpEnumActionEntry drawable_flip_actions[] =
 {
-  { "drawable-flip-horizontal", GIMP_STOCK_FLIP_HORIZONTAL,
+  { "drawable-flip-horizontal", GIMP_ICON_OBJECT_FLIP_HORIZONTAL,
     NC_("drawable-action", "Flip _Horizontally"), NULL,
     NC_("drawable-action", "Flip horizontally"),
     GIMP_ORIENTATION_HORIZONTAL, FALSE,
     GIMP_HELP_LAYER_FLIP_HORIZONTAL },
 
-  { "drawable-flip-vertical", GIMP_STOCK_FLIP_VERTICAL,
+  { "drawable-flip-vertical", GIMP_ICON_OBJECT_FLIP_VERTICAL,
     NC_("drawable-action", "Flip _Vertically"), NULL,
     NC_("drawable-action", "Flip vertically"),
     GIMP_ORIENTATION_VERTICAL, FALSE,
@@ -142,19 +142,19 @@ static const GimpEnumActionEntry drawable_flip_actions[] =
 
 static const GimpEnumActionEntry drawable_rotate_actions[] =
 {
-  { "drawable-rotate-90", GIMP_STOCK_ROTATE_90,
+  { "drawable-rotate-90", GIMP_ICON_OBJECT_ROTATE_90,
     NC_("drawable-action", "Rotate 90° _clockwise"), NULL,
     NC_("drawable-action", "Rotate 90 degrees to the right"),
     GIMP_ROTATE_90, FALSE,
     GIMP_HELP_LAYER_ROTATE_90 },
 
-  { "drawable-rotate-180", GIMP_STOCK_ROTATE_180,
+  { "drawable-rotate-180", GIMP_ICON_OBJECT_ROTATE_180,
     NC_("drawable-action", "Rotate _180°"), NULL,
     NC_("drawable-action", "Turn upside-down"),
     GIMP_ROTATE_180, FALSE,
     GIMP_HELP_LAYER_ROTATE_180 },
 
-  { "drawable-rotate-270", GIMP_STOCK_ROTATE_270,
+  { "drawable-rotate-270", GIMP_ICON_OBJECT_ROTATE_270,
     NC_("drawable-action", "Rotate 90° counter-clock_wise"), NULL,
     NC_("drawable-action", "Rotate 90 degrees to the left"),
     GIMP_ROTATE_270, FALSE,
diff --git a/app/actions/dynamics-actions.c b/app/actions/dynamics-actions.c
index 6ad1819..b6c9ff7 100644
--- a/app/actions/dynamics-actions.c
+++ b/app/actions/dynamics-actions.c
@@ -39,23 +39,23 @@
 
 static const GimpActionEntry dynamics_actions[] =
 {
-  { "dynamics-popup", GIMP_STOCK_DYNAMICS,
+  { "dynamics-popup", GIMP_ICON_DYNAMICS,
     NC_("dynamics-action", "Paint Dynamics Menu"), NULL, NULL, NULL,
     GIMP_HELP_DYNAMICS_DIALOG },
 
-  { "dynamics-new", "document-new",
+  { "dynamics-new", GIMP_ICON_DOCUMENT_NEW,
     NC_("dynamics-action", "_New Dynamics"), NULL,
     NC_("dynamics-action", "Create a new dynamics"),
     G_CALLBACK (data_new_cmd_callback),
     GIMP_HELP_DYNAMICS_NEW },
 
-  { "dynamics-duplicate", GIMP_STOCK_DUPLICATE,
+  { "dynamics-duplicate", GIMP_ICON_OBJECT_DUPLICATE,
     NC_("dynamics-action", "D_uplicate Dynamics"), NULL,
     NC_("dynamics-action", "Duplicate this dynamics"),
     G_CALLBACK (data_duplicate_cmd_callback),
     GIMP_HELP_DYNAMICS_DUPLICATE },
 
-  { "dynamics-copy-location", "edit-copy",
+  { "dynamics-copy-location", GIMP_ICON_EDIT_COPY,
     NC_("dynamics-action", "Copy Dynamics _Location"), NULL,
     NC_("dynamics-action", "Copy dynamics file location to clipboard"),
     G_CALLBACK (data_copy_location_cmd_callback),
@@ -67,13 +67,13 @@ static const GimpActionEntry dynamics_actions[] =
     G_CALLBACK (data_show_in_file_manager_cmd_callback),
     GIMP_HELP_DYNAMICS_SHOW_IN_FILE_MANAGER },
 
-  { "dynamics-delete", "edit-delete",
+  { "dynamics-delete", GIMP_ICON_EDIT_DELETE,
     NC_("dynamics-action", "_Delete Dynamics"), NULL,
     NC_("dynamics-action", "Delete this dynamics"),
     G_CALLBACK (data_delete_cmd_callback),
     GIMP_HELP_DYNAMICS_DELETE },
 
-  { "dynamics-refresh", "view-refresh",
+  { "dynamics-refresh", GIMP_ICON_VIEW_REFRESH,
     NC_("dynamics-action", "_Refresh Dynamics"), NULL,
     NC_("dynamics-action", "Refresh dynamics"),
     G_CALLBACK (data_refresh_cmd_callback),
@@ -82,7 +82,7 @@ static const GimpActionEntry dynamics_actions[] =
 
 static const GimpStringActionEntry dynamics_edit_actions[] =
 {
-  { "dynamics-edit", "gtk-edit",
+  { "dynamics-edit", GIMP_ICON_EDIT,
     NC_("dynamics-action", "_Edit Dynamics..."), NULL,
     NC_("dynamics-action", "Edit this dynamics"),
     "gimp-dynamics-editor",
diff --git a/app/actions/dynamics-editor-actions.c b/app/actions/dynamics-editor-actions.c
index f0bf14d..12d2bc3 100644
--- a/app/actions/dynamics-editor-actions.c
+++ b/app/actions/dynamics-editor-actions.c
@@ -39,7 +39,7 @@
 
 static const GimpActionEntry dynamics_editor_actions[] =
 {
-  { "dynamics-editor-popup", GIMP_STOCK_DYNAMICS,
+  { "dynamics-editor-popup", GIMP_ICON_DYNAMICS,
     NC_("dynamics-editor-action", "Paint Dynamics Editor Menu"), NULL, NULL, NULL,
     GIMP_HELP_BRUSH_EDITOR_DIALOG }
 };
@@ -47,7 +47,7 @@ static const GimpActionEntry dynamics_editor_actions[] =
 
 static const GimpToggleActionEntry dynamics_editor_toggle_actions[] =
 {
-  { "dynamics-editor-edit-active", GIMP_STOCK_LINKED,
+  { "dynamics-editor-edit-active", GIMP_ICON_LINKED,
     NC_("dynamics-editor-action", "Edit Active Dynamics"), NULL, NULL,
     G_CALLBACK (data_editor_edit_active_cmd_callback),
     FALSE,
diff --git a/app/actions/edit-actions.c b/app/actions/edit-actions.c
index b49c4f6..3aaf843 100644
--- a/app/actions/edit-actions.c
+++ b/app/actions/edit-actions.c
@@ -70,25 +70,25 @@ static const GimpActionEntry edit_actions[] =
     "edit-undo", NC_("edit-action", "Undo History Menu"), NULL, NULL, NULL,
     GIMP_HELP_UNDO_DIALOG },
 
-  { "edit-undo", "edit-undo",
+  { "edit-undo", GIMP_ICON_EDIT_UNDO,
     NC_("edit-action", "_Undo"), "<primary>Z",
     NC_("edit-action", "Undo the last operation"),
     G_CALLBACK (edit_undo_cmd_callback),
     GIMP_HELP_EDIT_UNDO },
 
-  { "edit-redo", "edit-redo",
+  { "edit-redo", GIMP_ICON_EDIT_REDO,
     NC_("edit-action", "_Redo"), "<primary>Y",
     NC_("edit-action", "Redo the last operation that was undone"),
     G_CALLBACK (edit_redo_cmd_callback),
     GIMP_HELP_EDIT_REDO },
 
-  { "edit-strong-undo", "edit-undo",
+  { "edit-strong-undo", GIMP_ICON_EDIT_UNDO,
     NC_("edit-action", "Strong Undo"), "<primary><shift>Z",
     NC_("edit-action", "Undo the last operation, skipping visibility changes"),
     G_CALLBACK (edit_strong_undo_cmd_callback),
     GIMP_HELP_EDIT_STRONG_UNDO },
 
-  { "edit-strong-redo", "edit-redo",
+  { "edit-strong-redo", GIMP_ICON_EDIT_REDO,
     NC_("edit-action", "Strong Redo"), "<primary><shift>Y",
     NC_("edit-action",
         "Redo the last operation that was undone, skipping visibility changes"),
@@ -101,38 +101,38 @@ static const GimpActionEntry edit_actions[] =
     G_CALLBACK (edit_undo_clear_cmd_callback),
     GIMP_HELP_EDIT_UNDO_CLEAR },
 
-  { "edit-fade", "edit-undo",
+  { "edit-fade", GIMP_ICON_EDIT_UNDO,
     NC_("edit-action", "_Fade..."), NULL,
     NC_("edit-action",
         "Modify paint mode and opacity of the last pixel manipulation"),
     G_CALLBACK (edit_fade_cmd_callback),
     GIMP_HELP_EDIT_FADE },
 
-  { "edit-cut", "edit-cut",
+  { "edit-cut", GIMP_ICON_EDIT_CUT,
     NC_("edit-action", "Cu_t"), "<primary>X",
     NC_("edit-action", "Move the selected pixels to the clipboard"),
     G_CALLBACK (edit_cut_cmd_callback),
     GIMP_HELP_EDIT_CUT },
 
-  { "edit-copy", "edit-copy",
+  { "edit-copy", GIMP_ICON_EDIT_COPY,
     NC_("edit-action", "_Copy"), "<primary>C",
     NC_("edit-action", "Copy the selected pixels to the clipboard"),
     G_CALLBACK (edit_copy_cmd_callback),
     GIMP_HELP_EDIT_COPY },
 
-  { "edit-copy-visible", NULL, /* GIMP_STOCK_COPY_VISIBLE, */
+  { "edit-copy-visible", NULL, /* GIMP_ICON_COPY_VISIBLE, */
     NC_("edit-action", "Copy _Visible"), "<primary><shift>C",
     NC_("edit-action", "Copy what is visible in the selected region"),
     G_CALLBACK (edit_copy_visible_cmd_callback),
     GIMP_HELP_EDIT_COPY_VISIBLE },
 
-  { "edit-paste", "edit-paste",
+  { "edit-paste", GIMP_ICON_EDIT_PASTE,
     NC_("edit-action", "_Paste"), "<primary>V",
     NC_("edit-action", "Paste the content of the clipboard"),
     G_CALLBACK (edit_paste_cmd_callback),
     GIMP_HELP_EDIT_PASTE },
 
-  { "edit-paste-into", GIMP_STOCK_PASTE_INTO,
+  { "edit-paste-into", GIMP_ICON_EDIT_PASTE_INTO,
     NC_("edit-action", "Paste _Into"), NULL,
     NC_("edit-action",
         "Paste the content of the clipboard into the current selection"),
@@ -145,44 +145,44 @@ static const GimpActionEntry edit_actions[] =
     G_CALLBACK (edit_paste_as_new_layer_cmd_callback),
     GIMP_HELP_EDIT_PASTE_AS_NEW_LAYER },
 
-  { "edit-paste-as-new-image", GIMP_STOCK_PASTE_AS_NEW,
+  { "edit-paste-as-new-image", GIMP_ICON_EDIT_PASTE_AS_NEW,
     NC_("edit-action", "From _Clipboard"), "<primary><shift>V",
     NC_("edit-action", "Create a new image from the content of the clipboard"),
     G_CALLBACK (edit_paste_as_new_image_cmd_callback),
     GIMP_HELP_EDIT_PASTE_AS_NEW_IMAGE },
 
-  { "edit-paste-as-new-image-short", GIMP_STOCK_PASTE_AS_NEW,
+  { "edit-paste-as-new-image-short", GIMP_ICON_EDIT_PASTE_AS_NEW,
     NC_("edit-action", "_New Image"), NULL,
     NC_("edit-action", "Create a new image from the content of the clipboard"),
     G_CALLBACK (edit_paste_as_new_image_cmd_callback),
     GIMP_HELP_EDIT_PASTE_AS_NEW_IMAGE },
 
-  { "edit-named-cut", "edit-cut",
+  { "edit-named-cut", GIMP_ICON_EDIT_CUT,
     NC_("edit-action", "Cu_t Named..."), NULL,
     NC_("edit-action", "Move the selected pixels to a named buffer"),
     G_CALLBACK (edit_named_cut_cmd_callback),
     GIMP_HELP_BUFFER_CUT },
 
-  { "edit-named-copy", "edit-copy",
+  { "edit-named-copy", GIMP_ICON_EDIT_COPY,
     NC_("edit-action", "_Copy Named..."), NULL,
     NC_("edit-action", "Copy the selected pixels to a named buffer"),
     G_CALLBACK (edit_named_copy_cmd_callback),
     GIMP_HELP_BUFFER_COPY },
 
-  { "edit-named-copy-visible", NULL, /* GIMP_STOCK_COPY_VISIBLE, */
+  { "edit-named-copy-visible", NULL, /* GIMP_ICON_COPY_VISIBLE, */
     NC_("edit-action", "Copy _Visible Named..."), "",
     NC_("edit-action",
         "Copy what is visible in the selected region to a named buffer"),
     G_CALLBACK (edit_named_copy_visible_cmd_callback),
     GIMP_HELP_BUFFER_COPY },
 
-  { "edit-named-paste", "edit-paste",
+  { "edit-named-paste", GIMP_ICON_EDIT_PASTE,
     NC_("edit-action", "_Paste Named..."), NULL,
     NC_("edit-action", "Paste the content of a named buffer"),
     G_CALLBACK (edit_named_paste_cmd_callback),
     GIMP_HELP_BUFFER_PASTE },
 
-  { "edit-clear", "edit-clear",
+  { "edit-clear", GIMP_ICON_EDIT_CLEAR,
     NC_("edit-action", "Cl_ear"), "Delete",
     NC_("edit-action", "Clear the selected pixels"),
     G_CALLBACK (edit_clear_cmd_callback),
@@ -191,19 +191,19 @@ static const GimpActionEntry edit_actions[] =
 
 static const GimpEnumActionEntry edit_fill_actions[] =
 {
-  { "edit-fill-fg", GIMP_STOCK_TOOL_BUCKET_FILL,
+  { "edit-fill-fg", GIMP_ICON_TOOL_BUCKET_FILL,
     NC_("edit-action", "Fill with _FG Color"), "<primary>comma",
     NC_("edit-action", "Fill the selection using the foreground color"),
     GIMP_FILL_FOREGROUND, FALSE,
     GIMP_HELP_EDIT_FILL_FG },
 
-  { "edit-fill-bg", GIMP_STOCK_TOOL_BUCKET_FILL,
+  { "edit-fill-bg", GIMP_ICON_TOOL_BUCKET_FILL,
     NC_("edit-action", "Fill with B_G Color"), "<primary>period",
     NC_("edit-action", "Fill the selection using the background color"),
     GIMP_FILL_BACKGROUND, FALSE,
     GIMP_HELP_EDIT_FILL_BG },
 
-  { "edit-fill-pattern", GIMP_STOCK_PATTERN,
+  { "edit-fill-pattern", GIMP_ICON_PATTERN,
     NC_("edit-action", "Fill _with Pattern"), "<primary>semicolon",
     NC_("edit-action", "Fill the selection using the active pattern"),
     GIMP_FILL_PATTERN, FALSE,
diff --git a/app/actions/edit-commands.c b/app/actions/edit-commands.c
index 36c0946..a171b66 100644
--- a/app/actions/edit-commands.c
+++ b/app/actions/edit-commands.c
@@ -151,7 +151,8 @@ edit_undo_clear_cmd_callback (GtkAction *action,
   return_if_no_image (image, data);
   return_if_no_widget (widget, data);
 
-  dialog = gimp_message_dialog_new (_("Clear Undo History"), GIMP_STOCK_WARNING,
+  dialog = gimp_message_dialog_new (_("Clear Undo History"),
+                                    GIMP_ICON_DIALOG_WARNING,
                                     widget,
                                     GTK_DIALOG_MODAL |
                                     GTK_DIALOG_DESTROY_WITH_PARENT,
diff --git a/app/actions/error-console-actions.c b/app/actions/error-console-actions.c
index a6bcb96..858d857 100644
--- a/app/actions/error-console-actions.c
+++ b/app/actions/error-console-actions.c
@@ -36,11 +36,11 @@
 
 static const GimpActionEntry error_console_actions[] =
 {
-  { "error-console-popup", GIMP_STOCK_WARNING,
+  { "error-console-popup", GIMP_ICON_DIALOG_WARNING,
     NC_("error-console-action", "Error Console Menu"), NULL, NULL, NULL,
     GIMP_HELP_ERRORS_DIALOG },
 
-  { "error-console-clear", "edit-clear",
+  { "error-console-clear", GIMP_ICON_EDIT_CLEAR,
     NC_("error-console-action", "_Clear"), NULL,
     NC_("error-console-action", "Clear error console"),
     G_CALLBACK (error_console_clear_cmd_callback),
@@ -55,13 +55,13 @@ static const GimpActionEntry error_console_actions[] =
 
 static const GimpEnumActionEntry error_console_save_actions[] =
 {
-  { "error-console-save-all", "document-save-as",
+  { "error-console-save-all", GIMP_ICON_DOCUMENT_SAVE_AS,
     NC_("error-console-action", "_Save Error Log to File..."), NULL,
     NC_("error-console-action", "Write all error messages to a file"),
     FALSE, FALSE,
     GIMP_HELP_ERRORS_SAVE },
 
-  { "error-console-save-selection", "document-save-as",
+  { "error-console-save-selection", GIMP_ICON_DOCUMENT_SAVE_AS,
     NC_("error-console-action", "Save S_election to File..."), NULL,
     NC_("error-console-action", "Write the selected error messages to a file"),
     TRUE, FALSE,
diff --git a/app/actions/file-actions.c b/app/actions/file-actions.c
index 2167bcf..eb49f04 100644
--- a/app/actions/file-actions.c
+++ b/app/actions/file-actions.c
@@ -78,13 +78,13 @@ static const GimpActionEntry file_actions[] =
     G_CALLBACK (file_open_cmd_callback),
     GIMP_HELP_FILE_OPEN },
 
-  { "file-open-as-layers", GIMP_STOCK_LAYER,
+  { "file-open-as-layers", GIMP_ICON_LAYER,
     NC_("file-action", "Op_en as Layers..."), "<primary><alt>O",
     NC_("file-action", "Open an image file as layers"),
     G_CALLBACK (file_open_as_layers_cmd_callback),
     GIMP_HELP_FILE_OPEN_AS_LAYER },
 
-  { "file-open-location", GIMP_STOCK_WEB,
+  { "file-open-location", GIMP_ICON_WEB,
     NC_("file-action", "Open _Location..."), NULL,
     NC_("file-action", "Open an image file from a specified location"),
     G_CALLBACK (file_open_location_cmd_callback),
@@ -108,7 +108,7 @@ static const GimpActionEntry file_actions[] =
     G_CALLBACK (file_close_all_cmd_callback),
     GIMP_HELP_FILE_CLOSE_ALL },
 
-  { "file-copy-location", "edit-copy",
+  { "file-copy-location", GIMP_ICON_EDIT_COPY,
     NC_("file-action", "Copy _Image Location"), NULL,
     NC_("file-action", "Copy image file location to clipboard"),
     G_CALLBACK (file_copy_location_cmd_callback),
@@ -120,7 +120,7 @@ static const GimpActionEntry file_actions[] =
     G_CALLBACK (file_show_in_file_manager_cmd_callback),
     GIMP_HELP_FILE_SHOW_IN_FILE_MANAGER },
 
-  { "file-quit", "application-exit",
+  { "file-quit", GIMP_ICON_APPLICATION_EXIT,
     NC_("file-action", "_Quit"), "<primary>Q",
     NC_("file-action", "Quit the GNU Image Manipulation Program"),
     G_CALLBACK (file_quit_cmd_callback),
@@ -129,13 +129,13 @@ static const GimpActionEntry file_actions[] =
 
 static const GimpEnumActionEntry file_save_actions[] =
 {
-  { "file-save", "document-save",
+  { "file-save", GIMP_ICON_DOCUMENT_SAVE,
     NC_("file-action", "_Save"), "<primary>S",
     NC_("file-action", "Save this image"),
     GIMP_SAVE_MODE_SAVE, FALSE,
     GIMP_HELP_FILE_SAVE },
 
-  { "file-save-as", "document-save-as",
+  { "file-save-as", GIMP_ICON_DOCUMENT_SAVE_AS,
     NC_("file-action", "Save _As..."), "<primary><shift>S",
     NC_("file-action", "Save this image with a different name"),
     GIMP_SAVE_MODE_SAVE_AS, FALSE,
@@ -198,7 +198,7 @@ file_actions_setup (GimpActionGroup *group)
     {
       entries[i].name           = g_strdup_printf ("file-open-recent-%02d",
                                                    i + 1);
-      entries[i].icon_name      = "document-open";
+      entries[i].icon_name      = GIMP_ICON_DOCUMENT_OPEN,
       entries[i].label          = entries[i].name;
       entries[i].tooltip        = NULL;
       entries[i].value          = i;
diff --git a/app/actions/file-commands.c b/app/actions/file-commands.c
index 8252ff9..8b297d2 100644
--- a/app/actions/file-commands.c
+++ b/app/actions/file-commands.c
@@ -433,7 +433,7 @@ file_revert_cmd_callback (GtkAction *action,
   if (! dialog)
     {
       dialog =
-        gimp_message_dialog_new (_("Revert Image"), "document-revert",
+        gimp_message_dialog_new (_("Revert Image"), GIMP_ICON_DOCUMENT_REVERT,
                                  GTK_WIDGET (gimp_display_get_shell (display)),
                                  0,
                                  gimp_standard_help_func, GIMP_HELP_FILE_REVERT,
diff --git a/app/actions/filters-actions.c b/app/actions/filters-actions.c
index 466e2e1..16f678a 100644
--- a/app/actions/filters-actions.c
+++ b/app/actions/filters-actions.c
@@ -97,492 +97,492 @@ static const GimpActionEntry filters_menu_actions[] =
 
 static const GimpStringActionEntry filters_actions[] =
 {
-  { "filters-alien-map", GIMP_STOCK_GEGL,
+  { "filters-alien-map", GIMP_ICON_GEGL,
     NC_("filters-action", "_Alien Map..."), NULL, NULL,
     "gegl:alien-map",
     GIMP_HELP_FILTER_ALIEN_MAP },
 
-  { "filters-antialias", GIMP_STOCK_GEGL,
+  { "filters-antialias", GIMP_ICON_GEGL,
     NC_("filters-action", "_Antialias..."), NULL, NULL,
     "gegl:antialias",
     GIMP_HELP_FILTER_ANTIALIAS },
 
-  { "filters-apply-canvas", GIMP_STOCK_GEGL,
+  { "filters-apply-canvas", GIMP_ICON_GEGL,
     NC_("filters-action", "_Apply Canvas..."), NULL, NULL,
     "gegl:texturize-canvas",
     GIMP_HELP_FILTER_APPLY_CANVAS },
 
-  { "filters-apply-lens", GIMP_STOCK_GEGL,
+  { "filters-apply-lens", GIMP_ICON_GEGL,
     NC_("filters-action", "Apply _Lens..."), NULL, NULL,
     "gegl:apply-lens",
     GIMP_HELP_FILTER_APPLY_LENS },
 
-  { "filters-bump-map", GIMP_STOCK_GEGL,
+  { "filters-bump-map", GIMP_ICON_GEGL,
     NC_("filters-action", "_Bump Map..."), NULL, NULL,
     "gegl:bump-map",
     GIMP_HELP_FILTER_BUMP_MAP },
 
-  { "filters-c2g", GIMP_STOCK_GEGL,
+  { "filters-c2g", GIMP_ICON_GEGL,
     NC_("filters-action", "_Color to Gray..."), NULL, NULL,
     "gegl:c2g",
     GIMP_HELP_FILTER_C2G },
 
-  { "filters-cartoon", GIMP_STOCK_GEGL,
+  { "filters-cartoon", GIMP_ICON_GEGL,
     NC_("filters-action", "Ca_rtoon..."), NULL, NULL,
     "gegl:cartoon",
     GIMP_HELP_FILTER_CARTOON },
 
-  { "filters-channel-mixer", GIMP_STOCK_GEGL,
+  { "filters-channel-mixer", GIMP_ICON_GEGL,
     NC_("filters-action", "_Channel Mixer..."), NULL, NULL,
     "gegl:channel-mixer",
     GIMP_HELP_FILTER_CHANNEL_MIXER },
 
-  { "filters-checkerboard", GIMP_STOCK_GEGL,
+  { "filters-checkerboard", GIMP_ICON_GEGL,
     NC_("filters-action", "_Checkerboard..."), NULL, NULL,
     "gegl:checkerboard",
     GIMP_HELP_FILTER_CHECKERBOARD },
 
-  { "filters-color-enhance", GIMP_STOCK_GEGL,
+  { "filters-color-enhance", GIMP_ICON_GEGL,
     NC_("filters-action", "_Color Enhance..."), NULL, NULL,
     "gegl:color-enhance",
     GIMP_HELP_FILTER_COLOR_ENHANCE },
 
-  { "filters-color-exchange", GIMP_STOCK_GEGL,
+  { "filters-color-exchange", GIMP_ICON_GEGL,
     NC_("filters-action", "_Color Exchange..."), NULL, NULL,
     "gegl:color-exchange",
     GIMP_HELP_FILTER_COLOR_EXCHANGE },
 
-  { "filters-dither", GIMP_STOCK_GEGL,
+  { "filters-dither", GIMP_ICON_GEGL,
     NC_("filters-action", "Dithe_r..."), NULL, NULL,
     "gegl:dither",
     GIMP_HELP_FILTER_DITHER },
 
-  { "filters-color-rotate", GIMP_STOCK_GEGL,
+  { "filters-color-rotate", GIMP_ICON_GEGL,
     NC_("filters-action", "_Rotate Colors..."), NULL, NULL,
     "gegl:color-rotate",
     GIMP_HELP_FILTER_COLOR_ROTATE },
 
-  { "filters-color-temperature", GIMP_STOCK_GEGL,
+  { "filters-color-temperature", GIMP_ICON_GEGL,
     NC_("filters-action", "Color T_emperature..."), NULL, NULL,
     "gegl:color-temperature",
     GIMP_HELP_FILTER_COLOR_TEMPERATURE },
 
-  { "filters-color-to-alpha", GIMP_STOCK_GEGL,
+  { "filters-color-to-alpha", GIMP_ICON_GEGL,
     NC_("filters-action", "Color to _Alpha..."), NULL, NULL,
     "gegl:color-to-alpha",
     GIMP_HELP_FILTER_COLOR_TO_ALPHA },
 
-  { "filters-component-extract", GIMP_STOCK_GEGL,
+  { "filters-component-extract", GIMP_ICON_GEGL,
     NC_("filters-action", "_Extract Component..."), NULL, NULL,
     "gegl:component-extract",
     GIMP_HELP_FILTER_COMPONENT_EXTRACT },
 
-  { "filters-convolution-matrix", GIMP_STOCK_GEGL,
+  { "filters-convolution-matrix", GIMP_ICON_GEGL,
     NC_("filters-action", "_Convolution Matrix..."), NULL, NULL,
     "gegl:convolution-matrix",
     GIMP_HELP_FILTER_CONVOLUTION_MATRIX },
 
-  { "filters-cubism", GIMP_STOCK_GEGL,
+  { "filters-cubism", GIMP_ICON_GEGL,
     NC_("filters-action", "_Cubism..."), NULL, NULL,
     "gegl:cubism",
     GIMP_HELP_FILTER_CUBISM },
 
-  { "filters-deinterlace", GIMP_STOCK_GEGL,
+  { "filters-deinterlace", GIMP_ICON_GEGL,
     NC_("filters-action", "_Deinterlace..."), NULL, NULL,
     "gegl:deinterlace",
     GIMP_HELP_FILTER_DEINTERLACE },
 
-  { "filters-desaturate", GIMP_STOCK_TOOL_DESATURATE,
+  { "filters-desaturate", GIMP_ICON_TOOL_DESATURATE,
     NC_("filters-action", "_Desaturate..."), NULL, NULL,
     "gimp:desaturate",
     GIMP_HELP_FILTER_DESATURATE },
 
-  { "filters-difference-of-gaussians", GIMP_STOCK_GEGL,
+  { "filters-difference-of-gaussians", GIMP_ICON_GEGL,
     NC_("filters-action", "Difference of Gaussians..."), NULL, NULL,
     "gegl:difference-of-gaussians",
     GIMP_HELP_FILTER_DIFFERENCE_OF_GAUSSIANS },
 
-  { "filters-diffraction-patterns", GIMP_STOCK_GEGL,
+  { "filters-diffraction-patterns", GIMP_ICON_GEGL,
     NC_("filters-action", "Diffraction Patterns..."), NULL, NULL,
     "gegl:diffraction-patterns",
     GIMP_HELP_FILTER_DIFFRACTION_PATTERNS },
 
-  { "filters-displace", GIMP_STOCK_GEGL,
+  { "filters-displace", GIMP_ICON_GEGL,
     NC_("filters-action", "Displace..."), NULL, NULL,
     "gegl:displace",
     GIMP_HELP_FILTER_DISPLACE },
 
-  { "filters-distance-map", GIMP_STOCK_GEGL,
+  { "filters-distance-map", GIMP_ICON_GEGL,
     NC_("filters-action", "Distance Map..."), NULL, NULL,
     "gegl:distance-transform",
     GIMP_HELP_FILTER_DISTANCE_MAP },
 
-  { "filters-dropshadow", GIMP_STOCK_GEGL,
+  { "filters-dropshadow", GIMP_ICON_GEGL,
     NC_("filters-action", "_Drop Shadow..."), NULL, NULL,
     "gegl:dropshadow",
     GIMP_HELP_FILTER_DROPSHADOW },
 
-  { "filters-edge", GIMP_STOCK_GEGL,
+  { "filters-edge", GIMP_ICON_GEGL,
     NC_("filters-action", "_Edge..."), NULL, NULL,
     "gegl:edge",
     GIMP_HELP_FILTER_EDGE },
 
-  { "filters-edge-laplace", GIMP_STOCK_GEGL,
+  { "filters-edge-laplace", GIMP_ICON_GEGL,
     NC_("filters-action", "_Laplace"), NULL, NULL,
     "gegl:edge-laplace",
     GIMP_HELP_FILTER_EDGE_LAPLACE },
 
-  { "filters-edge-neon", GIMP_STOCK_GEGL,
+  { "filters-edge-neon", GIMP_ICON_GEGL,
     NC_("filters-action", "_Neon..."), NULL, NULL,
     "gegl:edge-neon",
     GIMP_HELP_FILTER_EDGE_NEON },
 
-  { "filters-edge-sobel", GIMP_STOCK_GEGL,
+  { "filters-edge-sobel", GIMP_ICON_GEGL,
     NC_("filters-action", "_Sobel..."), NULL, NULL,
     "gegl:edge-sobel",
     GIMP_HELP_FILTER_EDGE_SOBEL },
 
-  { "filters-emboss", GIMP_STOCK_GEGL,
+  { "filters-emboss", GIMP_ICON_GEGL,
     NC_("filters-action", "_Emboss..."), NULL, NULL,
     "gegl:emboss",
     GIMP_HELP_FILTER_EMBOSS },
 
-  { "filters-engrave", GIMP_STOCK_GEGL,
+  { "filters-engrave", GIMP_ICON_GEGL,
     NC_("filters-action", "En_grave..."), NULL, NULL,
     "gegl:engrave",
     GIMP_HELP_FILTER_ENGRAVE },
 
-  { "filters-exposure", GIMP_STOCK_GEGL,
+  { "filters-exposure", GIMP_ICON_GEGL,
     NC_("filters-action", "E_xposure..."), NULL, NULL,
     "gegl:exposure",
     GIMP_HELP_FILTER_EXPOSURE },
 
-  { "filters-fattal-2002", GIMP_STOCK_GEGL,
+  { "filters-fattal-2002", GIMP_ICON_GEGL,
     NC_("filters-action", "_Fattal et al. 2002..."), NULL, NULL,
     "gegl:fattal02",
     GIMP_HELP_FILTER_FATTAL_2002 },
 
-  { "filters-fractal-trace", GIMP_STOCK_GEGL,
+  { "filters-fractal-trace", GIMP_ICON_GEGL,
     NC_("filters-action", "_Fractal Trace..."), NULL, NULL,
     "gegl:fractal-trace",
     GIMP_HELP_FILTER_FRACTAL_TRACE },
 
-  { "filters-gaussian-blur", GIMP_STOCK_GEGL,
+  { "filters-gaussian-blur", GIMP_ICON_GEGL,
     NC_("filters-action", "_Gaussian Blur..."), NULL, NULL,
     "gegl:gaussian-blur",
     GIMP_HELP_FILTER_GAUSSIAN_BLUR },
 
-  { "filters-gaussian-blur-selective", GIMP_STOCK_GEGL,
+  { "filters-gaussian-blur-selective", GIMP_ICON_GEGL,
     NC_("filters-action", "_Selective Gaussian Blur..."), NULL, NULL,
     "gegl:gaussian-blur-selective",
     GIMP_HELP_FILTER_GAUSSIAN_BLUR_SELECTIVE },
 
-  { "filters-gegl-graph", GIMP_STOCK_GEGL,
+  { "filters-gegl-graph", GIMP_ICON_GEGL,
     NC_("filters-action", "_GEGL graph..."), NULL, NULL,
     "gegl:gegl",
     GIMP_HELP_FILTER_GEGL_GRAPH },
 
-  { "filters-grid", GIMP_STOCK_GRID,
+  { "filters-grid", GIMP_ICON_GRID,
     NC_("filters-action", "_Grid..."), NULL, NULL,
     "gegl:grid",
     GIMP_HELP_FILTER_GAUSSIAN_GRID },
 
-  { "filters-high-pass", GIMP_STOCK_GEGL,
+  { "filters-high-pass", GIMP_ICON_GEGL,
     NC_("filters-action", "_High Pass..."), NULL, NULL,
     "gegl:high-pass",
     GIMP_HELP_FILTER_HIGH_PASS },
 
-  { "filters-illusion", GIMP_STOCK_GEGL,
+  { "filters-illusion", GIMP_ICON_GEGL,
     NC_("filters-action", "_Illusion..."), NULL, NULL,
     "gegl:illusion",
     GIMP_HELP_FILTER_ILLUSION },
 
-  { "filters-image-gradient", GIMP_STOCK_GEGL,
+  { "filters-image-gradient", GIMP_ICON_GEGL,
     NC_("filters-action", "_Image Gradient..."), NULL, NULL,
     "gegl:image-gradient",
     GIMP_HELP_FILTER_IMAGE_GRADIENT },
 
-  { "filters-kaleidoscope", GIMP_STOCK_GEGL,
+  { "filters-kaleidoscope", GIMP_ICON_GEGL,
     NC_("filters-action", "_Kaleidoscope..."), NULL, NULL,
     "gegl:mirrors",
     GIMP_HELP_FILTER_KALEIDOSCOPE },
 
-  { "filters-lens-distortion", GIMP_STOCK_GEGL,
+  { "filters-lens-distortion", GIMP_ICON_GEGL,
     NC_("filters-action", "Lens Distortion..."), NULL, NULL,
     "gegl:lens-distortion",
     GIMP_HELP_FILTER_LENS_DISTORTION },
 
-  { "filters-lens-flare", GIMP_STOCK_GEGL,
+  { "filters-lens-flare", GIMP_ICON_GEGL,
     NC_("filters-action", "Lens Flare..."), NULL, NULL,
     "gegl:lens-flare",
     GIMP_HELP_FILTER_LENS_FLARE },
 
-  { "filters-mantiuk-2006", GIMP_STOCK_GEGL,
+  { "filters-mantiuk-2006", GIMP_ICON_GEGL,
     NC_("filters-action", "_Mantiuk 2006..."), NULL, NULL,
     "gegl:mantiuk06",
     GIMP_HELP_FILTER_MANTIUK_2006 },
 
-  { "filters-maze", GIMP_STOCK_GEGL,
+  { "filters-maze", GIMP_ICON_GEGL,
     NC_("filters-action", "_Maze..."), NULL, NULL,
     "gegl:maze",
     GIMP_HELP_FILTER_MAZE },
 
-  { "filters-mono-mixer", GIMP_STOCK_GEGL,
+  { "filters-mono-mixer", GIMP_ICON_GEGL,
     NC_("filters-action", "_Mono Mixer..."), NULL, NULL,
     "gegl:mono-mixer",
     GIMP_HELP_FILTER_MONO_MIXER },
 
-  { "filters-mosaic", GIMP_STOCK_GEGL,
+  { "filters-mosaic", GIMP_ICON_GEGL,
     NC_("filters-action", "_Mosaic..."), NULL, NULL,
     "gegl:mosaic",
     GIMP_HELP_FILTER_MOSAIC },
 
-  { "filters-motion-blur-circular", GIMP_STOCK_GEGL,
+  { "filters-motion-blur-circular", GIMP_ICON_GEGL,
     NC_("filters-action", "_Circular Motion Blur..."), NULL, NULL,
     "gegl:motion-blur-circular",
     GIMP_HELP_FILTER_MOTION_BLUR_CIRCULAR },
 
-  { "filters-motion-blur-linear", GIMP_STOCK_GEGL,
+  { "filters-motion-blur-linear", GIMP_ICON_GEGL,
     NC_("filters-action", "_Linear Motion Blur..."), NULL, NULL,
     "gegl:motion-blur-linear",
     GIMP_HELP_FILTER_MOTION_BLUR_LINEAR },
 
-  { "filters-motion-blur-zoom", GIMP_STOCK_GEGL,
+  { "filters-motion-blur-zoom", GIMP_ICON_GEGL,
     NC_("filters-action", "_Zoom Motion Blur..."), NULL, NULL,
     "gegl:motion-blur-zoom",
     GIMP_HELP_FILTER_MOTION_BLUR_ZOOM },
 
-  { "filters-noise-cell", GIMP_STOCK_GEGL,
+  { "filters-noise-cell", GIMP_ICON_GEGL,
     NC_("filters-action", "_Cell Noise..."), NULL, NULL,
     "gegl:cell-noise",
     GIMP_HELP_FILTER_NOISE_CELL },
 
-  { "filters-noise-cie-lch", GIMP_STOCK_GEGL,
+  { "filters-noise-cie-lch", GIMP_ICON_GEGL,
     NC_("filters-action", "CIE lch Noise..."), NULL, NULL,
     "gegl:noise-cie-lch",
     GIMP_HELP_FILTER_NOISE_CIE_LCH },
 
-  { "filters-noise-hsv", GIMP_STOCK_GEGL,
+  { "filters-noise-hsv", GIMP_ICON_GEGL,
     NC_("filters-action", "HSV Noise..."), NULL, NULL,
     "gegl:noise-hsv",
     GIMP_HELP_FILTER_NOISE_HSV },
 
-  { "filters-noise-hurl", GIMP_STOCK_GEGL,
+  { "filters-noise-hurl", GIMP_ICON_GEGL,
     NC_("filters-action", "_Hurl..."), NULL, NULL,
     "gegl:noise-hurl",
     GIMP_HELP_FILTER_NOISE_HURL },
 
-  { "filters-noise-perlin", GIMP_STOCK_GEGL,
+  { "filters-noise-perlin", GIMP_ICON_GEGL,
     NC_("filters-action", "_Perlin Noise..."), NULL, NULL,
     "gegl:perlin-noise",
     GIMP_HELP_FILTER_NOISE_PERLIN },
 
-  { "filters-noise-pick", GIMP_STOCK_GEGL,
+  { "filters-noise-pick", GIMP_ICON_GEGL,
     NC_("filters-action", "_Pick..."), NULL, NULL,
     "gegl:noise-pick",
     GIMP_HELP_FILTER_NOISE_PICK },
 
-  { "filters-noise-rgb", GIMP_STOCK_GEGL,
+  { "filters-noise-rgb", GIMP_ICON_GEGL,
     NC_("filters-action", "_RGB Noise..."), NULL, NULL,
     "gegl:noise-rgb",
     GIMP_HELP_FILTER_NOISE_RGB },
 
-  { "filters-noise-reduction", GIMP_STOCK_GEGL,
+  { "filters-noise-reduction", GIMP_ICON_GEGL,
     NC_("filters-action", "Noise R_eduction..."), NULL, NULL,
     "gegl:noise-reduction",
     GIMP_HELP_FILTER_NOISE_REDUCTION },
 
-  { "filters-noise-simplex", GIMP_STOCK_GEGL,
+  { "filters-noise-simplex", GIMP_ICON_GEGL,
     NC_("filters-action", "_Simplex Noise..."), NULL, NULL,
     "gegl:simplex-noise",
     GIMP_HELP_FILTER_NOISE_SIMPLEX },
 
-  { "filters-noise-slur", GIMP_STOCK_GEGL,
+  { "filters-noise-slur", GIMP_ICON_GEGL,
     NC_("filters-action", "_Slur..."), NULL, NULL,
     "gegl:noise-slur",
     GIMP_HELP_FILTER_NOISE_SLUR },
 
-  { "filters-noise-solid", GIMP_STOCK_GEGL,
+  { "filters-noise-solid", GIMP_ICON_GEGL,
     NC_("filters-action", "_Solid Noise..."), NULL, NULL,
     "gegl:noise-solid",
     GIMP_HELP_FILTER_NOISE_SOLID },
 
-  { "filters-noise-spread", GIMP_STOCK_GEGL,
+  { "filters-noise-spread", GIMP_ICON_GEGL,
     NC_("filters-action", "Sp_read..."), NULL, NULL,
     "gegl:noise-spread",
     GIMP_HELP_FILTER_NOISE_SPREAD },
 
-  { "filters-oilify", GIMP_STOCK_GEGL,
+  { "filters-oilify", GIMP_ICON_GEGL,
     NC_("filters-action", "Oili_fy..."), NULL, NULL,
     "gegl:oilify",
     GIMP_HELP_FILTER_OILIFY },
 
-  { "filters-panorama-projection", GIMP_STOCK_GEGL,
+  { "filters-panorama-projection", GIMP_ICON_GEGL,
     NC_("filters-action", "_Panorama Projection..."), NULL, NULL,
     "gegl:panorama-projection",
     GIMP_HELP_FILTER_PANORAMA_PROJECTION },
 
-  { "filters-photocopy", GIMP_STOCK_GEGL,
+  { "filters-photocopy", GIMP_ICON_GEGL,
     NC_("filters-action", "_Photocopy..."), NULL, NULL,
     "gegl:photocopy",
     GIMP_HELP_FILTER_PHOTOCOPY },
 
-  { "filters-pixelize", GIMP_STOCK_GEGL,
+  { "filters-pixelize", GIMP_ICON_GEGL,
     NC_("filters-action", "_Pixelize..."), NULL, NULL,
     "gegl:pixelize",
     GIMP_HELP_FILTER_PIXELIZE },
 
-  { "filters-plasma", GIMP_STOCK_GEGL,
+  { "filters-plasma", GIMP_ICON_GEGL,
     NC_("filters-action", "_Plasma..."), NULL, NULL,
     "gegl:plasma",
     GIMP_HELP_FILTER_PLASMA },
 
-  { "filters-polar-coordinates", GIMP_STOCK_GEGL,
+  { "filters-polar-coordinates", GIMP_ICON_GEGL,
     NC_("filters-action", "P_olar Coordinates..."), NULL, NULL,
     "gegl:polar-coordinates",
     GIMP_HELP_FILTER_POLAR_COORDINATES },
 
-  { "filters-posterize", GIMP_STOCK_TOOL_POSTERIZE,
+  { "filters-posterize", GIMP_ICON_TOOL_POSTERIZE,
     NC_("filters-action", "_Posterize..."), NULL, NULL,
     "gimp:posterize",
     GIMP_HELP_FILTER_POSTERIZE },
 
-  { "filters-red-eye-removal", GIMP_STOCK_GEGL,
+  { "filters-red-eye-removal", GIMP_ICON_GEGL,
     NC_("filters-action", "_Red Eye Removal..."), NULL, NULL,
     "gegl:red-eye-removal",
     GIMP_HELP_FILTER_RED_EYE_REMOVAL },
 
-  { "filters-reinhard-2005", GIMP_STOCK_GEGL,
+  { "filters-reinhard-2005", GIMP_ICON_GEGL,
     NC_("filters-action", "_Reinhard 2005..."), NULL, NULL,
     "gegl:reinhard05",
     GIMP_HELP_FILTER_REINHARD_2005 },
 
-  { "filters-rgb-clip", GIMP_STOCK_GEGL,
+  { "filters-rgb-clip", GIMP_ICON_GEGL,
     NC_("filters-action", "RGB _Clip..."), NULL, NULL,
     "gegl:rgb-clip",
     GIMP_HELP_FILTER_RGB_CLIP },
 
-  { "filters-ripple", GIMP_STOCK_GEGL,
+  { "filters-ripple", GIMP_ICON_GEGL,
     NC_("filters-action", "_Ripple..."), NULL, NULL,
     "gegl:ripple",
     GIMP_HELP_FILTER_RIPPLE },
 
-  { "filters-saturation", GIMP_STOCK_GEGL,
+  { "filters-saturation", GIMP_ICON_GEGL,
     NC_("filters-action", "Sat_uration..."), NULL, NULL,
     "gegl:saturation",
     GIMP_HELP_FILTER_SATURATION },
 
-  { "filters-semi-flatten", GIMP_STOCK_GEGL,
+  { "filters-semi-flatten", GIMP_ICON_GEGL,
     NC_("filters-action", "_Semi-Flatten..."), NULL, NULL,
     "gimp:semi-flatten",
     GIMP_HELP_FILTER_SEMI_FLATTEN },
 
-  { "filters-sepia", GIMP_STOCK_GEGL,
+  { "filters-sepia", GIMP_ICON_GEGL,
     NC_("filters-action", "_Sepia..."), NULL, NULL,
     "gegl:sepia",
     GIMP_HELP_FILTER_SEPIA },
 
-  { "filters-shift", GIMP_STOCK_GEGL,
+  { "filters-shift", GIMP_ICON_GEGL,
     NC_("filters-action", "_Shift..."), NULL, NULL,
     "gegl:shift",
     GIMP_HELP_FILTER_SHIFT },
 
-  { "filters-sinus", GIMP_STOCK_GEGL,
+  { "filters-sinus", GIMP_ICON_GEGL,
     NC_("filters-action", "_Sinus..."), NULL, NULL,
     "gegl:sinus",
     GIMP_HELP_FILTER_SINUS },
 
-  { "filters-slic", GIMP_STOCK_GEGL,
+  { "filters-slic", GIMP_ICON_GEGL,
     NC_("filters-action", "_Simple Linear Iterative Clustering..."), NULL, NULL,
     "gegl:slic",
     GIMP_HELP_FILTER_SLIC },
 
-  { "filters-snn-mean", GIMP_STOCK_GEGL,
+  { "filters-snn-mean", GIMP_ICON_GEGL,
     NC_("filters-action", "_Symmetric Nearest Neighbor..."), NULL, NULL,
     "gegl:snn-mean",
     GIMP_HELP_FILTER_SNN_MEAN },
 
-  { "filters-softglow", GIMP_STOCK_GEGL,
+  { "filters-softglow", GIMP_ICON_GEGL,
     NC_("filters-action", "_Softglow..."), NULL, NULL,
     "gegl:softglow",
     GIMP_HELP_FILTER_SOFTGLOW },
 
-  { "filters-stretch-contrast", GIMP_STOCK_GEGL,
+  { "filters-stretch-contrast", GIMP_ICON_GEGL,
     NC_("filters-action", "_Stretch Contrast..."), NULL, NULL,
     "gegl:stretch-contrast",
     GIMP_HELP_FILTER_STRETCH_CONTRAST },
 
-  { "filters-stretch-contrast-hsv", GIMP_STOCK_GEGL,
+  { "filters-stretch-contrast-hsv", GIMP_ICON_GEGL,
     NC_("filters-action", "_Stretch Contrast HSV..."), NULL, NULL,
     "gegl:stretch-contrast-hsv",
     GIMP_HELP_FILTER_STRETCH_CONTRAST_HSV },
 
-  { "filters-stress", GIMP_STOCK_GEGL,
+  { "filters-stress", GIMP_ICON_GEGL,
     NC_("filters-action", "_Stress..."), NULL, NULL,
     "gegl:stress",
     GIMP_HELP_FILTER_STRESS },
 
-  { "filters-supernova", GIMP_STOCK_GEGL,
+  { "filters-supernova", GIMP_ICON_GEGL,
     NC_("filters-action", "Super_nova..."), NULL, NULL,
     "gegl:supernova",
     GIMP_HELP_FILTER_SUPERNOVA },
 
-  { "filters-threshold-alpha", GIMP_STOCK_GEGL,
+  { "filters-threshold-alpha", GIMP_ICON_GEGL,
     NC_("filters-action", "_Threshold Alpha..."), NULL, NULL,
     "gimp:threshold-alpha",
     GIMP_HELP_FILTER_THRESHOLD_ALPHA },
 
-  { "filters-tile-glass", GIMP_STOCK_GEGL,
+  { "filters-tile-glass", GIMP_ICON_GEGL,
     NC_("filters-action", "_Glass Tile..."), NULL, NULL,
     "gegl:tile-glass",
     GIMP_HELP_FILTER_TILE_GLASS },
 
-  { "filters-tile-paper", GIMP_STOCK_GEGL,
+  { "filters-tile-paper", GIMP_ICON_GEGL,
     NC_("filters-action", "_Paper Tile..."), NULL, NULL,
     "gegl:tile-paper",
     GIMP_HELP_FILTER_TILE_PAPER },
 
-  { "filters-tile-seamless", GIMP_STOCK_GEGL,
+  { "filters-tile-seamless", GIMP_ICON_GEGL,
     NC_("filters-action", "_Tile Seamless..."), NULL, NULL,
     "gegl:tile-seamless",
     GIMP_HELP_FILTER_TILE_SEAMLESS },
 
-  { "filters-unsharp-mask", GIMP_STOCK_GEGL,
+  { "filters-unsharp-mask", GIMP_ICON_GEGL,
     NC_("filters-action", "_Unsharp Mask..."), NULL, NULL,
     "gegl:unsharp-mask",
     GIMP_HELP_FILTER_UNSHARP_MASK },
 
-  { "filters-value-propagate", GIMP_STOCK_GEGL,
+  { "filters-value-propagate", GIMP_ICON_GEGL,
     NC_("filters-action", "_Value Propagate..."), NULL, NULL,
     "gegl:value-propagate",
     GIMP_HELP_FILTER_VALUE_PROPAGATE },
 
-  { "filters-video-degradation", GIMP_STOCK_GEGL,
+  { "filters-video-degradation", GIMP_ICON_GEGL,
     NC_("filters-action", "Vi_deo Degradation..."), NULL, NULL,
     "gegl:video-degradation",
     GIMP_HELP_FILTER_VIDEO_DEGRADATION },
 
-  { "filters-vignette", GIMP_STOCK_GEGL,
+  { "filters-vignette", GIMP_ICON_GEGL,
     NC_("filters-action", "_Vignette..."), NULL, NULL,
     "gegl:vignette",
     GIMP_HELP_FILTER_VIGNETTE },
 
-  { "filters-waterpixels", GIMP_STOCK_GEGL,
+  { "filters-waterpixels", GIMP_ICON_GEGL,
     NC_("filters-action", "_Waterpixels..."), NULL, NULL,
     "gegl:waterpixels",
     GIMP_HELP_FILTER_WATERPIXELS },
 
-  { "filters-waves", GIMP_STOCK_GEGL,
+  { "filters-waves", GIMP_ICON_GEGL,
     NC_("filters-action", "_Waves..."), NULL, NULL,
     "gegl:waves",
     GIMP_HELP_FILTER_WAVES },
 
-  { "filters-whirl-pinch", GIMP_STOCK_GEGL,
+  { "filters-whirl-pinch", GIMP_ICON_GEGL,
     NC_("filters-action", "W_hirl and Pinch..."), NULL, NULL,
     "gegl:whirl-pinch",
     GIMP_HELP_FILTER_WHIRL_PINCH },
 
-  { "filters-wind", GIMP_STOCK_GEGL,
+  { "filters-wind", GIMP_ICON_GEGL,
     NC_("filters-action", "W_ind..."), NULL, NULL,
     "gegl:wind",
     GIMP_HELP_FILTER_WIND }
@@ -590,14 +590,14 @@ static const GimpStringActionEntry filters_actions[] =
 
 static const GimpEnumActionEntry filters_repeat_actions[] =
 {
-  { "filters-repeat", "system-run",
+  { "filters-repeat", GIMP_ICON_SYSTEM_RUN,
     NC_("filters-action", "Re_peat Last"), "<primary>F",
     NC_("filters-action",
         "Rerun the last used filter using the same settings"),
     GIMP_RUN_WITH_LAST_VALS, FALSE,
     GIMP_HELP_FILTER_REPEAT },
 
-  { "filters-reshow", GIMP_STOCK_RESHOW_FILTER,
+  { "filters-reshow", GIMP_ICON_DIALOG_RESHOW_FILTER,
     NC_("filters-action", "R_e-Show Last"), "<primary><shift>F",
     NC_("filters-action", "Show the last used filter dialog again"),
     GIMP_RUN_INTERACTIVE, FALSE,
diff --git a/app/actions/fonts-actions.c b/app/actions/fonts-actions.c
index 93724a9..386228d 100644
--- a/app/actions/fonts-actions.c
+++ b/app/actions/fonts-actions.c
@@ -40,11 +40,11 @@
 
 static const GimpActionEntry fonts_actions[] =
 {
-  { "fonts-popup", "gtk-select-font",
+  { "fonts-popup", GIMP_ICON_FONT,
     NC_("fonts-action", "Fonts Menu"), NULL, NULL, NULL,
     GIMP_HELP_FONT_DIALOG },
 
-  { "fonts-refresh", "view-refresh",
+  { "fonts-refresh", GIMP_ICON_VIEW_REFRESH,
     NC_("fonts-action", "_Rescan Font List"), NULL,
     NC_("fonts-action", "Rescan the installed fonts"),
     G_CALLBACK (fonts_refresh_cmd_callback),
diff --git a/app/actions/gradient-editor-actions.c b/app/actions/gradient-editor-actions.c
index ea8f97c..30f9f78 100644
--- a/app/actions/gradient-editor-actions.c
+++ b/app/actions/gradient-editor-actions.c
@@ -42,22 +42,22 @@
 
 static const GimpActionEntry gradient_editor_actions[] =
 {
-  { "gradient-editor-popup", GIMP_STOCK_GRADIENT,
+  { "gradient-editor-popup", GIMP_ICON_GRADIENT,
     NC_("gradient-editor-action", "Gradient Editor Menu"), NULL, NULL, NULL,
     GIMP_HELP_GRADIENT_EDITOR_DIALOG },
 
   { "gradient-editor-left-color-type", NULL,
     NC_("gradient-editor-action", "Left Color Type") },
-  { "gradient-editor-load-left-color", "document-revert",
+  { "gradient-editor-load-left-color", GIMP_ICON_DOCUMENT_REVERT,
     NC_("gradient-editor-action", "_Load Left Color From") },
-  { "gradient-editor-save-left-color", "document-save",
+  { "gradient-editor-save-left-color", GIMP_ICON_DOCUMENT_SAVE,
     NC_("gradient-editor-action", "_Save Left Color To") },
 
   { "gradient-editor-right-color-type", NULL,
     NC_("gradient-editor-action", "Right Color Type") },
-  { "gradient-editor-load-right-color", "document-revert",
+  { "gradient-editor-load-right-color", GIMP_ICON_DOCUMENT_REVERT,
     NC_("gradient-editor-action", "Load Right Color Fr_om") },
-  { "gradient-editor-save-right-color", "document-save",
+  { "gradient-editor-save-right-color", GIMP_ICON_DOCUMENT_SAVE,
     NC_("gradient-editor-action", "Sa_ve Right Color To") },
 
   { "gradient-editor-blending-func", NULL, "blending-function" },
@@ -73,12 +73,12 @@ static const GimpActionEntry gradient_editor_actions[] =
     G_CALLBACK (gradient_editor_right_color_cmd_callback),
     GIMP_HELP_GRADIENT_EDITOR_RIGHT_COLOR },
 
-  { "gradient-editor-flip", GIMP_STOCK_FLIP_HORIZONTAL,
+  { "gradient-editor-flip", GIMP_ICON_OBJECT_FLIP_HORIZONTAL,
     "flip", NULL, NULL,
     G_CALLBACK (gradient_editor_flip_cmd_callback),
     GIMP_HELP_GRADIENT_EDITOR_FLIP },
 
-  { "gradient-editor-replicate", GIMP_STOCK_DUPLICATE,
+  { "gradient-editor-replicate", GIMP_ICON_OBJECT_DUPLICATE,
     "replicate", NULL, NULL,
     G_CALLBACK (gradient_editor_replicate_cmd_callback),
     GIMP_HELP_GRADIENT_EDITOR_FLIP },
@@ -93,7 +93,7 @@ static const GimpActionEntry gradient_editor_actions[] =
     G_CALLBACK (gradient_editor_split_uniformly_cmd_callback),
     GIMP_HELP_GRADIENT_EDITOR_SPLIT_UNIFORM },
 
-  { "gradient-editor-delete", "edit-delete",
+  { "gradient-editor-delete", GIMP_ICON_EDIT_DELETE,
     "delete", "", NULL,
     G_CALLBACK (gradient_editor_delete_cmd_callback),
     GIMP_HELP_GRADIENT_EDITOR_DELETE },
@@ -121,7 +121,7 @@ static const GimpActionEntry gradient_editor_actions[] =
 
 static const GimpToggleActionEntry gradient_editor_toggle_actions[] =
 {
-  { "gradient-editor-edit-active", GIMP_STOCK_LINKED,
+  { "gradient-editor-edit-active", GIMP_ICON_LINKED,
     NC_("gradient-editor-action", "Edit Active Gradient"), NULL, NULL,
     G_CALLBACK (data_editor_edit_active_cmd_callback),
     FALSE,
@@ -370,19 +370,19 @@ static const GimpRadioActionEntry gradient_editor_coloring_actions[] =
 
 static const GimpEnumActionEntry gradient_editor_zoom_actions[] =
 {
-  { "gradient-editor-zoom-in", "zoom-in",
+  { "gradient-editor-zoom-in", GIMP_ICON_ZOOM_IN,
     N_("Zoom In"), NULL,
     N_("Zoom in"),
     GIMP_ZOOM_IN, FALSE,
     GIMP_HELP_GRADIENT_EDITOR_ZOOM_IN },
 
-  { "gradient-editor-zoom-out", "zoom-out",
+  { "gradient-editor-zoom-out", GIMP_ICON_ZOOM_OUT,
     N_("Zoom Out"), NULL,
     N_("Zoom out"),
     GIMP_ZOOM_OUT, FALSE,
     GIMP_HELP_GRADIENT_EDITOR_ZOOM_OUT },
 
-  { "gradient-editor-zoom-all", "zoom-fit-best",
+  { "gradient-editor-zoom-all", GIMP_ICON_ZOOM_FIT_BEST,
     N_("Zoom All"), NULL,
     N_("Zoom all"),
     GIMP_ZOOM_OUT_MAX, FALSE,
diff --git a/app/actions/gradient-editor-commands.c b/app/actions/gradient-editor-commands.c
index 1f25eba..746e47a 100644
--- a/app/actions/gradient-editor-commands.c
+++ b/app/actions/gradient-editor-commands.c
@@ -83,7 +83,7 @@ gradient_editor_left_color_cmd_callback (GtkAction *action,
     gimp_color_dialog_new (GIMP_VIEWABLE (gradient),
                            GIMP_DATA_EDITOR (editor)->context,
                            _("Left Endpoint Color"),
-                           GIMP_STOCK_GRADIENT,
+                           GIMP_ICON_GRADIENT,
                            _("Gradient Segment's Left Endpoint Color"),
                            GTK_WIDGET (editor),
                            gimp_dialog_factory_get_singleton (),
@@ -237,7 +237,7 @@ gradient_editor_right_color_cmd_callback (GtkAction *action,
     gimp_color_dialog_new (GIMP_VIEWABLE (gradient),
                            GIMP_DATA_EDITOR (editor)->context,
                            _("Right Endpoint Color"),
-                           GIMP_STOCK_GRADIENT,
+                           GIMP_ICON_GRADIENT,
                            _("Gradient Segment's Right Endpoint Color"),
                            GTK_WIDGET (editor),
                            gimp_dialog_factory_get_singleton (),
@@ -474,7 +474,7 @@ gradient_editor_replicate_cmd_callback (GtkAction *action,
     gimp_viewable_dialog_new (GIMP_VIEWABLE (data_editor->data),
                               data_editor->context,
                               title, "gimp-gradient-segment-replicate",
-                              GIMP_STOCK_GRADIENT, desc,
+                              GIMP_ICON_GRADIENT, desc,
                               GTK_WIDGET (editor),
                               gimp_standard_help_func,
                               GIMP_HELP_GRADIENT_EDITOR_REPLICATE,
@@ -576,7 +576,7 @@ gradient_editor_split_uniformly_cmd_callback (GtkAction *action,
     gimp_viewable_dialog_new (GIMP_VIEWABLE (data_editor->data),
                               data_editor->context,
                               title, "gimp-gradient-segment-split-uniformly",
-                              GIMP_STOCK_GRADIENT, desc,
+                              GIMP_ICON_GRADIENT, desc,
                               GTK_WIDGET (editor),
                               gimp_standard_help_func,
                               GIMP_HELP_GRADIENT_EDITOR_SPLIT_UNIFORM,
diff --git a/app/actions/gradients-actions.c b/app/actions/gradients-actions.c
index 9df9b76..a538d63 100644
--- a/app/actions/gradients-actions.c
+++ b/app/actions/gradients-actions.c
@@ -40,23 +40,23 @@
 
 static const GimpActionEntry gradients_actions[] =
 {
-  { "gradients-popup", GIMP_STOCK_GRADIENT,
+  { "gradients-popup", GIMP_ICON_GRADIENT,
     NC_("gradients-action", "Gradients Menu"), NULL, NULL, NULL,
     GIMP_HELP_GRADIENT_DIALOG },
 
-  { "gradients-new", "document-new",
+  { "gradients-new", GIMP_ICON_DOCUMENT_NEW,
     NC_("gradients-action", "_New Gradient"), NULL,
     NC_("gradients-action", "Create a new gradient"),
     G_CALLBACK (data_new_cmd_callback),
     GIMP_HELP_GRADIENT_NEW },
 
-  { "gradients-duplicate", GIMP_STOCK_DUPLICATE,
+  { "gradients-duplicate", GIMP_ICON_OBJECT_DUPLICATE,
     NC_("gradients-action", "D_uplicate Gradient"), NULL,
     NC_("gradients-action", "Duplicate this gradient"),
     G_CALLBACK (data_duplicate_cmd_callback),
     GIMP_HELP_GRADIENT_DUPLICATE },
 
-  { "gradients-copy-location", "edit-copy",
+  { "gradients-copy-location", GIMP_ICON_EDIT_COPY,
     NC_("gradients-action", "Copy Gradient _Location"), NULL,
     NC_("gradients-action", "Copy gradient file location to clipboard"),
     G_CALLBACK (data_copy_location_cmd_callback),
@@ -68,19 +68,19 @@ static const GimpActionEntry gradients_actions[] =
     G_CALLBACK (data_show_in_file_manager_cmd_callback),
     GIMP_HELP_GRADIENT_SHOW_IN_FILE_MANAGER },
 
-  { "gradients-save-as-pov", "document-save-as",
+  { "gradients-save-as-pov", GIMP_ICON_DOCUMENT_SAVE_AS,
     NC_("gradients-action", "Save as _POV-Ray..."), NULL,
     NC_("gradients-action", "Save gradient as POV-Ray"),
     G_CALLBACK (gradients_save_as_pov_ray_cmd_callback),
     GIMP_HELP_GRADIENT_SAVE_AS_POV },
 
-  { "gradients-delete", "edit-delete",
+  { "gradients-delete", GIMP_ICON_EDIT_DELETE,
     NC_("gradients-action", "_Delete Gradient"), NULL,
     NC_("gradients-action", "Delete this gradient"),
     G_CALLBACK (data_delete_cmd_callback),
     GIMP_HELP_GRADIENT_DELETE },
 
-  { "gradients-refresh", "view-refresh",
+  { "gradients-refresh", GIMP_ICON_VIEW_REFRESH,
     NC_("gradients-action", "_Refresh Gradients"), NULL,
     NC_("gradients-action", "Refresh gradients"),
     G_CALLBACK (data_refresh_cmd_callback),
@@ -89,7 +89,7 @@ static const GimpActionEntry gradients_actions[] =
 
 static const GimpStringActionEntry gradients_edit_actions[] =
 {
-  { "gradients-edit", "gtk-edit",
+  { "gradients-edit", GIMP_ICON_EDIT,
     NC_("gradients-action", "_Edit Gradient..."), NULL,
     NC_("gradients-action", "Edit this gradient"),
     "gimp-gradient-editor",
diff --git a/app/actions/image-actions.c b/app/actions/image-actions.c
index afcbf32..27324e7 100644
--- a/app/actions/image-actions.c
+++ b/app/actions/image-actions.c
@@ -71,13 +71,13 @@ static const GimpActionEntry image_actions[] =
   { "colors-components-menu",   NULL, NC_("image-action", "C_omponents")   },
   { "colors-desaturate-menu",   NULL, NC_("image-action", "D_esaturate")   },
 
-  { "image-new", "document-new",
+  { "image-new", GIMP_ICON_DOCUMENT_NEW,
     NC_("image-action", "_New..."), "<primary>N",
     NC_("image-action", "Create a new image"),
     G_CALLBACK (image_new_cmd_callback),
     GIMP_HELP_FILE_NEW },
 
-  { "image-duplicate", GIMP_STOCK_DUPLICATE,
+  { "image-duplicate", GIMP_ICON_OBJECT_DUPLICATE,
     NC_("image-action", "_Duplicate"), "<primary>D",
     NC_("image-action", "Create a duplicate of this image"),
     G_CALLBACK (image_duplicate_cmd_callback),
@@ -107,7 +107,7 @@ static const GimpActionEntry image_actions[] =
     G_CALLBACK (image_color_profile_save_cmd_callback),
     GIMP_HELP_IMAGE_COLOR_PROFILE_SAVE },
 
-  { "image-resize", GIMP_STOCK_RESIZE,
+  { "image-resize", GIMP_ICON_OBJECT_RESIZE,
     NC_("image-action", "Can_vas Size..."), NULL,
     NC_("image-action", "Adjust the image dimensions"),
     G_CALLBACK (image_resize_cmd_callback),
@@ -125,25 +125,25 @@ static const GimpActionEntry image_actions[] =
     G_CALLBACK (image_resize_to_selection_cmd_callback),
     GIMP_HELP_IMAGE_RESIZE_TO_SELECTION },
 
-  { "image-print-size", GIMP_STOCK_PRINT_RESOLUTION,
+  { "image-print-size", GIMP_ICON_DOCUMENT_PRINT_RESOLUTION,
     NC_("image-action", "_Print Size..."), NULL,
     NC_("image-action", "Adjust the print resolution"),
     G_CALLBACK (image_print_size_cmd_callback),
     GIMP_HELP_IMAGE_PRINT_SIZE },
 
-  { "image-scale", GIMP_STOCK_SCALE,
+  { "image-scale", GIMP_ICON_OBJECT_SCALE,
     NC_("image-action", "_Scale Image..."), NULL,
     NC_("image-action", "Change the size of the image content"),
     G_CALLBACK (image_scale_cmd_callback),
     GIMP_HELP_IMAGE_SCALE },
 
-  { "image-crop-to-selection", GIMP_STOCK_TOOL_CROP,
+  { "image-crop-to-selection", GIMP_ICON_TOOL_CROP,
     NC_("image-action", "_Crop to Selection"), NULL,
     NC_("image-action", "Crop the image to the extents of the selection"),
     G_CALLBACK (image_crop_to_selection_cmd_callback),
     GIMP_HELP_IMAGE_CROP },
 
-  { "image-crop-to-content", GIMP_STOCK_TOOL_CROP,
+  { "image-crop-to-content", GIMP_ICON_TOOL_CROP,
     NC_("image-action", "Crop to C_ontent"), NULL,
     NC_("image-action", "Crop the image to the extents of its content (remove empty borders from the 
image)"),
     G_CALLBACK (image_crop_to_content_cmd_callback),
@@ -161,7 +161,7 @@ static const GimpActionEntry image_actions[] =
     G_CALLBACK (image_flatten_image_cmd_callback),
     GIMP_HELP_IMAGE_FLATTEN },
 
-  { "image-configure-grid", GIMP_STOCK_GRID,
+  { "image-configure-grid", GIMP_ICON_GRID,
     NC_("image-action", "Configure G_rid..."), NULL,
     NC_("image-action", "Configure the grid for this image"),
     G_CALLBACK (image_configure_grid_cmd_callback),
@@ -188,17 +188,17 @@ static const GimpToggleActionEntry image_toggle_actions[] =
 
 static const GimpRadioActionEntry image_convert_base_type_actions[] =
 {
-  { "image-convert-rgb", GIMP_STOCK_CONVERT_RGB,
+  { "image-convert-rgb", GIMP_ICON_CONVERT_RGB,
     NC_("image-convert-action", "_RGB"), NULL,
     NC_("image-convert-action", "Convert the image to the RGB colorspace"),
     GIMP_RGB, GIMP_HELP_IMAGE_CONVERT_RGB },
 
-  { "image-convert-grayscale", GIMP_STOCK_CONVERT_GRAYSCALE,
+  { "image-convert-grayscale", GIMP_ICON_CONVERT_GRAYSCALE,
     NC_("image-convert-action", "_Grayscale"), NULL,
     NC_("image-convert-action", "Convert the image to grayscale"),
     GIMP_GRAY, GIMP_HELP_IMAGE_CONVERT_GRAYSCALE },
 
-  { "image-convert-indexed", GIMP_STOCK_CONVERT_INDEXED,
+  { "image-convert-indexed", GIMP_ICON_CONVERT_INDEXED,
     NC_("image-convert-action", "_Indexed..."), NULL,
     NC_("image-convert-action", "Convert the image to indexed colors"),
     GIMP_INDEXED, GIMP_HELP_IMAGE_CONVERT_INDEXED }
@@ -260,13 +260,13 @@ static const GimpRadioActionEntry image_convert_gamma_actions[] =
 
 static const GimpEnumActionEntry image_flip_actions[] =
 {
-  { "image-flip-horizontal", GIMP_STOCK_FLIP_HORIZONTAL,
+  { "image-flip-horizontal", GIMP_ICON_OBJECT_FLIP_HORIZONTAL,
     NC_("image-action", "Flip _Horizontally"), NULL,
     NC_("image-action", "Flip image horizontally"),
     GIMP_ORIENTATION_HORIZONTAL, FALSE,
     GIMP_HELP_IMAGE_FLIP_HORIZONTAL },
 
-  { "image-flip-vertical", GIMP_STOCK_FLIP_VERTICAL,
+  { "image-flip-vertical", GIMP_ICON_OBJECT_FLIP_VERTICAL,
     NC_("image-action", "Flip _Vertically"), NULL,
     NC_("image-action", "Flip image vertically"),
     GIMP_ORIENTATION_VERTICAL, FALSE,
@@ -275,19 +275,19 @@ static const GimpEnumActionEntry image_flip_actions[] =
 
 static const GimpEnumActionEntry image_rotate_actions[] =
 {
-  { "image-rotate-90", GIMP_STOCK_ROTATE_90,
+  { "image-rotate-90", GIMP_ICON_OBJECT_ROTATE_90,
     NC_("image-action", "Rotate 90° _clockwise"), NULL,
     NC_("image-action", "Rotate the image 90 degrees to the right"),
     GIMP_ROTATE_90, FALSE,
     GIMP_HELP_IMAGE_ROTATE_90 },
 
-  { "image-rotate-180", GIMP_STOCK_ROTATE_180,
+  { "image-rotate-180", GIMP_ICON_OBJECT_ROTATE_180,
     NC_("image-action", "Rotate _180°"), NULL,
     NC_("image-action", "Turn the image upside-down"),
     GIMP_ROTATE_180, FALSE,
     GIMP_HELP_IMAGE_ROTATE_180 },
 
-  { "image-rotate-270", GIMP_STOCK_ROTATE_270,
+  { "image-rotate-270", GIMP_ICON_OBJECT_ROTATE_270,
     NC_("image-action", "Rotate 90° counter-clock_wise"), NULL,
     NC_("image-action", "Rotate the image 90 degrees to the left"),
     GIMP_ROTATE_270, FALSE,
diff --git a/app/actions/images-actions.c b/app/actions/images-actions.c
index 4e02a9b..5674671 100644
--- a/app/actions/images-actions.c
+++ b/app/actions/images-actions.c
@@ -39,23 +39,23 @@
 
 static const GimpActionEntry images_actions[] =
 {
-  { "images-popup", GIMP_STOCK_IMAGES,
+  { "images-popup", GIMP_ICON_DIALOG_IMAGES,
     NC_("images-action", "Images Menu"), NULL, NULL, NULL,
     GIMP_HELP_IMAGE_DIALOG },
 
-  { "images-raise-views", "go-top",
+  { "images-raise-views", GIMP_ICON_GO_TOP,
     NC_("images-action", "_Raise Views"), NULL,
     NC_("images-action", "Raise this image's displays"),
     G_CALLBACK (images_raise_views_cmd_callback),
     NULL },
 
-  { "images-new-view", "document-new",
+  { "images-new-view", GIMP_ICON_DOCUMENT_NEW,
     NC_("images-action", "_New View"), NULL,
     NC_("images-action", "Create a new display for this image"),
     G_CALLBACK (images_new_view_cmd_callback),
     NULL },
 
-  { "images-delete", "edit-delete",
+  { "images-delete", GIMP_ICON_EDIT_DELETE,
     NC_("images-action", "_Delete Image"), NULL,
     NC_("images-action", "Delete this image"),
     G_CALLBACK (images_delete_image_cmd_callback),
diff --git a/app/actions/layers-actions.c b/app/actions/layers-actions.c
index f4e4c80..6faf3da 100644
--- a/app/actions/layers-actions.c
+++ b/app/actions/layers-actions.c
@@ -48,7 +48,7 @@
 
 static const GimpActionEntry layers_actions[] =
 {
-  { "layers-popup", GIMP_STOCK_LAYERS,
+  { "layers-popup", GIMP_ICON_DIALOG_LAYERS,
     NC_("layers-action", "Layers Menu"), NULL, NULL, NULL,
     GIMP_HELP_LAYER_DIALOG },
 
@@ -64,7 +64,7 @@ static const GimpActionEntry layers_actions[] =
     NC_("layers-action", "Composite Mode"), NULL, NULL, NULL,
     NULL },
 
-  { "layers-color-tag-menu", GIMP_STOCK_CLOSE /* abused */,
+  { "layers-color-tag-menu", GIMP_ICON_CLOSE /* abused */,
     NC_("layers-action", "Color Tag"), NULL, NULL, NULL,
     GIMP_HELP_LAYER_COLOR_TAG },
 
@@ -78,32 +78,32 @@ static const GimpActionEntry layers_actions[] =
     NC_("layers-action", "Tr_ansparency") },
   { "layers-transform-menu",         NULL,
     NC_("layers-action", "_Transform")    },
-  { "layers-properties-menu",        "document-properties",
+  { "layers-properties-menu",        GIMP_ICON_DOCUMENT_PROPERTIES,
     NC_("layers-action", "_Properties")   },
-  { "layers-opacity-menu",           GIMP_STOCK_TRANSPARENCY,
+  { "layers-opacity-menu",           GIMP_ICON_TRANSPARENCY,
     NC_("layers-action", "_Opacity")      },
-  { "layers-mode-menu",              GIMP_STOCK_TOOL_PENCIL,
+  { "layers-mode-menu",              GIMP_ICON_TOOL_PENCIL,
     NC_("layers-action", "Layer _Mode")   },
 
-  { "layers-text-tool", GIMP_STOCK_TOOL_TEXT,
+  { "layers-text-tool", GIMP_ICON_TOOL_TEXT,
     NC_("layers-action", "Te_xt Tool"), NULL,
     NC_("layers-action", "Activate the text tool on this text layer"),
     G_CALLBACK (layers_text_tool_cmd_callback),
     GIMP_HELP_TOOL_TEXT },
 
-  { "layers-edit-attributes", "gtk-edit",
+  { "layers-edit-attributes", GIMP_ICON_EDIT,
     NC_("layers-action", "_Edit Layer Attributes..."), NULL,
     NC_("layers-action", "Edit the layer's name"),
     G_CALLBACK (layers_edit_attributes_cmd_callback),
     GIMP_HELP_LAYER_EDIT },
 
-  { "layers-new", "document-new",
+  { "layers-new", GIMP_ICON_DOCUMENT_NEW,
     NC_("layers-action", "_New Layer..."), "<primary><shift>N",
     NC_("layers-action", "Create a new layer and add it to the image"),
     G_CALLBACK (layers_new_cmd_callback),
     GIMP_HELP_LAYER_NEW },
 
-  { "layers-new-last-values", "document-new",
+  { "layers-new-last-values", GIMP_ICON_DOCUMENT_NEW,
     NC_("layers-action", "_New Layer"), NULL,
     NC_("layers-action", "Create a new layer with last used values"),
     G_CALLBACK (layers_new_last_vals_cmd_callback),
@@ -116,56 +116,56 @@ static const GimpActionEntry layers_actions[] =
     G_CALLBACK (layers_new_from_visible_cmd_callback),
     GIMP_HELP_LAYER_NEW_FROM_VISIBLE },
 
-  { "layers-new-group", "folder-new",
+  { "layers-new-group", GIMP_ICON_FOLDER_NEW,
     NC_("layers-action", "New Layer _Group"), NULL,
     NC_("layers-action", "Create a new layer group and add it to the image"),
     G_CALLBACK (layers_new_group_cmd_callback),
     GIMP_HELP_LAYER_NEW },
 
-  { "layers-duplicate", GIMP_STOCK_DUPLICATE,
+  { "layers-duplicate", GIMP_ICON_OBJECT_DUPLICATE,
     NC_("layers-action", "D_uplicate Layer"), "<primary><shift>D",
     NC_("layers-action",
         "Create a duplicate of the layer and add it to the image"),
     G_CALLBACK (layers_duplicate_cmd_callback),
     GIMP_HELP_LAYER_DUPLICATE },
 
-  { "layers-delete", "edit-delete",
+  { "layers-delete", GIMP_ICON_EDIT_DELETE,
     NC_("layers-action", "_Delete Layer"), NULL,
     NC_("layers-action", "Delete this layer"),
     G_CALLBACK (layers_delete_cmd_callback),
     GIMP_HELP_LAYER_DELETE },
 
-  { "layers-raise", "go-up",
+  { "layers-raise", GIMP_ICON_GO_UP,
     NC_("layers-action", "_Raise Layer"), NULL,
     NC_("layers-action", "Raise this layer one step in the layer stack"),
     G_CALLBACK (layers_raise_cmd_callback),
     GIMP_HELP_LAYER_RAISE },
 
-  { "layers-raise-to-top", "go-top",
+  { "layers-raise-to-top", GIMP_ICON_GO_TOP,
     NC_("layers-action", "Layer to _Top"), NULL,
     NC_("layers-action", "Move this layer to the top of the layer stack"),
     G_CALLBACK (layers_raise_to_top_cmd_callback),
     GIMP_HELP_LAYER_RAISE_TO_TOP },
 
-  { "layers-lower", "go-down",
+  { "layers-lower", GIMP_ICON_GO_DOWN,
     NC_("layers-action", "_Lower Layer"), NULL,
     NC_("layers-action", "Lower this layer one step in the layer stack"),
     G_CALLBACK (layers_lower_cmd_callback),
     GIMP_HELP_LAYER_LOWER },
 
-  { "layers-lower-to-bottom", "go-bottom",
+  { "layers-lower-to-bottom", GIMP_ICON_GO_BOTTOM,
     NC_("layers-action", "Layer to _Bottom"), NULL,
     NC_("layers-action", "Move this layer to the bottom of the layer stack"),
     G_CALLBACK (layers_lower_to_bottom_cmd_callback),
     GIMP_HELP_LAYER_LOWER_TO_BOTTOM },
 
-  { "layers-anchor", GIMP_STOCK_ANCHOR,
+  { "layers-anchor", GIMP_ICON_LAYER_ANCHOR,
     NC_("layers-action", "_Anchor Layer"), "<primary>H",
     NC_("layers-action", "Anchor the floating layer"),
     G_CALLBACK (layers_anchor_cmd_callback),
     GIMP_HELP_LAYER_ANCHOR },
 
-  { "layers-merge-down", GIMP_STOCK_MERGE_DOWN,
+  { "layers-merge-down", GIMP_ICON_LAYER_MERGE_DOWN,
     NC_("layers-action", "Merge Do_wn"), NULL,
     NC_("layers-action", "Merge this layer with the first visible layer below it"),
     G_CALLBACK (layers_merge_down_cmd_callback),
@@ -189,55 +189,55 @@ static const GimpActionEntry layers_actions[] =
     G_CALLBACK (image_flatten_image_cmd_callback),
     GIMP_HELP_IMAGE_FLATTEN },
 
-  { "layers-text-discard", GIMP_STOCK_TOOL_TEXT,
+  { "layers-text-discard", GIMP_ICON_TOOL_TEXT,
     NC_("layers-action", "_Discard Text Information"), NULL,
     NC_("layers-action", "Turn this text layer into a normal layer"),
     G_CALLBACK (layers_text_discard_cmd_callback),
     GIMP_HELP_LAYER_TEXT_DISCARD },
 
-  { "layers-text-to-vectors", GIMP_STOCK_TOOL_TEXT,
+  { "layers-text-to-vectors", GIMP_ICON_TOOL_TEXT,
     NC_("layers-action", "Text to _Path"), NULL,
     NC_("layers-action", "Create a path from this text layer"),
     G_CALLBACK (layers_text_to_vectors_cmd_callback),
     GIMP_HELP_LAYER_TEXT_TO_PATH },
 
-  { "layers-text-along-vectors", GIMP_STOCK_TOOL_TEXT,
+  { "layers-text-along-vectors", GIMP_ICON_TOOL_TEXT,
     NC_("layers-action", "Text alon_g Path"), NULL,
     NC_("layers-action", "Warp this layer's text along the current path"),
     G_CALLBACK (layers_text_along_vectors_cmd_callback),
     GIMP_HELP_LAYER_TEXT_ALONG_PATH },
 
-  { "layers-resize", GIMP_STOCK_RESIZE,
+  { "layers-resize", GIMP_ICON_OBJECT_RESIZE,
     NC_("layers-action", "Layer B_oundary Size..."), NULL,
     NC_("layers-action", "Adjust the layer dimensions"),
     G_CALLBACK (layers_resize_cmd_callback),
     GIMP_HELP_LAYER_RESIZE },
 
-  { "layers-resize-to-image", GIMP_STOCK_LAYER_TO_IMAGESIZE,
+  { "layers-resize-to-image", GIMP_ICON_LAYER_TO_IMAGESIZE,
     NC_("layers-action", "Layer to _Image Size"), NULL,
     NC_("layers-action", "Resize the layer to the size of the image"),
     G_CALLBACK (layers_resize_to_image_cmd_callback),
     GIMP_HELP_LAYER_RESIZE_TO_IMAGE },
 
-  { "layers-scale", GIMP_STOCK_SCALE,
+  { "layers-scale", GIMP_ICON_OBJECT_SCALE,
     NC_("layers-action", "_Scale Layer..."), NULL,
     NC_("layers-action", "Change the size of the layer content"),
     G_CALLBACK (layers_scale_cmd_callback),
     GIMP_HELP_LAYER_SCALE },
 
-  { "layers-crop-to-selection", GIMP_STOCK_TOOL_CROP,
+  { "layers-crop-to-selection", GIMP_ICON_TOOL_CROP,
     NC_("layers-action", "_Crop to Selection"), NULL,
     NC_("layers-action", "Crop the layer to the extents of the selection"),
     G_CALLBACK (layers_crop_to_selection_cmd_callback),
     GIMP_HELP_LAYER_CROP },
 
-  { "layers-crop-to-content", GIMP_STOCK_TOOL_CROP,
+  { "layers-crop-to-content", GIMP_ICON_TOOL_CROP,
     NC_("layers-action", "Crop to C_ontent"), NULL,
     NC_("layers-action", "Crop the layer to the extents of its content (remove empty borders from the 
layer)"),
     G_CALLBACK (layers_crop_to_content_cmd_callback),
     GIMP_HELP_LAYER_CROP },
 
-  { "layers-mask-add", GIMP_STOCK_LAYER_MASK,
+  { "layers-mask-add", GIMP_ICON_LAYER_MASK,
     NC_("layers-action", "Add La_yer Mask..."), NULL,
     NC_("layers-action",
         "Add a mask that allows non-destructive editing of transparency"),
@@ -247,21 +247,21 @@ static const GimpActionEntry layers_actions[] =
   /* this is the same as layers-mask-add, except it's sensitive even if
    * there is a mask on the layer
    */
-  { "layers-mask-add-button", GIMP_STOCK_LAYER_MASK,
+  { "layers-mask-add-button", GIMP_ICON_LAYER_MASK,
     NC_("layers-action", "Add La_yer Mask..."), NULL,
     NC_("layers-action",
         "Add a mask that allows non-destructive editing of transparency"),
     G_CALLBACK (layers_mask_add_cmd_callback),
     GIMP_HELP_LAYER_MASK_ADD },
 
-  { "layers-mask-add-last-values", GIMP_STOCK_LAYER_MASK,
+  { "layers-mask-add-last-values", GIMP_ICON_LAYER_MASK,
     NC_("layers-action", "Add La_yer Mask"), NULL,
     NC_("layers-action",
         "Add a mask with last used values"),
     G_CALLBACK (layers_mask_add_last_vals_cmd_callback),
     GIMP_HELP_LAYER_MASK_ADD },
 
-  { "layers-alpha-add", GIMP_STOCK_TRANSPARENCY,
+  { "layers-alpha-add", GIMP_ICON_TRANSPARENCY,
     NC_("layers-action", "Add Alpha C_hannel"), NULL,
     NC_("layers-action", "Add transparency information to the layer"),
     G_CALLBACK (layers_alpha_add_cmd_callback),
@@ -276,14 +276,14 @@ static const GimpActionEntry layers_actions[] =
 
 static const GimpToggleActionEntry layers_toggle_actions[] =
 {
-  { "layers-mask-edit", "gtk-edit",
+  { "layers-mask-edit", GIMP_ICON_EDIT,
     NC_("layers-action", "_Edit Layer Mask"), NULL,
     NC_("layers-action", "Work on the layer mask"),
     G_CALLBACK (layers_mask_edit_cmd_callback),
     FALSE,
     GIMP_HELP_LAYER_MASK_EDIT },
 
-  { "layers-mask-show", GIMP_STOCK_VISIBLE,
+  { "layers-mask-show", GIMP_ICON_VISIBLE,
     NC_("layers-action", "S_how Layer Mask"), NULL, NULL,
     G_CALLBACK (layers_mask_show_cmd_callback),
     FALSE,
@@ -296,31 +296,31 @@ static const GimpToggleActionEntry layers_toggle_actions[] =
     FALSE,
     GIMP_HELP_LAYER_MASK_DISABLE },
 
-  { "layers-visible", GIMP_STOCK_VISIBLE,
+  { "layers-visible", GIMP_ICON_VISIBLE,
     NC_("layers-action", "_Visible"), NULL, NULL,
     G_CALLBACK (layers_visible_cmd_callback),
     FALSE,
     GIMP_HELP_LAYER_VISIBLE },
 
-  { "layers-linked", GIMP_STOCK_LINKED,
+  { "layers-linked", GIMP_ICON_LINKED,
     NC_("layers-action", "_Linked"), NULL, NULL,
     G_CALLBACK (layers_linked_cmd_callback),
     FALSE,
     GIMP_HELP_LAYER_LINKED },
 
-  { "layers-lock-content", NULL /* GIMP_STOCK_LOCK */,
+  { "layers-lock-content", NULL /* GIMP_ICON_LOCK */,
     NC_("layers-action", "L_ock pixels"), NULL, NULL,
     G_CALLBACK (layers_lock_content_cmd_callback),
     FALSE,
     GIMP_HELP_LAYER_LOCK_PIXELS },
 
-  { "layers-lock-position", GIMP_STOCK_TOOL_MOVE,
+  { "layers-lock-position", GIMP_ICON_TOOL_MOVE,
     NC_("layers-action", "L_ock position"), NULL, NULL,
     G_CALLBACK (layers_lock_position_cmd_callback),
     FALSE,
     GIMP_HELP_LAYER_LOCK_POSITION },
 
-  { "layers-lock-alpha", GIMP_STOCK_TRANSPARENCY,
+  { "layers-lock-alpha", GIMP_ICON_TRANSPARENCY,
     NC_("layers-action", "Lock Alph_a Channel"), NULL,
     NC_("layers-action",
         "Keep transparency information on this layer from being modified"),
@@ -395,7 +395,7 @@ static const GimpRadioActionEntry layers_composite_mode_actions[] =
 
 static const GimpEnumActionEntry layers_color_tag_actions[] =
 {
-  { "layers-color-tag-none", GIMP_STOCK_CLOSE /* abused */,
+  { "layers-color-tag-none", GIMP_ICON_CLOSE /* abused */,
     NC_("layers-action", "None"), NULL,
     NC_("layers-action", "Clear color tag"),
     GIMP_COLOR_TAG_NONE, FALSE,
@@ -458,7 +458,7 @@ static const GimpEnumActionEntry layers_mask_apply_actions[] =
     GIMP_MASK_APPLY, FALSE,
     GIMP_HELP_LAYER_MASK_APPLY },
 
-  { "layers-mask-delete", "edit-delete",
+  { "layers-mask-delete", GIMP_ICON_EDIT_DELETE,
     NC_("layers-action", "Delete Layer Mas_k"), NULL,
     NC_("layers-action", "Remove the layer mask and its effect"),
     GIMP_MASK_DISCARD, FALSE,
@@ -467,25 +467,25 @@ static const GimpEnumActionEntry layers_mask_apply_actions[] =
 
 static const GimpEnumActionEntry layers_mask_to_selection_actions[] =
 {
-  { "layers-mask-selection-replace", GIMP_STOCK_SELECTION_REPLACE,
+  { "layers-mask-selection-replace", GIMP_ICON_SELECTION_REPLACE,
     NC_("layers-action", "_Mask to Selection"), NULL,
     NC_("layers-action", "Replace the selection with the layer mask"),
     GIMP_CHANNEL_OP_REPLACE, FALSE,
     GIMP_HELP_LAYER_MASK_SELECTION_REPLACE },
 
-  { "layers-mask-selection-add", GIMP_STOCK_SELECTION_ADD,
+  { "layers-mask-selection-add", GIMP_ICON_SELECTION_ADD,
     NC_("layers-action", "_Add to Selection"), NULL,
     NC_("layers-action", "Add the layer mask to the current selection"),
     GIMP_CHANNEL_OP_ADD, FALSE,
     GIMP_HELP_LAYER_MASK_SELECTION_ADD },
 
-  { "layers-mask-selection-subtract", GIMP_STOCK_SELECTION_SUBTRACT,
+  { "layers-mask-selection-subtract", GIMP_ICON_SELECTION_SUBTRACT,
     NC_("layers-action", "_Subtract from Selection"), NULL,
     NC_("layers-action", "Subtract the layer mask from the current selection"),
     GIMP_CHANNEL_OP_SUBTRACT, FALSE,
     GIMP_HELP_LAYER_MASK_SELECTION_SUBTRACT },
 
-  { "layers-mask-selection-intersect", GIMP_STOCK_SELECTION_INTERSECT,
+  { "layers-mask-selection-intersect", GIMP_ICON_SELECTION_INTERSECT,
     NC_("layers-action", "_Intersect with Selection"), NULL,
     NC_("layers-action", "Intersect the layer mask with the current selection"),
     GIMP_CHANNEL_OP_INTERSECT, FALSE,
@@ -494,28 +494,28 @@ static const GimpEnumActionEntry layers_mask_to_selection_actions[] =
 
 static const GimpEnumActionEntry layers_alpha_to_selection_actions[] =
 {
-  { "layers-alpha-selection-replace", GIMP_STOCK_SELECTION_REPLACE,
+  { "layers-alpha-selection-replace", GIMP_ICON_SELECTION_REPLACE,
     NC_("layers-action", "Al_pha to Selection"), NULL,
     NC_("layers-action",
         "Replace the selection with the layer's alpha channel"),
     GIMP_CHANNEL_OP_REPLACE, FALSE,
     GIMP_HELP_LAYER_ALPHA_SELECTION_REPLACE },
 
-  { "layers-alpha-selection-add", GIMP_STOCK_SELECTION_ADD,
+  { "layers-alpha-selection-add", GIMP_ICON_SELECTION_ADD,
     NC_("layers-action", "A_dd to Selection"), NULL,
     NC_("layers-action",
         "Add the layer's alpha channel to the current selection"),
     GIMP_CHANNEL_OP_ADD, FALSE,
     GIMP_HELP_LAYER_ALPHA_SELECTION_ADD },
 
-  { "layers-alpha-selection-subtract", GIMP_STOCK_SELECTION_SUBTRACT,
+  { "layers-alpha-selection-subtract", GIMP_ICON_SELECTION_SUBTRACT,
     NC_("layers-action", "_Subtract from Selection"), NULL,
     NC_("layers-action",
         "Subtract the layer's alpha channel from the current selection"),
     GIMP_CHANNEL_OP_SUBTRACT, FALSE,
     GIMP_HELP_LAYER_ALPHA_SELECTION_SUBTRACT },
 
-  { "layers-alpha-selection-intersect", GIMP_STOCK_SELECTION_INTERSECT,
+  { "layers-alpha-selection-intersect", GIMP_ICON_SELECTION_INTERSECT,
     NC_("layers-action", "_Intersect with Selection"), NULL,
     NC_("layers-action",
         "Intersect the layer's alpha channel with the current selection"),
@@ -552,31 +552,31 @@ static const GimpEnumActionEntry layers_select_actions[] =
 
 static const GimpEnumActionEntry layers_opacity_actions[] =
 {
-  { "layers-opacity-set", GIMP_STOCK_TRANSPARENCY,
+  { "layers-opacity-set", GIMP_ICON_TRANSPARENCY,
     "Set Opacity", NULL, NULL,
     GIMP_ACTION_SELECT_SET, TRUE,
     GIMP_HELP_LAYER_OPACITY },
-  { "layers-opacity-transparent", GIMP_STOCK_TRANSPARENCY,
+  { "layers-opacity-transparent", GIMP_ICON_TRANSPARENCY,
     "Completely Transparent", NULL, NULL,
     GIMP_ACTION_SELECT_FIRST, FALSE,
     GIMP_HELP_LAYER_OPACITY },
-  { "layers-opacity-opaque", GIMP_STOCK_TRANSPARENCY,
+  { "layers-opacity-opaque", GIMP_ICON_TRANSPARENCY,
     "Completely Opaque", NULL, NULL,
     GIMP_ACTION_SELECT_LAST, FALSE,
     GIMP_HELP_LAYER_OPACITY },
-  { "layers-opacity-decrease", GIMP_STOCK_TRANSPARENCY,
+  { "layers-opacity-decrease", GIMP_ICON_TRANSPARENCY,
     "More Transparent", NULL, NULL,
     GIMP_ACTION_SELECT_PREVIOUS, FALSE,
     GIMP_HELP_LAYER_OPACITY },
-  { "layers-opacity-increase", GIMP_STOCK_TRANSPARENCY,
+  { "layers-opacity-increase", GIMP_ICON_TRANSPARENCY,
     "More Opaque", NULL, NULL,
     GIMP_ACTION_SELECT_NEXT, FALSE,
     GIMP_HELP_LAYER_OPACITY },
-  { "layers-opacity-decrease-skip", GIMP_STOCK_TRANSPARENCY,
+  { "layers-opacity-decrease-skip", GIMP_ICON_TRANSPARENCY,
     "10% More Transparent", NULL, NULL,
     GIMP_ACTION_SELECT_SKIP_PREVIOUS, FALSE,
     GIMP_HELP_LAYER_OPACITY },
-  { "layers-opacity-increase-skip", GIMP_STOCK_TRANSPARENCY,
+  { "layers-opacity-increase-skip", GIMP_ICON_TRANSPARENCY,
     "10% More Opaque", NULL, NULL,
     GIMP_ACTION_SELECT_SKIP_NEXT, FALSE,
     GIMP_HELP_LAYER_OPACITY }
@@ -584,19 +584,19 @@ static const GimpEnumActionEntry layers_opacity_actions[] =
 
 static const GimpEnumActionEntry layers_mode_actions[] =
 {
-  { "layers-mode-first", GIMP_STOCK_TOOL_PENCIL,
+  { "layers-mode-first", GIMP_ICON_TOOL_PENCIL,
     "First Layer Mode", NULL, NULL,
     GIMP_ACTION_SELECT_FIRST, FALSE,
     GIMP_HELP_LAYER_MODE },
-  { "layers-mode-last", GIMP_STOCK_TOOL_PENCIL,
+  { "layers-mode-last", GIMP_ICON_TOOL_PENCIL,
     "Last Layer Mode", NULL, NULL,
     GIMP_ACTION_SELECT_LAST, FALSE,
     GIMP_HELP_LAYER_MODE },
-  { "layers-mode-previous", GIMP_STOCK_TOOL_PENCIL,
+  { "layers-mode-previous", GIMP_ICON_TOOL_PENCIL,
     "Previous Layer Mode", NULL, NULL,
     GIMP_ACTION_SELECT_PREVIOUS, FALSE,
     GIMP_HELP_LAYER_MODE },
-  { "layers-mode-next", GIMP_STOCK_TOOL_PENCIL,
+  { "layers-mode-next", GIMP_ICON_TOOL_PENCIL,
     "Next Layer Mode", NULL, NULL,
     GIMP_ACTION_SELECT_NEXT, FALSE,
     GIMP_HELP_LAYER_MODE }
diff --git a/app/actions/layers-commands.c b/app/actions/layers-commands.c
index 950170b..2693eb6 100644
--- a/app/actions/layers-commands.c
+++ b/app/actions/layers-commands.c
@@ -235,7 +235,7 @@ layers_edit_attributes_cmd_callback (GtkAction *action,
                                          widget,
                                          _("Layer Attributes"),
                                          "gimp-layer-edit",
-                                         "gtk-edit",
+                                         GIMP_ICON_EDIT,
                                          _("Edit Layer Attributes"),
                                          GIMP_HELP_LAYER_EDIT,
                                          gimp_object_get_name (layer),
@@ -304,7 +304,7 @@ layers_new_cmd_callback (GtkAction *action,
                                          widget,
                                          _("New Layer"),
                                          "gimp-layer-new",
-                                         GIMP_STOCK_LAYER,
+                                         GIMP_ICON_LAYER,
                                          _("Create a New Layer"),
                                          GIMP_HELP_LAYER_NEW,
                                          config->layer_new_name,
diff --git a/app/actions/mypaint-brushes-actions.c b/app/actions/mypaint-brushes-actions.c
index e25a25a..d3d8a7d 100644
--- a/app/actions/mypaint-brushes-actions.c
+++ b/app/actions/mypaint-brushes-actions.c
@@ -43,19 +43,19 @@ static const GimpActionEntry mypaint_brushes_actions[] =
     NC_("mypaint-brushes-action", "MyPaint Brushes Menu"), NULL, NULL, NULL,
     GIMP_HELP_MYPAINT_BRUSH_DIALOG },
 
-  { "mypaint-brushes-new", "document-new",
+  { "mypaint-brushes-new", GIMP_ICON_DOCUMENT_NEW,
     NC_("mypaint-brushes-action", "_New MyPaint Brush"), NULL,
     NC_("mypaint-brushes-action", "Create a new MyPaint brush"),
     G_CALLBACK (data_new_cmd_callback),
     GIMP_HELP_MYPAINT_BRUSH_NEW },
 
-  { "mypaint-brushes-duplicate", GIMP_STOCK_DUPLICATE,
+  { "mypaint-brushes-duplicate", GIMP_ICON_OBJECT_DUPLICATE,
     NC_("mypaint-brushes-action", "D_uplicate MyPaint Brush"), NULL,
     NC_("mypaint-brushes-action", "Duplicate this MyPaint brush"),
     G_CALLBACK (data_duplicate_cmd_callback),
     GIMP_HELP_MYPAINT_BRUSH_DUPLICATE },
 
-  { "mypaint-brushes-copy-location", "edit-copy",
+  { "mypaint-brushes-copy-location", GIMP_ICON_EDIT_COPY,
     NC_("mypaint-brushes-action", "Copy MyPaint Brush _Location"), NULL,
     NC_("mypaint-brushes-action", "Copy MyPaint brush file location to clipboard"),
     G_CALLBACK (data_copy_location_cmd_callback),
@@ -67,13 +67,13 @@ static const GimpActionEntry mypaint_brushes_actions[] =
     G_CALLBACK (data_show_in_file_manager_cmd_callback),
     GIMP_HELP_MYPAINT_BRUSH_SHOW_IN_FILE_MANAGER },
 
-  { "mypaint-brushes-delete", "edit-delete",
+  { "mypaint-brushes-delete", GIMP_ICON_EDIT_DELETE,
     NC_("mypaint-brushes-action", "_Delete MyPaint Brush"), NULL,
     NC_("mypaint-brushes-action", "Delete this MyPaint brush"),
     G_CALLBACK (data_delete_cmd_callback),
     GIMP_HELP_MYPAINT_BRUSH_DELETE },
 
-  { "mypaint-brushes-refresh", "view-refresh",
+  { "mypaint-brushes-refresh", GIMP_ICON_VIEW_REFRESH,
     NC_("mypaint-brushes-action", "_Refresh MyPaint Brushes"), NULL,
     NC_("mypaint-brushes-action", "Refresh MyPaint brushes"),
     G_CALLBACK (data_refresh_cmd_callback),
@@ -82,7 +82,7 @@ static const GimpActionEntry mypaint_brushes_actions[] =
 
 static const GimpStringActionEntry mypaint_brushes_edit_actions[] =
 {
-  { "mypaint-brushes-edit", "gtk-edit",
+  { "mypaint-brushes-edit", GIMP_ICON_EDIT,
     NC_("mypaint-brushes-action", "_Edit MyPaint Brush..."), NULL,
     NC_("mypaint-brushes-action", "Edit MyPaint brush"),
     "gimp-mybrush-editor",
diff --git a/app/actions/palette-editor-actions.c b/app/actions/palette-editor-actions.c
index 4ded581..d286261 100644
--- a/app/actions/palette-editor-actions.c
+++ b/app/actions/palette-editor-actions.c
@@ -40,17 +40,17 @@
 
 static const GimpActionEntry palette_editor_actions[] =
 {
-  { "palette-editor-popup", GIMP_STOCK_PALETTE,
+  { "palette-editor-popup", GIMP_ICON_PALETTE,
     NC_("palette-editor-action", "Palette Editor Menu"), NULL, NULL, NULL,
     GIMP_HELP_PALETTE_EDITOR_DIALOG },
 
-  { "palette-editor-edit-color", "gtk-edit",
+  { "palette-editor-edit-color", GIMP_ICON_EDIT,
     NC_("palette-editor-action", "_Edit Color..."), NULL,
     NC_("palette-editor-action", "Edit this entry"),
     G_CALLBACK (palette_editor_edit_color_cmd_callback),
     GIMP_HELP_PALETTE_EDITOR_EDIT },
 
-  { "palette-editor-delete-color", "edit-delete",
+  { "palette-editor-delete-color", GIMP_ICON_EDIT_DELETE,
     NC_("palette-editor-action", "_Delete Color"), NULL,
     NC_("palette-editor-action", "Delete this entry"),
     G_CALLBACK (palette_editor_delete_color_cmd_callback),
@@ -59,7 +59,7 @@ static const GimpActionEntry palette_editor_actions[] =
 
 static const GimpToggleActionEntry palette_editor_toggle_actions[] =
 {
-  { "palette-editor-edit-active", GIMP_STOCK_LINKED,
+  { "palette-editor-edit-active", GIMP_ICON_LINKED,
     NC_("palette-editor-action", "Edit Active Palette"), NULL, NULL,
     G_CALLBACK (data_editor_edit_active_cmd_callback),
     FALSE,
@@ -68,14 +68,14 @@ static const GimpToggleActionEntry palette_editor_toggle_actions[] =
 
 static const GimpEnumActionEntry palette_editor_new_actions[] =
 {
-  { "palette-editor-new-color-fg", "document-new",
+  { "palette-editor-new-color-fg", GIMP_ICON_DOCUMENT_NEW,
     NC_("palette-editor-action", "New Color from _FG"), NULL,
     NC_("palette-editor-action",
         "Create a new entry from the foreground color"),
     FALSE, FALSE,
     GIMP_HELP_PALETTE_EDITOR_NEW },
 
-  { "palette-editor-new-color-bg", "document-new",
+  { "palette-editor-new-color-bg", GIMP_ICON_DOCUMENT_NEW,
     NC_("palette-editor-action", "New Color from _BG"), NULL,
     NC_("palette-editor-action",
         "Create a new entry from the background color"),
@@ -85,19 +85,19 @@ static const GimpEnumActionEntry palette_editor_new_actions[] =
 
 static const GimpEnumActionEntry palette_editor_zoom_actions[] =
 {
-  { "palette-editor-zoom-in", "zoom-in",
+  { "palette-editor-zoom-in", GIMP_ICON_ZOOM_IN,
     N_("Zoom _In"), NULL,
     N_("Zoom in"),
     GIMP_ZOOM_IN, FALSE,
     GIMP_HELP_PALETTE_EDITOR_ZOOM_IN },
 
-  { "palette-editor-zoom-out", "zoom-out",
+  { "palette-editor-zoom-out", GIMP_ICON_ZOOM_OUT,
     N_("Zoom _Out"), NULL,
     N_("Zoom out"),
     GIMP_ZOOM_OUT, FALSE,
     GIMP_HELP_PALETTE_EDITOR_ZOOM_OUT },
 
-  { "palette-editor-zoom-all", "zoom-fit-best",
+  { "palette-editor-zoom-all", GIMP_ICON_ZOOM_FIT_BEST,
     N_("Zoom _All"), NULL,
     N_("Zoom all"),
     GIMP_ZOOM_OUT_MAX, FALSE,
diff --git a/app/actions/palette-editor-commands.c b/app/actions/palette-editor-commands.c
index d4ee2d8..2119c7d 100644
--- a/app/actions/palette-editor-commands.c
+++ b/app/actions/palette-editor-commands.c
@@ -67,7 +67,7 @@ palette_editor_edit_color_cmd_callback (GtkAction *action,
         gimp_color_dialog_new (GIMP_VIEWABLE (palette),
                                data_editor->context,
                                _("Edit Palette Color"),
-                               GIMP_STOCK_PALETTE,
+                               GIMP_ICON_PALETTE,
                                _("Edit Color Palette Entry"),
                                GTK_WIDGET (editor),
                                gimp_dialog_factory_get_singleton (),
diff --git a/app/actions/palettes-actions.c b/app/actions/palettes-actions.c
index 6b2cf3f..d3a2b3b 100644
--- a/app/actions/palettes-actions.c
+++ b/app/actions/palettes-actions.c
@@ -40,11 +40,11 @@
 
 static const GimpActionEntry palettes_actions[] =
 {
-  { "palettes-popup", GIMP_STOCK_PALETTE,
+  { "palettes-popup", GIMP_ICON_PALETTE,
     NC_("palettes-action", "Palettes Menu"), NULL, NULL, NULL,
     GIMP_HELP_PALETTE_DIALOG },
 
-  { "palettes-new", "document-new",
+  { "palettes-new", GIMP_ICON_DOCUMENT_NEW,
     NC_("palettes-action", "_New Palette"), NULL,
     NC_("palettes-action", "Create a new palette"),
     G_CALLBACK (data_new_cmd_callback),
@@ -56,7 +56,7 @@ static const GimpActionEntry palettes_actions[] =
     G_CALLBACK (palettes_import_cmd_callback),
     GIMP_HELP_PALETTE_IMPORT },
 
-  { "palettes-duplicate", GIMP_STOCK_DUPLICATE,
+  { "palettes-duplicate", GIMP_ICON_OBJECT_DUPLICATE,
     NC_("palettes-action", "D_uplicate Palette"), NULL,
     NC_("palettes-action", "Duplicate this palette"),
     G_CALLBACK (data_duplicate_cmd_callback),
@@ -68,7 +68,7 @@ static const GimpActionEntry palettes_actions[] =
     G_CALLBACK (palettes_merge_cmd_callback),
     GIMP_HELP_PALETTE_MERGE },
 
-  { "palettes-copy-location", "edit-copy",
+  { "palettes-copy-location", GIMP_ICON_EDIT_COPY,
     NC_("palettes-action", "Copy Palette _Location"), NULL,
     NC_("palettes-action", "Copy palette file location to clipboard"),
     G_CALLBACK (data_copy_location_cmd_callback),
@@ -80,13 +80,13 @@ static const GimpActionEntry palettes_actions[] =
     G_CALLBACK (data_show_in_file_manager_cmd_callback),
     GIMP_HELP_PALETTE_SHOW_IN_FILE_MANAGER },
 
-  { "palettes-delete", "edit-delete",
+  { "palettes-delete", GIMP_ICON_EDIT_DELETE,
     NC_("palettes-action", "_Delete Palette"), NULL,
     NC_("palettes-action", "Delete this palette"),
     G_CALLBACK (data_delete_cmd_callback),
     GIMP_HELP_PALETTE_DELETE },
 
-  { "palettes-refresh", "view-refresh",
+  { "palettes-refresh", GIMP_ICON_VIEW_REFRESH,
     NC_("palettes-action", "_Refresh Palettes"), NULL,
     NC_("palettes-action", "Refresh palettes"),
     G_CALLBACK (data_refresh_cmd_callback),
@@ -95,7 +95,7 @@ static const GimpActionEntry palettes_actions[] =
 
 static const GimpStringActionEntry palettes_edit_actions[] =
 {
-  { "palettes-edit", "gtk-edit",
+  { "palettes-edit", GIMP_ICON_EDIT,
     NC_("palettes-action", "_Edit Palette..."), NULL,
     NC_("palettes-action", "Edit this palette"),
     "gimp-palette-editor",
diff --git a/app/actions/patterns-actions.c b/app/actions/patterns-actions.c
index 49ddbbe..d253083 100644
--- a/app/actions/patterns-actions.c
+++ b/app/actions/patterns-actions.c
@@ -39,29 +39,29 @@
 
 static const GimpActionEntry patterns_actions[] =
 {
-  { "patterns-popup", GIMP_STOCK_PATTERN,
+  { "patterns-popup", GIMP_ICON_PATTERN,
     NC_("patterns-action", "Patterns Menu"), NULL, NULL, NULL,
     GIMP_HELP_PATTERN_DIALOG },
 
-  { "patterns-open-as-image", "document-open",
+  { "patterns-open-as-image", GIMP_ICON_DOCUMENT_OPEN,
     NC_("patterns-action", "_Open Pattern as Image"), NULL,
     NC_("patterns-action", "Open this pattern as an image"),
     G_CALLBACK (data_open_as_image_cmd_callback),
     GIMP_HELP_PATTERN_OPEN_AS_IMAGE },
 
-  { "patterns-new", "document-new",
+  { "patterns-new", GIMP_ICON_DOCUMENT_NEW,
     NC_("patterns-action", "_New Pattern"), NULL,
     NC_("patterns-action", "Create a new pattern"),
     G_CALLBACK (data_new_cmd_callback),
     GIMP_HELP_PATTERN_NEW },
 
-  { "patterns-duplicate", GIMP_STOCK_DUPLICATE,
+  { "patterns-duplicate", GIMP_ICON_OBJECT_DUPLICATE,
     NC_("patterns-action", "D_uplicate Pattern"), NULL,
     NC_("patterns-action", "Duplicate this pattern"),
     G_CALLBACK (data_duplicate_cmd_callback),
     GIMP_HELP_PATTERN_DUPLICATE },
 
-  { "patterns-copy-location", "edit-copy",
+  { "patterns-copy-location", GIMP_ICON_EDIT_COPY,
     NC_("patterns-action", "Copy Pattern _Location"), NULL,
     NC_("patterns-action", "Copy pattern file location to clipboard"),
     G_CALLBACK (data_copy_location_cmd_callback),
@@ -73,13 +73,13 @@ static const GimpActionEntry patterns_actions[] =
     G_CALLBACK (data_show_in_file_manager_cmd_callback),
     GIMP_HELP_PATTERN_SHOW_IN_FILE_MANAGER },
 
-  { "patterns-delete", "edit-delete",
+  { "patterns-delete", GIMP_ICON_EDIT_DELETE,
     NC_("patterns-action", "_Delete Pattern"), NULL,
     NC_("patterns-action", "Delete this pattern"),
     G_CALLBACK (data_delete_cmd_callback),
     GIMP_HELP_PATTERN_DELETE },
 
-  { "patterns-refresh", "view-refresh",
+  { "patterns-refresh", GIMP_ICON_VIEW_REFRESH,
     NC_("patterns-action", "_Refresh Patterns"), NULL,
     NC_("patterns-action", "Refresh patterns"),
     G_CALLBACK (data_refresh_cmd_callback),
@@ -88,7 +88,7 @@ static const GimpActionEntry patterns_actions[] =
 
 static const GimpStringActionEntry patterns_edit_actions[] =
 {
-  { "patterns-edit", "gtk-edit",
+  { "patterns-edit", GIMP_ICON_EDIT,
     NC_("patterns-action", "_Edit Pattern..."), NULL,
     NC_("patterns-action", "Edit pattern"),
     "gimp-pattern-editor",
diff --git a/app/actions/plug-in-actions.c b/app/actions/plug-in-actions.c
index ced328f..9632a0d 100644
--- a/app/actions/plug-in-actions.c
+++ b/app/actions/plug-in-actions.c
@@ -78,7 +78,7 @@ static void     plug_in_actions_build_path           (GimpActionGroup     *group
 
 static const GimpActionEntry plug_in_actions[] =
 {
-  { "plug-in-reset-all", GIMP_STOCK_RESET,
+  { "plug-in-reset-all", GIMP_ICON_RESET,
     NC_("plug-in-action", "Reset all _Filters"), NULL,
     NC_("plug-in-action", "Reset all plug-ins to their default settings"),
     G_CALLBACK (plug_in_reset_all_cmd_callback),
diff --git a/app/actions/plug-in-commands.c b/app/actions/plug-in-commands.c
index dcc7bd4..462d1c3 100644
--- a/app/actions/plug-in-commands.c
+++ b/app/actions/plug-in-commands.c
@@ -173,7 +173,7 @@ plug_in_reset_all_cmd_callback (GtkAction *action,
   if (! dialog)
     {
       dialog = gimp_message_dialog_new (_("Reset all Filters"),
-                                        GIMP_STOCK_QUESTION,
+                                        GIMP_ICON_DIALOG_QUESTION,
                                         NULL, 0,
                                         gimp_standard_help_func, NULL,
 
diff --git a/app/actions/quick-mask-actions.c b/app/actions/quick-mask-actions.c
index 2255143..a1edc03 100644
--- a/app/actions/quick-mask-actions.c
+++ b/app/actions/quick-mask-actions.c
@@ -51,7 +51,7 @@ static const GimpActionEntry quick_mask_actions[] =
 
 static const GimpToggleActionEntry quick_mask_toggle_actions[] =
 {
-  { "quick-mask-toggle", GIMP_STOCK_QUICK_MASK_ON,
+  { "quick-mask-toggle", GIMP_ICON_QUICK_MASK_ON,
     NC_("quick-mask-action", "Toggle _Quick Mask"), "<shift>Q",
     NC_("quick-mask-action", "Toggle Quick Mask on/off"),
     G_CALLBACK (quick_mask_toggle_cmd_callback),
diff --git a/app/actions/quick-mask-commands.c b/app/actions/quick-mask-commands.c
index d66020c..49373cf 100644
--- a/app/actions/quick-mask-commands.c
+++ b/app/actions/quick-mask-commands.c
@@ -121,7 +121,7 @@ quick_mask_configure_cmd_callback (GtkAction *action,
                                            widget,
                                            _("Quick Mask Attributes"),
                                            "gimp-quick-mask-edit",
-                                           GIMP_STOCK_QUICK_MASK_ON,
+                                           GIMP_ICON_QUICK_MASK_ON,
                                            _("Edit Quick Mask Attributes"),
                                            GIMP_HELP_QUICK_MASK_EDIT,
                                            _("Edit Quick Mask Color"),
diff --git a/app/actions/sample-points-actions.c b/app/actions/sample-points-actions.c
index fabe81e..4befd36 100644
--- a/app/actions/sample-points-actions.c
+++ b/app/actions/sample-points-actions.c
@@ -36,7 +36,7 @@
 
 static const GimpActionEntry sample_points_actions[] =
 {
-  { "sample-points-popup", GIMP_STOCK_SAMPLE_POINT,
+  { "sample-points-popup", GIMP_ICON_SAMPLE_POINT,
     NC_("sample-points-action", "Sample Point Menu"), NULL, NULL, NULL,
     GIMP_HELP_SAMPLE_POINT_DIALOG }
 };
diff --git a/app/actions/select-actions.c b/app/actions/select-actions.c
index 9ab868b..95ad602 100644
--- a/app/actions/select-actions.c
+++ b/app/actions/select-actions.c
@@ -40,31 +40,31 @@
 
 static const GimpActionEntry select_actions[] =
 {
-  { "selection-popup", GIMP_STOCK_SELECTION,
+  { "selection-popup", GIMP_ICON_SELECTION,
     NC_("select-action", "Selection Editor Menu"), NULL, NULL, NULL,
     GIMP_HELP_SELECTION_DIALOG },
 
   { "select-menu", NULL, NC_("select-action", "_Select") },
 
-  { "select-all", GIMP_STOCK_SELECTION_ALL,
+  { "select-all", GIMP_ICON_SELECTION_ALL,
     NC_("select-action", "_All"), "<primary>A",
     NC_("select-action", "Select everything"),
     G_CALLBACK (select_all_cmd_callback),
     GIMP_HELP_SELECTION_ALL },
 
-  { "select-none", GIMP_STOCK_SELECTION_NONE,
+  { "select-none", GIMP_ICON_SELECTION_NONE,
     NC_("select-action", "_None"), "<primary><shift>A",
     NC_("select-action", "Dismiss the selection"),
     G_CALLBACK (select_none_cmd_callback),
     GIMP_HELP_SELECTION_NONE },
 
-  { "select-invert", GIMP_STOCK_INVERT,
+  { "select-invert", GIMP_ICON_INVERT,
     NC_("select-action", "_Invert"), "<primary>I",
     NC_("select-action", "Invert the selection"),
     G_CALLBACK (select_invert_cmd_callback),
     GIMP_HELP_SELECTION_INVERT },
 
-  { "select-float", GIMP_STOCK_FLOATING_SELECTION,
+  { "select-float", GIMP_ICON_LAYER_FLOATING_SELECTION,
     NC_("select-action", "_Float"), "<primary><shift>L",
     NC_("select-action", "Create a floating selection"),
     G_CALLBACK (select_float_cmd_callback),
@@ -83,19 +83,19 @@ static const GimpActionEntry select_actions[] =
     G_CALLBACK (select_sharpen_cmd_callback),
     GIMP_HELP_SELECTION_SHARPEN },
 
-  { "select-shrink", GIMP_STOCK_SELECTION_SHRINK,
+  { "select-shrink", GIMP_ICON_SELECTION_SHRINK,
     NC_("select-action", "S_hrink..."), NULL,
     NC_("select-action", "Contract the selection"),
     G_CALLBACK (select_shrink_cmd_callback),
     GIMP_HELP_SELECTION_SHRINK },
 
-  { "select-grow", GIMP_STOCK_SELECTION_GROW,
+  { "select-grow", GIMP_ICON_SELECTION_GROW,
     NC_("select-action", "_Grow..."), NULL,
     NC_("select-action", "Enlarge the selection"),
     G_CALLBACK (select_grow_cmd_callback),
     GIMP_HELP_SELECTION_GROW },
 
-  { "select-border", GIMP_STOCK_SELECTION_BORDER,
+  { "select-border", GIMP_ICON_SELECTION_BORDER,
     NC_("select-action", "Bo_rder..."), NULL,
     NC_("select-action", "Replace the selection by its border"),
     G_CALLBACK (select_border_cmd_callback),
@@ -107,31 +107,31 @@ static const GimpActionEntry select_actions[] =
     G_CALLBACK (select_flood_cmd_callback),
     GIMP_HELP_SELECTION_FLOOD },
 
-  { "select-save", GIMP_STOCK_SELECTION_TO_CHANNEL,
+  { "select-save", GIMP_ICON_SELECTION_TO_CHANNEL,
     NC_("select-action", "Save to _Channel"), NULL,
     NC_("select-action", "Save the selection to a channel"),
     G_CALLBACK (select_save_cmd_callback),
     GIMP_HELP_SELECTION_TO_CHANNEL },
 
-  { "select-fill", GIMP_STOCK_TOOL_BUCKET_FILL,
+  { "select-fill", GIMP_ICON_TOOL_BUCKET_FILL,
     NC_("select-action", "_Fill Selection Outline..."), NULL,
     NC_("select-action", "Fill the selection outline"),
     G_CALLBACK (select_fill_cmd_callback),
     GIMP_HELP_SELECTION_FILL },
 
-  { "select-fill-last-values", GIMP_STOCK_TOOL_BUCKET_FILL,
+  { "select-fill-last-values", GIMP_ICON_TOOL_BUCKET_FILL,
     NC_("select-action", "_Fill Selection Outline"), NULL,
     NC_("select-action", "Fill the selection outline with last used values"),
     G_CALLBACK (select_fill_last_vals_cmd_callback),
     GIMP_HELP_SELECTION_FILL },
 
-  { "select-stroke", GIMP_STOCK_SELECTION_STROKE,
+  { "select-stroke", GIMP_ICON_SELECTION_STROKE,
     NC_("select-action", "_Stroke Selection..."), NULL,
     NC_("select-action", "Paint along the selection outline"),
     G_CALLBACK (select_stroke_cmd_callback),
     GIMP_HELP_SELECTION_STROKE },
 
-  { "select-stroke-last-values", GIMP_STOCK_SELECTION_STROKE,
+  { "select-stroke-last-values", GIMP_ICON_SELECTION_STROKE,
     NC_("select-action", "_Stroke Selection"), NULL,
     NC_("select-action", "Stroke the selection with last used values"),
     G_CALLBACK (select_stroke_last_vals_cmd_callback),
diff --git a/app/actions/select-commands.c b/app/actions/select-commands.c
index 1fea78d..99df95f 100644
--- a/app/actions/select-commands.c
+++ b/app/actions/select-commands.c
@@ -413,7 +413,7 @@ select_fill_cmd_callback (GtkAction *action,
                            image, GIMP_ITEM (gimp_image_get_mask (image)),
                            "gimp-selection-fill-dialog",
                            _("Fill Selection Outline"),
-                           GIMP_STOCK_TOOL_BUCKET_FILL,
+                           GIMP_ICON_TOOL_BUCKET_FILL,
                            GIMP_HELP_SELECTION_FILL,
                            data);
 }
@@ -442,7 +442,7 @@ select_stroke_cmd_callback (GtkAction *action,
                              image, GIMP_ITEM (gimp_image_get_mask (image)),
                              "gimp-selection-stroke-dialog",
                              _("Stroke Selection"),
-                             GIMP_STOCK_SELECTION_STROKE,
+                             GIMP_ICON_SELECTION_STROKE,
                              GIMP_HELP_SELECTION_STROKE,
                              data);
 }
diff --git a/app/actions/templates-actions.c b/app/actions/templates-actions.c
index 88449b5..6a26c01 100644
--- a/app/actions/templates-actions.c
+++ b/app/actions/templates-actions.c
@@ -38,35 +38,35 @@
 
 static const GimpActionEntry templates_actions[] =
 {
-  { "templates-popup", GIMP_STOCK_TEMPLATE,
+  { "templates-popup", GIMP_ICON_TEMPLATE,
     NC_("templates-action", "Templates Menu"), NULL, NULL, NULL,
     GIMP_HELP_TEMPLATE_DIALOG },
 
-  { "templates-create-image", GIMP_STOCK_IMAGE,
+  { "templates-create-image", GIMP_ICON_IMAGE,
     NC_("templates-action", "_Create Image from Template"), "",
     NC_("templates-action", "Create a new image from the selected template"),
     G_CALLBACK (templates_create_image_cmd_callback),
     GIMP_HELP_TEMPLATE_IMAGE_NEW },
 
-  { "templates-new", "document-new",
+  { "templates-new", GIMP_ICON_DOCUMENT_NEW,
     NC_("templates-action", "_New Template..."), NULL,
     NC_("templates-action", "Create a new template"),
     G_CALLBACK (templates_new_cmd_callback),
     GIMP_HELP_TEMPLATE_NEW },
 
-  { "templates-duplicate", GIMP_STOCK_DUPLICATE,
+  { "templates-duplicate", GIMP_ICON_OBJECT_DUPLICATE,
     NC_("templates-action", "D_uplicate Template..."), "",
     NC_("templates-action", "Duplicate this template"),
     G_CALLBACK (templates_duplicate_cmd_callback),
     GIMP_HELP_TEMPLATE_DUPLICATE },
 
-  { "templates-edit", "gtk-edit",
+  { "templates-edit", GIMP_ICON_EDIT,
     NC_("templates-action", "_Edit Template..."), NULL,
     NC_("templates-action", "Edit this template"),
     G_CALLBACK (templates_edit_cmd_callback),
     GIMP_HELP_TEMPLATE_EDIT },
 
-  { "templates-delete", "edit-delete",
+  { "templates-delete", GIMP_ICON_EDIT_DELETE,
     NC_("templates-action", "_Delete Template"), NULL,
     NC_("templates-action", "Delete this template"),
     G_CALLBACK (templates_delete_cmd_callback),
diff --git a/app/actions/templates-commands.c b/app/actions/templates-commands.c
index d88902d..4ff8458 100644
--- a/app/actions/templates-commands.c
+++ b/app/actions/templates-commands.c
@@ -130,7 +130,7 @@ templates_new_cmd_callback (GtkAction *action,
                                             GTK_WIDGET (editor),
                                             _("New Template"),
                                             "gimp-template-new",
-                                            GIMP_STOCK_TEMPLATE,
+                                            GIMP_ICON_TEMPLATE,
                                             _("Create a New Template"),
                                             GIMP_HELP_TEMPLATE_NEW,
                                             templates_new_callback,
@@ -200,7 +200,7 @@ templates_edit_cmd_callback (GtkAction *action,
                                                 GTK_WIDGET (editor),
                                                 _("Edit Template"),
                                                 "gimp-template-edit",
-                                                "gtk-edit",
+                                                GIMP_ICON_EDIT,
                                                 _("Edit Template"),
                                                 GIMP_HELP_TEMPLATE_EDIT,
                                                 templates_edit_callback,
diff --git a/app/actions/text-editor-actions.c b/app/actions/text-editor-actions.c
index c7f9e37..beada37 100644
--- a/app/actions/text-editor-actions.c
+++ b/app/actions/text-editor-actions.c
@@ -36,17 +36,17 @@
 
 static const GimpActionEntry text_editor_actions[] =
 {
-  { "text-editor-toolbar", "gtk-edit",
+  { "text-editor-toolbar", GIMP_ICON_EDIT,
     "Text Editor Toolbar", NULL, NULL, NULL,
     GIMP_HELP_TEXT_EDITOR_DIALOG },
 
-  { "text-editor-load", "document-open",
+  { "text-editor-load", GIMP_ICON_DOCUMENT_OPEN,
     NC_("text-editor-action", "Open"), NULL,
     NC_("text-editor-action", "Load text from file"),
     G_CALLBACK (text_editor_load_cmd_callback),
     NULL },
 
-  { "text-editor-clear", "edit-clear",
+  { "text-editor-clear", GIMP_ICON_EDIT_CLEAR,
     NC_("text-editor-action", "Clear"), NULL,
     NC_("text-editor-action", "Clear all text"),
     G_CALLBACK (text_editor_clear_cmd_callback),
@@ -55,13 +55,13 @@ static const GimpActionEntry text_editor_actions[] =
 
 static const GimpRadioActionEntry text_editor_direction_actions[] =
 {
-  { "text-editor-direction-ltr", GIMP_STOCK_TEXT_DIR_LTR,
+  { "text-editor-direction-ltr", GIMP_ICON_FORMAT_TEXT_DIRECTION_LTR,
     NC_("text-editor-action", "LTR"), NULL,
     NC_("text-editor-action", "From left to right"),
     GIMP_TEXT_DIRECTION_LTR,
     NULL },
 
-  { "text-editor-direction-rtl", GIMP_STOCK_TEXT_DIR_RTL,
+  { "text-editor-direction-rtl", GIMP_ICON_FORMAT_TEXT_DIRECTION_RTL,
     NC_("text-editor-action", "RTL"), NULL,
     NC_("text-editor-action", "From right to left"),
     GIMP_TEXT_DIRECTION_RTL,
diff --git a/app/actions/text-tool-actions.c b/app/actions/text-tool-actions.c
index f727593..66d43fe 100644
--- a/app/actions/text-tool-actions.c
+++ b/app/actions/text-tool-actions.c
@@ -54,45 +54,45 @@ static const GimpActionEntry text_tool_actions[] =
     NC_("text-tool-action", "Input _Methods"), NULL, NULL, NULL,
     NULL },
 
-  { "text-tool-cut", "edit-cut",
+  { "text-tool-cut", GIMP_ICON_EDIT_CUT,
     NC_("text-tool-action", "Cu_t"), NULL, "<primary>X",
     G_CALLBACK (text_tool_cut_cmd_callback),
     NULL },
 
-  { "text-tool-copy", "edit-copy",
+  { "text-tool-copy", GIMP_ICON_EDIT_COPY,
     NC_("text-tool-action", "_Copy"), NULL, "<primary>C",
     G_CALLBACK (text_tool_copy_cmd_callback),
     NULL },
 
-  { "text-tool-paste", "edit-paste",
+  { "text-tool-paste", GIMP_ICON_EDIT_PASTE,
     NC_("text-tool-action", "_Paste"), NULL, "<primary>V",
     G_CALLBACK (text_tool_paste_cmd_callback),
     NULL },
 
-  { "text-tool-delete", "edit-delete",
+  { "text-tool-delete", GIMP_ICON_EDIT_DELETE,
     NC_("text-tool-action", "_Delete"), NULL, NULL,
     G_CALLBACK (text_tool_delete_cmd_callback),
     NULL },
 
-  { "text-tool-load", "document-open",
+  { "text-tool-load", GIMP_ICON_DOCUMENT_OPEN,
     NC_("text-tool-action", "_Open text file..."), NULL, NULL,
     G_CALLBACK (text_tool_load_cmd_callback),
     NULL },
 
-  { "text-tool-clear", "edit-clear",
+  { "text-tool-clear", GIMP_ICON_EDIT_CLEAR,
     NC_("text-tool-action", "Cl_ear"), NULL,
     NC_("text-tool-action", "Clear all text"),
     G_CALLBACK (text_tool_clear_cmd_callback),
     NULL },
 
-  { "text-tool-text-to-path", GIMP_STOCK_PATH,
+  { "text-tool-text-to-path", GIMP_ICON_PATH,
     NC_("text-tool-action", "_Path from Text"), "",
     NC_("text-tool-action",
         "Create a path from the outlines of the current text"),
     G_CALLBACK (text_tool_text_to_path_cmd_callback),
     NULL },
 
-  { "text-tool-text-along-path", GIMP_STOCK_PATH,
+  { "text-tool-text-along-path", GIMP_ICON_PATH,
     NC_("text-tool-action", "Text _along Path"), "",
     NC_("text-tool-action",
         "Bend the text along the currently active path"),
@@ -102,12 +102,12 @@ static const GimpActionEntry text_tool_actions[] =
 
 static const GimpRadioActionEntry text_tool_direction_actions[] =
 {
-  { "text-tool-direction-ltr", GIMP_STOCK_TEXT_DIR_LTR,
+  { "text-tool-direction-ltr", GIMP_ICON_FORMAT_TEXT_DIRECTION_LTR,
     NC_("text-tool-action", "From left to right"), NULL, NULL,
     GIMP_TEXT_DIRECTION_LTR,
     NULL },
 
-  { "text-tool-direction-rtl", GIMP_STOCK_TEXT_DIR_RTL,
+  { "text-tool-direction-rtl", GIMP_ICON_FORMAT_TEXT_DIRECTION_RTL,
     NC_("text-tool-action", "From right to left"), NULL, NULL,
     GIMP_TEXT_DIRECTION_RTL,
     NULL }
diff --git a/app/actions/tool-options-actions.c b/app/actions/tool-options-actions.c
index ae39d1a..b224688 100644
--- a/app/actions/tool-options-actions.c
+++ b/app/actions/tool-options-actions.c
@@ -53,38 +53,38 @@ static void tool_options_actions_update_presets (GimpActionGroup *group,
 
 static const GimpActionEntry tool_options_actions[] =
 {
-  { "tool-options-popup", GIMP_STOCK_TOOL_OPTIONS,
+  { "tool-options-popup", GIMP_ICON_DIALOG_TOOL_OPTIONS,
     NC_("tool-options-action", "Tool Options Menu"), NULL, NULL, NULL,
     GIMP_HELP_TOOL_OPTIONS_DIALOG },
 
-  { "tool-options-save-preset-menu", "document-save",
+  { "tool-options-save-preset-menu", GIMP_ICON_DOCUMENT_SAVE,
     NC_("tool-options-action", "_Save Tool Preset"), "", NULL, NULL,
     GIMP_HELP_TOOL_OPTIONS_SAVE },
 
-  { "tool-options-restore-preset-menu", "document-revert",
+  { "tool-options-restore-preset-menu", GIMP_ICON_DOCUMENT_REVERT,
     NC_("tool-options-action", "_Restore Tool Preset"), "", NULL, NULL,
     GIMP_HELP_TOOL_OPTIONS_RESTORE },
 
-  { "tool-options-edit-preset-menu", "gtk-edit",
+  { "tool-options-edit-preset-menu", GIMP_ICON_EDIT,
     NC_("tool-options-action", "E_dit Tool Preset"), NULL, NULL, NULL,
     GIMP_HELP_TOOL_OPTIONS_EDIT },
 
-  { "tool-options-delete-preset-menu", "edit-delete",
+  { "tool-options-delete-preset-menu", GIMP_ICON_EDIT_DELETE,
     NC_("tool-options-action", "_Delete Tool Preset"), "", NULL, NULL,
     GIMP_HELP_TOOL_OPTIONS_DELETE },
 
-  { "tool-options-save-new-preset", "document-new",
+  { "tool-options-save-new-preset", GIMP_ICON_DOCUMENT_NEW,
     NC_("tool-options-action", "_New Tool Preset..."), "", NULL,
     G_CALLBACK (tool_options_save_new_preset_cmd_callback),
     GIMP_HELP_TOOL_OPTIONS_SAVE },
 
-  { "tool-options-reset", GIMP_STOCK_RESET,
+  { "tool-options-reset", GIMP_ICON_RESET,
     NC_("tool-options-action", "R_eset Tool Options"), NULL,
     NC_("tool-options-action", "Reset to default values"),
     G_CALLBACK (tool_options_reset_cmd_callback),
     GIMP_HELP_TOOL_OPTIONS_RESET },
 
-  { "tool-options-reset-all", GIMP_STOCK_RESET,
+  { "tool-options-reset-all", GIMP_ICON_RESET,
     NC_("tool-options-action", "Reset _all Tool Options"), NULL,
     NC_("tool-options-action", "Reset all tool options"),
     G_CALLBACK (tool_options_reset_all_cmd_callback),
diff --git a/app/actions/tool-options-commands.c b/app/actions/tool-options-commands.c
index ca0f6f2..1ad56ec 100644
--- a/app/actions/tool-options-commands.c
+++ b/app/actions/tool-options-commands.c
@@ -186,7 +186,7 @@ tool_options_reset_all_cmd_callback (GtkAction *action,
   GtkWidget  *dialog;
 
   dialog = gimp_message_dialog_new (_("Reset All Tool Options"),
-                                    GIMP_STOCK_QUESTION,
+                                    GIMP_ICON_DIALOG_QUESTION,
                                     GTK_WIDGET (editor),
                                     GTK_DIALOG_MODAL |
                                     GTK_DIALOG_DESTROY_WITH_PARENT,
diff --git a/app/actions/tool-preset-editor-actions.c b/app/actions/tool-preset-editor-actions.c
index 0b9d12e..7a493c2 100644
--- a/app/actions/tool-preset-editor-actions.c
+++ b/app/actions/tool-preset-editor-actions.c
@@ -40,18 +40,18 @@
 
 static const GimpActionEntry tool_preset_editor_actions[] =
 {
-  { "tool-preset-editor-popup", GIMP_STOCK_TOOL_PRESET,
+  { "tool-preset-editor-popup", GIMP_ICON_TOOL_PRESET,
     NC_("tool-preset-editor-action", "Tool Preset Editor Menu"), NULL, NULL, NULL,
     GIMP_HELP_TOOL_PRESET_EDITOR_DIALOG },
 
-  { "tool-preset-editor-save", "document-save",
+  { "tool-preset-editor-save", GIMP_ICON_DOCUMENT_SAVE,
     NC_("tool-preset-editor-action", "_Save Tool Options to Preset"), NULL,
     NC_("tool-preset-editor-action", "Save the active tool options to this "
         "tool preset"),
     G_CALLBACK (tool_preset_editor_save_cmd_callback),
     GIMP_HELP_TOOL_PRESET_SAVE },
 
-  { "tool-preset-editor-restore", "document-revert",
+  { "tool-preset-editor-restore", GIMP_ICON_DOCUMENT_REVERT,
     NC_("tool-preset-editor-action", "_Restore Tool Preset"), NULL,
     NC_("tool-preset-editor-action", "Restore this tool preset"),
     G_CALLBACK (tool_preset_editor_restore_cmd_callback),
@@ -61,7 +61,7 @@ static const GimpActionEntry tool_preset_editor_actions[] =
 
 static const GimpToggleActionEntry tool_preset_editor_toggle_actions[] =
 {
-  { "tool-preset-editor-edit-active", GIMP_STOCK_LINKED,
+  { "tool-preset-editor-edit-active", GIMP_ICON_LINKED,
     NC_("tool-preset-editor-action", "Edit Active Tool Preset"), NULL, NULL,
     G_CALLBACK (data_editor_edit_active_cmd_callback),
     FALSE,
diff --git a/app/actions/tool-presets-actions.c b/app/actions/tool-presets-actions.c
index 70a8a60..83a275e 100644
--- a/app/actions/tool-presets-actions.c
+++ b/app/actions/tool-presets-actions.c
@@ -42,23 +42,23 @@
 
 static const GimpActionEntry tool_presets_actions[] =
 {
-  { "tool-presets-popup", GIMP_STOCK_TOOL_PRESET,
+  { "tool-presets-popup", GIMP_ICON_TOOL_PRESET,
     NC_("tool-presets-action", "Tool Presets Menu"), NULL, NULL, NULL,
     GIMP_HELP_TOOL_PRESET_DIALOG },
 
-  { "tool-presets-new", "document-new",
+  { "tool-presets-new", GIMP_ICON_DOCUMENT_NEW,
     NC_("tool-presets-action", "_New Tool Preset"), NULL,
     NC_("tool-presets-action", "Create a new tool preset"),
     G_CALLBACK (data_new_cmd_callback),
     GIMP_HELP_TOOL_PRESET_NEW },
 
-  { "tool-presets-duplicate", GIMP_STOCK_DUPLICATE,
+  { "tool-presets-duplicate", GIMP_ICON_OBJECT_DUPLICATE,
     NC_("tool-presets-action", "D_uplicate Tool Preset"), NULL,
     NC_("tool-presets-action", "Duplicate this tool preset"),
     G_CALLBACK (data_duplicate_cmd_callback),
     GIMP_HELP_TOOL_PRESET_DUPLICATE },
 
-  { "tool-presets-copy-location", "edit-copy",
+  { "tool-presets-copy-location", GIMP_ICON_EDIT_COPY,
     NC_("tool-presets-action", "Copy Tool Preset _Location"), NULL,
     NC_("tool-presets-action", "Copy tool preset file location to clipboard"),
     G_CALLBACK (data_copy_location_cmd_callback),
@@ -70,26 +70,26 @@ static const GimpActionEntry tool_presets_actions[] =
     G_CALLBACK (data_show_in_file_manager_cmd_callback),
     GIMP_HELP_TOOL_PRESET_SHOW_IN_FILE_MANAGER },
 
-  { "tool-presets-save", "document-save",
+  { "tool-presets-save", GIMP_ICON_DOCUMENT_SAVE,
     NC_("tool-presets-action", "_Save Tool Options to Preset"), NULL,
     NC_("tool-presets-action", "Save the active tool options to this "
         "tool preset"),
     G_CALLBACK (tool_presets_save_cmd_callback),
     GIMP_HELP_TOOL_PRESET_SAVE },
 
-  { "tool-presets-restore", "document-revert",
+  { "tool-presets-restore", GIMP_ICON_DOCUMENT_REVERT,
     NC_("tool-presets-action", "_Restore Tool Preset"), NULL,
     NC_("tool-presets-action", "Restore this tool preset"),
     G_CALLBACK (tool_presets_restore_cmd_callback),
     GIMP_HELP_TOOL_PRESET_RESTORE },
 
-  { "tool-presets-delete", "edit-delete",
+  { "tool-presets-delete", GIMP_ICON_EDIT_DELETE,
     NC_("tool-presets-action", "_Delete Tool Preset"), NULL,
     NC_("tool-presets-action", "Delete this tool preset"),
     G_CALLBACK (data_delete_cmd_callback),
     GIMP_HELP_TOOL_PRESET_DELETE },
 
-  { "tool-presets-refresh", "view-refresh",
+  { "tool-presets-refresh", GIMP_ICON_VIEW_REFRESH,
     NC_("tool-presets-action", "_Refresh Tool Presets"), NULL,
     NC_("tool-presets-action", "Refresh tool presets"),
     G_CALLBACK (data_refresh_cmd_callback),
@@ -98,7 +98,7 @@ static const GimpActionEntry tool_presets_actions[] =
 
 static const GimpStringActionEntry tool_presets_edit_actions[] =
 {
-  { "tool-presets-edit", "gtk-edit",
+  { "tool-presets-edit", GIMP_ICON_EDIT,
     NC_("tool-presets-action", "_Edit Tool Preset..."), NULL,
     NC_("tool-presets-action", "Edit this tool preset"),
     "gimp-tool-preset-editor",
diff --git a/app/actions/tools-actions.c b/app/actions/tools-actions.c
index 7def218..b2bd72f 100644
--- a/app/actions/tools-actions.c
+++ b/app/actions/tools-actions.c
@@ -52,13 +52,13 @@ static const GimpActionEntry tools_actions[] =
 
 static const GimpStringActionEntry tools_alternative_actions[] =
 {
-  { "tools-by-color-select-short", GIMP_STOCK_TOOL_BY_COLOR_SELECT,
+  { "tools-by-color-select-short", GIMP_ICON_TOOL_BY_COLOR_SELECT,
     NC_("tools-action", "_By Color"), NULL,
     NC_("tools-action", "Select regions with similar colors"),
     "gimp-by-color-select-tool",
     GIMP_HELP_TOOL_BY_COLOR_SELECT },
 
-  { "tools-rotate-arbitrary", GIMP_STOCK_TOOL_ROTATE,
+  { "tools-rotate-arbitrary", GIMP_ICON_TOOL_ROTATE,
     NC_("tools-action", "_Arbitrary Rotation..."), "",
     NC_("tools-action", "Rotate by an arbitrary angle"),
     "gimp-rotate-layer",
@@ -67,7 +67,7 @@ static const GimpStringActionEntry tools_alternative_actions[] =
 
 static const GimpEnumActionEntry tools_color_average_radius_actions[] =
 {
-  { "tools-color-average-radius-set", GIMP_STOCK_TOOL_COLOR_PICKER,
+  { "tools-color-average-radius-set", GIMP_ICON_TOOL_COLOR_PICKER,
     "Set Color Picker Radius", NULL, NULL,
     GIMP_ACTION_SELECT_SET, TRUE,
     NULL }
@@ -75,7 +75,7 @@ static const GimpEnumActionEntry tools_color_average_radius_actions[] =
 
 static const GimpEnumActionEntry tools_paintbrush_size_actions[] =
 {
-  { "tools-paintbrush-size-set", GIMP_STOCK_TOOL_PAINTBRUSH,
+  { "tools-paintbrush-size-set", GIMP_ICON_TOOL_PAINTBRUSH,
     "Set Brush Size", NULL, NULL,
     GIMP_ACTION_SELECT_SET, TRUE,
     NULL }
@@ -83,7 +83,7 @@ static const GimpEnumActionEntry tools_paintbrush_size_actions[] =
 
 static const GimpEnumActionEntry tools_paintbrush_aspect_ratio_actions[] =
 {
-  { "tools-paintbrush-aspect-ratio-set", GIMP_STOCK_TOOL_PAINTBRUSH,
+  { "tools-paintbrush-aspect-ratio-set", GIMP_ICON_TOOL_PAINTBRUSH,
     "Set Brush Aspect Ratio", NULL, NULL,
     GIMP_ACTION_SELECT_SET, TRUE,
     NULL }
@@ -91,7 +91,7 @@ static const GimpEnumActionEntry tools_paintbrush_aspect_ratio_actions[] =
 
 static const GimpEnumActionEntry tools_paintbrush_angle_actions[] =
 {
-  { "tools-paintbrush-angle-set", GIMP_STOCK_TOOL_PAINTBRUSH,
+  { "tools-paintbrush-angle-set", GIMP_ICON_TOOL_PAINTBRUSH,
     "Set Brush Angle", NULL, NULL,
     GIMP_ACTION_SELECT_SET, TRUE,
     NULL }
@@ -99,7 +99,7 @@ static const GimpEnumActionEntry tools_paintbrush_angle_actions[] =
 
 static const GimpEnumActionEntry tools_paintbrush_spacing_actions[] =
 {
-  { "tools-paintbrush-spacing-set", GIMP_STOCK_TOOL_PAINTBRUSH,
+  { "tools-paintbrush-spacing-set", GIMP_ICON_TOOL_PAINTBRUSH,
     "Set Brush Spacing", NULL, NULL,
     GIMP_ACTION_SELECT_SET, TRUE,
     NULL }
@@ -107,7 +107,7 @@ static const GimpEnumActionEntry tools_paintbrush_spacing_actions[] =
 
 static const GimpEnumActionEntry tools_paintbrush_hardness_actions[] =
 {
-  { "tools-paintbrush-hardness-set", GIMP_STOCK_TOOL_PAINTBRUSH,
+  { "tools-paintbrush-hardness-set", GIMP_ICON_TOOL_PAINTBRUSH,
     "Set Brush Hardness", NULL, NULL,
     GIMP_ACTION_SELECT_SET, TRUE,
     NULL }
@@ -115,7 +115,7 @@ static const GimpEnumActionEntry tools_paintbrush_hardness_actions[] =
 
 static const GimpEnumActionEntry tools_paintbrush_force_actions[] =
 {
-  { "tools-paintbrush-force-set", GIMP_STOCK_TOOL_PAINTBRUSH,
+  { "tools-paintbrush-force-set", GIMP_ICON_TOOL_PAINTBRUSH,
     "Set Brush Force", NULL, NULL,
     GIMP_ACTION_SELECT_SET, TRUE,
     NULL }
@@ -123,7 +123,7 @@ static const GimpEnumActionEntry tools_paintbrush_force_actions[] =
 
 static const GimpEnumActionEntry tools_ink_blob_size_actions[] =
 {
-  { "tools-ink-blob-size-set", GIMP_STOCK_TOOL_INK,
+  { "tools-ink-blob-size-set", GIMP_ICON_TOOL_INK,
     "Set Ink Blob Size", NULL, NULL,
     GIMP_ACTION_SELECT_SET, TRUE,
     NULL }
@@ -131,7 +131,7 @@ static const GimpEnumActionEntry tools_ink_blob_size_actions[] =
 
 static const GimpEnumActionEntry tools_ink_blob_aspect_actions[] =
 {
-  { "tools-ink-blob-aspect-set", GIMP_STOCK_TOOL_INK,
+  { "tools-ink-blob-aspect-set", GIMP_ICON_TOOL_INK,
     "Set Ink Blob Aspect", NULL, NULL,
     GIMP_ACTION_SELECT_SET, TRUE,
     NULL }
@@ -139,7 +139,7 @@ static const GimpEnumActionEntry tools_ink_blob_aspect_actions[] =
 
 static const GimpEnumActionEntry tools_ink_blob_angle_actions[] =
 {
-  { "tools-ink-blob-angle-set", GIMP_STOCK_TOOL_INK,
+  { "tools-ink-blob-angle-set", GIMP_ICON_TOOL_INK,
     "Set Ink Blob Angle", NULL, NULL,
     GIMP_ACTION_SELECT_SET, TRUE,
     NULL }
@@ -147,31 +147,31 @@ static const GimpEnumActionEntry tools_ink_blob_angle_actions[] =
 
 static const GimpEnumActionEntry tools_airbrush_rate_actions[] =
 {
-  { "tools-airbrush-rate-set", GIMP_STOCK_TOOL_AIRBRUSH,
+  { "tools-airbrush-rate-set", GIMP_ICON_TOOL_AIRBRUSH,
     "Set Airrush Rate", NULL, NULL,
     GIMP_ACTION_SELECT_SET, TRUE,
     NULL },
-  { "tools-airbrush-rate-minimum", GIMP_STOCK_TOOL_AIRBRUSH,
+  { "tools-airbrush-rate-minimum", GIMP_ICON_TOOL_AIRBRUSH,
     "Minimum Rate", NULL, NULL,
     GIMP_ACTION_SELECT_FIRST, FALSE,
     NULL },
-  { "tools-airbrush-rate-maximum", GIMP_STOCK_TOOL_AIRBRUSH,
+  { "tools-airbrush-rate-maximum", GIMP_ICON_TOOL_AIRBRUSH,
     "Maximum Rate", NULL, NULL,
     GIMP_ACTION_SELECT_LAST, FALSE,
     NULL },
-  { "tools-airbrush-rate-decrease", GIMP_STOCK_TOOL_AIRBRUSH,
+  { "tools-airbrush-rate-decrease", GIMP_ICON_TOOL_AIRBRUSH,
     "Decrease Rate", NULL, NULL,
     GIMP_ACTION_SELECT_PREVIOUS, FALSE,
     NULL },
-  { "tools-airbrush-rate-increase", GIMP_STOCK_TOOL_AIRBRUSH,
+  { "tools-airbrush-rate-increase", GIMP_ICON_TOOL_AIRBRUSH,
     "Increase Rate", NULL, NULL,
     GIMP_ACTION_SELECT_NEXT, FALSE,
     NULL },
-  { "tools-airbrush-rate-decrease-skip", GIMP_STOCK_TOOL_AIRBRUSH,
+  { "tools-airbrush-rate-decrease-skip", GIMP_ICON_TOOL_AIRBRUSH,
     "Decrease Rate More", NULL, NULL,
     GIMP_ACTION_SELECT_SKIP_PREVIOUS, FALSE,
     NULL },
-  { "tools-airbrush-rate-increase-skip", GIMP_STOCK_TOOL_AIRBRUSH,
+  { "tools-airbrush-rate-increase-skip", GIMP_ICON_TOOL_AIRBRUSH,
     "Increase Rate More", NULL, NULL,
     GIMP_ACTION_SELECT_SKIP_NEXT, FALSE,
     NULL }
@@ -179,31 +179,31 @@ static const GimpEnumActionEntry tools_airbrush_rate_actions[] =
 
 static const GimpEnumActionEntry tools_airbrush_flow_actions[] =
 {
-  { "tools-airbrush-flow-set", GIMP_STOCK_TOOL_AIRBRUSH,
+  { "tools-airbrush-flow-set", GIMP_ICON_TOOL_AIRBRUSH,
     "Set Airrush Flow", NULL, NULL,
     GIMP_ACTION_SELECT_SET, TRUE,
     NULL },
-  { "tools-airbrush-flow-minimum", GIMP_STOCK_TOOL_AIRBRUSH,
+  { "tools-airbrush-flow-minimum", GIMP_ICON_TOOL_AIRBRUSH,
     "Minimum Flow", NULL, NULL,
     GIMP_ACTION_SELECT_FIRST, FALSE,
     NULL },
-  { "tools-airbrush-flow-maximum", GIMP_STOCK_TOOL_AIRBRUSH,
+  { "tools-airbrush-flow-maximum", GIMP_ICON_TOOL_AIRBRUSH,
     "Maximum Flow", NULL, NULL,
     GIMP_ACTION_SELECT_LAST, FALSE,
     NULL },
-  { "tools-airbrush-flow-decrease", GIMP_STOCK_TOOL_AIRBRUSH,
+  { "tools-airbrush-flow-decrease", GIMP_ICON_TOOL_AIRBRUSH,
     "Decrease Flow", NULL, NULL,
     GIMP_ACTION_SELECT_PREVIOUS, FALSE,
     NULL },
-  { "tools-airbrush-flow-increase", GIMP_STOCK_TOOL_AIRBRUSH,
+  { "tools-airbrush-flow-increase", GIMP_ICON_TOOL_AIRBRUSH,
     "Increase Flow", NULL, NULL,
     GIMP_ACTION_SELECT_NEXT, FALSE,
     NULL },
-  { "tools-airbrush-flow-decrease-skip", GIMP_STOCK_TOOL_AIRBRUSH,
+  { "tools-airbrush-flow-decrease-skip", GIMP_ICON_TOOL_AIRBRUSH,
     "Decrease Flow More", NULL, NULL,
     GIMP_ACTION_SELECT_SKIP_PREVIOUS, FALSE,
     NULL },
-  { "tools-airbrush-flow-increase-skip", GIMP_STOCK_TOOL_AIRBRUSH,
+  { "tools-airbrush-flow-increase-skip", GIMP_ICON_TOOL_AIRBRUSH,
     "Increase Flow More", NULL, NULL,
     GIMP_ACTION_SELECT_SKIP_NEXT, FALSE,
     NULL }
@@ -228,7 +228,7 @@ static const GimpEnumActionEntry tools_mybrush_hardness_actions[] =
 static const GimpEnumActionEntry tools_foreground_select_brush_size_actions[] =
 {
   { "tools-foreground-select-brush-size-set",
-    GIMP_STOCK_TOOL_FOREGROUND_SELECT,
+    GIMP_ICON_TOOL_FOREGROUND_SELECT,
     "Set Foreground Select Brush Size", NULL, NULL,
     GIMP_ACTION_SELECT_SET, TRUE,
     NULL }
@@ -236,7 +236,7 @@ static const GimpEnumActionEntry tools_foreground_select_brush_size_actions[] =
 
 static const GimpEnumActionEntry tools_transform_preview_opacity_actions[] =
 {
-  { "tools-transform-preview-opacity-set", GIMP_STOCK_TOOL_PERSPECTIVE,
+  { "tools-transform-preview-opacity-set", GIMP_ICON_TOOL_PERSPECTIVE,
     "Set Transform Tool Preview Opacity", NULL, NULL,
     GIMP_ACTION_SELECT_SET, TRUE,
     NULL }
@@ -260,43 +260,43 @@ static const GimpEnumActionEntry tools_warp_effect_hardness_actions[] =
 
 static const GimpEnumActionEntry tools_opacity_actions[] =
 {
-  { "tools-opacity-set", GIMP_STOCK_TOOL_OPTIONS,
+  { "tools-opacity-set", GIMP_ICON_DIALOG_TOOL_OPTIONS,
     "Set Opacity", NULL, NULL,
     GIMP_ACTION_SELECT_SET, TRUE,
     NULL },
-  { "tools-opacity-set-to-default", GIMP_STOCK_TOOL_OPTIONS,
+  { "tools-opacity-set-to-default", GIMP_ICON_DIALOG_TOOL_OPTIONS,
     "Set Opacity To Default Value", NULL, NULL,
     GIMP_ACTION_SELECT_SET_TO_DEFAULT, FALSE,
     NULL },
-  { "tools-opacity-minimum", GIMP_STOCK_TOOL_OPTIONS,
+  { "tools-opacity-minimum", GIMP_ICON_DIALOG_TOOL_OPTIONS,
     "Minimize Opacity", NULL, NULL,
     GIMP_ACTION_SELECT_FIRST, FALSE,
     NULL },
-  { "tools-opacity-maximum", GIMP_STOCK_TOOL_OPTIONS,
+  { "tools-opacity-maximum", GIMP_ICON_DIALOG_TOOL_OPTIONS,
     "Maximize Opacity", NULL, NULL,
     GIMP_ACTION_SELECT_LAST, FALSE,
     NULL },
-  { "tools-opacity-decrease", GIMP_STOCK_TOOL_OPTIONS,
+  { "tools-opacity-decrease", GIMP_ICON_DIALOG_TOOL_OPTIONS,
     "Decrease Opacity", "less", NULL,
     GIMP_ACTION_SELECT_PREVIOUS, FALSE,
     NULL },
-  { "tools-opacity-increase", GIMP_STOCK_TOOL_OPTIONS,
+  { "tools-opacity-increase", GIMP_ICON_DIALOG_TOOL_OPTIONS,
     "Increase Opacity", "greater", NULL,
     GIMP_ACTION_SELECT_NEXT, FALSE,
     NULL },
-  { "tools-opacity-decrease-skip", GIMP_STOCK_TOOL_OPTIONS,
+  { "tools-opacity-decrease-skip", GIMP_ICON_DIALOG_TOOL_OPTIONS,
     "Decrease Opacity More", "<primary>less", NULL,
     GIMP_ACTION_SELECT_SKIP_PREVIOUS, FALSE,
     NULL },
-  { "tools-opacity-increase-skip", GIMP_STOCK_TOOL_OPTIONS,
+  { "tools-opacity-increase-skip", GIMP_ICON_DIALOG_TOOL_OPTIONS,
     "Increase Opacity More", "<primary>greater", NULL,
     GIMP_ACTION_SELECT_SKIP_NEXT, FALSE,
     NULL },
-  { "tools-opacity-decrease-percent", GIMP_STOCK_TOOL_OPTIONS,
+  { "tools-opacity-decrease-percent", GIMP_ICON_DIALOG_TOOL_OPTIONS,
     "Decrease Opacity Relative", NULL, NULL,
     GIMP_ACTION_SELECT_PERCENT_PREVIOUS, FALSE,
     NULL },
-  { "tools-opacity-increase-percent", GIMP_STOCK_TOOL_OPTIONS,
+  { "tools-opacity-increase-percent", GIMP_ICON_DIALOG_TOOL_OPTIONS,
     "Increase Opacity Relative", NULL, NULL,
     GIMP_ACTION_SELECT_PERCENT_NEXT, FALSE,
     NULL },
@@ -304,43 +304,43 @@ static const GimpEnumActionEntry tools_opacity_actions[] =
 
 static const GimpEnumActionEntry tools_size_actions[] =
 {
-  { "tools-size-set", GIMP_STOCK_TOOL_OPTIONS,
+  { "tools-size-set", GIMP_ICON_DIALOG_TOOL_OPTIONS,
     "Set Size", NULL, NULL,
     GIMP_ACTION_SELECT_SET, TRUE,
     NULL },
-  { "tools-size-set-to-default", GIMP_STOCK_TOOL_OPTIONS,
+  { "tools-size-set-to-default", GIMP_ICON_DIALOG_TOOL_OPTIONS,
     "Set Size To Default Value", "backslash", NULL,
     GIMP_ACTION_SELECT_SET_TO_DEFAULT, FALSE,
     NULL },
-  { "tools-size-minimum", GIMP_STOCK_TOOL_OPTIONS,
+  { "tools-size-minimum", GIMP_ICON_DIALOG_TOOL_OPTIONS,
     "Minimize Size", NULL, NULL,
     GIMP_ACTION_SELECT_FIRST, FALSE,
     NULL },
-  { "tools-size-maximum", GIMP_STOCK_TOOL_OPTIONS,
+  { "tools-size-maximum", GIMP_ICON_DIALOG_TOOL_OPTIONS,
     "Maximize Size", NULL, NULL,
     GIMP_ACTION_SELECT_LAST, FALSE,
     NULL },
-  { "tools-size-decrease", GIMP_STOCK_TOOL_OPTIONS,
+  { "tools-size-decrease", GIMP_ICON_DIALOG_TOOL_OPTIONS,
     "Decrease Size", "bracketleft", NULL,
     GIMP_ACTION_SELECT_PREVIOUS, FALSE,
     NULL },
-  { "tools-size-increase", GIMP_STOCK_TOOL_OPTIONS,
+  { "tools-size-increase", GIMP_ICON_DIALOG_TOOL_OPTIONS,
     "Increase Size", "bracketright", NULL,
     GIMP_ACTION_SELECT_NEXT, FALSE,
     NULL },
-  { "tools-size-decrease-skip", GIMP_STOCK_TOOL_OPTIONS,
+  { "tools-size-decrease-skip", GIMP_ICON_DIALOG_TOOL_OPTIONS,
     "Decrease Size More", "<shift>bracketleft", NULL,
     GIMP_ACTION_SELECT_SKIP_PREVIOUS, FALSE,
     NULL },
-  { "tools-size-increase-skip", GIMP_STOCK_TOOL_OPTIONS,
+  { "tools-size-increase-skip", GIMP_ICON_DIALOG_TOOL_OPTIONS,
     "Increase Size More", "<shift>bracketright", NULL,
     GIMP_ACTION_SELECT_SKIP_NEXT, FALSE,
     NULL },
-  { "tools-size-decrease-percent", GIMP_STOCK_TOOL_OPTIONS,
+  { "tools-size-decrease-percent", GIMP_ICON_DIALOG_TOOL_OPTIONS,
     "Decrease Size Relative", NULL, NULL,
     GIMP_ACTION_SELECT_PERCENT_PREVIOUS, FALSE,
     NULL },
-  { "tools-size-increase-percent", GIMP_STOCK_TOOL_OPTIONS,
+  { "tools-size-increase-percent", GIMP_ICON_DIALOG_TOOL_OPTIONS,
     "Increase Size Relative", NULL, NULL,
     GIMP_ACTION_SELECT_PERCENT_NEXT, FALSE,
     NULL },
@@ -348,43 +348,43 @@ static const GimpEnumActionEntry tools_size_actions[] =
 
 static const GimpEnumActionEntry tools_aspect_actions[] =
 {
-  { "tools-aspect-set", GIMP_STOCK_TOOL_OPTIONS,
+  { "tools-aspect-set", GIMP_ICON_DIALOG_TOOL_OPTIONS,
     "Set Aspect Ratio", NULL, NULL,
     GIMP_ACTION_SELECT_SET, TRUE,
     NULL },
-  { "tools-aspect-set-to-default", GIMP_STOCK_TOOL_OPTIONS,
+  { "tools-aspect-set-to-default", GIMP_ICON_DIALOG_TOOL_OPTIONS,
     "Set Aspect Ratio To Default Value", NULL, NULL,
     GIMP_ACTION_SELECT_SET_TO_DEFAULT, FALSE,
     NULL },
-  { "tools-aspect-minimum", GIMP_STOCK_TOOL_OPTIONS,
+  { "tools-aspect-minimum", GIMP_ICON_DIALOG_TOOL_OPTIONS,
     "Minimize Aspect Ratio", NULL, NULL,
     GIMP_ACTION_SELECT_FIRST, FALSE,
     NULL },
-  { "tools-aspect-maximum", GIMP_STOCK_TOOL_OPTIONS,
+  { "tools-aspect-maximum", GIMP_ICON_DIALOG_TOOL_OPTIONS,
     "Maximize Aspect Ratio", NULL, NULL,
     GIMP_ACTION_SELECT_LAST, FALSE,
     NULL },
-  { "tools-aspect-decrease", GIMP_STOCK_TOOL_OPTIONS,
+  { "tools-aspect-decrease", GIMP_ICON_DIALOG_TOOL_OPTIONS,
     "Decrease Aspect Ratio", NULL, NULL,
     GIMP_ACTION_SELECT_PREVIOUS, FALSE,
     NULL },
-  { "tools-aspect-increase", GIMP_STOCK_TOOL_OPTIONS,
+  { "tools-aspect-increase", GIMP_ICON_DIALOG_TOOL_OPTIONS,
     "Increase Aspect Ratio", NULL, NULL,
     GIMP_ACTION_SELECT_NEXT, FALSE,
     NULL },
-  { "tools-aspect-decrease-skip", GIMP_STOCK_TOOL_OPTIONS,
+  { "tools-aspect-decrease-skip", GIMP_ICON_DIALOG_TOOL_OPTIONS,
     "Decrease Aspect Ratio More", NULL, NULL,
     GIMP_ACTION_SELECT_SKIP_PREVIOUS, FALSE,
     NULL },
-  { "tools-aspect-increase-skip", GIMP_STOCK_TOOL_OPTIONS,
+  { "tools-aspect-increase-skip", GIMP_ICON_DIALOG_TOOL_OPTIONS,
     "Increase Aspect Ratio More", NULL, NULL,
     GIMP_ACTION_SELECT_SKIP_NEXT, FALSE,
     NULL },
-  { "tools-aspect-decrease-percent", GIMP_STOCK_TOOL_OPTIONS,
+  { "tools-aspect-decrease-percent", GIMP_ICON_DIALOG_TOOL_OPTIONS,
     "Decrease Aspect Ratio Relative", NULL, NULL,
     GIMP_ACTION_SELECT_PERCENT_PREVIOUS, FALSE,
     NULL },
-  { "tools-aspect-increase-percent", GIMP_STOCK_TOOL_OPTIONS,
+  { "tools-aspect-increase-percent", GIMP_ICON_DIALOG_TOOL_OPTIONS,
     "Increase Aspect Ratio Relative", NULL, NULL,
     GIMP_ACTION_SELECT_PERCENT_NEXT, FALSE,
     NULL },
@@ -392,43 +392,43 @@ static const GimpEnumActionEntry tools_aspect_actions[] =
 
 static const GimpEnumActionEntry tools_angle_actions[] =
 {
-  { "tools-angle-set", GIMP_STOCK_TOOL_OPTIONS,
+  { "tools-angle-set", GIMP_ICON_DIALOG_TOOL_OPTIONS,
     "Set Angle", NULL, NULL,
     GIMP_ACTION_SELECT_SET, TRUE,
     NULL },
-  { "tools-angle-set-to-default", GIMP_STOCK_TOOL_OPTIONS,
+  { "tools-angle-set-to-default", GIMP_ICON_DIALOG_TOOL_OPTIONS,
     "Set Angle To Default Value", NULL, NULL,
     GIMP_ACTION_SELECT_SET_TO_DEFAULT, FALSE,
     NULL },
-  { "tools-angle-minimum", GIMP_STOCK_TOOL_OPTIONS,
+  { "tools-angle-minimum", GIMP_ICON_DIALOG_TOOL_OPTIONS,
     "Minimize Angle", NULL, NULL,
     GIMP_ACTION_SELECT_FIRST, FALSE,
     NULL },
-  { "tools-angle-maximum", GIMP_STOCK_TOOL_OPTIONS,
+  { "tools-angle-maximum", GIMP_ICON_DIALOG_TOOL_OPTIONS,
     "Maximize Angle", NULL, NULL,
     GIMP_ACTION_SELECT_LAST, FALSE,
     NULL },
-  { "tools-angle-decrease", GIMP_STOCK_TOOL_OPTIONS,
+  { "tools-angle-decrease", GIMP_ICON_DIALOG_TOOL_OPTIONS,
     "Decrease Angle", NULL, NULL,
     GIMP_ACTION_SELECT_PREVIOUS, FALSE,
     NULL },
-  { "tools-angle-increase", GIMP_STOCK_TOOL_OPTIONS,
+  { "tools-angle-increase", GIMP_ICON_DIALOG_TOOL_OPTIONS,
     "Increase Angle", NULL, NULL,
     GIMP_ACTION_SELECT_NEXT, FALSE,
     NULL },
-  { "tools-angle-decrease-skip", GIMP_STOCK_TOOL_OPTIONS,
+  { "tools-angle-decrease-skip", GIMP_ICON_DIALOG_TOOL_OPTIONS,
     "Decrease Angle More", NULL, NULL,
     GIMP_ACTION_SELECT_SKIP_PREVIOUS, FALSE,
     NULL },
-  { "tools-angle-increase-skip", GIMP_STOCK_TOOL_OPTIONS,
+  { "tools-angle-increase-skip", GIMP_ICON_DIALOG_TOOL_OPTIONS,
     "Increase Angle More", NULL, NULL,
     GIMP_ACTION_SELECT_SKIP_NEXT, FALSE,
     NULL },
-  { "tools-angle-decrease-percent", GIMP_STOCK_TOOL_OPTIONS,
+  { "tools-angle-decrease-percent", GIMP_ICON_DIALOG_TOOL_OPTIONS,
     "Decrease Angle Relative", NULL, NULL,
     GIMP_ACTION_SELECT_PERCENT_PREVIOUS, FALSE,
     NULL },
-  { "tools-angle-increase-percent", GIMP_STOCK_TOOL_OPTIONS,
+  { "tools-angle-increase-percent", GIMP_ICON_DIALOG_TOOL_OPTIONS,
     "Increase Angle Relative", NULL, NULL,
     GIMP_ACTION_SELECT_PERCENT_NEXT, FALSE,
     NULL },
@@ -436,43 +436,43 @@ static const GimpEnumActionEntry tools_angle_actions[] =
 
 static const GimpEnumActionEntry tools_spacing_actions[] =
 {
-  { "tools-spacing-set", GIMP_STOCK_TOOL_OPTIONS,
+  { "tools-spacing-set", GIMP_ICON_DIALOG_TOOL_OPTIONS,
     "Set Spacing", NULL, NULL,
     GIMP_ACTION_SELECT_SET, TRUE,
     NULL },
-  { "tools-spacing-set-to-default", GIMP_STOCK_TOOL_OPTIONS,
+  { "tools-spacing-set-to-default", GIMP_ICON_DIALOG_TOOL_OPTIONS,
     "Set Spacing To Default Value", NULL, NULL,
     GIMP_ACTION_SELECT_SET_TO_DEFAULT, FALSE,
     NULL },
-  { "tools-spacing-minimum", GIMP_STOCK_TOOL_OPTIONS,
+  { "tools-spacing-minimum", GIMP_ICON_DIALOG_TOOL_OPTIONS,
     "Minimize Spacing", NULL, NULL,
     GIMP_ACTION_SELECT_FIRST, FALSE,
     NULL },
-  { "tools-spacing-maximum", GIMP_STOCK_TOOL_OPTIONS,
+  { "tools-spacing-maximum", GIMP_ICON_DIALOG_TOOL_OPTIONS,
     "Maximize Spacing", NULL, NULL,
     GIMP_ACTION_SELECT_LAST, FALSE,
     NULL },
-  { "tools-spacing-decrease", GIMP_STOCK_TOOL_OPTIONS,
+  { "tools-spacing-decrease", GIMP_ICON_DIALOG_TOOL_OPTIONS,
     "Decrease Spacing", NULL, NULL,
     GIMP_ACTION_SELECT_PREVIOUS, FALSE,
     NULL },
-  { "tools-spacing-increase", GIMP_STOCK_TOOL_OPTIONS,
+  { "tools-spacing-increase", GIMP_ICON_DIALOG_TOOL_OPTIONS,
     "Increase Spacing", NULL, NULL,
     GIMP_ACTION_SELECT_NEXT, FALSE,
     NULL },
-  { "tools-spacing-decrease-skip", GIMP_STOCK_TOOL_OPTIONS,
+  { "tools-spacing-decrease-skip", GIMP_ICON_DIALOG_TOOL_OPTIONS,
     "Decrease Spacing More", NULL, NULL,
     GIMP_ACTION_SELECT_SKIP_PREVIOUS, FALSE,
     NULL },
-  { "tools-spacing-increase-skip", GIMP_STOCK_TOOL_OPTIONS,
+  { "tools-spacing-increase-skip", GIMP_ICON_DIALOG_TOOL_OPTIONS,
     "Increase Spacing More", NULL, NULL,
     GIMP_ACTION_SELECT_SKIP_NEXT, FALSE,
     NULL },
-  { "tools-spacing-decrease-percent", GIMP_STOCK_TOOL_OPTIONS,
+  { "tools-spacing-decrease-percent", GIMP_ICON_DIALOG_TOOL_OPTIONS,
     "Decrease Spacing Relative", NULL, NULL,
     GIMP_ACTION_SELECT_PERCENT_PREVIOUS, FALSE,
     NULL },
-  { "tools-spacing-increase-percent", GIMP_STOCK_TOOL_OPTIONS,
+  { "tools-spacing-increase-percent", GIMP_ICON_DIALOG_TOOL_OPTIONS,
     "Increase Spacing Relative", NULL, NULL,
     GIMP_ACTION_SELECT_PERCENT_NEXT, FALSE,
     NULL },
@@ -480,43 +480,43 @@ static const GimpEnumActionEntry tools_spacing_actions[] =
 
 static const GimpEnumActionEntry tools_hardness_actions[] =
 {
-  { "tools-hardness-set", GIMP_STOCK_TOOL_OPTIONS,
+  { "tools-hardness-set", GIMP_ICON_DIALOG_TOOL_OPTIONS,
     "Set Hardness", NULL, NULL,
     GIMP_ACTION_SELECT_SET, TRUE,
     NULL },
-  { "tools-hardness-set-to-default", GIMP_STOCK_TOOL_OPTIONS,
+  { "tools-hardness-set-to-default", GIMP_ICON_DIALOG_TOOL_OPTIONS,
     "Set Hardness To Default Value", NULL, NULL,
     GIMP_ACTION_SELECT_SET_TO_DEFAULT, FALSE,
     NULL },
-  { "tools-hardness-minimum", GIMP_STOCK_TOOL_OPTIONS,
+  { "tools-hardness-minimum", GIMP_ICON_DIALOG_TOOL_OPTIONS,
     "Minimize Hardness", NULL, NULL,
     GIMP_ACTION_SELECT_FIRST, FALSE,
     NULL },
-  { "tools-hardness-maximum", GIMP_STOCK_TOOL_OPTIONS,
+  { "tools-hardness-maximum", GIMP_ICON_DIALOG_TOOL_OPTIONS,
     "Maximize Hardness", NULL, NULL,
     GIMP_ACTION_SELECT_LAST, FALSE,
     NULL },
-  { "tools-hardness-decrease", GIMP_STOCK_TOOL_OPTIONS,
+  { "tools-hardness-decrease", GIMP_ICON_DIALOG_TOOL_OPTIONS,
     "Decrease Hardness", NULL, NULL,
     GIMP_ACTION_SELECT_PREVIOUS, FALSE,
     NULL },
-  { "tools-hardness-increase", GIMP_STOCK_TOOL_OPTIONS,
+  { "tools-hardness-increase", GIMP_ICON_DIALOG_TOOL_OPTIONS,
     "Increase Hardness", NULL, NULL,
     GIMP_ACTION_SELECT_NEXT, FALSE,
     NULL },
-  { "tools-hardness-decrease-skip", GIMP_STOCK_TOOL_OPTIONS,
+  { "tools-hardness-decrease-skip", GIMP_ICON_DIALOG_TOOL_OPTIONS,
     "Decrease Hardness More", NULL, NULL,
     GIMP_ACTION_SELECT_SKIP_PREVIOUS, FALSE,
     NULL },
-  { "tools-hardness-increase-skip", GIMP_STOCK_TOOL_OPTIONS,
+  { "tools-hardness-increase-skip", GIMP_ICON_DIALOG_TOOL_OPTIONS,
     "Increase Hardness More", NULL, NULL,
     GIMP_ACTION_SELECT_SKIP_NEXT, FALSE,
     NULL },
-  { "tools-hardness-decrease-percent", GIMP_STOCK_TOOL_OPTIONS,
+  { "tools-hardness-decrease-percent", GIMP_ICON_DIALOG_TOOL_OPTIONS,
     "Decrease Hardness Relative", NULL, NULL,
     GIMP_ACTION_SELECT_PERCENT_PREVIOUS, FALSE,
     NULL },
-  { "tools-hardness-increase-percent", GIMP_STOCK_TOOL_OPTIONS,
+  { "tools-hardness-increase-percent", GIMP_ICON_DIALOG_TOOL_OPTIONS,
     "Increase Hardness Relative", NULL, NULL,
     GIMP_ACTION_SELECT_PERCENT_NEXT, FALSE,
     NULL },
@@ -524,43 +524,43 @@ static const GimpEnumActionEntry tools_hardness_actions[] =
 
 static const GimpEnumActionEntry tools_force_actions[] =
 {
-  { "tools-force-set", GIMP_STOCK_TOOL_OPTIONS,
+  { "tools-force-set", GIMP_ICON_DIALOG_TOOL_OPTIONS,
     "Set Force", NULL, NULL,
     GIMP_ACTION_SELECT_SET, TRUE,
     NULL },
-  { "tools-force-set-to-default", GIMP_STOCK_TOOL_OPTIONS,
+  { "tools-force-set-to-default", GIMP_ICON_DIALOG_TOOL_OPTIONS,
     "Set Force To Default Value", NULL, NULL,
     GIMP_ACTION_SELECT_SET_TO_DEFAULT, FALSE,
     NULL },
-  { "tools-force-minimum", GIMP_STOCK_TOOL_OPTIONS,
+  { "tools-force-minimum", GIMP_ICON_DIALOG_TOOL_OPTIONS,
     "Minimize Force", NULL, NULL,
     GIMP_ACTION_SELECT_FIRST, FALSE,
     NULL },
-  { "tools-force-maximum", GIMP_STOCK_TOOL_OPTIONS,
+  { "tools-force-maximum", GIMP_ICON_DIALOG_TOOL_OPTIONS,
     "Maximize Force", NULL, NULL,
     GIMP_ACTION_SELECT_LAST, FALSE,
     NULL },
-  { "tools-force-decrease", GIMP_STOCK_TOOL_OPTIONS,
+  { "tools-force-decrease", GIMP_ICON_DIALOG_TOOL_OPTIONS,
     "Decrease Force", NULL, NULL,
     GIMP_ACTION_SELECT_PREVIOUS, FALSE,
     NULL },
-  { "tools-force-increase", GIMP_STOCK_TOOL_OPTIONS,
+  { "tools-force-increase", GIMP_ICON_DIALOG_TOOL_OPTIONS,
     "Increase Force", NULL, NULL,
     GIMP_ACTION_SELECT_NEXT, FALSE,
     NULL },
-  { "tools-force-decrease-skip", GIMP_STOCK_TOOL_OPTIONS,
+  { "tools-force-decrease-skip", GIMP_ICON_DIALOG_TOOL_OPTIONS,
     "Decrease Force More", NULL, NULL,
     GIMP_ACTION_SELECT_SKIP_PREVIOUS, FALSE,
     NULL },
-  { "tools-force-increase-skip", GIMP_STOCK_TOOL_OPTIONS,
+  { "tools-force-increase-skip", GIMP_ICON_DIALOG_TOOL_OPTIONS,
     "Increase Force More", NULL, NULL,
     GIMP_ACTION_SELECT_SKIP_NEXT, FALSE,
     NULL },
-  { "tools-force-decrease-percent", GIMP_STOCK_TOOL_OPTIONS,
+  { "tools-force-decrease-percent", GIMP_ICON_DIALOG_TOOL_OPTIONS,
     "Decrease Force Relative", NULL, NULL,
     GIMP_ACTION_SELECT_PERCENT_PREVIOUS, FALSE,
     NULL },
-  { "tools-force-increase-percent", GIMP_STOCK_TOOL_OPTIONS,
+  { "tools-force-increase-percent", GIMP_ICON_DIALOG_TOOL_OPTIONS,
     "Increase Force Relative", NULL, NULL,
     GIMP_ACTION_SELECT_PERCENT_NEXT, FALSE,
     NULL },
@@ -568,23 +568,23 @@ static const GimpEnumActionEntry tools_force_actions[] =
 
 static const GimpEnumActionEntry tools_object_1_actions[] =
 {
-  { "tools-object-1-set", GIMP_STOCK_TOOL_OPTIONS,
+  { "tools-object-1-set", GIMP_ICON_DIALOG_TOOL_OPTIONS,
     "Select Object 1 by Index", NULL, NULL,
     GIMP_ACTION_SELECT_SET, TRUE,
     NULL },
-  { "tools-object-1-first", GIMP_STOCK_TOOL_OPTIONS,
+  { "tools-object-1-first", GIMP_ICON_DIALOG_TOOL_OPTIONS,
     "First Object 1", NULL, NULL,
     GIMP_ACTION_SELECT_FIRST, FALSE,
     NULL },
-  { "tools-object-1-last", GIMP_STOCK_TOOL_OPTIONS,
+  { "tools-object-1-last", GIMP_ICON_DIALOG_TOOL_OPTIONS,
     "Last Object 1", NULL, NULL,
     GIMP_ACTION_SELECT_LAST, FALSE,
     NULL },
-  { "tools-object-1-previous", GIMP_STOCK_TOOL_OPTIONS,
+  { "tools-object-1-previous", GIMP_ICON_DIALOG_TOOL_OPTIONS,
     "Previous Object 1", NULL, NULL,
     GIMP_ACTION_SELECT_PREVIOUS, FALSE,
     NULL },
-  { "tools-object-1-next", GIMP_STOCK_TOOL_OPTIONS,
+  { "tools-object-1-next", GIMP_ICON_DIALOG_TOOL_OPTIONS,
     "Next Object 1", NULL, NULL,
     GIMP_ACTION_SELECT_NEXT, FALSE,
     NULL }
@@ -592,23 +592,23 @@ static const GimpEnumActionEntry tools_object_1_actions[] =
 
 static const GimpEnumActionEntry tools_object_2_actions[] =
 {
-  { "tools-object-2-set", GIMP_STOCK_TOOL_OPTIONS,
+  { "tools-object-2-set", GIMP_ICON_DIALOG_TOOL_OPTIONS,
     "Select Object 2 by Index", NULL, NULL,
     GIMP_ACTION_SELECT_SET, TRUE,
     NULL },
-  { "tools-object-2-first", GIMP_STOCK_TOOL_OPTIONS,
+  { "tools-object-2-first", GIMP_ICON_DIALOG_TOOL_OPTIONS,
     "First Object 2", NULL, NULL,
     GIMP_ACTION_SELECT_FIRST, FALSE,
     NULL },
-  { "tools-object-2-last", GIMP_STOCK_TOOL_OPTIONS,
+  { "tools-object-2-last", GIMP_ICON_DIALOG_TOOL_OPTIONS,
     "Last Object 2", NULL, NULL,
     GIMP_ACTION_SELECT_LAST, FALSE,
     NULL },
-  { "tools-object-2-previous", GIMP_STOCK_TOOL_OPTIONS,
+  { "tools-object-2-previous", GIMP_ICON_DIALOG_TOOL_OPTIONS,
     "Previous Object 2", NULL, NULL,
     GIMP_ACTION_SELECT_PREVIOUS, FALSE,
     NULL },
-  { "tools-object-2-next", GIMP_STOCK_TOOL_OPTIONS,
+  { "tools-object-2-next", GIMP_ICON_DIALOG_TOOL_OPTIONS,
     "Next Object 2", NULL, NULL,
     GIMP_ACTION_SELECT_NEXT, FALSE,
     NULL }
diff --git a/app/actions/vectors-actions.c b/app/actions/vectors-actions.c
index d36c13e..6ccb50e 100644
--- a/app/actions/vectors-actions.c
+++ b/app/actions/vectors-actions.c
@@ -42,44 +42,44 @@
 
 static const GimpActionEntry vectors_actions[] =
 {
-  { "vectors-popup", GIMP_STOCK_PATHS,
+  { "vectors-popup", GIMP_ICON_DIALOG_PATHS,
     NC_("vectors-action", "Paths Menu"), NULL, NULL, NULL,
     GIMP_HELP_PATH_DIALOG },
 
-  { "vectors-color-tag-menu", GIMP_STOCK_CLOSE /* abused */,
+  { "vectors-color-tag-menu", GIMP_ICON_CLOSE /* abused */,
     NC_("vectors-action", "Color Tag"), NULL, NULL, NULL,
     GIMP_HELP_PATH_COLOR_TAG },
 
-  { "vectors-path-tool", GIMP_STOCK_TOOL_PATH,
+  { "vectors-path-tool", GIMP_ICON_TOOL_PATH,
     NC_("vectors-action", "Path _Tool"), NULL, NULL,
     G_CALLBACK (vectors_vectors_tool_cmd_callback),
     GIMP_HELP_TOOL_VECTORS },
 
-  { "vectors-edit-attributes", "gtk-edit",
+  { "vectors-edit-attributes", GIMP_ICON_EDIT,
     NC_("vectors-action", "_Edit Path Attributes..."), NULL,
     NC_("vectors-action", "Edit path attributes"),
     G_CALLBACK (vectors_edit_attributes_cmd_callback),
     GIMP_HELP_PATH_EDIT },
 
-  { "vectors-new", "document-new",
+  { "vectors-new", GIMP_ICON_DOCUMENT_NEW,
     NC_("vectors-action", "_New Path..."), NULL,
     NC_("vectors-action", "Create a new path..."),
     G_CALLBACK (vectors_new_cmd_callback),
     GIMP_HELP_PATH_NEW },
 
-  { "vectors-new-last-values", "document-new",
+  { "vectors-new-last-values", GIMP_ICON_DOCUMENT_NEW,
     NC_("vectors-action", "_New Path with last values"), NULL,
     NC_("vectors-action", "Create a new path with last used values"),
     G_CALLBACK (vectors_new_last_vals_cmd_callback),
     GIMP_HELP_PATH_NEW },
 
-  { "vectors-duplicate", GIMP_STOCK_DUPLICATE,
+  { "vectors-duplicate", GIMP_ICON_OBJECT_DUPLICATE,
     NC_("vectors-action", "D_uplicate Path"), NULL,
     NC_("vectors-action", "Duplicate this path"),
     G_CALLBACK (vectors_duplicate_cmd_callback),
     GIMP_HELP_PATH_DUPLICATE },
 
-  { "vectors-delete", "edit-delete",
+  { "vectors-delete", GIMP_ICON_EDIT_DELETE,
     NC_("vectors-action", "_Delete Path"), NULL,
     NC_("vectors-action", "Delete this path"),
     G_CALLBACK (vectors_delete_cmd_callback),
@@ -90,70 +90,70 @@ static const GimpActionEntry vectors_actions[] =
     G_CALLBACK (vectors_merge_visible_cmd_callback),
     GIMP_HELP_PATH_MERGE_VISIBLE },
 
-  { "vectors-raise", "go-up",
+  { "vectors-raise", GIMP_ICON_GO_UP,
     NC_("vectors-action", "_Raise Path"), NULL,
     NC_("vectors-action", "Raise this path"),
     G_CALLBACK (vectors_raise_cmd_callback),
     GIMP_HELP_PATH_RAISE },
 
-  { "vectors-raise-to-top", "go-top",
+  { "vectors-raise-to-top", GIMP_ICON_GO_TOP,
     NC_("vectors-action", "Raise Path to _Top"), NULL,
     NC_("vectors-action", "Raise this path to the top"),
     G_CALLBACK (vectors_raise_to_top_cmd_callback),
     GIMP_HELP_PATH_RAISE_TO_TOP },
 
-  { "vectors-lower", "go-down",
+  { "vectors-lower", GIMP_ICON_GO_DOWN,
     NC_("vectors-action", "_Lower Path"), NULL,
     NC_("vectors-action", "Lower this path"),
     G_CALLBACK (vectors_lower_cmd_callback),
     GIMP_HELP_PATH_LOWER },
 
-  { "vectors-lower-to-bottom", "go-bottom",
+  { "vectors-lower-to-bottom", GIMP_ICON_GO_BOTTOM,
     NC_("vectors-action", "Lower Path to _Bottom"), NULL,
     NC_("vectors-action", "Lower this path to the bottom"),
     G_CALLBACK (vectors_lower_to_bottom_cmd_callback),
     GIMP_HELP_PATH_LOWER_TO_BOTTOM },
 
-  { "vectors-fill", GIMP_STOCK_TOOL_BUCKET_FILL,
+  { "vectors-fill", GIMP_ICON_TOOL_BUCKET_FILL,
     NC_("vectors-action", "Fill Path..."), NULL,
     NC_("vectors-action", "Fill the path"),
     G_CALLBACK (vectors_fill_cmd_callback),
     GIMP_HELP_PATH_FILL },
 
-  { "vectors-fill-last-values", GIMP_STOCK_TOOL_BUCKET_FILL,
+  { "vectors-fill-last-values", GIMP_ICON_TOOL_BUCKET_FILL,
     NC_("vectors-action", "Fill Path"), NULL,
     NC_("vectors-action", "Fill the path with last values"),
     G_CALLBACK (vectors_fill_last_vals_cmd_callback),
     GIMP_HELP_PATH_FILL },
 
-  { "vectors-stroke", GIMP_STOCK_PATH_STROKE,
+  { "vectors-stroke", GIMP_ICON_PATH_STROKE,
     NC_("vectors-action", "Stro_ke Path..."), NULL,
     NC_("vectors-action", "Paint along the path"),
     G_CALLBACK (vectors_stroke_cmd_callback),
     GIMP_HELP_PATH_STROKE },
 
-  { "vectors-stroke-last-values", GIMP_STOCK_PATH_STROKE,
+  { "vectors-stroke-last-values", GIMP_ICON_PATH_STROKE,
     NC_("vectors-action", "Stro_ke Path"), NULL,
     NC_("vectors-action", "Paint along the path with last values"),
     G_CALLBACK (vectors_stroke_last_vals_cmd_callback),
     GIMP_HELP_PATH_STROKE },
 
-  { "vectors-copy", "edit-copy",
+  { "vectors-copy", GIMP_ICON_EDIT_COPY,
     NC_("vectors-action", "Co_py Path"), "", NULL,
     G_CALLBACK (vectors_copy_cmd_callback),
     GIMP_HELP_PATH_COPY },
 
-  { "vectors-paste", "edit-paste",
+  { "vectors-paste", GIMP_ICON_EDIT_PASTE,
     NC_("vectors-action", "Paste Pat_h"), "", NULL,
     G_CALLBACK (vectors_paste_cmd_callback),
     GIMP_HELP_PATH_PASTE },
 
-  { "vectors-export", "document-save",
+  { "vectors-export", GIMP_ICON_DOCUMENT_SAVE,
     NC_("vectors-action", "E_xport Path..."), "", NULL,
     G_CALLBACK (vectors_export_cmd_callback),
     GIMP_HELP_PATH_EXPORT },
 
-  { "vectors-import", "document-open",
+  { "vectors-import", GIMP_ICON_DOCUMENT_OPEN,
     NC_("vectors-action", "I_mport Path..."), "", NULL,
     G_CALLBACK (vectors_import_cmd_callback),
     GIMP_HELP_PATH_IMPORT }
@@ -161,25 +161,25 @@ static const GimpActionEntry vectors_actions[] =
 
 static const GimpToggleActionEntry vectors_toggle_actions[] =
 {
-  { "vectors-visible", GIMP_STOCK_VISIBLE,
+  { "vectors-visible", GIMP_ICON_VISIBLE,
     NC_("vectors-action", "_Visible"), NULL, NULL,
     G_CALLBACK (vectors_visible_cmd_callback),
     FALSE,
     GIMP_HELP_PATH_VISIBLE },
 
-  { "vectors-linked", GIMP_STOCK_LINKED,
+  { "vectors-linked", GIMP_ICON_LINKED,
     NC_("vectors-action", "_Linked"), NULL, NULL,
     G_CALLBACK (vectors_linked_cmd_callback),
     FALSE,
     GIMP_HELP_PATH_LINKED },
 
-  { "vectors-lock-content", NULL /* GIMP_STOCK_LOCK */,
+  { "vectors-lock-content", NULL /* GIMP_ICON_LOCK */,
     NC_("vectors-action", "L_ock strokes"), NULL, NULL,
     G_CALLBACK (vectors_lock_content_cmd_callback),
     FALSE,
     GIMP_HELP_PATH_LOCK_STROKES },
 
-  { "vectors-lock-position", GIMP_STOCK_TOOL_MOVE,
+  { "vectors-lock-position", GIMP_ICON_TOOL_MOVE,
     NC_("vectors-action", "L_ock position"), NULL, NULL,
     G_CALLBACK (vectors_lock_position_cmd_callback),
     FALSE,
@@ -188,7 +188,7 @@ static const GimpToggleActionEntry vectors_toggle_actions[] =
 
 static const GimpEnumActionEntry vectors_color_tag_actions[] =
 {
-  { "vectors-color-tag-none", GIMP_STOCK_CLOSE /* abused */,
+  { "vectors-color-tag-none", GIMP_ICON_CLOSE /* abused */,
     NC_("vectors-action", "None"), NULL,
     NC_("vectors-action", "Clear color tag"),
     GIMP_COLOR_TAG_NONE, FALSE,
@@ -245,31 +245,31 @@ static const GimpEnumActionEntry vectors_color_tag_actions[] =
 
 static const GimpEnumActionEntry vectors_to_selection_actions[] =
 {
-  { "vectors-selection-replace", GIMP_STOCK_SELECTION_REPLACE,
+  { "vectors-selection-replace", GIMP_ICON_SELECTION_REPLACE,
     NC_("vectors-action", "Path to Sele_ction"), NULL,
     NC_("vectors-action", "Path to selection"),
     GIMP_CHANNEL_OP_REPLACE, FALSE,
     GIMP_HELP_PATH_SELECTION_REPLACE },
 
-  { "vectors-selection-from-vectors", GIMP_STOCK_SELECTION_REPLACE,
+  { "vectors-selection-from-vectors", GIMP_ICON_SELECTION_REPLACE,
     NC_("vectors-action", "Fr_om Path"), "<shift>V",
     NC_("vectors-action", "Replace selection with path"),
     GIMP_CHANNEL_OP_REPLACE, FALSE,
     GIMP_HELP_PATH_SELECTION_REPLACE },
 
-  { "vectors-selection-add", GIMP_STOCK_SELECTION_ADD,
+  { "vectors-selection-add", GIMP_ICON_SELECTION_ADD,
     NC_("vectors-action", "_Add to Selection"), NULL,
     NC_("vectors-action", "Add path to selection"),
     GIMP_CHANNEL_OP_ADD, FALSE,
     GIMP_HELP_PATH_SELECTION_ADD },
 
-  { "vectors-selection-subtract", GIMP_STOCK_SELECTION_SUBTRACT,
+  { "vectors-selection-subtract", GIMP_ICON_SELECTION_SUBTRACT,
     NC_("vectors-action", "_Subtract from Selection"), NULL,
     NC_("vectors-action", "Subtract path from selection"),
     GIMP_CHANNEL_OP_SUBTRACT, FALSE,
     GIMP_HELP_PATH_SELECTION_SUBTRACT },
 
-  { "vectors-selection-intersect", GIMP_STOCK_SELECTION_INTERSECT,
+  { "vectors-selection-intersect", GIMP_ICON_SELECTION_INTERSECT,
     NC_("vectors-action", "_Intersect with Selection"), NULL,
     NC_("vectors-action", "Intersect path with selection"),
     GIMP_CHANNEL_OP_INTERSECT, FALSE,
@@ -278,19 +278,19 @@ static const GimpEnumActionEntry vectors_to_selection_actions[] =
 
 static const GimpEnumActionEntry vectors_selection_to_vectors_actions[] =
 {
-  { "vectors-selection-to-vectors", GIMP_STOCK_SELECTION_TO_PATH,
+  { "vectors-selection-to-vectors", GIMP_ICON_SELECTION_TO_PATH,
     NC_("vectors-action", "Selecti_on to Path"), NULL,
     NC_("vectors-action", "Selection to path"),
     FALSE, FALSE,
     GIMP_HELP_SELECTION_TO_PATH },
 
-  { "vectors-selection-to-vectors-short", GIMP_STOCK_SELECTION_TO_PATH,
+  { "vectors-selection-to-vectors-short", GIMP_ICON_SELECTION_TO_PATH,
     NC_("vectors-action", "To _Path"), NULL,
     NC_("vectors-action", "Selection to path"),
     FALSE, FALSE,
     GIMP_HELP_SELECTION_TO_PATH },
 
-  { "vectors-selection-to-vectors-advanced", GIMP_STOCK_SELECTION_TO_PATH,
+  { "vectors-selection-to-vectors-advanced", GIMP_ICON_SELECTION_TO_PATH,
     NC_("vectors-action", "Selection to Path (_Advanced)"), NULL,
     NC_("vectors-action", "Advanced options"),
     TRUE, FALSE,
diff --git a/app/actions/vectors-commands.c b/app/actions/vectors-commands.c
index 58ac21a..be616d2 100644
--- a/app/actions/vectors-commands.c
+++ b/app/actions/vectors-commands.c
@@ -161,7 +161,7 @@ vectors_edit_attributes_cmd_callback (GtkAction *action,
                                            widget,
                                            _("Path Attributes"),
                                            "gimp-vectors-edit",
-                                           "gtk-edit",
+                                           GIMP_ICON_EDIT,
                                            _("Edit Path Attributes"),
                                            GIMP_HELP_PATH_EDIT,
                                            gimp_object_get_name (vectors),
@@ -202,7 +202,7 @@ vectors_new_cmd_callback (GtkAction *action,
                                            widget,
                                            _("New Path"),
                                            "gimp-vectors-new",
-                                           GIMP_STOCK_PATH,
+                                           GIMP_ICON_PATH,
                                            _("Create a New Path"),
                                            GIMP_HELP_PATH_NEW,
                                            config->vectors_new_name,
@@ -423,7 +423,7 @@ vectors_fill_cmd_callback (GtkAction *action,
                            image, GIMP_ITEM (vectors),
                            "gimp-vectors-fill-dialog",
                            _("Fill Path"),
-                           GIMP_STOCK_TOOL_BUCKET_FILL,
+                           GIMP_ICON_TOOL_BUCKET_FILL,
                            GIMP_HELP_PATH_FILL,
                            data);
 }
@@ -453,7 +453,7 @@ vectors_stroke_cmd_callback (GtkAction *action,
                              image, GIMP_ITEM (vectors),
                              "gimp-vectors-stroke-dialog",
                              _("Stroke Path"),
-                             GIMP_STOCK_PATH_STROKE,
+                             GIMP_ICON_PATH_STROKE,
                              GIMP_HELP_PATH_STROKE,
                              data);
 }
diff --git a/app/actions/view-actions.c b/app/actions/view-actions.c
index 9f5b333..9107898 100644
--- a/app/actions/view-actions.c
+++ b/app/actions/view-actions.c
@@ -81,35 +81,35 @@ static const GimpActionEntry view_actions[] =
   { "view-softproof-intent-menu", NULL,
     NC_("view-action", "Soft-Proofing Re_ndering Intent") },
 
-  { "view-move-to-screen-menu", GIMP_STOCK_MOVE_TO_SCREEN,
+  { "view-move-to-screen-menu", GIMP_ICON_WINDOW_MOVE_TO_SCREEN,
     NC_("view-action", "Move to Screen"), NULL, NULL, NULL,
     GIMP_HELP_VIEW_CHANGE_SCREEN },
 
-  { "view-new", "window-new",
+  { "view-new", GIMP_ICON_WINDOW_NEW,
     NC_("view-action", "_New View"), NULL,
     NC_("view-action", "Create another view on this image"),
     G_CALLBACK (view_new_cmd_callback),
     GIMP_HELP_VIEW_NEW },
 
-  { "view-close", "window-close",
+  { "view-close", GIMP_ICON_WINDOW_CLOSE,
     NC_("view-action",  "_Close View"), "<primary>W",
     NC_("view-action", "Close the active image view"),
     G_CALLBACK (view_close_cmd_callback),
     GIMP_HELP_FILE_CLOSE },
 
-  { "view-zoom-fit-in", "zoom-fit-best",
+  { "view-zoom-fit-in", GIMP_ICON_ZOOM_FIT_BEST,
     NC_("view-action", "_Fit Image in Window"), "<primary><shift>J",
     NC_("view-action", "Adjust the zoom ratio so that the image becomes fully visible"),
     G_CALLBACK (view_zoom_fit_in_cmd_callback),
     GIMP_HELP_VIEW_ZOOM_FIT_IN },
 
-  { "view-zoom-fill", "zoom-fit-best",
+  { "view-zoom-fill", GIMP_ICON_ZOOM_FIT_BEST,
     NC_("view-action", "Fi_ll Window"), NULL,
     NC_("view-action", "Adjust the zoom ratio so that the entire window is used"),
     G_CALLBACK (view_zoom_fill_cmd_callback),
     GIMP_HELP_VIEW_ZOOM_FILL },
 
-  { "view-zoom-selection", "gimp-selection",
+  { "view-zoom-selection", GIMP_ICON_SELECTION,
     NC_("view-action", "Zoom to _Selection"), NULL,
     NC_("view-action", "Adjust the zoom ratio so that the selection fills the window"),
     G_CALLBACK (view_zoom_selection_cmd_callback),
@@ -127,19 +127,19 @@ static const GimpActionEntry view_actions[] =
     G_CALLBACK (view_rotate_other_cmd_callback),
     GIMP_HELP_VIEW_ROTATE_OTHER },
 
-  { "view-navigation-window", GIMP_STOCK_NAVIGATION,
+  { "view-navigation-window", GIMP_ICON_DIALOG_NAVIGATION,
     NC_("view-action", "Na_vigation Window"), NULL,
     NC_("view-action", "Show an overview window for this image"),
     G_CALLBACK (view_navigation_window_cmd_callback),
     GIMP_HELP_NAVIGATION_DIALOG },
 
-  { "view-display-filters", GIMP_STOCK_DISPLAY_FILTER,
+  { "view-display-filters", GIMP_ICON_DISPLAY_FILTER,
     NC_("view-action", "Display _Filters..."), NULL,
     NC_("view-action", "Configure filters applied to this view"),
     G_CALLBACK (view_display_filters_cmd_callback),
     GIMP_HELP_DISPLAY_FILTER_DIALOG },
 
-  { "view-color-management-reset", GIMP_STOCK_RESET,
+  { "view-color-management-reset", GIMP_ICON_RESET,
     NC_("view-action", "As in _Preferences"), NULL,
     NC_("view-action",
         "Reset color management to what's configured in preferences"),
@@ -152,7 +152,7 @@ static const GimpActionEntry view_actions[] =
     G_CALLBACK (view_softproof_profile_cmd_callback),
     GIMP_HELP_VIEW_COLOR_MANAGEMENT },
 
-  { "view-shrink-wrap", "zoom-fit-best",
+  { "view-shrink-wrap", GIMP_ICON_ZOOM_FIT_BEST,
     NC_("view-action", "Shrink _Wrap"), "<primary>J",
     NC_("view-action", "Reduce the image window to the size of the image display"),
     G_CALLBACK (view_shrink_wrap_cmd_callback),
@@ -301,7 +301,7 @@ static const GimpToggleActionEntry view_toggle_actions[] =
     TRUE,
     GIMP_HELP_VIEW_SHOW_STATUSBAR },
 
-  { "view-fullscreen", "view-fullscreen",
+  { "view-fullscreen", GIMP_ICON_VIEW_FULLSCREEN,
     NC_("view-action", "Fullscr_een"), "F11",
     NC_("view-action", "Toggle fullscreen view"),
     G_CALLBACK (view_fullscreen_cmd_callback),
@@ -316,46 +316,46 @@ static const GimpEnumActionEntry view_zoom_actions[] =
     GIMP_ACTION_SELECT_SET, TRUE,
     NULL },
 
-  { "view-zoom-minimum", "zoom-out",
+  { "view-zoom-minimum", GIMP_ICON_ZOOM_OUT,
     "Zoom out as far as possible", NULL, NULL,
     GIMP_ACTION_SELECT_FIRST, FALSE,
     GIMP_HELP_VIEW_ZOOM_OUT },
 
-  { "view-zoom-maximum", "zoom-in",
+  { "view-zoom-maximum", GIMP_ICON_ZOOM_IN,
     "Zoom in as far as possible", NULL, NULL,
     GIMP_ACTION_SELECT_LAST, FALSE,
     GIMP_HELP_VIEW_ZOOM_IN },
 
-  { "view-zoom-out", "zoom-out",
+  { "view-zoom-out", GIMP_ICON_ZOOM_OUT,
     NC_("view-zoom-action", "Zoom _Out"), "minus",
     NC_("view-zoom-action", "Zoom out"),
     GIMP_ACTION_SELECT_PREVIOUS, FALSE,
     GIMP_HELP_VIEW_ZOOM_OUT },
 
-  { "view-zoom-in", "zoom-in",
+  { "view-zoom-in", GIMP_ICON_ZOOM_IN,
     NC_("view-zoom-action", "Zoom _In"), "plus",
     NC_("view-zoom-action", "Zoom in"),
     GIMP_ACTION_SELECT_NEXT, FALSE,
     GIMP_HELP_VIEW_ZOOM_IN },
 
-  { "view-zoom-out-accel", GIMP_STOCK_CHAR_PICKER,
+  { "view-zoom-out-accel", GIMP_ICON_CHAR_PICKER,
     NC_("view-zoom-action", "Zoom Out"), "KP_Subtract",
     NC_("view-zoom-action", "Zoom out"),
     GIMP_ACTION_SELECT_PREVIOUS, FALSE,
     GIMP_HELP_VIEW_ZOOM_OUT },
 
-  { "view-zoom-in-accel", GIMP_STOCK_CHAR_PICKER,
+  { "view-zoom-in-accel", GIMP_ICON_CHAR_PICKER,
     NC_("view-zoom-action", "Zoom In"), "KP_Add",
     NC_("view-zoom-action", "Zoom in"),
     GIMP_ACTION_SELECT_NEXT, FALSE,
     GIMP_HELP_VIEW_ZOOM_IN },
 
-  { "view-zoom-out-skip", "zoom-out",
+  { "view-zoom-out-skip", GIMP_ICON_ZOOM_OUT,
     "Zoom out a lot", NULL, NULL,
     GIMP_ACTION_SELECT_SKIP_PREVIOUS, FALSE,
     GIMP_HELP_VIEW_ZOOM_OUT },
 
-  { "view-zoom-in-skip", "zoom-in",
+  { "view-zoom-in-skip", GIMP_ICON_ZOOM_IN,
     "Zoom in a lot", NULL, NULL,
     GIMP_ACTION_SELECT_SKIP_NEXT, FALSE,
     GIMP_HELP_VIEW_ZOOM_IN }
@@ -411,13 +411,13 @@ static const GimpRadioActionEntry view_zoom_explicit_actions[] =
     20000,
     GIMP_HELP_VIEW_ZOOM_IN },
 
-  { "view-zoom-1-1", "zoom-original",
+  { "view-zoom-1-1", GIMP_ICON_ZOOM_ORIGINAL,
     NC_("view-zoom-action", "_1:1  (100%)"), "1",
     NC_("view-zoom-action", "Zoom 1:1"),
     10000,
     GIMP_HELP_VIEW_ZOOM_100 },
 
-  { "view-zoom-1-1-accel", "zoom-original",
+  { "view-zoom-1-1-accel", GIMP_ICON_ZOOM_ORIGINAL,
     NC_("view-zoom-action", "_1:1  (100%)"), "KP_1",
     NC_("view-zoom-action", "Zoom 1:1"),
     10000,
@@ -456,13 +456,13 @@ static const GimpRadioActionEntry view_zoom_explicit_actions[] =
 
 static const GimpToggleActionEntry view_flip_actions[] =
 {
-  { "view-flip-horizontally", GIMP_STOCK_FLIP_HORIZONTAL,
+  { "view-flip-horizontally", GIMP_ICON_OBJECT_FLIP_HORIZONTAL,
     NC_("view-action", "Flip Horizontally"), NULL, NULL,
     G_CALLBACK (view_flip_horizontally_cmd_callback),
     FALSE,
     GIMP_HELP_VIEW_FLIP },
 
-  { "view-flip-vertically", GIMP_STOCK_FLIP_VERTICAL,
+  { "view-flip-vertically", GIMP_ICON_OBJECT_FLIP_VERTICAL,
     NC_("view-action", "Flip Vertically"), NULL, NULL,
     G_CALLBACK (view_flip_vertically_cmd_callback),
     FALSE,
@@ -476,7 +476,7 @@ static const GimpEnumActionEntry view_rotate_absolute_actions[] =
     GIMP_ACTION_SELECT_SET, TRUE,
     NULL },
 
-  { "view-rotate-reset", GIMP_STOCK_RESET,
+  { "view-rotate-reset", GIMP_ICON_RESET,
     NC_("view-action", "_Reset Flip & Rotate"), "exclam",
     NC_("view-action",
         "Reset flipping to unflipped and the angle of rotation to 0°"),
@@ -486,31 +486,31 @@ static const GimpEnumActionEntry view_rotate_absolute_actions[] =
 
 static const GimpEnumActionEntry view_rotate_relative_actions[] =
 {
-  { "view-rotate-15", GIMP_STOCK_ROTATE_90,
+  { "view-rotate-15", GIMP_ICON_OBJECT_ROTATE_90,
     NC_("view-action", "Rotate 15° _clockwise"), NULL,
     NC_("view-action", "Rotate 15 degrees to the right"),
     GIMP_ACTION_SELECT_NEXT, FALSE,
     GIMP_HELP_VIEW_ROTATE_15 },
 
-  { "view-rotate-90", GIMP_STOCK_ROTATE_90,
+  { "view-rotate-90", GIMP_ICON_OBJECT_ROTATE_90,
     NC_("view-action", "Rotate 90° _clockwise"), NULL,
     NC_("view-action", "Rotate 90 degrees to the right"),
     GIMP_ACTION_SELECT_SKIP_NEXT, FALSE,
     GIMP_HELP_VIEW_ROTATE_90 },
 
-  { "view-rotate-180", GIMP_STOCK_ROTATE_180,
+  { "view-rotate-180", GIMP_ICON_OBJECT_ROTATE_180,
     NC_("view-action", "Rotate _180°"), NULL,
     NC_("view-action", "Turn upside-down"),
     GIMP_ACTION_SELECT_LAST, FALSE,
     GIMP_HELP_VIEW_ROTATE_180 },
 
-  { "view-rotate-270", GIMP_STOCK_ROTATE_270,
+  { "view-rotate-270", GIMP_ICON_OBJECT_ROTATE_270,
     NC_("view-action", "Rotate 90° counter-clock_wise"), NULL,
     NC_("view-action", "Rotate 90 degrees to the left"),
     GIMP_ACTION_SELECT_SKIP_PREVIOUS, FALSE,
     GIMP_HELP_VIEW_ROTATE_270 },
 
-  { "view-rotate-345", GIMP_STOCK_ROTATE_270,
+  { "view-rotate-345", GIMP_ICON_OBJECT_ROTATE_270,
     NC_("view-action", "Rotate 15° counter-clock_wise"), NULL,
     NC_("view-action", "Rotate 15 degrees to the left"),
     GIMP_ACTION_SELECT_PREVIOUS, FALSE,
@@ -591,13 +591,13 @@ static const GimpEnumActionEntry view_padding_color_actions[] =
     GIMP_CANVAS_PADDING_MODE_DARK_CHECK, FALSE,
     GIMP_HELP_VIEW_PADDING_COLOR },
 
-  { "view-padding-color-custom", "gtk-select-color",
+  { "view-padding-color-custom", GIMP_ICON_PALETTE,
     NC_("view-padding-color", "_Custom Color..."), NULL,
     NC_("view-padding-color", "Use an arbitrary color"),
     GIMP_CANVAS_PADDING_MODE_CUSTOM, FALSE,
     GIMP_HELP_VIEW_PADDING_COLOR },
 
-  { "view-padding-color-prefs", GIMP_STOCK_RESET,
+  { "view-padding-color-prefs", GIMP_ICON_RESET,
     NC_("view-padding-color", "As in _Preferences"), NULL,
     NC_("view-padding-color",
         "Reset padding color to what's configured in preferences"),
diff --git a/app/actions/view-commands.c b/app/actions/view-commands.c
index 8ee7a98..a567741 100644
--- a/app/actions/view-commands.c
+++ b/app/actions/view-commands.c
@@ -1003,7 +1003,7 @@ view_padding_color_cmd_callback (GtkAction *action,
               gimp_color_dialog_new (GIMP_VIEWABLE (image),
                                      action_data_get_context (data),
                                      _("Set Canvas Padding Color"),
-                                     "gtk-select-color",
+                                     GIMP_ICON_FONT,
                                      _("Set Custom Canvas Padding Color"),
                                      GTK_WIDGET (shell),
                                      NULL, NULL,
diff --git a/app/actions/window-actions.c b/app/actions/window-actions.c
index ed656ea..c1aaa42 100644
--- a/app/actions/window-actions.c
+++ b/app/actions/window-actions.c
@@ -166,7 +166,7 @@ window_actions_display_opened (GdkDisplayManager *manager,
 
       entries[i].name        = g_strdup_printf ("%s-move-to-screen-%s",
                                                 group_name, screen_name);
-      entries[i].icon_name   = GIMP_STOCK_MOVE_TO_SCREEN;
+      entries[i].icon_name   = GIMP_ICON_WINDOW_MOVE_TO_SCREEN;
       entries[i].label       = g_strdup_printf (_("Screen %s"), screen_name);
       entries[i].accelerator = NULL;
       entries[i].tooltip     = g_strdup_printf (_("Move this window to "
diff --git a/app/actions/window-commands.c b/app/actions/window-commands.c
index b81b470..c0338eb 100644
--- a/app/actions/window-commands.c
+++ b/app/actions/window-commands.c
@@ -68,7 +68,7 @@ window_open_display_cmd_callback (GtkAction *action,
   GtkWidget *entry;
   return_if_no_widget (widget, data);
 
-  dialog = gimp_message_dialog_new ("Open Display", GIMP_STOCK_WILBER_EEK,
+  dialog = gimp_message_dialog_new ("Open Display", GIMP_ICON_WILBER_EEK,
                                     widget, GTK_DIALOG_MODAL,
                                     NULL, NULL,
 
diff --git a/app/actions/windows-actions.c b/app/actions/windows-actions.c
index a92292c..80b52c6 100644
--- a/app/actions/windows-actions.c
+++ b/app/actions/windows-actions.c
@@ -136,22 +136,22 @@ static const GimpToggleActionEntry windows_toggle_actions[] =
 
 static const GimpRadioActionEntry windows_tabs_position_actions[] =
 {
-  { "windows-tabs-position-top", "to-top",
+  { "windows-tabs-position-top", GIMP_ICON_GO_TOP,
     NC_("windows-tabs-position-action", "_Top"), NULL,
     NC_("windows-tabs-position-action", "Position the tabs on the top"),
     GIMP_POSITION_TOP, GIMP_HELP_WINDOWS_TABS_POSITION },
 
-  { "windows-tabs-position-bottom", "go-bottom",
+  { "windows-tabs-position-bottom", GIMP_ICON_GO_BOTTOM,
     NC_("windows-tabs-position-action", "_Bottom"), NULL,
     NC_("windows-tabs-position-action", "Position the tabs on the bottom"),
     GIMP_POSITION_BOTTOM, GIMP_HELP_WINDOWS_TABS_POSITION },
 
-  { "windows-tabs-position-left", "go-first",
+  { "windows-tabs-position-left", GIMP_ICON_GO_FIRST,
     NC_("windows-tabs-position-action", "_Left"), NULL,
     NC_("windows-tabs-position-action", "Position the tabs on the left"),
     GIMP_POSITION_LEFT, GIMP_HELP_WINDOWS_TABS_POSITION },
 
-  { "windows-tabs-position-right", "go-last",
+  { "windows-tabs-position-right", GIMP_ICON_GO_LAST,
     NC_("windows-tabs-position-action", "_Right"), NULL,
     NC_("windows-tabs-position-action", "Position the tabs on the right"),
     GIMP_POSITION_RIGHT, GIMP_HELP_WINDOWS_TABS_POSITION },
@@ -345,7 +345,7 @@ windows_actions_image_notify (GimpDisplay      *display,
           GimpActionEntry entry;
 
           entry.name        = action_name;
-          entry.icon_name   = GIMP_STOCK_IMAGE;
+          entry.icon_name   = GIMP_ICON_IMAGE;
           entry.label       = "";
           entry.accelerator = NULL;
           entry.tooltip     = NULL;
diff --git a/app/dialogs/channel-options-dialog.c b/app/dialogs/channel-options-dialog.c
index cf8d740..eda81b6 100644
--- a/app/dialogs/channel-options-dialog.c
+++ b/app/dialogs/channel-options-dialog.c
@@ -124,7 +124,7 @@ channel_options_dialog_new (GimpImage                  *image,
                                     parent, title, role,
                                     icon_name, desc, help_id,
                                     channel_name ? _("Channel _name:") : NULL,
-                                    GIMP_STOCK_TOOL_PAINTBRUSH,
+                                    GIMP_ICON_TOOL_PAINTBRUSH,
                                     _("Lock _pixels"),
                                     _("Lock position and _size"),
                                     channel_name,
diff --git a/app/dialogs/color-profile-dialog.c b/app/dialogs/color-profile-dialog.c
index 9ed3a7b..cf816d8 100644
--- a/app/dialogs/color-profile-dialog.c
+++ b/app/dialogs/color-profile-dialog.c
@@ -163,7 +163,7 @@ color_profile_dialog_new (ColorProfileDialogType    dialog_type,
         gimp_viewable_dialog_new (GIMP_VIEWABLE (image), context,
                                   _("RGB Conversion"),
                                   "gimp-image-convert-rgb",
-                                  GIMP_STOCK_CONVERT_RGB,
+                                  GIMP_ICON_CONVERT_RGB,
                                   _("Convert Image to RGB"),
                                   parent,
                                   gimp_standard_help_func,
@@ -181,7 +181,7 @@ color_profile_dialog_new (ColorProfileDialogType    dialog_type,
         gimp_viewable_dialog_new (GIMP_VIEWABLE (image), context,
                                   _("Grayscale Conversion"),
                                   "gimp-image-convert-gray",
-                                  GIMP_STOCK_CONVERT_GRAYSCALE,
+                                  GIMP_ICON_CONVERT_GRAYSCALE,
                                   _("Convert Image to Grayscale"),
                                   parent,
                                   gimp_standard_help_func,
@@ -199,7 +199,7 @@ color_profile_dialog_new (ColorProfileDialogType    dialog_type,
         gimp_viewable_dialog_new (GIMP_VIEWABLE (image), context,
                                   _("Soft-Proof Profile"),
                                   "gimp-select-softproof-profile",
-                                  GTK_STOCK_PRINT,
+                                  GIMP_ICON_DOCUMENT_PRINT,
                                   _("Select Soft-Proof Profile"),
                                   parent,
                                   gimp_standard_help_func,
diff --git a/app/dialogs/convert-indexed-dialog.c b/app/dialogs/convert-indexed-dialog.c
index c479645..be389d7 100644
--- a/app/dialogs/convert-indexed-dialog.c
+++ b/app/dialogs/convert-indexed-dialog.c
@@ -129,7 +129,7 @@ convert_indexed_dialog_new (GimpImage                  *image,
     gimp_viewable_dialog_new (GIMP_VIEWABLE (image), context,
                               _("Indexed Color Conversion"),
                               "gimp-image-convert-indexed",
-                              GIMP_STOCK_CONVERT_INDEXED,
+                              GIMP_ICON_CONVERT_INDEXED,
                               _("Convert Image to Indexed Colors"),
                               parent,
                               gimp_standard_help_func,
diff --git a/app/dialogs/dialogs.c b/app/dialogs/dialogs.c
index 2cb9f40..6112808 100644
--- a/app/dialogs/dialogs.c
+++ b/app/dialogs/dialogs.c
@@ -304,83 +304,83 @@ static const GimpDialogFactoryEntry entries[] =
 
   /*  singleton dockables  */
   DOCKABLE ("gimp-tool-options",
-            N_("Tool Options"), NULL, GIMP_STOCK_TOOL_OPTIONS,
+            N_("Tool Options"), NULL, GIMP_ICON_DIALOG_TOOL_OPTIONS,
             GIMP_HELP_TOOL_OPTIONS_DIALOG,
             dialogs_tool_options_new, 0, TRUE),
   DOCKABLE ("gimp-device-status",
-            N_("Devices"), N_("Device Status"), GIMP_STOCK_DEVICE_STATUS,
+            N_("Devices"), N_("Device Status"), GIMP_ICON_DIALOG_DEVICE_STATUS,
             GIMP_HELP_DEVICE_STATUS_DIALOG,
             dialogs_device_status_new, 0, TRUE),
   DOCKABLE ("gimp-error-console",
-            N_("Errors"), N_("Error Console"), GIMP_STOCK_WARNING,
+            N_("Errors"), N_("Error Console"), GIMP_ICON_DIALOG_WARNING,
             GIMP_HELP_ERRORS_DIALOG,
             dialogs_error_console_new, 0, TRUE),
   DOCKABLE ("gimp-cursor-view",
-            N_("Pointer"), N_("Pointer Information"), GIMP_STOCK_CURSOR,
+            N_("Pointer"), N_("Pointer Information"), GIMP_ICON_CURSOR,
             GIMP_HELP_POINTER_INFO_DIALOG,
             dialogs_cursor_view_new, 0, TRUE),
 
   /*  list & grid views  */
   LISTGRID (image, image,
-            N_("Images"), NULL, GIMP_STOCK_IMAGES,
+            N_("Images"), NULL, GIMP_ICON_DIALOG_IMAGES,
             GIMP_HELP_IMAGE_DIALOG, GIMP_VIEW_SIZE_MEDIUM),
   LISTGRID (brush, brush,
-            N_("Brushes"), NULL, GIMP_STOCK_BRUSH,
+            N_("Brushes"), NULL, GIMP_ICON_BRUSH,
             GIMP_HELP_BRUSH_DIALOG, GIMP_VIEW_SIZE_MEDIUM),
   LISTGRID (dynamics, dynamics,
-            N_("Paint Dynamics"), NULL, GIMP_STOCK_DYNAMICS,
+            N_("Paint Dynamics"), NULL, GIMP_ICON_DYNAMICS,
             GIMP_HELP_DYNAMICS_DIALOG, GIMP_VIEW_SIZE_MEDIUM),
   LISTGRID (mypaint-brush, mypaint_brush,
             N_("MyPaint Brushes"), NULL, GIMP_ICON_MYPAINT_BRUSH,
             GIMP_HELP_MYPAINT_BRUSH_DIALOG, GIMP_VIEW_SIZE_LARGE),
   LISTGRID (pattern, pattern,
-            N_("Patterns"), NULL, GIMP_STOCK_PATTERN,
+            N_("Patterns"), NULL, GIMP_ICON_PATTERN,
             GIMP_HELP_PATTERN_DIALOG, GIMP_VIEW_SIZE_MEDIUM),
   LISTGRID (gradient, gradient,
-            N_("Gradients"), NULL, GIMP_STOCK_GRADIENT,
+            N_("Gradients"), NULL, GIMP_ICON_GRADIENT,
             GIMP_HELP_GRADIENT_DIALOG, GIMP_VIEW_SIZE_MEDIUM),
   LISTGRID (palette, palette,
-            N_("Palettes"), NULL, GIMP_STOCK_PALETTE,
+            N_("Palettes"), NULL, GIMP_ICON_PALETTE,
             GIMP_HELP_PALETTE_DIALOG, GIMP_VIEW_SIZE_MEDIUM),
   LISTGRID (font, font,
-            N_("Fonts"), NULL, "gtk-select-font",
+            N_("Fonts"), NULL, GIMP_ICON_FONT,
             GIMP_HELP_FONT_DIALOG, GIMP_VIEW_SIZE_MEDIUM),
   LISTGRID (buffer, buffer,
-            N_("Buffers"), NULL, GIMP_STOCK_BUFFER,
+            N_("Buffers"), NULL, GIMP_ICON_BUFFER,
             GIMP_HELP_BUFFER_DIALOG, GIMP_VIEW_SIZE_MEDIUM),
   LISTGRID (tool-preset, tool_preset,
-            N_("Tool Presets"), NULL, GIMP_STOCK_TOOL_PRESET,
+            N_("Tool Presets"), NULL, GIMP_ICON_TOOL_PRESET,
             GIMP_HELP_TOOL_PRESET_DIALOG, GIMP_VIEW_SIZE_MEDIUM),
   LISTGRID (document, document,
-            N_("History"), N_("Document History"), "document-open-recent",
+            N_("History"), N_("Document History"), GIMP_ICON_DOCUMENT_OPEN_RECENT,
             GIMP_HELP_DOCUMENT_DIALOG, GIMP_VIEW_SIZE_LARGE),
   LISTGRID (template, template,
-            N_("Templates"), N_("Image Templates"), GIMP_STOCK_TEMPLATE,
+            N_("Templates"), N_("Image Templates"), GIMP_ICON_TEMPLATE,
             GIMP_HELP_TEMPLATE_DIALOG, GIMP_VIEW_SIZE_SMALL),
 
   /*  image related  */
   DOCKABLE ("gimp-layer-list",
-            N_("Layers"), NULL, GIMP_STOCK_LAYERS,
+            N_("Layers"), NULL, GIMP_ICON_DIALOG_LAYERS,
             GIMP_HELP_LAYER_DIALOG,
             dialogs_layer_list_view_new, 0, FALSE),
   DOCKABLE ("gimp-channel-list",
-            N_("Channels"), NULL, GIMP_STOCK_CHANNELS,
+            N_("Channels"), NULL, GIMP_ICON_DIALOG_CHANNELS,
             GIMP_HELP_CHANNEL_DIALOG,
             dialogs_channel_list_view_new, 0, FALSE),
   DOCKABLE ("gimp-vectors-list",
-            N_("Paths"), NULL, GIMP_STOCK_PATHS,
+            N_("Paths"), NULL, GIMP_ICON_DIALOG_PATHS,
             GIMP_HELP_PATH_DIALOG,
             dialogs_vectors_list_view_new, 0, FALSE),
   DOCKABLE ("gimp-indexed-palette",
-            N_("Colormap"), NULL, GIMP_STOCK_COLORMAP,
+            N_("Colormap"), NULL, GIMP_ICON_COLORMAP,
             GIMP_HELP_INDEXED_PALETTE_DIALOG,
             dialogs_colormap_editor_new, 0, FALSE),
   DOCKABLE ("gimp-histogram-editor",
-            N_("Histogram"), NULL, GIMP_STOCK_HISTOGRAM,
+            N_("Histogram"), NULL, GIMP_ICON_HISTOGRAM,
             GIMP_HELP_HISTOGRAM_DIALOG,
             dialogs_histogram_editor_new, 0, FALSE),
   DOCKABLE ("gimp-selection-editor",
-            N_("Selection"), N_("Selection Editor"), GIMP_STOCK_SELECTION,
+            N_("Selection"), N_("Selection Editor"), GIMP_ICON_SELECTION,
             GIMP_HELP_SELECTION_DIALOG,
             dialogs_selection_editor_new, 0, FALSE),
   DOCKABLE ("gimp-symmetry-editor",
@@ -388,45 +388,45 @@ static const GimpDialogFactoryEntry entries[] =
             GIMP_HELP_SYMMETRY_DIALOG,
             dialogs_symmetry_editor_new, 0, FALSE),
   DOCKABLE ("gimp-undo-history",
-            N_("Undo"), N_("Undo History"), GIMP_STOCK_UNDO_HISTORY,
+            N_("Undo"), N_("Undo History"), GIMP_ICON_DIALOG_UNDO_HISTORY,
             GIMP_HELP_UNDO_DIALOG,
             dialogs_undo_editor_new, 0, FALSE),
   DOCKABLE ("gimp-sample-point-editor",
-            N_("Sample Points"), N_("Sample Points"), GIMP_STOCK_SAMPLE_POINT,
+            N_("Sample Points"), N_("Sample Points"), GIMP_ICON_SAMPLE_POINT,
             GIMP_HELP_SAMPLE_POINT_DIALOG,
             dialogs_sample_point_editor_new, 0, FALSE),
 
   /*  display related  */
   DOCKABLE ("gimp-navigation-view",
-            N_("Navigation"), N_("Display Navigation"), GIMP_STOCK_NAVIGATION,
+            N_("Navigation"), N_("Display Navigation"), GIMP_ICON_DIALOG_NAVIGATION,
             GIMP_HELP_NAVIGATION_DIALOG,
             dialogs_navigation_editor_new, 0, FALSE),
 
   /*  editors  */
   DOCKABLE ("gimp-color-editor",
-            N_("FG/BG"), N_("FG/BG Color"), GIMP_STOCK_DEFAULT_COLORS,
+            N_("FG/BG"), N_("FG/BG Color"), GIMP_ICON_COLORS_DEFAULT,
             GIMP_HELP_COLOR_DIALOG,
             dialogs_color_editor_new, 0, FALSE),
 
   /*  singleton editors  */
   DOCKABLE ("gimp-brush-editor",
-            N_("Brush Editor"), NULL, GIMP_STOCK_BRUSH,
+            N_("Brush Editor"), NULL, GIMP_ICON_BRUSH,
             GIMP_HELP_BRUSH_EDITOR_DIALOG,
             dialogs_brush_editor_get, 0, TRUE),
   DOCKABLE ("gimp-dynamics-editor",
-            N_("Paint Dynamics Editor"), NULL, GIMP_STOCK_DYNAMICS,
+            N_("Paint Dynamics Editor"), NULL, GIMP_ICON_DYNAMICS,
             GIMP_HELP_DYNAMICS_EDITOR_DIALOG,
             dialogs_dynamics_editor_get, 0, TRUE),
   DOCKABLE ("gimp-gradient-editor",
-            N_("Gradient Editor"), NULL, GIMP_STOCK_GRADIENT,
+            N_("Gradient Editor"), NULL, GIMP_ICON_GRADIENT,
             GIMP_HELP_GRADIENT_EDITOR_DIALOG,
             dialogs_gradient_editor_get, 0, TRUE),
   DOCKABLE ("gimp-palette-editor",
-            N_("Palette Editor"), NULL, GIMP_STOCK_PALETTE,
+            N_("Palette Editor"), NULL, GIMP_ICON_PALETTE,
             GIMP_HELP_PALETTE_EDITOR_DIALOG,
             dialogs_palette_editor_get, 0, TRUE),
   DOCKABLE ("gimp-tool-preset-editor",
-            N_("Tool Preset Editor"), NULL, GIMP_STOCK_TOOL_PRESET,
+            N_("Tool Preset Editor"), NULL, GIMP_ICON_TOOL_PRESET,
             GIMP_HELP_TOOL_PRESET_EDITOR_DIALOG,
             dialogs_tool_preset_editor_get, 0, TRUE),
 
diff --git a/app/dialogs/file-open-location-dialog.c b/app/dialogs/file-open-location-dialog.c
index 22abf52..a7b00b2 100644
--- a/app/dialogs/file-open-location-dialog.c
+++ b/app/dialogs/file-open-location-dialog.c
@@ -101,7 +101,7 @@ file_open_location_dialog_new (Gimp *gimp)
   gtk_box_pack_start (GTK_BOX (hbox), vbox, FALSE, FALSE, 0);
   gtk_widget_show (vbox);
 
-  image = gtk_image_new_from_icon_name (GIMP_STOCK_WEB, GTK_ICON_SIZE_BUTTON);
+  image = gtk_image_new_from_icon_name (GIMP_ICON_WEB, GTK_ICON_SIZE_BUTTON);
   gtk_box_pack_start (GTK_BOX (vbox), image, FALSE, FALSE, 0);
   gtk_widget_show (image);
 
diff --git a/app/dialogs/file-save-dialog.c b/app/dialogs/file-save-dialog.c
index 9d0561d..d3e0a60 100644
--- a/app/dialogs/file-save-dialog.c
+++ b/app/dialogs/file-save-dialog.c
@@ -624,7 +624,7 @@ file_save_dialog_switch_dialogs (GimpFileDialog *file_dialog,
         }
 
       dialog = gimp_message_dialog_new (_("Extension Mismatch"),
-                                        GIMP_STOCK_WARNING,
+                                        GIMP_ICON_DIALOG_WARNING,
                                         GTK_WIDGET (file_dialog),
                                         GTK_DIALOG_DESTROY_WITH_PARENT,
                                         gimp_standard_help_func, NULL,
@@ -701,7 +701,7 @@ file_save_dialog_use_extension (GtkWidget *save_dialog,
   gboolean   use_name = FALSE;
 
   dialog = gimp_message_dialog_new (_("Extension Mismatch"),
-                                    GIMP_STOCK_QUESTION,
+                                    GIMP_ICON_DIALOG_QUESTION,
                                     save_dialog, GTK_DIALOG_DESTROY_WITH_PARENT,
                                     gimp_standard_help_func, NULL,
 
diff --git a/app/dialogs/grid-dialog.c b/app/dialogs/grid-dialog.c
index 3c74297..1b50176 100644
--- a/app/dialogs/grid-dialog.c
+++ b/app/dialogs/grid-dialog.c
@@ -93,7 +93,7 @@ grid_dialog_new (GimpImage   *image,
 
   dialog = gimp_viewable_dialog_new (GIMP_VIEWABLE (image), context,
                                      _("Configure Grid"), "gimp-grid-configure",
-                                     GIMP_STOCK_GRID, _("Configure Image Grid"),
+                                     GIMP_ICON_GRID, _("Configure Image Grid"),
                                      parent,
                                      gimp_standard_help_func,
                                      GIMP_HELP_IMAGE_GRID,
diff --git a/app/dialogs/image-merge-layers-dialog.c b/app/dialogs/image-merge-layers-dialog.c
index 2903477..0d26906 100644
--- a/app/dialogs/image-merge-layers-dialog.c
+++ b/app/dialogs/image-merge-layers-dialog.c
@@ -91,7 +91,7 @@ image_merge_layers_dialog_new (GimpImage               *image,
 
   dialog = gimp_viewable_dialog_new (GIMP_VIEWABLE (image), context,
                                      _("Merge Layers"), "gimp-image-merge-layers",
-                                     GIMP_STOCK_MERGE_DOWN,
+                                     GIMP_ICON_LAYER_MERGE_DOWN,
                                      _("Layers Merge Options"),
                                      parent,
                                      gimp_standard_help_func,
diff --git a/app/dialogs/image-new-dialog.c b/app/dialogs/image-new-dialog.c
index 9400d4e..c8784ff 100644
--- a/app/dialogs/image-new-dialog.c
+++ b/app/dialogs/image-new-dialog.c
@@ -317,7 +317,7 @@ image_new_confirm_dialog (ImageNewDialog *private)
 
   private->confirm_dialog =
     dialog = gimp_message_dialog_new (_("Confirm Image Size"),
-                                      GIMP_STOCK_WARNING,
+                                      GIMP_ICON_DIALOG_WARNING,
                                       private->dialog,
                                       GTK_DIALOG_DESTROY_WITH_PARENT,
                                       gimp_standard_help_func, NULL,
diff --git a/app/dialogs/image-scale-dialog.c b/app/dialogs/image-scale-dialog.c
index 1de1034..a606e00 100644
--- a/app/dialogs/image-scale-dialog.c
+++ b/app/dialogs/image-scale-dialog.c
@@ -201,7 +201,7 @@ image_scale_confirm_dialog (ImageScaleDialog *private)
   GtkWidget *widget;
 
   widget = gimp_message_dialog_new (_("Confirm Scaling"),
-                                    GIMP_STOCK_WARNING,
+                                    GIMP_ICON_DIALOG_WARNING,
                                     private->dialog,
                                     GTK_DIALOG_DESTROY_WITH_PARENT,
                                     gimp_standard_help_func,
diff --git a/app/dialogs/item-options-dialog.c b/app/dialogs/item-options-dialog.c
index a1e05cb..37ae93f 100644
--- a/app/dialogs/item-options-dialog.c
+++ b/app/dialogs/item-options-dialog.c
@@ -242,7 +242,7 @@ item_options_dialog_new (GimpImage               *image,
             }
           else
             {
-              image = gtk_image_new_from_icon_name (GIMP_STOCK_CLOSE,
+              image = gtk_image_new_from_icon_name (GIMP_ICON_CLOSE,
                                                     GTK_ICON_SIZE_MENU);
             }
 
@@ -266,7 +266,7 @@ item_options_dialog_new (GimpImage               *image,
   gtk_widget_show (private->right_vbox);
 
   button = check_button_with_icon_new (_("_Visible"),
-                                       GIMP_STOCK_VISIBLE,
+                                       GIMP_ICON_VISIBLE,
                                        GTK_BOX (private->right_vbox));
   gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button),
                                 private->visible);
@@ -275,7 +275,7 @@ item_options_dialog_new (GimpImage               *image,
                     &private->visible);
 
   button = check_button_with_icon_new (_("_Linked"),
-                                       GIMP_STOCK_LINKED,
+                                       GIMP_ICON_LINKED,
                                        GTK_BOX (private->right_vbox));
   gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button),
                                 private->linked);
@@ -293,7 +293,7 @@ item_options_dialog_new (GimpImage               *image,
                     &private->lock_content);
 
   button = check_button_with_icon_new (lock_position_label,
-                                       GIMP_STOCK_TOOL_MOVE,
+                                       GIMP_ICON_TOOL_MOVE,
                                        GTK_BOX (private->right_vbox));
   gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button),
                                 private->lock_position);
diff --git a/app/dialogs/layer-add-mask-dialog.c b/app/dialogs/layer-add-mask-dialog.c
index 380ade9..28cc3be 100644
--- a/app/dialogs/layer-add-mask-dialog.c
+++ b/app/dialogs/layer-add-mask-dialog.c
@@ -101,7 +101,7 @@ layer_add_mask_dialog_new (GimpLayer           *layer,
 
   dialog = gimp_viewable_dialog_new (GIMP_VIEWABLE (layer), context,
                                      _("Add Layer Mask"), "gimp-layer-add-mask",
-                                     GIMP_STOCK_LAYER_MASK,
+                                     GIMP_ICON_LAYER_MASK,
                                      _("Add a Mask to the Layer"),
                                      parent,
                                      gimp_standard_help_func,
diff --git a/app/dialogs/layer-options-dialog.c b/app/dialogs/layer-options-dialog.c
index c887e90..53ddac9 100644
--- a/app/dialogs/layer-options-dialog.c
+++ b/app/dialogs/layer-options-dialog.c
@@ -164,7 +164,7 @@ layer_options_dialog_new (GimpImage                *image,
                                     parent, title, role,
                                     icon_name, desc, help_id,
                                     _("Layer _name:"),
-                                    GIMP_STOCK_TOOL_PAINTBRUSH,
+                                    GIMP_ICON_TOOL_PAINTBRUSH,
                                     _("Lock _pixels"),
                                     _("Lock position and _size"),
                                     layer_name,
@@ -434,7 +434,7 @@ layer_options_dialog_new (GimpImage                *image,
                           G_BINDING_INVERT_BOOLEAN);
 
   button = item_options_dialog_add_switch (dialog,
-                                           GIMP_STOCK_TRANSPARENCY,
+                                           GIMP_ICON_TRANSPARENCY,
                                            _("Lock _alpha"));
   gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button),
                                 private->lock_alpha);
@@ -446,7 +446,7 @@ layer_options_dialog_new (GimpImage                *image,
   if (layer && gimp_item_is_text_layer (GIMP_ITEM (layer)))
     {
       button = item_options_dialog_add_switch (dialog,
-                                               GIMP_STOCK_TOOL_TEXT,
+                                               GIMP_ICON_TOOL_TEXT,
                                                _("Set name from _text"));
       gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button),
                                     private->rename_text_layers);
diff --git a/app/dialogs/module-dialog.c b/app/dialogs/module-dialog.c
index 9705e4a..e18ea55 100644
--- a/app/dialogs/module-dialog.c
+++ b/app/dialogs/module-dialog.c
@@ -207,7 +207,8 @@ module_dialog_new (Gimp *gimp)
   private->error_box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
   gtk_box_pack_start (GTK_BOX (vbox), private->error_box, FALSE, FALSE, 0);
 
-  image = gtk_image_new_from_icon_name (GIMP_STOCK_WARNING, GTK_ICON_SIZE_BUTTON);
+  image = gtk_image_new_from_icon_name (GIMP_ICON_DIALOG_WARNING,
+                                        GTK_ICON_SIZE_BUTTON);
   gtk_box_pack_start (GTK_BOX (private->error_box), image, FALSE, FALSE, 0);
   gtk_widget_show (image);
 
diff --git a/app/dialogs/offset-dialog.c b/app/dialogs/offset-dialog.c
index 32f2760..c446433 100644
--- a/app/dialogs/offset-dialog.c
+++ b/app/dialogs/offset-dialog.c
@@ -127,7 +127,7 @@ offset_dialog_new (GimpDrawable       *drawable,
 
   dialog = gimp_viewable_dialog_new (GIMP_VIEWABLE (drawable), context,
                                      _("Offset"), "gimp-drawable-offset",
-                                     GIMP_STOCK_TOOL_MOVE,
+                                     GIMP_ICON_TOOL_MOVE,
                                      title,
                                      parent,
                                      gimp_standard_help_func,
diff --git a/app/dialogs/preferences-dialog.c b/app/dialogs/preferences-dialog.c
index 989bea4..3fbf0b9 100644
--- a/app/dialogs/preferences-dialog.c
+++ b/app/dialogs/preferences-dialog.c
@@ -267,7 +267,7 @@ prefs_response (GtkWidget *widget,
         GtkWidget *confirm;
 
         confirm = gimp_message_dialog_new (_("Reset All Preferences"),
-                                           GIMP_STOCK_QUESTION,
+                                           GIMP_ICON_DIALOG_QUESTION,
                                            dialog,
                                            GTK_DIALOG_MODAL |
                                            GTK_DIALOG_DESTROY_WITH_PARENT,
@@ -597,7 +597,7 @@ prefs_menus_remove_callback (GtkWidget *widget,
   GtkWidget *dialog;
 
   dialog = gimp_message_dialog_new (_("Remove all Keyboard Shortcuts"),
-                                    GIMP_STOCK_QUESTION,
+                                    GIMP_ICON_DIALOG_QUESTION,
                                     gtk_widget_get_toplevel (widget),
                                     GTK_DIALOG_MODAL |
                                     GTK_DIALOG_DESTROY_WITH_PARENT,
@@ -1361,14 +1361,14 @@ prefs_dialog_new (Gimp       *gimp,
                           _("_Save tool options on exit"),
                           GTK_BOX (vbox2));
 
-  button = prefs_button_add ("document-save",
+  button = prefs_button_add (GIMP_ICON_DOCUMENT_SAVE,
                              _("Save Tool Options _Now"),
                              GTK_BOX (vbox2));
   g_signal_connect (button, "clicked",
                     G_CALLBACK (prefs_tool_options_save_callback),
                     gimp);
 
-  button2 = prefs_button_add (GIMP_STOCK_RESET,
+  button2 = prefs_button_add (GIMP_ICON_RESET,
                               _("_Reset Saved Tool Options to "
                                 "Default Values"),
                               GTK_BOX (vbox2));
@@ -1394,16 +1394,16 @@ prefs_dialog_new (Gimp       *gimp,
                            GTK_CONTAINER (vbox), FALSE);
 
   prefs_check_button_add_with_icon (object, "global-brush",
-                                    _("_Brush"),    GIMP_STOCK_BRUSH,
+                                    _("_Brush"),    GIMP_ICON_BRUSH,
                                     GTK_BOX (vbox2), size_group);
   prefs_check_button_add_with_icon (object, "global-dynamics",
-                                    _("_Dynamics"), GIMP_STOCK_DYNAMICS,
+                                    _("_Dynamics"), GIMP_ICON_DYNAMICS,
                                     GTK_BOX (vbox2), size_group);
   prefs_check_button_add_with_icon (object, "global-pattern",
-                                    _("_Pattern"),  GIMP_STOCK_PATTERN,
+                                    _("_Pattern"),  GIMP_ICON_PATTERN,
                                     GTK_BOX (vbox2), size_group);
   prefs_check_button_add_with_icon (object, "global-gradient",
-                                    _("_Gradient"), GIMP_STOCK_GRADIENT,
+                                    _("_Gradient"), GIMP_ICON_GRADIENT,
                                     GTK_BOX (vbox2), size_group);
 
   /*  Move Tool */
@@ -1412,7 +1412,7 @@ prefs_dialog_new (Gimp       *gimp,
 
   prefs_check_button_add_with_icon (object, "move-tool-changes-active",
                                     _("Set layer or path as active"),
-                                    GIMP_STOCK_TOOL_MOVE,
+                                    GIMP_ICON_TOOL_MOVE,
                                     GTK_BOX (vbox2), size_group);
 
   g_object_unref (size_group);
@@ -1534,7 +1534,7 @@ prefs_dialog_new (Gimp       *gimp,
                           _("_Use dynamic keyboard shortcuts"),
                           GTK_BOX (vbox2));
 
-  button = prefs_button_add ("preferences-system",
+  button = prefs_button_add (GIMP_ICON_PREFERENCES_SYSTEM,
                              _("Configure _Keyboard Shortcuts..."),
                              GTK_BOX (vbox2));
   g_signal_connect (button, "clicked",
@@ -1545,14 +1545,14 @@ prefs_dialog_new (Gimp       *gimp,
                           _("_Save keyboard shortcuts on exit"),
                           GTK_BOX (vbox2));
 
-  button = prefs_button_add ("document-save",
+  button = prefs_button_add (GIMP_ICON_DOCUMENT_SAVE,
                              _("Save Keyboard Shortcuts _Now"),
                              GTK_BOX (vbox2));
   g_signal_connect (button, "clicked",
                     G_CALLBACK (prefs_menus_save_callback),
                     gimp);
 
-  button2 = prefs_button_add (GIMP_STOCK_RESET,
+  button2 = prefs_button_add (GIMP_ICON_RESET,
                               _("_Reset Keyboard Shortcuts to Default Values"),
                               GTK_BOX (vbox2));
   g_signal_connect (button2, "clicked",
@@ -1561,7 +1561,7 @@ prefs_dialog_new (Gimp       *gimp,
 
   g_object_set_data (G_OBJECT (button), "clear-button", button2);
 
-  button = prefs_button_add ("edit-clear",
+  button = prefs_button_add (GIMP_ICON_EDIT_CLEAR,
                              _("Remove _All Keyboard Shortcuts"),
                              GTK_BOX (vbox2));
   g_signal_connect (button, "clicked",
@@ -1661,7 +1661,7 @@ prefs_dialog_new (Gimp       *gimp,
   gtk_box_pack_start (GTK_BOX (vbox2), hbox, FALSE, FALSE, 0);
   gtk_widget_show (hbox);
 
-  button = prefs_button_add ("view-refresh",
+  button = prefs_button_add (GIMP_ICON_VIEW_REFRESH,
                              _("Reload C_urrent Theme"),
                              GTK_BOX (hbox));
   g_signal_connect (button, "clicked",
@@ -1805,15 +1805,15 @@ prefs_dialog_new (Gimp       *gimp,
 
   prefs_check_button_add_with_icon (object, "toolbox-color-area",
                                     _("Show _foreground & background color"),
-                                    GIMP_STOCK_DEFAULT_COLORS,
+                                    GIMP_ICON_COLORS_DEFAULT,
                                     GTK_BOX (vbox2), size_group);
   prefs_check_button_add_with_icon (object, "toolbox-foo-area",
                                     _("Show active _brush, pattern & gradient"),
-                                    GIMP_STOCK_BRUSH,
+                                    GIMP_ICON_BRUSH,
                                     GTK_BOX (vbox2), size_group);
   prefs_check_button_add_with_icon (object, "toolbox-image-area",
                                     _("Show active _image"),
-                                    GIMP_STOCK_IMAGE,
+                                    GIMP_ICON_IMAGE,
                                     GTK_BOX (vbox2), size_group);
 
   g_object_unref (size_group);
@@ -2151,13 +2151,13 @@ prefs_dialog_new (Gimp       *gimp,
 
   if (gimp_help_user_manual_is_installed (gimp))
     {
-      hbox = prefs_hint_box_new (GIMP_STOCK_INFO,
+      hbox = prefs_hint_box_new (GIMP_ICON_DIALOG_INFORMATION,
                                  _("There's a local installation "
                                    "of the user manual."));
     }
   else
     {
-      hbox = prefs_hint_box_new (GIMP_STOCK_WARNING,
+      hbox = prefs_hint_box_new (GIMP_ICON_DIALOG_WARNING,
                                  _("The user manual is not installed "
                                    "locally."));
     }
@@ -2183,7 +2183,7 @@ prefs_dialog_new (Gimp       *gimp,
     }
   else
     {
-      hbox = prefs_hint_box_new (GIMP_STOCK_WARNING,
+      hbox = prefs_hint_box_new (GIMP_ICON_DIALOG_WARNING,
                                  _("The GIMP help browser doesn't seem to "
                                    "be installed. Using the web browser "
                                    "instead."));
@@ -2383,14 +2383,14 @@ prefs_dialog_new (Gimp       *gimp,
                           _("Open windows on the same _monitor they were open before"),
                           GTK_BOX (vbox2));
 
-  button = prefs_button_add ("document-save",
+  button = prefs_button_add (GIMP_ICON_DOCUMENT_SAVE,
                              _("Save Window Positions _Now"),
                              GTK_BOX (vbox2));
   g_signal_connect (button, "clicked",
                     G_CALLBACK (prefs_session_save_callback),
                     gimp);
 
-  button2 = prefs_button_add (GIMP_STOCK_RESET,
+  button2 = prefs_button_add (GIMP_ICON_RESET,
                               _("_Reset Saved Window Positions to "
                                 "Default Values"),
                               GTK_BOX (vbox2));
@@ -2674,7 +2674,7 @@ prefs_dialog_new (Gimp       *gimp,
                           _("S_hare tool and tool options between input devices"),
                           GTK_BOX (vbox2));
 
-  button = prefs_button_add ("preferences-system",
+  button = prefs_button_add (GIMP_ICON_PREFERENCES_SYSTEM,
                              _("Configure E_xtended Input Devices..."),
                              GTK_BOX (vbox2));
   g_signal_connect (button, "clicked",
@@ -2685,14 +2685,14 @@ prefs_dialog_new (Gimp       *gimp,
                           _("_Save input device settings on exit"),
                           GTK_BOX (vbox2));
 
-  button = prefs_button_add ("document-save",
+  button = prefs_button_add (GIMP_ICON_DOCUMENT_SAVE,
                              _("Save Input Device Settings _Now"),
                              GTK_BOX (vbox2));
   g_signal_connect (button, "clicked",
                     G_CALLBACK (prefs_devices_save_callback),
                     gimp);
 
-  button2 = prefs_button_add (GIMP_STOCK_RESET,
+  button2 = prefs_button_add (GIMP_ICON_RESET,
                               _("_Reset Saved Input Device Settings to "
                                 "Default Values"),
                               GTK_BOX (vbox2));
diff --git a/app/dialogs/print-size-dialog.c b/app/dialogs/print-size-dialog.c
index ea4c239..a9fe3b0 100644
--- a/app/dialogs/print-size-dialog.c
+++ b/app/dialogs/print-size-dialog.c
@@ -116,7 +116,7 @@ print_size_dialog_new (GimpImage              *image,
 
   dialog = gimp_viewable_dialog_new (GIMP_VIEWABLE (image), context,
                                      title, role,
-                                     GIMP_STOCK_PRINT_RESOLUTION, title,
+                                     GIMP_ICON_DOCUMENT_PRINT_RESOLUTION, title,
                                      parent,
                                      help_func, help_id,
 
diff --git a/app/dialogs/quit-dialog.c b/app/dialogs/quit-dialog.c
index 252f20a..c297024 100644
--- a/app/dialogs/quit-dialog.c
+++ b/app/dialogs/quit-dialog.c
@@ -161,7 +161,7 @@ quit_close_all_dialog_new (Gimp     *gimp,
 
   private->dialog =
     gimp_message_dialog_new (do_quit ? _("Quit GIMP") : _("Close All Images"),
-                             GIMP_STOCK_WARNING,
+                             GIMP_ICON_DIALOG_WARNING,
                              NULL, 0,
                              gimp_standard_help_func,
                              do_quit ?
diff --git a/app/dialogs/resize-dialog.c b/app/dialogs/resize-dialog.c
index 038f518..9f573c5 100644
--- a/app/dialogs/resize-dialog.c
+++ b/app/dialogs/resize-dialog.c
@@ -178,7 +178,7 @@ resize_dialog_new (GimpViewable       *viewable,
   private->old_resize_text_layers = private->resize_text_layers;
 
   dialog = gimp_viewable_dialog_new (viewable, context,
-                                     title, role, GIMP_STOCK_RESIZE, title,
+                                     title, role, GIMP_ICON_OBJECT_RESIZE, title,
                                      parent,
                                      help_func, help_id,
 
@@ -274,7 +274,7 @@ resize_dialog_new (GimpViewable       *viewable,
                     G_CALLBACK (offset_update),
                     private);
 
-  button = gtk_button_new_from_stock (GIMP_STOCK_CENTER);
+  button = gtk_button_new_from_stock (GIMP_ICON_CENTER);
   gtk_table_attach_defaults (GTK_TABLE (entry), button, 4, 5, 1, 2);
   gtk_widget_show (button);
 
diff --git a/app/dialogs/scale-dialog.c b/app/dialogs/scale-dialog.c
index c11c268..af24d58 100644
--- a/app/dialogs/scale-dialog.c
+++ b/app/dialogs/scale-dialog.c
@@ -129,7 +129,7 @@ scale_dialog_new (GimpViewable          *viewable,
   gimp_image_get_resolution (image, &xres, &yres);
 
   dialog = gimp_viewable_dialog_new (viewable, context,
-                                     title, role, GIMP_STOCK_SCALE, title,
+                                     title, role, GIMP_ICON_OBJECT_SCALE, title,
                                      parent,
                                      help_func, help_id,
 
@@ -206,7 +206,7 @@ scale_dialog_new (GimpViewable          *viewable,
 
   if (gimp_image_get_base_type (image) == GIMP_INDEXED)
     {
-      GtkWidget *box = gimp_message_box_new (GIMP_STOCK_INFO);
+      GtkWidget *box = gimp_message_box_new (GIMP_ICON_DIALOG_INFORMATION);
 
       gimp_message_box_set_text (GIMP_MESSAGE_BOX (box),
                                  _("Indexed color layers are always scaled "
diff --git a/app/dialogs/tips-dialog.c b/app/dialogs/tips-dialog.c
index e72f80d..dcf0bd0 100644
--- a/app/dialogs/tips-dialog.c
+++ b/app/dialogs/tips-dialog.c
@@ -144,13 +144,13 @@ tips_dialog_create (Gimp *gimp)
   button = gtk_dialog_add_button (GTK_DIALOG (tips_dialog),
                                   _("_Previous Tip"), RESPONSE_PREVIOUS);
   gtk_button_set_image (GTK_BUTTON (button),
-                        gtk_image_new_from_icon_name ("go-previous",
+                        gtk_image_new_from_icon_name (GIMP_ICON_GO_PREVIOUS,
                                                       GTK_ICON_SIZE_BUTTON));
 
   button = gtk_dialog_add_button (GTK_DIALOG (tips_dialog),
                                   _("_Next Tip"), RESPONSE_NEXT);
   gtk_button_set_image (GTK_BUTTON (button),
-                        gtk_image_new_from_icon_name ("go-next",
+                        gtk_image_new_from_icon_name (GIMP_ICON_GO_NEXT,
                                                       GTK_ICON_SIZE_BUTTON));
 
   gtk_dialog_set_response_sensitive (GTK_DIALOG (tips_dialog),
@@ -180,7 +180,8 @@ tips_dialog_create (Gimp *gimp)
   gtk_box_pack_start (GTK_BOX (hbox), vbox, TRUE, TRUE, 0);
   gtk_widget_show (vbox);
 
-  image = gtk_image_new_from_icon_name (GIMP_STOCK_INFO, GTK_ICON_SIZE_DIALOG);
+  image = gtk_image_new_from_icon_name (GIMP_ICON_DIALOG_INFORMATION,
+                                        GTK_ICON_SIZE_DIALOG);
   gtk_misc_set_alignment (GTK_MISC (image), 0.5, 0.0);
   gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, FALSE, 0);
   gtk_widget_show (image);
diff --git a/app/dialogs/user-install-dialog.c b/app/dialogs/user-install-dialog.c
index aa0d68c..e498f29 100644
--- a/app/dialogs/user-install-dialog.c
+++ b/app/dialogs/user-install-dialog.c
@@ -83,7 +83,7 @@ user_install_dialog_new (GimpUserInstall *install)
   gimp_icons_init ();
 
   dialog = gimp_message_dialog_new (_("GIMP User Installation"),
-                                    GIMP_STOCK_WILBER_EEK,
+                                    GIMP_ICON_WILBER_EEK,
                                     NULL, 0, NULL, NULL,
 
                                     _("_Quit"), GTK_RESPONSE_OK,
diff --git a/app/dialogs/vectors-options-dialog.c b/app/dialogs/vectors-options-dialog.c
index 9e5834d..85fe4d4 100644
--- a/app/dialogs/vectors-options-dialog.c
+++ b/app/dialogs/vectors-options-dialog.c
@@ -104,7 +104,7 @@ vectors_options_dialog_new (GimpImage                  *image,
                                     parent, title, role,
                                     icon_name, desc, help_id,
                                     _("Path _name:"),
-                                    GIMP_STOCK_TOOL_PATH,
+                                    GIMP_ICON_TOOL_PATH,
                                     _("Lock path _strokes"),
                                     _("Lock path _position"),
                                     vectors_name,
diff --git a/app/display/gimpdisplayshell-close.c b/app/display/gimpdisplayshell-close.c
index b422c5b..bd89c62 100644
--- a/app/display/gimpdisplayshell-close.c
+++ b/app/display/gimpdisplayshell-close.c
@@ -168,7 +168,7 @@ gimp_display_shell_close_dialog (GimpDisplayShell *shell,
   title = g_strdup_printf (_("Close %s"), gimp_image_get_display_name (image));
 
   shell->close_dialog =
-    dialog = gimp_message_dialog_new (title, "document-save",
+    dialog = gimp_message_dialog_new (title, GIMP_ICON_DOCUMENT_SAVE,
                                       GTK_WIDGET (shell),
                                       GTK_DIALOG_DESTROY_WITH_PARENT,
                                       gimp_standard_help_func, NULL,
diff --git a/app/display/gimpdisplayshell-filter-dialog.c b/app/display/gimpdisplayshell-filter-dialog.c
index 4cefc7e..aedd279 100644
--- a/app/display/gimpdisplayshell-filter-dialog.c
+++ b/app/display/gimpdisplayshell-filter-dialog.c
@@ -78,7 +78,7 @@ gimp_display_shell_filter_dialog_new (GimpDisplayShell *shell)
                                           gimp_get_user_context (shell->display->gimp),
                                           _("Color Display Filters"),
                                           "gimp-display-filters",
-                                          GIMP_STOCK_DISPLAY_FILTER,
+                                          GIMP_ICON_DISPLAY_FILTER,
                                           _("Configure Color Display Filters"),
                                           GTK_WIDGET (cdd->shell),
                                           gimp_standard_help_func,
diff --git a/app/display/gimpdisplayshell-handlers.c b/app/display/gimpdisplayshell-handlers.c
index f81e8fe..cdd45ae 100644
--- a/app/display/gimpdisplayshell-handlers.c
+++ b/app/display/gimpdisplayshell-handlers.c
@@ -639,10 +639,10 @@ gimp_display_shell_quick_mask_changed_handler (GimpImage        *image,
                                 quick_mask_state);
 
   if (quick_mask_state)
-    gtk_image_set_from_icon_name (gtk_image, GIMP_STOCK_QUICK_MASK_ON,
+    gtk_image_set_from_icon_name (gtk_image, GIMP_ICON_QUICK_MASK_ON,
                                   GTK_ICON_SIZE_MENU);
   else
-    gtk_image_set_from_icon_name (gtk_image, GIMP_STOCK_QUICK_MASK_OFF,
+    gtk_image_set_from_icon_name (gtk_image, GIMP_ICON_QUICK_MASK_OFF,
                                   GTK_ICON_SIZE_MENU);
 
   g_signal_handlers_unblock_by_func (shell->quick_mask_button,
@@ -866,7 +866,8 @@ gimp_display_shell_saved_handler (GimpImage        *image,
   GimpStatusbar *statusbar = gimp_display_shell_get_statusbar (shell);
 
   gimp_statusbar_push_temp (statusbar, GIMP_MESSAGE_INFO,
-                            "document-save", _("Image saved to '%s'"),
+                            GIMP_ICON_DOCUMENT_SAVE,
+                            _("Image saved to '%s'"),
                             gimp_file_get_utf8_name (file));
 }
 
@@ -878,7 +879,8 @@ gimp_display_shell_exported_handler (GimpImage        *image,
   GimpStatusbar *statusbar = gimp_display_shell_get_statusbar (shell);
 
   gimp_statusbar_push_temp (statusbar, GIMP_MESSAGE_INFO,
-                            "document-save", _("Image exported to '%s'"),
+                            GIMP_ICON_DOCUMENT_SAVE,
+                            _("Image exported to '%s'"),
                             gimp_file_get_utf8_name (file));
 }
 
diff --git a/app/display/gimpdisplayshell-rotate-dialog.c b/app/display/gimpdisplayshell-rotate-dialog.c
index 346ac9b..faebd83 100644
--- a/app/display/gimpdisplayshell-rotate-dialog.c
+++ b/app/display/gimpdisplayshell-rotate-dialog.c
@@ -112,7 +112,7 @@ gimp_display_shell_rotate_dialog (GimpDisplayShell *shell)
     gimp_viewable_dialog_new (GIMP_VIEWABLE (image),
                               gimp_get_user_context (shell->display->gimp),
                               _("Rotate View"), "display-rotate",
-                              GIMP_STOCK_ROTATE_180,
+                              GIMP_ICON_OBJECT_ROTATE_180,
                               _("Select Rotation Angle"),
                               GTK_WIDGET (shell),
                               gimp_standard_help_func,
diff --git a/app/display/gimpdisplayshell.c b/app/display/gimpdisplayshell.c
index bfaa0b2..6f56761 100644
--- a/app/display/gimpdisplayshell.c
+++ b/app/display/gimpdisplayshell.c
@@ -539,7 +539,7 @@ gimp_display_shell_constructed (GObject *object)
   /*  the menu popup button  */
   shell->origin = gtk_event_box_new ();
 
-  gtk_image = gtk_image_new_from_icon_name (GIMP_STOCK_MENU_RIGHT,
+  gtk_image = gtk_image_new_from_icon_name (GIMP_ICON_MENU_RIGHT,
                                             GTK_ICON_SIZE_MENU);
   gtk_container_add (GTK_CONTAINER (shell->origin), gtk_image);
   gtk_widget_show (gtk_image);
@@ -658,7 +658,7 @@ gimp_display_shell_constructed (GObject *object)
                                      NULL);
   gtk_widget_set_can_focus (shell->zoom_button, FALSE);
 
-  gtk_image = gtk_image_new_from_icon_name (GIMP_STOCK_ZOOM_FOLLOW_WINDOW,
+  gtk_image = gtk_image_new_from_icon_name (GIMP_ICON_ZOOM_FOLLOW_WINDOW,
                                             GTK_ICON_SIZE_MENU);
   gtk_container_add (GTK_CONTAINER (shell->zoom_button), gtk_image);
   gtk_widget_show (gtk_image);
@@ -682,7 +682,7 @@ gimp_display_shell_constructed (GObject *object)
                                            NULL);
   gtk_widget_set_can_focus (shell->quick_mask_button, FALSE);
 
-  gtk_image = gtk_image_new_from_icon_name (GIMP_STOCK_QUICK_MASK_OFF,
+  gtk_image = gtk_image_new_from_icon_name (GIMP_ICON_QUICK_MASK_OFF,
                                             GTK_ICON_SIZE_MENU);
   gtk_container_add (GTK_CONTAINER (shell->quick_mask_button), gtk_image);
   gtk_widget_show (gtk_image);
@@ -706,7 +706,7 @@ gimp_display_shell_constructed (GObject *object)
   /*  the navigation window button  */
   shell->nav_ebox = gtk_event_box_new ();
 
-  gtk_image = gtk_image_new_from_icon_name (GIMP_STOCK_NAVIGATION,
+  gtk_image = gtk_image_new_from_icon_name (GIMP_ICON_DIALOG_NAVIGATION,
                                             GTK_ICON_SIZE_MENU);
   gtk_container_add (GTK_CONTAINER (shell->nav_ebox), gtk_image);
   gtk_widget_show (gtk_image);
diff --git a/app/display/gimpimagewindow.c b/app/display/gimpimagewindow.c
index 98c3fa2..b0371d1 100644
--- a/app/display/gimpimagewindow.c
+++ b/app/display/gimpimagewindow.c
@@ -2380,7 +2380,7 @@ gimp_image_window_create_tab_label (GimpImageWindow  *window,
   gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 0);
   gtk_widget_show (button);
 
-  gtk_image = gtk_image_new_from_icon_name (GIMP_STOCK_CLOSE,
+  gtk_image = gtk_image_new_from_icon_name (GIMP_ICON_CLOSE,
                                             GTK_ICON_SIZE_MENU);
   gtk_container_add (GTK_CONTAINER (button), gtk_image);
   gtk_widget_show (gtk_image);
diff --git a/app/display/gimpnavigationeditor.c b/app/display/gimpnavigationeditor.c
index 300a5f4..33df757 100644
--- a/app/display/gimpnavigationeditor.c
+++ b/app/display/gimpnavigationeditor.c
@@ -442,7 +442,7 @@ gimp_navigation_editor_new_private (GimpMenuFactory  *menu_factory,
     }
 
   gimp_view_renderer_set_background (GIMP_VIEW (editor->view)->renderer,
-                                     GIMP_STOCK_TEXTURE);
+                                     GIMP_ICON_TEXTURE);
 
   return GTK_WIDGET (editor);
 }
diff --git a/app/gui/gui.c b/app/gui/gui.c
index 98245ea..334f7e7 100644
--- a/app/gui/gui.c
+++ b/app/gui/gui.c
@@ -196,7 +196,7 @@ gui_abort (const gchar *abort_message)
   gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE);
 
   box = g_object_new (GIMP_TYPE_MESSAGE_BOX,
-                      "icon-name",    GIMP_STOCK_WILBER_EEK,
+                      "icon-name",    GIMP_ICON_WILBER_EEK,
                       "border-width", 12,
                       NULL);
 
diff --git a/app/tools/gimpairbrushtool.c b/app/tools/gimpairbrushtool.c
index 2a52f47..62796a7 100644
--- a/app/tools/gimpairbrushtool.c
+++ b/app/tools/gimpairbrushtool.c
@@ -56,7 +56,7 @@ gimp_airbrush_tool_register (GimpToolRegisterCallback  callback,
                 _("Airbrush Tool: Paint using a brush, with variable pressure"),
                 N_("_Airbrush"), "A",
                 NULL, GIMP_HELP_TOOL_AIRBRUSH,
-                GIMP_STOCK_TOOL_AIRBRUSH,
+                GIMP_ICON_TOOL_AIRBRUSH,
                 data);
 }
 
diff --git a/app/tools/gimpalignoptions.c b/app/tools/gimpalignoptions.c
index f84fba1..fcfcafe 100644
--- a/app/tools/gimpalignoptions.c
+++ b/app/tools/gimpalignoptions.c
@@ -197,46 +197,46 @@ gimp_align_options_button_new (GimpAlignOptions  *options,
   switch (action)
     {
     case GIMP_ALIGN_LEFT:
-      icon_name = GIMP_STOCK_GRAVITY_WEST;
+      icon_name = GIMP_ICON_GRAVITY_WEST;
       break;
     case GIMP_ALIGN_HCENTER:
-      icon_name = GIMP_STOCK_HCENTER;
+      icon_name = GIMP_ICON_CENTER_HORIZONTAL;
       break;
     case GIMP_ALIGN_RIGHT:
-      icon_name = GIMP_STOCK_GRAVITY_EAST;
+      icon_name = GIMP_ICON_GRAVITY_EAST;
       break;
     case GIMP_ALIGN_TOP:
-      icon_name = GIMP_STOCK_GRAVITY_NORTH;
+      icon_name = GIMP_ICON_GRAVITY_NORTH;
       break;
     case GIMP_ALIGN_VCENTER:
-      icon_name = GIMP_STOCK_VCENTER;
+      icon_name = GIMP_ICON_CENTER_VERTICAL;
       break;
     case GIMP_ALIGN_BOTTOM:
-      icon_name = GIMP_STOCK_GRAVITY_SOUTH;
+      icon_name = GIMP_ICON_GRAVITY_SOUTH;
       break;
     case GIMP_ARRANGE_LEFT:
-      icon_name = GIMP_STOCK_GRAVITY_WEST;
+      icon_name = GIMP_ICON_GRAVITY_WEST;
       break;
     case GIMP_ARRANGE_HCENTER:
-      icon_name = GIMP_STOCK_HCENTER;
+      icon_name = GIMP_ICON_CENTER_HORIZONTAL;
       break;
     case GIMP_ARRANGE_RIGHT:
-      icon_name = GIMP_STOCK_GRAVITY_EAST;
+      icon_name = GIMP_ICON_GRAVITY_EAST;
       break;
     case GIMP_ARRANGE_TOP:
-      icon_name = GIMP_STOCK_GRAVITY_NORTH;
+      icon_name = GIMP_ICON_GRAVITY_NORTH;
       break;
     case GIMP_ARRANGE_VCENTER:
-      icon_name = GIMP_STOCK_VCENTER;
+      icon_name = GIMP_ICON_CENTER_VERTICAL;
       break;
     case GIMP_ARRANGE_BOTTOM:
-      icon_name = GIMP_STOCK_GRAVITY_SOUTH;
+      icon_name = GIMP_ICON_GRAVITY_SOUTH;
       break;
     case GIMP_ARRANGE_HFILL:
-        icon_name = GIMP_ICON_HFILL;
+        icon_name = GIMP_ICON_FILL_HORIZONTAL;
         break;
     case GIMP_ARRANGE_VFILL:
-        icon_name = GIMP_ICON_VFILL;
+        icon_name = GIMP_ICON_FILL_VERTICAL;
         break;
     default:
       g_return_val_if_reached (NULL);
diff --git a/app/tools/gimpaligntool.c b/app/tools/gimpaligntool.c
index 83622eb..a7cddbb 100644
--- a/app/tools/gimpaligntool.c
+++ b/app/tools/gimpaligntool.c
@@ -125,7 +125,7 @@ gimp_align_tool_register (GimpToolRegisterCallback  callback,
                 _("Alignment Tool: Align or arrange layers and other objects"),
                 N_("_Align"), "Q",
                 NULL, GIMP_HELP_TOOL_ALIGN,
-                GIMP_STOCK_TOOL_ALIGN,
+                GIMP_ICON_TOOL_ALIGN,
                 data);
 }
 
diff --git a/app/tools/gimpblendtool.c b/app/tools/gimpblendtool.c
index 6eb769f..dab7a7d 100644
--- a/app/tools/gimpblendtool.c
+++ b/app/tools/gimpblendtool.c
@@ -171,7 +171,7 @@ gimp_blend_tool_register (GimpToolRegisterCallback  callback,
                 _("Blend Tool: Fill selected area with a color gradient"),
                 N_("Blen_d"), "L",
                 NULL, GIMP_HELP_TOOL_BLEND,
-                GIMP_STOCK_TOOL_BLEND,
+                GIMP_ICON_TOOL_BLEND,
                 data);
 }
 
@@ -1200,7 +1200,7 @@ gimp_blend_tool_create_filter (GimpBlendTool *blend_tool,
   blend_tool->filter = gimp_drawable_filter_new (drawable,
                                                  C_("undo-type", "Blend"),
                                                  blend_tool->graph,
-                                                 GIMP_STOCK_TOOL_BLEND);
+                                                 GIMP_ICON_TOOL_BLEND);
 
   gimp_drawable_filter_set_region (blend_tool->filter,
                                    GIMP_FILTER_REGION_DRAWABLE);
diff --git a/app/tools/gimpbrightnesscontrasttool.c b/app/tools/gimpbrightnesscontrasttool.c
index 3b39a55..3e623bb 100644
--- a/app/tools/gimpbrightnesscontrasttool.c
+++ b/app/tools/gimpbrightnesscontrasttool.c
@@ -102,7 +102,7 @@ gimp_brightness_contrast_tool_register (GimpToolRegisterCallback  callback,
                 _("Brightness/Contrast Tool: Adjust brightness and contrast"),
                 N_("B_rightness-Contrast..."), NULL,
                 NULL, GIMP_HELP_TOOL_BRIGHTNESS_CONTRAST,
-                GIMP_STOCK_TOOL_BRIGHTNESS_CONTRAST,
+                GIMP_ICON_TOOL_BRIGHTNESS_CONTRAST,
                 data);
 }
 
@@ -299,7 +299,7 @@ gimp_brightness_contrast_tool_dialog (GimpFilterTool *filter_tool)
 
   bc_tool->contrast_scale = scale;
 
-  button = gimp_icon_button_new (GIMP_STOCK_TOOL_LEVELS,
+  button = gimp_icon_button_new (GIMP_ICON_TOOL_LEVELS,
                                  _("Edit these Settings as Levels"));
   gtk_box_pack_start (GTK_BOX (main_vbox), button, FALSE, FALSE, 0);
   gtk_widget_show (button);
diff --git a/app/tools/gimpbucketfilltool.c b/app/tools/gimpbucketfilltool.c
index 7755777..52c5526 100644
--- a/app/tools/gimpbucketfilltool.c
+++ b/app/tools/gimpbucketfilltool.c
@@ -88,7 +88,7 @@ gimp_bucket_fill_tool_register (GimpToolRegisterCallback  callback,
                 _("Bucket Fill Tool: Fill selected area with a color or pattern"),
                 N_("_Bucket Fill"), "<shift>B",
                 NULL, GIMP_HELP_TOOL_BUCKET_FILL,
-                GIMP_STOCK_TOOL_BUCKET_FILL,
+                GIMP_ICON_TOOL_BUCKET_FILL,
                 data);
 }
 
diff --git a/app/tools/gimpbycolorselecttool.c b/app/tools/gimpbycolorselecttool.c
index 7b8c52a..cf648a4 100644
--- a/app/tools/gimpbycolorselecttool.c
+++ b/app/tools/gimpbycolorselecttool.c
@@ -68,7 +68,7 @@ gimp_by_color_select_tool_register (GimpToolRegisterCallback  callback,
                 _("Select by Color Tool: Select regions with similar colors"),
                 N_("_By Color Select"), "<shift>O",
                 NULL, GIMP_HELP_TOOL_BY_COLOR_SELECT,
-                GIMP_STOCK_TOOL_BY_COLOR_SELECT,
+                GIMP_ICON_TOOL_BY_COLOR_SELECT,
                 data);
 }
 
diff --git a/app/tools/gimpcagetool.c b/app/tools/gimpcagetool.c
index 8bba32c..330c2e7 100644
--- a/app/tools/gimpcagetool.c
+++ b/app/tools/gimpcagetool.c
@@ -158,7 +158,7 @@ gimp_cage_tool_register (GimpToolRegisterCallback  callback,
                 _("Cage Transform: Deform a selection with a cage"),
                 N_("_Cage Transform"), "<shift>G",
                 NULL, GIMP_HELP_TOOL_CAGE,
-                GIMP_STOCK_TOOL_CAGE,
+                GIMP_ICON_TOOL_CAGE,
                 data);
 }
 
@@ -1280,7 +1280,7 @@ gimp_cage_tool_create_filter (GimpCageTool *ct)
   ct->filter = gimp_drawable_filter_new (GIMP_TOOL (ct)->drawable,
                                          _("Cage transform"),
                                          ct->render_node,
-                                         GIMP_STOCK_TOOL_CAGE);
+                                         GIMP_ICON_TOOL_CAGE);
 
   g_signal_connect (ct->filter, "flush",
                     G_CALLBACK (gimp_cage_tool_filter_flush),
diff --git a/app/tools/gimpclonetool.c b/app/tools/gimpclonetool.c
index 4dde602..06152be 100644
--- a/app/tools/gimpclonetool.c
+++ b/app/tools/gimpclonetool.c
@@ -57,7 +57,7 @@ gimp_clone_tool_register (GimpToolRegisterCallback  callback,
                 _("Clone Tool: Selectively copy from an image or pattern, using a brush"),
                 N_("_Clone"), "C",
                 NULL, GIMP_HELP_TOOL_CLONE,
-                GIMP_STOCK_TOOL_CLONE,
+                GIMP_ICON_TOOL_CLONE,
                 data);
 }
 
diff --git a/app/tools/gimpcolorbalancetool.c b/app/tools/gimpcolorbalancetool.c
index 57fd898..0b4dcb0 100644
--- a/app/tools/gimpcolorbalancetool.c
+++ b/app/tools/gimpcolorbalancetool.c
@@ -82,7 +82,7 @@ gimp_color_balance_tool_register (GimpToolRegisterCallback  callback,
                 _("Color Balance Tool: Adjust color distribution"),
                 N_("Color _Balance..."), NULL,
                 NULL, GIMP_HELP_TOOL_COLOR_BALANCE,
-                GIMP_STOCK_TOOL_COLOR_BALANCE,
+                GIMP_ICON_TOOL_COLOR_BALANCE,
                 data);
 }
 
diff --git a/app/tools/gimpcolorizetool.c b/app/tools/gimpcolorizetool.c
index a8c1478..08405d9 100644
--- a/app/tools/gimpcolorizetool.c
+++ b/app/tools/gimpcolorizetool.c
@@ -83,7 +83,7 @@ gimp_colorize_tool_register (GimpToolRegisterCallback  callback,
                 _("Colorize Tool: Colorize the image"),
                 N_("Colori_ze..."), NULL,
                 NULL, GIMP_HELP_TOOL_COLORIZE,
-                GIMP_STOCK_TOOL_COLORIZE,
+                GIMP_ICON_TOOL_COLORIZE,
                 data);
 }
 
@@ -207,7 +207,7 @@ gimp_colorize_tool_dialog (GimpFilterTool *filter_tool)
 
   button = gimp_filter_tool_add_color_picker (filter_tool,
                                               "colorize",
-                                              GIMP_STOCK_COLOR_PICKER_GRAY,
+                                              GIMP_ICON_COLOR_PICKER_GRAY,
                                               _("Pick color from image"));
   gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 0);
   gtk_widget_show (button);
diff --git a/app/tools/gimpcolorpickertool.c b/app/tools/gimpcolorpickertool.c
index 2a6f435..447c4a0 100644
--- a/app/tools/gimpcolorpickertool.c
+++ b/app/tools/gimpcolorpickertool.c
@@ -103,7 +103,7 @@ gimp_color_picker_tool_register (GimpToolRegisterCallback  callback,
                 _("Color Picker Tool: Set colors from image pixels"),
                 N_("C_olor Picker"), "O",
                 NULL, GIMP_HELP_TOOL_COLOR_PICKER,
-                GIMP_STOCK_TOOL_COLOR_PICKER,
+                GIMP_ICON_TOOL_COLOR_PICKER,
                 data);
 }
 
diff --git a/app/tools/gimpconvolvetool.c b/app/tools/gimpconvolvetool.c
index 886079d..3f0688b 100644
--- a/app/tools/gimpconvolvetool.c
+++ b/app/tools/gimpconvolvetool.c
@@ -75,7 +75,7 @@ gimp_convolve_tool_register (GimpToolRegisterCallback  callback,
                 _("Blur / Sharpen Tool: Selective blurring or unblurring using a brush"),
                 N_("Bl_ur / Sharpen"), "<shift>U",
                 NULL, GIMP_HELP_TOOL_CONVOLVE,
-                GIMP_STOCK_TOOL_BLUR,
+                GIMP_ICON_TOOL_BLUR,
                 data);
 }
 
diff --git a/app/tools/gimpcroptool.c b/app/tools/gimpcroptool.c
index 678a268..e2810d8 100644
--- a/app/tools/gimpcroptool.c
+++ b/app/tools/gimpcroptool.c
@@ -118,7 +118,7 @@ gimp_crop_tool_register (GimpToolRegisterCallback  callback,
                 _("Crop Tool: Remove edge areas from image or layer"),
                 N_("_Crop"), "<shift>C",
                 NULL, GIMP_HELP_TOOL_CROP,
-                GIMP_STOCK_TOOL_CROP,
+                GIMP_ICON_TOOL_CROP,
                 data);
 }
 
diff --git a/app/tools/gimpcurvestool.c b/app/tools/gimpcurvestool.c
index 0afe490..2703a36 100644
--- a/app/tools/gimpcurvestool.c
+++ b/app/tools/gimpcurvestool.c
@@ -150,7 +150,7 @@ gimp_curves_tool_register (GimpToolRegisterCallback  callback,
                 _("Curves Tool: Adjust color curves"),
                 N_("_Curves..."), NULL,
                 NULL, GIMP_HELP_TOOL_CURVES,
-                GIMP_STOCK_TOOL_CURVES,
+                GIMP_ICON_TOOL_CURVES,
                 data);
 }
 
diff --git a/app/tools/gimpdodgeburntool.c b/app/tools/gimpdodgeburntool.c
index 78d86a4..22cd820 100644
--- a/app/tools/gimpdodgeburntool.c
+++ b/app/tools/gimpdodgeburntool.c
@@ -75,7 +75,7 @@ gimp_dodge_burn_tool_register (GimpToolRegisterCallback  callback,
                 _("Dodge / Burn Tool: Selectively lighten or darken using a brush"),
                 N_("Dod_ge / Burn"), "<shift>D",
                 NULL, GIMP_HELP_TOOL_DODGE_BURN,
-                GIMP_STOCK_TOOL_DODGE,
+                GIMP_ICON_TOOL_DODGE,
                 data);
 }
 
diff --git a/app/tools/gimpellipseselecttool.c b/app/tools/gimpellipseselecttool.c
index 93134b4..17f9c14 100644
--- a/app/tools/gimpellipseselecttool.c
+++ b/app/tools/gimpellipseselecttool.c
@@ -67,7 +67,7 @@ gimp_ellipse_select_tool_register (GimpToolRegisterCallback  callback,
                 _("Ellipse Select Tool: Select an elliptical region"),
                 N_("_Ellipse Select"), "E",
                 NULL, GIMP_HELP_TOOL_ELLIPSE_SELECT,
-                GIMP_STOCK_TOOL_ELLIPSE_SELECT,
+                GIMP_ICON_TOOL_ELLIPSE_SELECT,
                 data);
 }
 
diff --git a/app/tools/gimperasertool.c b/app/tools/gimperasertool.c
index e73c4a8..d070a89 100644
--- a/app/tools/gimperasertool.c
+++ b/app/tools/gimperasertool.c
@@ -67,7 +67,7 @@ gimp_eraser_tool_register (GimpToolRegisterCallback  callback,
                 _("Eraser Tool: Erase to background or transparency using a brush"),
                 N_("_Eraser"), "<shift>E",
                 NULL, GIMP_HELP_TOOL_ERASER,
-                GIMP_STOCK_TOOL_ERASER,
+                GIMP_ICON_TOOL_ERASER,
                 data);
 }
 
diff --git a/app/tools/gimpfliptool.c b/app/tools/gimpfliptool.c
index a27c35f..aee8db2 100644
--- a/app/tools/gimpfliptool.c
+++ b/app/tools/gimpfliptool.c
@@ -87,7 +87,7 @@ gimp_flip_tool_register (GimpToolRegisterCallback  callback,
                   "Reverse the layer, selection or path horizontally or vertically"),
                 N_("_Flip"), "<shift>F",
                 NULL, GIMP_HELP_TOOL_FLIP,
-                GIMP_STOCK_TOOL_FLIP,
+                GIMP_ICON_TOOL_FLIP,
                 data);
 }
 
diff --git a/app/tools/gimpforegroundselectoptions.c b/app/tools/gimpforegroundselectoptions.c
index 18ef257..7ddabee 100644
--- a/app/tools/gimpforegroundselectoptions.c
+++ b/app/tools/gimpforegroundselectoptions.c
@@ -285,10 +285,10 @@ gimp_foreground_select_options_gui (GimpToolOptions *tool_options)
   gtk_box_pack_start (GTK_BOX (hbox), scale, TRUE, TRUE, 0);
   gtk_widget_show (scale);
 
-  button = gimp_icon_button_new (GIMP_STOCK_RESET, NULL);
+  button = gimp_icon_button_new (GIMP_ICON_RESET, NULL);
   gtk_button_set_relief (GTK_BUTTON (button), GTK_RELIEF_NONE);
   gtk_image_set_from_icon_name (GTK_IMAGE (gtk_bin_get_child (GTK_BIN (button))),
-                                GIMP_STOCK_RESET, GTK_ICON_SIZE_MENU);
+                                GIMP_ICON_RESET, GTK_ICON_SIZE_MENU);
   gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 0);
   gtk_widget_show (button);
 
diff --git a/app/tools/gimpforegroundselecttool.c b/app/tools/gimpforegroundselecttool.c
index dd79976..6f67d3e 100644
--- a/app/tools/gimpforegroundselecttool.c
+++ b/app/tools/gimpforegroundselecttool.c
@@ -188,7 +188,7 @@ gimp_foreground_select_tool_register (GimpToolRegisterCallback  callback,
                 _("Foreground Select Tool: Select a region containing foreground objects"),
                 N_("F_oreground Select"), NULL,
                 NULL, GIMP_HELP_TOOL_FOREGROUND_SELECT,
-                GIMP_STOCK_TOOL_FOREGROUND_SELECT,
+                GIMP_ICON_TOOL_FOREGROUND_SELECT,
                 data);
 }
 
diff --git a/app/tools/gimpfreeselecttool.c b/app/tools/gimpfreeselecttool.c
index 5b5703f..e3d016a 100644
--- a/app/tools/gimpfreeselecttool.c
+++ b/app/tools/gimpfreeselecttool.c
@@ -198,7 +198,7 @@ gimp_free_select_tool_register (GimpToolRegisterCallback  callback,
                   "and polygonal segments"),
                 N_("_Free Select"), "F",
                 NULL, GIMP_HELP_TOOL_FREE_SELECT,
-                GIMP_STOCK_TOOL_FREE_SELECT,
+                GIMP_ICON_TOOL_FREE_SELECT,
                 data);
 }
 
diff --git a/app/tools/gimpfuzzyselecttool.c b/app/tools/gimpfuzzyselecttool.c
index 670d53b..9a5a801 100644
--- a/app/tools/gimpfuzzyselecttool.c
+++ b/app/tools/gimpfuzzyselecttool.c
@@ -67,7 +67,7 @@ gimp_fuzzy_select_tool_register (GimpToolRegisterCallback  callback,
                 _("Fuzzy Select Tool: Select a contiguous region on the basis of color"),
                 N_("Fu_zzy Select"), "U",
                 NULL, GIMP_HELP_TOOL_FUZZY_SELECT,
-                GIMP_STOCK_TOOL_FUZZY_SELECT,
+                GIMP_ICON_TOOL_FUZZY_SELECT,
                 data);
 }
 
diff --git a/app/tools/gimpgegltool.c b/app/tools/gimpgegltool.c
index 8a69d5f..b9f44db 100644
--- a/app/tools/gimpgegltool.c
+++ b/app/tools/gimpgegltool.c
@@ -73,7 +73,7 @@ gimp_gegl_tool_register (GimpToolRegisterCallback  callback,
                 _("GEGL Tool: Use an arbitrary GEGL operation"),
                 N_("_GEGL Operation..."), NULL,
                 NULL, GIMP_HELP_TOOL_GEGL,
-                GIMP_STOCK_GEGL,
+                GIMP_ICON_GEGL,
                 data);
 }
 
@@ -380,7 +380,7 @@ gimp_gegl_tool_dialog (GimpFilterTool *filter_tool)
       gchar              *label;
 
       if (g_str_has_prefix (opclass->name, "gegl:"))
-        icon_name = GIMP_STOCK_GEGL;
+        icon_name = GIMP_ICON_GEGL;
 
       if (g_str_has_prefix (op_name, "gegl:"))
         op_name += strlen ("gegl:");
@@ -484,7 +484,7 @@ gimp_gegl_tool_operation_changed (GtkWidget    *widget,
                                          _("GEGL Operation"),
                                          _("GEGL Operation"),
                                          NULL,
-                                         GIMP_STOCK_GEGL,
+                                         GIMP_ICON_GEGL,
                                          GIMP_HELP_TOOL_GEGL);
       g_free (operation);
     }
diff --git a/app/tools/gimphealtool.c b/app/tools/gimphealtool.c
index 9e8aaf6..31bc82f 100644
--- a/app/tools/gimphealtool.c
+++ b/app/tools/gimphealtool.c
@@ -56,7 +56,7 @@ gimp_heal_tool_register (GimpToolRegisterCallback  callback,
                 "H",
                 NULL,
                 GIMP_HELP_TOOL_HEAL,
-                GIMP_STOCK_TOOL_HEAL,
+                GIMP_ICON_TOOL_HEAL,
                 data);
 }
 
diff --git a/app/tools/gimphuesaturationtool.c b/app/tools/gimphuesaturationtool.c
index 9d87b95..921de82 100644
--- a/app/tools/gimphuesaturationtool.c
+++ b/app/tools/gimphuesaturationtool.c
@@ -97,7 +97,7 @@ gimp_hue_saturation_tool_register (GimpToolRegisterCallback  callback,
                 _("Hue-Saturation Tool: Adjust hue, saturation, and lightness"),
                 N_("Hue-_Saturation..."), NULL,
                 NULL, GIMP_HELP_TOOL_HUE_SATURATION,
-                GIMP_STOCK_TOOL_HUE_SATURATION,
+                GIMP_ICON_TOOL_HUE_SATURATION,
                 data);
 }
 
diff --git a/app/tools/gimpinktool.c b/app/tools/gimpinktool.c
index 17b05c6..71b9dbd 100644
--- a/app/tools/gimpinktool.c
+++ b/app/tools/gimpinktool.c
@@ -62,7 +62,7 @@ gimp_ink_tool_register (GimpToolRegisterCallback  callback,
                 _("Ink Tool: Calligraphy-style painting"),
                 N_("In_k"), "K",
                 NULL, GIMP_HELP_TOOL_INK,
-                GIMP_STOCK_TOOL_INK,
+                GIMP_ICON_TOOL_INK,
                 data);
 }
 
diff --git a/app/tools/gimpiscissorstool.c b/app/tools/gimpiscissorstool.c
index 71723fc..a9def3b 100644
--- a/app/tools/gimpiscissorstool.c
+++ b/app/tools/gimpiscissorstool.c
@@ -294,7 +294,7 @@ gimp_iscissors_tool_register (GimpToolRegisterCallback  callback,
                 N_("Intelligent _Scissors"),
                 "I",
                 NULL, GIMP_HELP_TOOL_ISCISSORS,
-                GIMP_STOCK_TOOL_ISCISSORS,
+                GIMP_ICON_TOOL_ISCISSORS,
                 data);
 }
 
diff --git a/app/tools/gimplevelstool.c b/app/tools/gimplevelstool.c
index 6dca751..8c4afa9 100644
--- a/app/tools/gimplevelstool.c
+++ b/app/tools/gimplevelstool.c
@@ -138,7 +138,7 @@ gimp_levels_tool_register (GimpToolRegisterCallback  callback,
                 _("Levels Tool: Adjust color levels"),
                 N_("_Levels..."), NULL,
                 NULL, GIMP_HELP_TOOL_LEVELS,
-                GIMP_STOCK_TOOL_LEVELS,
+                GIMP_ICON_TOOL_LEVELS,
                 data);
 }
 
@@ -282,7 +282,7 @@ gimp_levels_tool_color_picker_new (GimpLevelsTool *tool,
   switch (value & 0xF)
     {
     case PICK_LOW_INPUT:
-      icon_name = GIMP_STOCK_COLOR_PICKER_BLACK;
+      icon_name = GIMP_ICON_COLOR_PICKER_BLACK;
 
       if (all_channels)
         help = _("Pick black point for all channels");
@@ -291,7 +291,7 @@ gimp_levels_tool_color_picker_new (GimpLevelsTool *tool,
       break;
 
     case PICK_GAMMA:
-      icon_name = GIMP_STOCK_COLOR_PICKER_GRAY;
+      icon_name = GIMP_ICON_COLOR_PICKER_GRAY;
 
       if (all_channels)
         help = _("Pick gray point for all channels");
@@ -300,7 +300,7 @@ gimp_levels_tool_color_picker_new (GimpLevelsTool *tool,
       break;
 
     case PICK_HIGH_INPUT:
-      icon_name = GIMP_STOCK_COLOR_PICKER_WHITE;
+      icon_name = GIMP_ICON_COLOR_PICKER_WHITE;
 
       if (all_channels)
         help = _("Pick white point for all channels");
@@ -618,7 +618,7 @@ gimp_levels_tool_dialog (GimpFilterTool *filter_tool)
   gtk_box_pack_end (GTK_BOX (hbox), button, FALSE, FALSE, 0);
   gtk_widget_show (button);
 
-  button = gimp_icon_button_new (GIMP_STOCK_TOOL_CURVES,
+  button = gimp_icon_button_new (GIMP_ICON_TOOL_CURVES,
                                  _("Edit these Settings as Curves"));
   gtk_box_pack_start (GTK_BOX (main_vbox), button, FALSE, FALSE, 0);
   gtk_widget_show (button);
diff --git a/app/tools/gimpmagnifytool.c b/app/tools/gimpmagnifytool.c
index 056b60e..631a8b3 100644
--- a/app/tools/gimpmagnifytool.c
+++ b/app/tools/gimpmagnifytool.c
@@ -94,7 +94,7 @@ gimp_magnify_tool_register (GimpToolRegisterCallback  callback,
                 _("Zoom Tool: Adjust the zoom level"),
                 N_("_Zoom"), "Z",
                 NULL, GIMP_HELP_TOOL_ZOOM,
-                GIMP_STOCK_TOOL_ZOOM,
+                GIMP_ICON_TOOL_ZOOM,
                 data);
 }
 
diff --git a/app/tools/gimpmeasuretool.c b/app/tools/gimpmeasuretool.c
index daa6a6e..03ce51b 100644
--- a/app/tools/gimpmeasuretool.c
+++ b/app/tools/gimpmeasuretool.c
@@ -128,7 +128,7 @@ gimp_measure_tool_register (GimpToolRegisterCallback  callback,
                 _("Measure Tool: Measure distances and angles"),
                 N_("_Measure"), "<shift>M",
                 NULL, GIMP_HELP_TOOL_MEASURE,
-                GIMP_STOCK_TOOL_MEASURE,
+                GIMP_ICON_TOOL_MEASURE,
                 data);
 }
 
diff --git a/app/tools/gimpmovetool.c b/app/tools/gimpmovetool.c
index 0b64956..bf3f99b 100644
--- a/app/tools/gimpmovetool.c
+++ b/app/tools/gimpmovetool.c
@@ -114,7 +114,7 @@ gimp_move_tool_register (GimpToolRegisterCallback  callback,
                 _("Move Tool: Move layers, selections, and other objects"),
                 N_("_Move"), "M",
                 NULL, GIMP_HELP_TOOL_MOVE,
-                GIMP_STOCK_TOOL_MOVE,
+                GIMP_ICON_TOOL_MOVE,
                 data);
 }
 
diff --git a/app/tools/gimpoperationtool.c b/app/tools/gimpoperationtool.c
index c0e4417..c9a1540 100644
--- a/app/tools/gimpoperationtool.c
+++ b/app/tools/gimpoperationtool.c
@@ -132,7 +132,7 @@ gimp_operation_tool_register (GimpToolRegisterCallback  callback,
                 _("Operation Tool: Use an arbitrary GEGL operation"),
                 N_("_GEGL Operation..."), NULL,
                 NULL, GIMP_HELP_TOOL_GEGL,
-                GIMP_STOCK_GEGL,
+                GIMP_ICON_GEGL,
                 data);
 }
 
diff --git a/app/tools/gimppaintbrushtool.c b/app/tools/gimppaintbrushtool.c
index 77f7609..218fb33 100644
--- a/app/tools/gimppaintbrushtool.c
+++ b/app/tools/gimppaintbrushtool.c
@@ -52,7 +52,7 @@ gimp_paintbrush_tool_register (GimpToolRegisterCallback  callback,
                 _("Paintbrush Tool: Paint smooth strokes using a brush"),
                 N_("_Paintbrush"), "P",
                 NULL, GIMP_HELP_TOOL_PAINTBRUSH,
-                GIMP_STOCK_TOOL_PAINTBRUSH,
+                GIMP_ICON_TOOL_PAINTBRUSH,
                 data);
 }
 
diff --git a/app/tools/gimppaintoptions-gui.c b/app/tools/gimppaintoptions-gui.c
index 8b8b9f3..7613124 100644
--- a/app/tools/gimppaintoptions-gui.c
+++ b/app/tools/gimppaintoptions-gui.c
@@ -574,10 +574,10 @@ gimp_paint_options_gui_scale_with_buttons (GObject      *config,
   gtk_box_pack_start (GTK_BOX (hbox), scale, TRUE, TRUE, 0);
   gtk_widget_show (scale);
 
-  button = gimp_icon_button_new (GIMP_STOCK_RESET, NULL);
+  button = gimp_icon_button_new (GIMP_ICON_RESET, NULL);
   gtk_button_set_relief (GTK_BUTTON (button), GTK_RELIEF_NONE);
   gtk_image_set_from_icon_name (GTK_IMAGE (gtk_bin_get_child (GTK_BIN (button))),
-                                GIMP_STOCK_RESET, GTK_ICON_SIZE_MENU);
+                                GIMP_ICON_RESET, GTK_ICON_SIZE_MENU);
   gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 0);
   gtk_widget_show (button);
 
@@ -595,7 +595,7 @@ gimp_paint_options_gui_scale_with_buttons (GObject      *config,
       button = gtk_toggle_button_new ();
       gtk_button_set_relief (GTK_BUTTON (button), GTK_RELIEF_NONE);
 
-      image = gtk_image_new_from_icon_name (GIMP_STOCK_LINKED,
+      image = gtk_image_new_from_icon_name (GIMP_ICON_LINKED,
                                             GTK_ICON_SIZE_MENU);
       gtk_container_add (GTK_CONTAINER (button), image);
       gtk_widget_show (image);
diff --git a/app/tools/gimppenciltool.c b/app/tools/gimppenciltool.c
index bd83f60..29a18fe 100644
--- a/app/tools/gimppenciltool.c
+++ b/app/tools/gimppenciltool.c
@@ -52,7 +52,7 @@ gimp_pencil_tool_register (GimpToolRegisterCallback  callback,
                 _("Pencil Tool: Hard edge painting using a brush"),
                 N_("Pe_ncil"), "N",
                 NULL, GIMP_HELP_TOOL_PENCIL,
-                GIMP_STOCK_TOOL_PENCIL,
+                GIMP_ICON_TOOL_PENCIL,
                 data);
 }
 
diff --git a/app/tools/gimpperspectiveclonetool.c b/app/tools/gimpperspectiveclonetool.c
index 2a530ac..bb975f6 100644
--- a/app/tools/gimpperspectiveclonetool.c
+++ b/app/tools/gimpperspectiveclonetool.c
@@ -135,7 +135,7 @@ gimp_perspective_clone_tool_register (GimpToolRegisterCallback  callback,
                   "after applying a perspective transformation"),
                 N_("_Perspective Clone"), NULL,
                 NULL, GIMP_HELP_TOOL_PERSPECTIVE_CLONE,
-                GIMP_STOCK_TOOL_PERSPECTIVE_CLONE,
+                GIMP_ICON_TOOL_PERSPECTIVE_CLONE,
                 data);
 }
 
diff --git a/app/tools/gimpperspectivetool.c b/app/tools/gimpperspectivetool.c
index 7aa9993..c912b52 100644
--- a/app/tools/gimpperspectivetool.c
+++ b/app/tools/gimpperspectivetool.c
@@ -85,7 +85,7 @@ gimp_perspective_tool_register (GimpToolRegisterCallback  callback,
                   "Change perspective of the layer, selection or path"),
                 N_("_Perspective"), "<shift>P",
                 NULL, GIMP_HELP_TOOL_PERSPECTIVE,
-                GIMP_STOCK_TOOL_PERSPECTIVE,
+                GIMP_ICON_TOOL_PERSPECTIVE,
                 data);
 }
 
diff --git a/app/tools/gimprectangleselecttool.c b/app/tools/gimprectangleselecttool.c
index 9fe78a3..933a4f1 100644
--- a/app/tools/gimprectangleselecttool.c
+++ b/app/tools/gimprectangleselecttool.c
@@ -167,7 +167,7 @@ gimp_rectangle_select_tool_register (GimpToolRegisterCallback  callback,
                 _("Rectangle Select Tool: Select a rectangular region"),
                 N_("_Rectangle Select"), "R",
                 NULL, GIMP_HELP_TOOL_RECT_SELECT,
-                GIMP_STOCK_TOOL_RECT_SELECT,
+                GIMP_ICON_TOOL_RECT_SELECT,
                 data);
 }
 
diff --git a/app/tools/gimprotatetool.c b/app/tools/gimprotatetool.c
index 1da4086..ba76ccd 100644
--- a/app/tools/gimprotatetool.c
+++ b/app/tools/gimprotatetool.c
@@ -95,7 +95,7 @@ gimp_rotate_tool_register (GimpToolRegisterCallback  callback,
                 _("Rotate Tool: Rotate the layer, selection or path"),
                 N_("_Rotate"), "<shift>R",
                 NULL, GIMP_HELP_TOOL_ROTATE,
-                GIMP_STOCK_TOOL_ROTATE,
+                GIMP_ICON_TOOL_ROTATE,
                 data);
 }
 
diff --git a/app/tools/gimpscaletool.c b/app/tools/gimpscaletool.c
index ef2db05..c5cf5bd 100644
--- a/app/tools/gimpscaletool.c
+++ b/app/tools/gimpscaletool.c
@@ -91,7 +91,7 @@ gimp_scale_tool_register (GimpToolRegisterCallback  callback,
                 _("Scale Tool: Scale the layer, selection or path"),
                 N_("_Scale"), "<shift>T",
                 NULL, GIMP_HELP_TOOL_SCALE,
-                GIMP_STOCK_TOOL_SCALE,
+                GIMP_ICON_TOOL_SCALE,
                 data);
 }
 
diff --git a/app/tools/gimpsheartool.c b/app/tools/gimpsheartool.c
index df41248..68f4620 100644
--- a/app/tools/gimpsheartool.c
+++ b/app/tools/gimpsheartool.c
@@ -88,7 +88,7 @@ gimp_shear_tool_register (GimpToolRegisterCallback  callback,
                 _("Shear Tool: Shear the layer, selection or path"),
                 N_("S_hear"), "<shift>S",
                 NULL, GIMP_HELP_TOOL_SHEAR,
-                GIMP_STOCK_TOOL_SHEAR,
+                GIMP_ICON_TOOL_SHEAR,
                 data);
 }
 
diff --git a/app/tools/gimpsmudgetool.c b/app/tools/gimpsmudgetool.c
index 22db3b5..ee5be8a 100644
--- a/app/tools/gimpsmudgetool.c
+++ b/app/tools/gimpsmudgetool.c
@@ -55,7 +55,7 @@ gimp_smudge_tool_register (GimpToolRegisterCallback  callback,
                 _("Smudge Tool: Smudge selectively using a brush"),
                 N_("_Smudge"), "S",
                 NULL, GIMP_HELP_TOOL_SMUDGE,
-                GIMP_STOCK_TOOL_SMUDGE,
+                GIMP_ICON_TOOL_SMUDGE,
                 data);
 }
 
diff --git a/app/tools/gimptextoptions.c b/app/tools/gimptextoptions.c
index 436b7d8..d8f7d7b 100644
--- a/app/tools/gimptextoptions.c
+++ b/app/tools/gimptextoptions.c
@@ -602,7 +602,7 @@ gimp_text_options_gui (GimpToolOptions *tool_options)
                              button, 1, TRUE);
   gtk_size_group_add_widget (size_group, button);
 
-  box = gimp_prop_enum_icon_box_new (config, "justify", "gtk-justify", 0, 0);
+  box = gimp_prop_enum_icon_box_new (config, "justify", "format-justify", 0, 0);
   gimp_table_attach_aligned (GTK_TABLE (table), 0, row++,
                              _("Justify:"), 0.0, 0.5,
                              box, 2, TRUE);
@@ -612,18 +612,21 @@ gimp_text_options_gui (GimpToolOptions *tool_options)
   spinbutton = gimp_prop_spin_button_new (config, "indent", 1.0, 10.0, 1);
   gtk_entry_set_width_chars (GTK_ENTRY (spinbutton), 5);
   gimp_table_attach_icon (GTK_TABLE (table), row++,
-                          "format-indent-more", spinbutton, 1, TRUE);
+                          GIMP_ICON_FORMAT_INDENT_MORE,
+                          spinbutton, 1, TRUE);
 
   spinbutton = gimp_prop_spin_button_new (config, "line-spacing", 1.0, 10.0, 1);
   gtk_entry_set_width_chars (GTK_ENTRY (spinbutton), 5);
   gimp_table_attach_icon (GTK_TABLE (table), row++,
-                          GIMP_STOCK_LINE_SPACING, spinbutton, 1, TRUE);
+                          GIMP_ICON_FORMAT_TEXT_SPACING_LINE,
+                          spinbutton, 1, TRUE);
 
   spinbutton = gimp_prop_spin_button_new (config,
                                           "letter-spacing", 1.0, 10.0, 1);
   gtk_entry_set_width_chars (GTK_ENTRY (spinbutton), 5);
   gimp_table_attach_icon (GTK_TABLE (table), row++,
-                          GIMP_STOCK_LETTER_SPACING, spinbutton, 1, TRUE);
+                          GIMP_ICON_FORMAT_TEXT_SPACING_LETTER,
+                          spinbutton, 1, TRUE);
 
   combo = gimp_prop_enum_combo_box_new (config, "box-mode", 0, 0);
   gimp_table_attach_aligned (GTK_TABLE (table), 0, row++,
diff --git a/app/tools/gimptexttool.c b/app/tools/gimptexttool.c
index a044b95..982ab26 100644
--- a/app/tools/gimptexttool.c
+++ b/app/tools/gimptexttool.c
@@ -193,7 +193,7 @@ gimp_text_tool_register (GimpToolRegisterCallback  callback,
                 _("Text Tool: Create or edit text layers"),
                 N_("Te_xt"), "T",
                 NULL, GIMP_HELP_TOOL_TEXT,
-                GIMP_STOCK_TOOL_TEXT,
+                GIMP_ICON_TOOL_TEXT,
                 data);
 }
 
@@ -1519,7 +1519,7 @@ gimp_text_tool_confirm_dialog (GimpTextTool *text_tool)
                                      GIMP_CONTEXT (gimp_tool_get_options (tool)),
                                      _("Confirm Text Editing"),
                                      "gimp-text-tool-confirm",
-                                     GIMP_STOCK_TEXT_LAYER,
+                                     GIMP_ICON_LAYER_TEXT_LAYER,
                                      _("Confirm Text Editing"),
                                      GTK_WIDGET (shell),
                                      gimp_standard_help_func, NULL,
diff --git a/app/tools/gimpthresholdtool.c b/app/tools/gimpthresholdtool.c
index 131ab7d..0af3ab1 100644
--- a/app/tools/gimpthresholdtool.c
+++ b/app/tools/gimpthresholdtool.c
@@ -94,7 +94,7 @@ gimp_threshold_tool_register (GimpToolRegisterCallback  callback,
                 _("Threshold Tool: Reduce image to two colors using a threshold"),
                 N_("_Threshold..."), NULL,
                 NULL, GIMP_HELP_TOOL_THRESHOLD,
-                GIMP_STOCK_TOOL_THRESHOLD,
+                GIMP_ICON_TOOL_THRESHOLD,
                 data);
 }
 
diff --git a/app/tools/gimpvectortool.c b/app/tools/gimpvectortool.c
index 71b567c..c5c81df 100644
--- a/app/tools/gimpvectortool.c
+++ b/app/tools/gimpvectortool.c
@@ -170,7 +170,7 @@ gimp_vector_tool_register (GimpToolRegisterCallback callback,
                 _("Paths Tool: Create and edit paths"),
                 N_("Pat_hs"), "b",
                 NULL, GIMP_HELP_TOOL_PATH,
-                GIMP_STOCK_TOOL_PATH,
+                GIMP_ICON_TOOL_PATH,
                 data);
 }
 
@@ -1988,7 +1988,7 @@ gimp_vector_tool_stroke_vectors (GimpVectorTool *vector_tool,
                               drawable,
                               GIMP_CONTEXT (GIMP_TOOL_GET_OPTIONS (vector_tool)),
                               _("Stroke Path"),
-                              GIMP_STOCK_PATH_STROKE,
+                              GIMP_ICON_PATH_STROKE,
                               GIMP_HELP_PATH_STROKE,
                               button,
                               config->stroke_options,
diff --git a/app/widgets/gimpactionview.c b/app/widgets/gimpactionview.c
index 3a959b6..b2f3312 100644
--- a/app/widgets/gimpactionview.c
+++ b/app/widgets/gimpactionview.c
@@ -667,7 +667,7 @@ gimp_action_view_conflict_confirm (GimpActionView  *view,
 
   dialog =
     gimp_message_dialog_new (_("Conflicting Shortcuts"),
-                             GIMP_STOCK_WARNING,
+                             GIMP_ICON_DIALOG_WARNING,
                              gtk_widget_get_toplevel (GTK_WIDGET (view)), 0,
                              gimp_standard_help_func, NULL,
 
diff --git a/app/widgets/gimpcolordisplayeditor.c b/app/widgets/gimpcolordisplayeditor.c
index f52fbb0..679c052 100644
--- a/app/widgets/gimpcolordisplayeditor.c
+++ b/app/widgets/gimpcolordisplayeditor.c
@@ -188,7 +188,7 @@ gimp_color_display_editor_init (GimpColorDisplayEditor *editor)
   gtk_widget_set_sensitive (editor->add_button, FALSE);
   gtk_widget_show (editor->add_button);
 
-  image = gtk_image_new_from_icon_name ("go-next",
+  image = gtk_image_new_from_icon_name (GIMP_ICON_GO_NEXT,
                                         GTK_ICON_SIZE_BUTTON);
   gtk_container_add (GTK_CONTAINER (editor->add_button), image);
   gtk_widget_show (image);
@@ -202,7 +202,7 @@ gimp_color_display_editor_init (GimpColorDisplayEditor *editor)
   gtk_widget_set_sensitive (editor->remove_button, FALSE);
   gtk_widget_show (editor->remove_button);
 
-  image = gtk_image_new_from_icon_name ("go-previous",
+  image = gtk_image_new_from_icon_name (GIMP_ICON_GO_PREVIOUS,
                                         GTK_ICON_SIZE_BUTTON);
   gtk_container_add (GTK_CONTAINER (editor->remove_button), image);
   gtk_widget_show (image);
@@ -217,7 +217,7 @@ gimp_color_display_editor_init (GimpColorDisplayEditor *editor)
 
   editor->up_button =
     gimp_editor_add_button (GIMP_EDITOR (ed),
-                            "go-up",
+                            GIMP_ICON_GO_UP,
                             _("Move the selected filter up"),
                             NULL,
                             G_CALLBACK (gimp_color_display_editor_up_clicked),
@@ -226,7 +226,7 @@ gimp_color_display_editor_init (GimpColorDisplayEditor *editor)
 
   editor->down_button =
     gimp_editor_add_button (GIMP_EDITOR (ed),
-                            "go-down",
+                            GIMP_ICON_GO_DOWN,
                             _("Move the selected filter down"),
                             NULL,
                             G_CALLBACK (gimp_color_display_editor_down_clicked),
@@ -268,7 +268,7 @@ gimp_color_display_editor_init (GimpColorDisplayEditor *editor)
                                                      NULL);
   gtk_tree_view_insert_column (GTK_TREE_VIEW (tv), column, 0);
 
-  image = gtk_image_new_from_icon_name (GIMP_STOCK_VISIBLE,
+  image = gtk_image_new_from_icon_name (GIMP_ICON_VISIBLE,
                                         GTK_ICON_SIZE_MENU);
   gtk_tree_view_column_set_widget (column, image);
   gtk_widget_show (image);
@@ -320,7 +320,7 @@ gimp_color_display_editor_init (GimpColorDisplayEditor *editor)
   gtk_box_pack_end (GTK_BOX (editor->config_box), hbox, FALSE, FALSE, 0);
   gtk_widget_show (hbox);
 
-  editor->reset_button = gtk_button_new_from_stock (GIMP_STOCK_RESET);
+  editor->reset_button = gtk_button_new_from_stock (GIMP_ICON_RESET);
   gtk_box_pack_end (GTK_BOX (hbox), editor->reset_button, FALSE, FALSE, 0);
   gtk_widget_show (editor->reset_button);
 
diff --git a/app/widgets/gimpcolorselectorpalette.c b/app/widgets/gimpcolorselectorpalette.c
index 68302c6..3d02c62 100644
--- a/app/widgets/gimpcolorselectorpalette.c
+++ b/app/widgets/gimpcolorselectorpalette.c
@@ -58,7 +58,7 @@ gimp_color_selector_palette_class_init (GimpColorSelectorPaletteClass *klass)
 
   selector_class->name       = _("Palette");
   selector_class->help_id    = "gimp-colorselector-palette";
-  selector_class->icon_name  = GIMP_STOCK_PALETTE;
+  selector_class->icon_name  = GIMP_ICON_PALETTE;
   selector_class->set_color  = gimp_color_selector_palette_set_color;
   selector_class->set_config = gimp_color_selector_palette_set_config;
 }
diff --git a/app/widgets/gimpcombotagentry.c b/app/widgets/gimpcombotagentry.c
index 77b023a..e254822 100644
--- a/app/widgets/gimpcombotagentry.c
+++ b/app/widgets/gimpcombotagentry.c
@@ -25,6 +25,8 @@
 #include <gegl.h>
 #include <gtk/gtk.h>
 
+#include "libgimpwidgets/gimpwidgets.h"
+
 #include "widgets-types.h"
 
 #include "core/gimpcontainer.h"
@@ -92,7 +94,7 @@ gimp_combo_tag_entry_init (GimpComboTagEntry *entry)
 
   gtk_entry_set_icon_from_icon_name (GTK_ENTRY (entry),
                                      GTK_ENTRY_ICON_SECONDARY,
-                                     "go-down");
+                                     GIMP_ICON_GO_DOWN);
 
   g_signal_connect (entry, "icon-press",
                     G_CALLBACK (gimp_combo_tag_entry_icon_press),
diff --git a/app/widgets/gimpcomponenteditor.c b/app/widgets/gimpcomponenteditor.c
index 52291c4..65ee806 100644
--- a/app/widgets/gimpcomponenteditor.c
+++ b/app/widgets/gimpcomponenteditor.c
@@ -136,7 +136,7 @@ gimp_component_editor_init (GimpComponentEditor *editor)
   editor->eye_column = gtk_tree_view_column_new ();
   gtk_tree_view_append_column (editor->view, editor->eye_column);
 
-  editor->eye_cell = gimp_cell_renderer_toggle_new (GIMP_STOCK_VISIBLE);
+  editor->eye_cell = gimp_cell_renderer_toggle_new (GIMP_ICON_VISIBLE);
   gtk_tree_view_column_pack_start (editor->eye_column, editor->eye_cell,
                                    FALSE);
   gtk_tree_view_column_set_attributes (editor->eye_column, editor->eye_cell,
@@ -299,7 +299,7 @@ gimp_component_editor_set_view_size (GimpComponentEditor *editor,
   tree_style  = gtk_widget_get_style (tree_widget);
 
   icon_size = gimp_get_icon_size (tree_widget,
-                                  GIMP_STOCK_VISIBLE,
+                                  GIMP_ICON_VISIBLE,
                                   GTK_ICON_SIZE_BUTTON,
                                   view_size -
                                   2 * tree_style->xthickness,
diff --git a/app/widgets/gimpcontrollereditor.c b/app/widgets/gimpcontrollereditor.c
index 0de4c9a..1a0b57c 100644
--- a/app/widgets/gimpcontrollereditor.c
+++ b/app/widgets/gimpcontrollereditor.c
@@ -371,7 +371,7 @@ gimp_controller_editor_constructed (GObject *object)
                              "the controller"),
                            NULL);
 
-  editor->edit_button = gtk_button_new_from_stock (GTK_STOCK_EDIT);
+  editor->edit_button = gtk_button_new_with_mnemonic (_("_Edit event"));
   gtk_box_pack_start (GTK_BOX (hbox), editor->edit_button, TRUE, TRUE, 0);
   gtk_widget_show (editor->edit_button);
 
@@ -379,7 +379,7 @@ gimp_controller_editor_constructed (GObject *object)
                     G_CALLBACK (gimp_controller_editor_edit_clicked),
                     editor);
 
-  editor->delete_button = gtk_button_new_from_stock (GTK_STOCK_CLEAR);
+  editor->delete_button = gtk_button_new_with_mnemonic (_("_Clear event"));
   gtk_box_pack_start (GTK_BOX (hbox), editor->delete_button, TRUE, TRUE, 0);
   gtk_widget_show (editor->delete_button);
 
@@ -656,7 +656,7 @@ gimp_controller_editor_edit_clicked (GtkWidget            *button,
         gimp_viewable_dialog_new (GIMP_VIEWABLE (editor->info), editor->context,
                                   _("Select Controller Event Action"),
                                   "gimp-controller-action-dialog",
-                                  "gtk-edit",
+                                  GIMP_ICON_EDIT,
                                   title,
                                   gtk_widget_get_toplevel (GTK_WIDGET (editor)),
                                   gimp_standard_help_func,
diff --git a/app/widgets/gimpcontrollerinfo.c b/app/widgets/gimpcontrollerinfo.c
index fed3cfa..c3b30c1 100644
--- a/app/widgets/gimpcontrollerinfo.c
+++ b/app/widgets/gimpcontrollerinfo.c
@@ -105,7 +105,7 @@ gimp_controller_info_class_init (GimpControllerInfoClass *klass)
   object_class->set_property        = gimp_controller_info_set_property;
   object_class->get_property        = gimp_controller_info_get_property;
 
-  viewable_class->default_icon_name = GIMP_STOCK_CONTROLLER;
+  viewable_class->default_icon_name = GIMP_ICON_CONTROLLER;
 
   GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_ENABLED,
                             "enabled",
diff --git a/app/widgets/gimpcontrollerkeyboard.c b/app/widgets/gimpcontrollerkeyboard.c
index 6b7e5be..6f973b8 100644
--- a/app/widgets/gimpcontrollerkeyboard.c
+++ b/app/widgets/gimpcontrollerkeyboard.c
@@ -177,7 +177,7 @@ gimp_controller_keyboard_class_init (GimpControllerKeyboardClass *klass)
 
   controller_class->name            = _("Keyboard");
   controller_class->help_id         = GIMP_HELP_CONTROLLER_KEYBOARD;
-  controller_class->icon_name       = GIMP_STOCK_CONTROLLER_KEYBOARD;
+  controller_class->icon_name       = GIMP_ICON_CONTROLLER_KEYBOARD;
 
   controller_class->get_n_events    = gimp_controller_keyboard_get_n_events;
   controller_class->get_event_name  = gimp_controller_keyboard_get_event_name;
diff --git a/app/widgets/gimpcontrollerlist.c b/app/widgets/gimpcontrollerlist.c
index 97fa72d..dc0d5b7 100644
--- a/app/widgets/gimpcontrollerlist.c
+++ b/app/widgets/gimpcontrollerlist.c
@@ -243,7 +243,7 @@ gimp_controller_list_init (GimpControllerList *list)
   gtk_widget_set_sensitive (list->add_button, FALSE);
   gtk_widget_show (list->add_button);
 
-  image = gtk_image_new_from_icon_name ("go-next",
+  image = gtk_image_new_from_icon_name (GIMP_ICON_GO_NEXT,
                                         GTK_ICON_SIZE_BUTTON);
   gtk_container_add (GTK_CONTAINER (list->add_button), image);
   gtk_widget_show (image);
@@ -260,7 +260,7 @@ gimp_controller_list_init (GimpControllerList *list)
   gtk_widget_set_sensitive (list->remove_button, FALSE);
   gtk_widget_show (list->remove_button);
 
-  image = gtk_image_new_from_icon_name ("go-previous",
+  image = gtk_image_new_from_icon_name (GIMP_ICON_GO_PREVIOUS,
                                         GTK_ICON_SIZE_BUTTON);
   gtk_container_add (GTK_CONTAINER (list->remove_button), image);
   gtk_widget_show (image);
@@ -292,7 +292,7 @@ gimp_controller_list_init (GimpControllerList *list)
 
   list->edit_button =
     gimp_editor_add_button (GIMP_EDITOR (list->dest),
-                            "document-properties",
+                            GIMP_ICON_DOCUMENT_PROPERTIES,
                             _("Configure the selected controller"),
                             NULL,
                             G_CALLBACK (gimp_controller_list_edit_clicked),
@@ -300,7 +300,7 @@ gimp_controller_list_init (GimpControllerList *list)
                             list);
   list->up_button =
     gimp_editor_add_button (GIMP_EDITOR (list->dest),
-                            "go-up",
+                            GIMP_ICON_GO_UP,
                             _("Move the selected controller up"),
                             NULL,
                             G_CALLBACK (gimp_controller_list_up_clicked),
@@ -308,7 +308,7 @@ gimp_controller_list_init (GimpControllerList *list)
                             list);
   list->down_button =
     gimp_editor_add_button (GIMP_EDITOR (list->dest),
-                            "go-down",
+                            GIMP_ICON_GO_DOWN,
                             _("Move the selected controller down"),
                             NULL,
                             G_CALLBACK (gimp_controller_list_down_clicked),
@@ -560,7 +560,7 @@ gimp_controller_list_remove_clicked (GtkWidget          *button,
 #define RESPONSE_DISABLE 1
 
   dialog = gimp_message_dialog_new (_("Remove Controller?"),
-                                    GIMP_STOCK_WARNING,
+                                    GIMP_ICON_DIALOG_WARNING,
                                     GTK_WIDGET (list), GTK_DIALOG_MODAL,
                                     NULL, NULL,
 
diff --git a/app/widgets/gimpcontrollermouse.c b/app/widgets/gimpcontrollermouse.c
index 6e2bfd5..9e3b908 100644
--- a/app/widgets/gimpcontrollermouse.c
+++ b/app/widgets/gimpcontrollermouse.c
@@ -202,7 +202,7 @@ gimp_controller_mouse_class_init (GimpControllerMouseClass *klass)
 
   controller_class->name            = _("Mouse Buttons");
   controller_class->help_id         = GIMP_HELP_CONTROLLER_MOUSE;
-  controller_class->icon_name       = GIMP_STOCK_CONTROLLER_MOUSE;
+  controller_class->icon_name       = GIMP_ICON_CONTROLLER_MOUSE;
 
   controller_class->get_n_events    = gimp_controller_mouse_get_n_events;
   controller_class->get_event_name  = gimp_controller_mouse_get_event_name;
diff --git a/app/widgets/gimpcontrollerwheel.c b/app/widgets/gimpcontrollerwheel.c
index 11779f5..dec4ccc 100644
--- a/app/widgets/gimpcontrollerwheel.c
+++ b/app/widgets/gimpcontrollerwheel.c
@@ -176,7 +176,7 @@ gimp_controller_wheel_class_init (GimpControllerWheelClass *klass)
 
   controller_class->name            = _("Mouse Wheel");
   controller_class->help_id         = GIMP_HELP_CONTROLLER_WHEEL;
-  controller_class->icon_name       = GIMP_STOCK_CONTROLLER_WHEEL;
+  controller_class->icon_name       = GIMP_ICON_CONTROLLER_WHEEL;
 
   controller_class->get_n_events    = gimp_controller_wheel_get_n_events;
   controller_class->get_event_name  = gimp_controller_wheel_get_event_name;
diff --git a/app/widgets/gimpdeviceeditor.c b/app/widgets/gimpdeviceeditor.c
index ec9e79d..c499650 100644
--- a/app/widgets/gimpdeviceeditor.c
+++ b/app/widgets/gimpdeviceeditor.c
@@ -500,7 +500,7 @@ gimp_device_editor_delete_clicked (GtkWidget        *button,
     return;
 
   dialog = gimp_message_dialog_new (_("Delete Device Settings"),
-                                    GIMP_STOCK_QUESTION,
+                                    GIMP_ICON_DIALOG_QUESTION,
                                     gtk_widget_get_toplevel (GTK_WIDGET (editor)),
                                     GTK_DIALOG_DESTROY_WITH_PARENT,
                                     gimp_standard_help_func, NULL,
diff --git a/app/widgets/gimpdeviceinfo.c b/app/widgets/gimpdeviceinfo.c
index f8a1817..46e8d1d 100644
--- a/app/widgets/gimpdeviceinfo.c
+++ b/app/widgets/gimpdeviceinfo.c
@@ -109,7 +109,7 @@ gimp_device_info_class_init (GimpDeviceInfoClass *klass)
   object_class->set_property        = gimp_device_info_set_property;
   object_class->get_property        = gimp_device_info_get_property;
 
-  viewable_class->default_icon_name = GIMP_STOCK_INPUT_DEVICE;
+  viewable_class->default_icon_name = GIMP_ICON_INPUT_DEVICE;
 
   g_object_class_install_property (object_class, PROP_DEVICE,
                                    g_param_spec_object ("device",
@@ -503,15 +503,15 @@ gimp_device_info_guess_icon (GimpDeviceInfo *info)
 
       if (strstr (down, "eraser"))
         {
-          icon_name = GIMP_STOCK_TOOL_ERASER;
+          icon_name = GIMP_ICON_TOOL_ERASER;
         }
       else if (strstr (down, "pen"))
         {
-          icon_name = GIMP_STOCK_TOOL_PAINTBRUSH;
+          icon_name = GIMP_ICON_TOOL_PAINTBRUSH;
         }
       else if (strstr (down, "airbrush"))
         {
-          icon_name = GIMP_STOCK_TOOL_AIRBRUSH;
+          icon_name = GIMP_ICON_TOOL_AIRBRUSH;
         }
       else if (strstr (down, "cursor")   ||
                strstr (down, "mouse")    ||
@@ -519,7 +519,7 @@ gimp_device_info_guess_icon (GimpDeviceInfo *info)
                strstr (down, "touchpad") ||
                strstr (down, "trackpoint"))
         {
-          icon_name = GIMP_STOCK_CURSOR;
+          icon_name = GIMP_ICON_CURSOR;
         }
 
       g_free (down);
diff --git a/app/widgets/gimpdevicestatus.c b/app/widgets/gimpdevicestatus.c
index 6c782b0..a63c2a5 100644
--- a/app/widgets/gimpdevicestatus.c
+++ b/app/widgets/gimpdevicestatus.c
@@ -141,7 +141,7 @@ gimp_device_status_init (GimpDeviceStatus *status)
   gtk_widget_show (status->vbox);
 
   status->save_button =
-    gimp_editor_add_button (GIMP_EDITOR (status), "document-save",
+    gimp_editor_add_button (GIMP_EDITOR (status), GIMP_ICON_DOCUMENT_SAVE,
                             _("Save device status"), NULL,
                             G_CALLBACK (gimp_device_status_save_clicked),
                             NULL,
diff --git a/app/widgets/gimpdnd-xds.c b/app/widgets/gimpdnd-xds.c
index 34af288..4902dec 100644
--- a/app/widgets/gimpdnd-xds.c
+++ b/app/widgets/gimpdnd-xds.c
@@ -220,7 +220,8 @@ gimp_file_overwrite_dialog (GtkWidget *parent,
   GtkWidget *dialog;
   gboolean   overwrite = FALSE;
 
-  dialog = gimp_message_dialog_new (_("File Exists"), GIMP_STOCK_WARNING,
+  dialog = gimp_message_dialog_new (_("File Exists"),
+                                    GIMP_ICON_DIALOG_WARNING,
                                     parent, GTK_DIALOG_DESTROY_WITH_PARENT,
                                     gimp_standard_help_func, NULL,
 
diff --git a/app/widgets/gimpdockbook.c b/app/widgets/gimpdockbook.c
index a5effbc..2071e7f 100644
--- a/app/widgets/gimpdockbook.c
+++ b/app/widgets/gimpdockbook.c
@@ -285,9 +285,11 @@ gimp_dockbook_init (GimpDockbook *dockbook)
                                   GTK_PACK_END);
   gtk_widget_show (dockbook->p->menu_button);
 
-  image = gtk_image_new_from_icon_name (GIMP_STOCK_MENU_LEFT, GTK_ICON_SIZE_MENU);
+  image = gtk_image_new_from_icon_name (GIMP_ICON_MENU_LEFT,
+                                        GTK_ICON_SIZE_MENU);
   gtk_image_set_pixel_size (GTK_IMAGE (image), 12);
-  gtk_image_set_from_icon_name (GTK_IMAGE (image), GIMP_STOCK_MENU_LEFT, GTK_ICON_SIZE_MENU);
+  gtk_image_set_from_icon_name (GTK_IMAGE (image), GIMP_ICON_MENU_LEFT,
+                                GTK_ICON_SIZE_MENU);
   gtk_container_add (GTK_CONTAINER (dockbook->p->menu_button), image);
   gtk_widget_show (image);
 
diff --git a/app/widgets/gimpdrawabletreeview.c b/app/widgets/gimpdrawabletreeview.c
index 5ad06b4..5efd134 100644
--- a/app/widgets/gimpdrawabletreeview.c
+++ b/app/widgets/gimpdrawabletreeview.c
@@ -117,9 +117,9 @@ gimp_drawable_tree_view_class_init (GimpDrawableTreeViewClass *klass)
 
   item_view_class->set_image     = gimp_drawable_tree_view_set_image;
 
-  item_view_class->lock_content_icon_name  = GIMP_STOCK_TOOL_PAINTBRUSH;
+  item_view_class->lock_content_icon_name  = GIMP_ICON_TOOL_PAINTBRUSH;
   item_view_class->lock_content_tooltip    = _("Lock pixels");
-  item_view_class->lock_position_icon_name = GIMP_STOCK_TOOL_MOVE;
+  item_view_class->lock_position_icon_name = GIMP_ICON_TOOL_MOVE;
   item_view_class->lock_position_tooltip   = _("Lock position and size");
 }
 
diff --git a/app/widgets/gimperrordialog.c b/app/widgets/gimperrordialog.c
index 7810c4f..c858f8b 100644
--- a/app/widgets/gimperrordialog.c
+++ b/app/widgets/gimperrordialog.c
@@ -149,7 +149,7 @@ gimp_error_dialog_add (GimpErrorDialog *dialog,
       g_printerr ("%s: %s\n\n", domain, message);
 
       overflow  = TRUE;
-      icon_name = GIMP_STOCK_WILBER_EEK;
+      icon_name = GIMP_ICON_WILBER_EEK;
       domain    = _("Too many error messages!");
       message   = _("Messages are redirected to stderr.");
 
diff --git a/app/widgets/gimpfgbgeditor.c b/app/widgets/gimpfgbgeditor.c
index e5c4ef1..320c5bc 100644
--- a/app/widgets/gimpfgbgeditor.c
+++ b/app/widgets/gimpfgbgeditor.c
@@ -286,7 +286,7 @@ gimp_fg_bg_editor_expose (GtkWidget      *widget,
   /*  draw the default colors pixbuf  */
   if (! editor->default_icon)
     editor->default_icon = gimp_widget_load_icon (widget,
-                                                  GIMP_STOCK_DEFAULT_COLORS, 12);
+                                                  GIMP_ICON_COLORS_DEFAULT, 12);
 
   default_w = gdk_pixbuf_get_width  (editor->default_icon);
   default_h = gdk_pixbuf_get_height (editor->default_icon);
@@ -305,7 +305,7 @@ gimp_fg_bg_editor_expose (GtkWidget      *widget,
   /*  draw the swap colors pixbuf  */
   if (! editor->swap_icon)
     editor->swap_icon = gimp_widget_load_icon (widget,
-                                               GIMP_STOCK_SWAP_COLORS, 12);
+                                               GIMP_ICON_COLORS_SWAP, 12);
 
   swap_w = gdk_pixbuf_get_width  (editor->swap_icon);
   swap_h = gdk_pixbuf_get_height (editor->swap_icon);
diff --git a/app/widgets/gimphelp.c b/app/widgets/gimphelp.c
index b08bcaa..c226a9d 100644
--- a/app/widgets/gimphelp.c
+++ b/app/widgets/gimphelp.c
@@ -379,7 +379,7 @@ gimp_help_browser_error (Gimp         *gimp,
 {
   GtkWidget *dialog;
 
-  dialog = gimp_message_dialog_new (title, GIMP_STOCK_USER_MANUAL,
+  dialog = gimp_message_dialog_new (title, GIMP_ICON_HELP_USER_MANUAL,
                                     NULL, 0,
                                     NULL, NULL,
 
@@ -715,7 +715,7 @@ gimp_help_query_user_manual_online (GimpIdleHelp *idle_help)
   GtkWidget *dialog;
 
   dialog = gimp_message_dialog_new (_("GIMP user manual is missing"),
-                                    GIMP_STOCK_USER_MANUAL,
+                                    GIMP_ICON_HELP_USER_MANUAL,
                                     NULL, 0, NULL, NULL,
 
                                     _("_Cancel"),      GTK_RESPONSE_CANCEL,
diff --git a/app/widgets/gimpitemtreeview.c b/app/widgets/gimpitemtreeview.c
index e48782d..11320a1 100644
--- a/app/widgets/gimpitemtreeview.c
+++ b/app/widgets/gimpitemtreeview.c
@@ -369,7 +369,7 @@ gimp_item_tree_view_constructed (GObject *object)
   column = gtk_tree_view_column_new ();
   gtk_tree_view_insert_column (tree_view->view, column, 0);
 
-  item_view->priv->eye_cell = gimp_cell_renderer_toggle_new (GIMP_STOCK_VISIBLE);
+  item_view->priv->eye_cell = gimp_cell_renderer_toggle_new (GIMP_ICON_VISIBLE);
   g_object_set (item_view->priv->eye_cell,
                 "xpad",                0,
                 "ypad",                0,
@@ -395,7 +395,7 @@ gimp_item_tree_view_constructed (GObject *object)
   column = gtk_tree_view_column_new ();
   gtk_tree_view_insert_column (tree_view->view, column, 1);
 
-  item_view->priv->chain_cell = gimp_cell_renderer_toggle_new (GIMP_STOCK_LINKED);
+  item_view->priv->chain_cell = gimp_cell_renderer_toggle_new (GIMP_ICON_LINKED);
   g_object_set (item_view->priv->chain_cell,
                 "xpad", 0,
                 "ypad", 0,
@@ -601,10 +601,10 @@ gimp_item_tree_view_style_set (GtkWidget *widget,
 
   /* force the toggle cells to recreate their icon */
   g_object_set (view->priv->eye_cell,
-                "icon-name", GIMP_STOCK_VISIBLE,
+                "icon-name", GIMP_ICON_VISIBLE,
                 NULL);
   g_object_set (view->priv->chain_cell,
-                "icon-name", GIMP_STOCK_LINKED,
+                "icon-name", GIMP_ICON_LINKED,
                 NULL);
 
   GTK_WIDGET_CLASS (parent_class)->style_set (widget, prev_style);
diff --git a/app/widgets/gimplayertreeview.c b/app/widgets/gimplayertreeview.c
index 7fee23f..2e132c1 100644
--- a/app/widgets/gimplayertreeview.c
+++ b/app/widgets/gimplayertreeview.c
@@ -314,7 +314,7 @@ gimp_layer_tree_view_init (GimpLayerTreeView *view)
                         "button-icon-size", &icon_size,
                         NULL);
 
-  image = gtk_image_new_from_icon_name (GIMP_STOCK_TRANSPARENCY, icon_size);
+  image = gtk_image_new_from_icon_name (GIMP_ICON_TRANSPARENCY, icon_size);
   gtk_container_add (GTK_CONTAINER (view->priv->lock_alpha_toggle), image);
   gtk_widget_show (image);
 
diff --git a/app/widgets/gimpoverlaydialog.c b/app/widgets/gimpoverlaydialog.c
index d8776b4..fe7d4a6 100644
--- a/app/widgets/gimpoverlaydialog.c
+++ b/app/widgets/gimpoverlaydialog.c
@@ -209,7 +209,7 @@ gimp_overlay_dialog_constructed (GObject *object)
   gtk_box_pack_end (GTK_BOX (dialog->header), button, FALSE, FALSE, 0);
   gtk_widget_show (button);
 
-  image = gtk_image_new_from_icon_name (GIMP_STOCK_CLOSE, GTK_ICON_SIZE_MENU);
+  image = gtk_image_new_from_icon_name (GIMP_ICON_CLOSE, GTK_ICON_SIZE_MENU);
   gtk_image_set_pixel_size (GTK_IMAGE (image), 12);
   gtk_container_add (GTK_CONTAINER (button), image);
   gtk_widget_show (image);
@@ -228,7 +228,7 @@ gimp_overlay_dialog_constructed (GObject *object)
   gimp_help_set_help_data (dialog->detach_button,
                            _("Detach dialog from canvas"), NULL);
 
-  image = gtk_image_new_from_icon_name (GIMP_STOCK_DETACH,
+  image = gtk_image_new_from_icon_name (GIMP_ICON_DETACH,
                                         GTK_ICON_SIZE_MENU);
   gtk_image_set_pixel_size (GTK_IMAGE (image), 12);
   gtk_container_add (GTK_CONTAINER (button), image);
diff --git a/app/widgets/gimpprefsbox.c b/app/widgets/gimpprefsbox.c
index 04ac4cc..8327d8d 100644
--- a/app/widgets/gimpprefsbox.c
+++ b/app/widgets/gimpprefsbox.c
@@ -415,7 +415,7 @@ gimp_prefs_box_set_page_resettable (GimpPrefsBox *box,
   gtk_box_reorder_child (GTK_BOX (page_vbox), hbox, 0);
   gtk_widget_show (hbox);
 
-  button = gimp_icon_button_new (GIMP_STOCK_RESET, label);
+  button = gimp_icon_button_new (GIMP_ICON_RESET, label);
   gtk_box_pack_end (GTK_BOX (hbox), button, FALSE, FALSE, 0);
   gtk_widget_show (button);
 
diff --git a/app/widgets/gimppropgui-constructors.c b/app/widgets/gimppropgui-constructors.c
index 6f30102..6f786b6 100644
--- a/app/widgets/gimppropgui-constructors.c
+++ b/app/widgets/gimppropgui-constructors.c
@@ -167,7 +167,7 @@ _gimp_prop_gui_new_generic (GObject              *config,
 
               button = create_picker_func (picker_creator,
                                            pspec_name,
-                                           GIMP_STOCK_CURSOR,
+                                           GIMP_ICON_CURSOR,
                                            _("Pick coordinates from the image"));
               gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 0);
               gtk_widget_show (button);
@@ -622,25 +622,25 @@ _gimp_prop_gui_new_convolution_matrix (GObject              *config,
     const ButtonInfo buttons[] = {
       {
         .tooltip   = _("Rotate matrix 90° counter-clockwise"),
-        .icon_name = GIMP_STOCK_ROTATE_270,
+        .icon_name = GIMP_ICON_OBJECT_ROTATE_270,
         .rotate    = 1,
         .flip      = 0
       },
       {
         .tooltip   = _("Rotate matrix 90° clockwise"),
-        .icon_name = GIMP_STOCK_ROTATE_90,
+        .icon_name = GIMP_ICON_OBJECT_ROTATE_90,
         .rotate    = 3,
         .flip      = 0
       },
       {
         .tooltip   = _("Flip matrix horizontally"),
-        .icon_name = GIMP_STOCK_FLIP_HORIZONTAL,
+        .icon_name = GIMP_ICON_OBJECT_FLIP_HORIZONTAL,
         .rotate    = 0,
         .flip      = 1
       },
       {
         .tooltip   = _("Flip matrix vertically"),
-        .icon_name = GIMP_STOCK_FLIP_VERTICAL,
+        .icon_name = GIMP_ICON_OBJECT_FLIP_VERTICAL,
         .rotate    = 2,
         .flip      = 1
       }};
diff --git a/app/widgets/gimppropgui.c b/app/widgets/gimppropgui.c
index 861361c..e147e16 100644
--- a/app/widgets/gimppropgui.c
+++ b/app/widgets/gimppropgui.c
@@ -288,7 +288,7 @@ gimp_prop_widget_new_from_pspec (GObject               *config,
         {
           GtkWidget *l;
 
-          widget = gimp_message_box_new (GIMP_STOCK_WILBER_EEK);
+          widget = gimp_message_box_new (GIMP_ICON_WILBER_EEK);
           gimp_message_box_set_primary_text (GIMP_MESSAGE_BOX (widget), "%s",
                                              *label);
           gimp_message_box_set_text (GIMP_MESSAGE_BOX (widget), "%s", "");
@@ -342,7 +342,7 @@ gimp_prop_widget_new_from_pspec (GObject               *config,
         {
           button = create_picker_func (picker_creator,
                                        pspec->name,
-                                       GIMP_STOCK_COLOR_PICKER_GRAY,
+                                       GIMP_ICON_COLOR_PICKER_GRAY,
                                        _("Pick color from the image"));
           gtk_box_pack_start (GTK_BOX (widget), button, FALSE, FALSE, 0);
           gtk_widget_show (button);
@@ -548,7 +548,7 @@ gimp_prop_kelvin_presets_new (GObject     *config,
   gtk_button_set_relief (GTK_BUTTON (button), GTK_RELIEF_NONE);
 
   gtk_button_set_image (GTK_BUTTON (button),
-                        gtk_image_new_from_icon_name (GIMP_STOCK_MENU_LEFT,
+                        gtk_image_new_from_icon_name (GIMP_ICON_MENU_LEFT,
                                                       GTK_ICON_SIZE_MENU));
 
   menu = gtk_menu_new ();
diff --git a/app/widgets/gimpselectioneditor.c b/app/widgets/gimpselectioneditor.c
index 3ee38ad..1626a6d 100644
--- a/app/widgets/gimpselectioneditor.c
+++ b/app/widgets/gimpselectioneditor.c
@@ -122,7 +122,7 @@ gimp_selection_editor_init (GimpSelectionEditor *editor)
                                          GIMP_VIEW_SIZE_HUGE,
                                          0, TRUE);
   gimp_view_renderer_set_background (GIMP_VIEW (editor->view)->renderer,
-                                     GIMP_STOCK_TEXTURE);
+                                     GIMP_ICON_TEXTURE);
   gtk_widget_set_size_request (editor->view,
                                GIMP_VIEW_SIZE_HUGE, GIMP_VIEW_SIZE_HUGE);
   gimp_view_set_expand (GIMP_VIEW (editor->view), TRUE);
diff --git a/app/widgets/gimpsettingsbox.c b/app/widgets/gimpsettingsbox.c
index 8e902f9..6d11466 100644
--- a/app/widgets/gimpsettingsbox.c
+++ b/app/widgets/gimpsettingsbox.c
@@ -284,7 +284,8 @@ gimp_settings_box_constructed (GObject *object)
   gtk_box_pack_start (GTK_BOX (hbox2), button, FALSE, FALSE, 0);
   gtk_widget_show (button);
 
-  image = gtk_image_new_from_icon_name ("list-add", GTK_ICON_SIZE_MENU);
+  image = gtk_image_new_from_icon_name (GIMP_ICON_LIST_ADD,
+                                        GTK_ICON_SIZE_MENU);
   gtk_container_add (GTK_CONTAINER (button), image);
   gtk_widget_show (image);
 
@@ -300,7 +301,8 @@ gimp_settings_box_constructed (GObject *object)
   gtk_box_pack_start (GTK_BOX (hbox2), button, FALSE, FALSE, 0);
   gtk_widget_show (button);
 
-  arrow = gtk_image_new_from_icon_name (GIMP_STOCK_MENU_LEFT, GTK_ICON_SIZE_MENU);
+  arrow = gtk_image_new_from_icon_name (GIMP_ICON_MENU_LEFT,
+                                        GTK_ICON_SIZE_MENU);
   gtk_container_add (GTK_CONTAINER (button), arrow);
   gtk_widget_show (arrow);
 
@@ -315,20 +317,20 @@ gimp_settings_box_constructed (GObject *object)
 
   private->import_item =
     gimp_settings_box_menu_item_add (box,
-                                     "document-open",
+                                     GIMP_ICON_DOCUMENT_OPEN,
                                      _("_Import Settings from File..."),
                                      G_CALLBACK (gimp_settings_box_import_activate));
 
   private->export_item =
     gimp_settings_box_menu_item_add (box,
-                                     "document-save",
+                                     GIMP_ICON_DOCUMENT_SAVE,
                                      _("_Export Settings to File..."),
                                      G_CALLBACK (gimp_settings_box_export_activate));
 
   gimp_settings_box_menu_item_add (box, NULL, NULL, NULL);
 
   gimp_settings_box_menu_item_add (box,
-                                   "gtk-edit",
+                                   GIMP_ICON_EDIT,
                                    _("_Manage Settings..."),
                                    G_CALLBACK (gimp_settings_box_manage_activate));
 }
diff --git a/app/widgets/gimpsettingseditor.c b/app/widgets/gimpsettingseditor.c
index 94b9d29..827421d 100644
--- a/app/widgets/gimpsettingseditor.c
+++ b/app/widgets/gimpsettingseditor.c
@@ -190,7 +190,7 @@ gimp_settings_editor_constructed (GObject *object)
 
   private->import_button =
     gimp_editor_add_button (GIMP_EDITOR (tree_view),
-                            "document-open",
+                            GIMP_ICON_DOCUMENT_OPEN,
                             _("Import settings from a file"),
                             NULL,
                             G_CALLBACK (gimp_settings_editor_import_clicked),
@@ -199,7 +199,7 @@ gimp_settings_editor_constructed (GObject *object)
 
   private->export_button =
     gimp_editor_add_button (GIMP_EDITOR (tree_view),
-                            "document-save",
+                            GIMP_ICON_DOCUMENT_SAVE,
                             _("Export the selected settings to a file"),
                             NULL,
                             G_CALLBACK (gimp_settings_editor_export_clicked),
@@ -208,7 +208,7 @@ gimp_settings_editor_constructed (GObject *object)
 
   private->delete_button =
     gimp_editor_add_button (GIMP_EDITOR (tree_view),
-                            "edit-delete",
+                            GIMP_ICON_EDIT_DELETE,
                             _("Delete the selected settings"),
                             NULL,
                             G_CALLBACK (gimp_settings_editor_delete_clicked),
diff --git a/app/widgets/gimptextstyleeditor.c b/app/widgets/gimptextstyleeditor.c
index ac94a19..3a37547 100644
--- a/app/widgets/gimptextstyleeditor.c
+++ b/app/widgets/gimptextstyleeditor.c
@@ -325,16 +325,16 @@ gimp_text_style_editor_constructed (GObject *object)
                                    editor->context);
 
   gimp_text_style_editor_create_toggle (editor, editor->buffer->bold_tag,
-                                        "format-text-bold",
+                                        GIMP_ICON_FORMAT_TEXT_BOLD,
                                         _("Bold"));
   gimp_text_style_editor_create_toggle (editor, editor->buffer->italic_tag,
-                                        "format-text-italic",
+                                        GIMP_ICON_FORMAT_TEXT_ITALIC,
                                         _("Italic"));
   gimp_text_style_editor_create_toggle (editor, editor->buffer->underline_tag,
-                                        "format-text-underline",
+                                        GIMP_ICON_FORMAT_TEXT_UNDERLINE,
                                         _("Underline"));
   gimp_text_style_editor_create_toggle (editor, editor->buffer->strikethrough_tag,
-                                        "format-text-strikethrough",
+                                        GIMP_ICON_FORMAT_TEXT_STRIKETHROUGH,
                                         _("Strikethrough"));
 
   g_signal_connect_swapped (editor->text, "notify::font",
diff --git a/app/widgets/gimptooleditor.c b/app/widgets/gimptooleditor.c
index d73832f..0a3eff6 100644
--- a/app/widgets/gimptooleditor.c
+++ b/app/widgets/gimptooleditor.c
@@ -262,9 +262,9 @@ gimp_tool_editor_new (GimpContainer *container,
 
     column    = gtk_tree_view_column_new ();
     gtk_tree_view_insert_column (tree_view->view, column, 0);
-    eye_cell  = gimp_cell_renderer_toggle_new (GIMP_STOCK_VISIBLE);
+    eye_cell  = gimp_cell_renderer_toggle_new (GIMP_ICON_VISIBLE);
     icon_size = gimp_get_icon_size (GTK_WIDGET (tool_editor),
-                                    GIMP_STOCK_VISIBLE,
+                                    GIMP_ICON_VISIBLE,
                                     GTK_ICON_SIZE_BUTTON,
                                     view_size -
                                     2 * tree_style->xthickness,
@@ -291,7 +291,7 @@ gimp_tool_editor_new (GimpContainer *container,
 
   /* buttons */
   priv->raise_button =
-    gimp_editor_add_button (GIMP_EDITOR (tree_view), "go-up",
+    gimp_editor_add_button (GIMP_EDITOR (tree_view), GIMP_ICON_GO_UP,
                             _("Raise this tool"),
                             _("Raise this tool to the top"),
                             G_CALLBACK (gimp_tool_editor_raise_clicked),
@@ -299,7 +299,7 @@ gimp_tool_editor_new (GimpContainer *container,
                             tool_editor);
 
   priv->lower_button =
-    gimp_editor_add_button (GIMP_EDITOR (tree_view), "go-down",
+    gimp_editor_add_button (GIMP_EDITOR (tree_view), GIMP_ICON_GO_DOWN,
                             _("Lower this tool"),
                             _("Lower this tool to the bottom"),
                             G_CALLBACK (gimp_tool_editor_lower_clicked),
@@ -307,7 +307,7 @@ gimp_tool_editor_new (GimpContainer *container,
                             tool_editor);
 
   priv->reset_button =
-    gimp_editor_add_button (GIMP_EDITOR (tree_view), GIMP_STOCK_RESET,
+    gimp_editor_add_button (GIMP_EDITOR (tree_view), GIMP_ICON_RESET,
                             _("Reset tool order and visibility"), NULL,
                             G_CALLBACK (gimp_tool_editor_reset_clicked), NULL,
                             tool_editor);
diff --git a/app/widgets/gimptooloptionseditor.c b/app/widgets/gimptooloptionseditor.c
index d954612..4a22d56 100644
--- a/app/widgets/gimptooloptionseditor.c
+++ b/app/widgets/gimptooloptionseditor.c
@@ -198,7 +198,8 @@ gimp_tool_options_editor_constructed (GObject *object)
   G_OBJECT_CLASS (parent_class)->constructed (object);
 
   editor->p->save_button =
-    gimp_editor_add_button (GIMP_EDITOR (editor), "document-save",
+    gimp_editor_add_button (GIMP_EDITOR (editor),
+                            GIMP_ICON_DOCUMENT_SAVE,
                             _("Save Tool Preset..."),
                             GIMP_HELP_TOOL_OPTIONS_SAVE,
                             G_CALLBACK (gimp_tool_options_editor_save_clicked),
@@ -206,7 +207,8 @@ gimp_tool_options_editor_constructed (GObject *object)
                             editor);
 
   editor->p->restore_button =
-    gimp_editor_add_button (GIMP_EDITOR (editor), "document-revert",
+    gimp_editor_add_button (GIMP_EDITOR (editor),
+                            GIMP_ICON_DOCUMENT_REVERT,
                             _("Restore Tool Preset..."),
                             GIMP_HELP_TOOL_OPTIONS_RESTORE,
                             G_CALLBACK (gimp_tool_options_editor_restore_clicked),
@@ -214,7 +216,8 @@ gimp_tool_options_editor_constructed (GObject *object)
                             editor);
 
   editor->p->delete_button =
-    gimp_editor_add_button (GIMP_EDITOR (editor), "edit-delete",
+    gimp_editor_add_button (GIMP_EDITOR (editor),
+                            GIMP_ICON_EDIT_DELETE,
                             _("Delete Tool Preset..."),
                             GIMP_HELP_TOOL_OPTIONS_DELETE,
                             G_CALLBACK (gimp_tool_options_editor_delete_clicked),
diff --git a/app/widgets/gimpvectorstreeview.c b/app/widgets/gimpvectorstreeview.c
index b283b73..e6ed149 100644
--- a/app/widgets/gimpvectorstreeview.c
+++ b/app/widgets/gimpvectorstreeview.c
@@ -107,10 +107,10 @@ gimp_vectors_tree_view_class_init (GimpVectorsTreeViewClass *klass)
   iv_class->lower_bottom_action     = "vectors-lower-to-bottom";
   iv_class->duplicate_action        = "vectors-duplicate";
   iv_class->delete_action           = "vectors-delete";
-  iv_class->lock_content_icon_name  = GIMP_STOCK_TOOL_PATH;
+  iv_class->lock_content_icon_name  = GIMP_ICON_TOOL_PATH;
   iv_class->lock_content_tooltip    = _("Lock path strokes");
   iv_class->lock_content_help_id    = GIMP_HELP_PATH_LOCK_STROKES;
-  iv_class->lock_position_icon_name = GIMP_STOCK_TOOL_MOVE;
+  iv_class->lock_position_icon_name = GIMP_ICON_TOOL_MOVE;
   iv_class->lock_position_tooltip   = _("Lock path position");
   iv_class->lock_position_help_id   = GIMP_HELP_PATH_LOCK_POSITION;
 }
diff --git a/app/widgets/gimpviewablebox.c b/app/widgets/gimpviewablebox.c
index a294e2f..d5642d3 100644
--- a/app/widgets/gimpviewablebox.c
+++ b/app/widgets/gimpviewablebox.c
@@ -87,7 +87,7 @@ brush_box_new (GimpContainer *container,
   return gimp_viewable_box_new (container, context, label, spacing,
                                 view_type, GIMP_VIEW_SIZE_SMALL, view_size,
                                 "gimp-brush-grid|gimp-brush-list",
-                                GIMP_STOCK_BRUSH,
+                                GIMP_ICON_BRUSH,
                                 _("Open the brush selection dialog"),
                                 editor_id, editor_tooltip);
 }
@@ -155,7 +155,7 @@ dynamics_box_new (GimpContainer *container,
   return gimp_viewable_box_new (container, context, label, spacing,
                                 view_type, GIMP_VIEW_SIZE_SMALL, view_size,
                                 "gimp-dynamics-list|gimp-dynamics-grid",
-                                GIMP_STOCK_DYNAMICS,
+                                GIMP_ICON_DYNAMICS,
                                 _("Open the dynamics selection dialog"),
                                 editor_id, editor_tooltip);
 }
@@ -222,7 +222,7 @@ mybrush_box_new (GimpContainer *container,
   return gimp_viewable_box_new (container, context, label, spacing,
                                 view_type, GIMP_VIEW_SIZE_LARGE, view_size,
                                 "gimp-mypaint-brush-grid|gimp-mypaint-brush-list",
-                                GIMP_STOCK_BRUSH,
+                                GIMP_ICON_BRUSH,
                                 _("Open the MyPaint brush selection dialog"),
                                 NULL, NULL);
 }
@@ -285,7 +285,7 @@ pattern_box_new (GimpContainer *container,
   return gimp_viewable_box_new (container, context, label, spacing,
                                 view_type, GIMP_VIEW_SIZE_SMALL, view_size,
                                 "gimp-pattern-grid|gimp-pattern-list",
-                                GIMP_STOCK_PATTERN,
+                                GIMP_ICON_PATTERN,
                                 _("Open the pattern selection dialog"),
                                 NULL, NULL);
 }
@@ -354,7 +354,7 @@ gradient_box_new (GimpContainer *container,
   hbox = gimp_viewable_box_new (container, context, label, spacing,
                                 view_type, GIMP_VIEW_SIZE_SMALL, view_size,
                                 "gimp-gradient-list|gimp-gradient-grid",
-                                GIMP_STOCK_GRADIENT,
+                                GIMP_ICON_GRADIENT,
                                 _("Open the gradient selection dialog"),
                                 editor_id, editor_tooltip);
 
@@ -380,7 +380,7 @@ gradient_box_new (GimpContainer *container,
 
       gimp_help_set_help_data (toggle, _("Reverse"), NULL);
 
-      image = gtk_image_new_from_icon_name (GIMP_STOCK_FLIP_HORIZONTAL,
+      image = gtk_image_new_from_icon_name (GIMP_ICON_OBJECT_FLIP_HORIZONTAL,
                                             GTK_ICON_SIZE_MENU);
       /* gimp_prop_check_button_new() adds the property nick as label of
        * the button by default. */
@@ -472,7 +472,7 @@ palette_box_new (GimpContainer *container,
   return gimp_viewable_box_new (container, context, label, spacing,
                                 view_type, GIMP_VIEW_SIZE_MEDIUM, view_size,
                                 "gimp-palette-list|gimp-palette-grid",
-                                GIMP_STOCK_PALETTE,
+                                GIMP_ICON_PALETTE,
                                 _("Open the palette selection dialog"),
                                 editor_id, editor_tooltip);
 }
@@ -538,7 +538,7 @@ font_box_new (GimpContainer *container,
   return gimp_viewable_box_new (container, context, label, spacing,
                                 view_type, GIMP_VIEW_SIZE_SMALL, view_size,
                                 "gimp-font-list|gimp-font-grid",
-                                "gtk-select-font",
+                                GIMP_ICON_FONT,
                                 _("Open the font selection dialog"),
                                 NULL, NULL);
 }
@@ -670,7 +670,7 @@ gimp_viewable_box_new (GimpContainer *container,
       if (editor_tooltip)
         gimp_help_set_help_data (edit_button, editor_tooltip, NULL);
 
-      image = gtk_image_new_from_icon_name (GTK_STOCK_EDIT,
+      image = gtk_image_new_from_icon_name (GIMP_ICON_EDIT,
                                             GTK_ICON_SIZE_BUTTON);
       gtk_misc_set_alignment (GTK_MISC (image), 0.5, 1.0);
       gtk_container_add (GTK_CONTAINER (edit_button), image);
diff --git a/app/widgets/gimpviewrenderer-frame.c b/app/widgets/gimpviewrenderer-frame.c
index 5c5956e..0c938d0 100644
--- a/app/widgets/gimpviewrenderer-frame.c
+++ b/app/widgets/gimpviewrenderer-frame.c
@@ -198,7 +198,7 @@ gimp_view_renderer_ensure_frame (GimpViewRenderer *renderer,
 
   if (! class->frame)
     {
-      class->frame = gimp_widget_load_icon (widget, GIMP_STOCK_FRAME, 48);
+      class->frame = gimp_widget_load_icon (widget, GIMP_ICON_FRAME, 48);
 
       /*  FIXME: shouldn't be hardcoded  */
       class->frame_left   = 2;
diff --git a/app/widgets/gimpviewrendererimage.c b/app/widgets/gimpviewrendererimage.c
index ae51436..10ee8f5 100644
--- a/app/widgets/gimpviewrendererimage.c
+++ b/app/widgets/gimpviewrendererimage.c
@@ -158,12 +158,12 @@ gimp_view_renderer_image_render (GimpViewRenderer *renderer,
 
   switch (rendererimage->channel)
     {
-    case GIMP_CHANNEL_RED:     icon_name = GIMP_STOCK_CHANNEL_RED;     break;
-    case GIMP_CHANNEL_GREEN:   icon_name = GIMP_STOCK_CHANNEL_GREEN;   break;
-    case GIMP_CHANNEL_BLUE:    icon_name = GIMP_STOCK_CHANNEL_BLUE;    break;
-    case GIMP_CHANNEL_GRAY:    icon_name = GIMP_STOCK_CHANNEL_GRAY;    break;
-    case GIMP_CHANNEL_INDEXED: icon_name = GIMP_STOCK_CHANNEL_INDEXED; break;
-    case GIMP_CHANNEL_ALPHA:   icon_name = GIMP_STOCK_CHANNEL_ALPHA;   break;
+    case GIMP_CHANNEL_RED:     icon_name = GIMP_ICON_CHANNEL_RED;     break;
+    case GIMP_CHANNEL_GREEN:   icon_name = GIMP_ICON_CHANNEL_GREEN;   break;
+    case GIMP_CHANNEL_BLUE:    icon_name = GIMP_ICON_CHANNEL_BLUE;    break;
+    case GIMP_CHANNEL_GRAY:    icon_name = GIMP_ICON_CHANNEL_GRAY;    break;
+    case GIMP_CHANNEL_INDEXED: icon_name = GIMP_ICON_CHANNEL_INDEXED; break;
+    case GIMP_CHANNEL_ALPHA:   icon_name = GIMP_ICON_CHANNEL_ALPHA;   break;
 
     default:
       icon_name = gimp_viewable_get_icon_name (renderer->viewable);
diff --git a/app/widgets/gimpviewrendererlayer.c b/app/widgets/gimpviewrendererlayer.c
index a7ed71a..aa92707 100644
--- a/app/widgets/gimpviewrendererlayer.c
+++ b/app/widgets/gimpviewrendererlayer.c
@@ -65,7 +65,7 @@ gimp_view_renderer_layer_render (GimpViewRenderer *renderer,
 
   if (gimp_layer_is_floating_sel (GIMP_LAYER (renderer->viewable)))
     {
-      icon_name = GIMP_STOCK_FLOATING_SELECTION;
+      icon_name = GIMP_ICON_LAYER_FLOATING_SELECTION;
     }
   else if (gimp_item_is_text_layer (GIMP_ITEM (renderer->viewable)))
     {
diff --git a/app/widgets/gimpwidgets-utils.c b/app/widgets/gimpwidgets-utils.c
index c1c93e7..77a1ae9 100644
--- a/app/widgets/gimpwidgets-utils.c
+++ b/app/widgets/gimpwidgets-utils.c
@@ -387,7 +387,7 @@ gimp_widget_load_icon (GtkWidget   *widget,
       g_printerr ("gimp_widget_load_icon(): icon theme has no icon '%s'.\n",
                   icon_name);
 
-      return gtk_icon_theme_load_icon (icon_theme, GIMP_STOCK_WILBER_EEK,
+      return gtk_icon_theme_load_icon (icon_theme, GIMP_ICON_WILBER_EEK,
                                        size, 0, NULL);
     }
 
@@ -1147,16 +1147,16 @@ gimp_get_message_icon_name (GimpMessageSeverity severity)
   switch (severity)
     {
     case GIMP_MESSAGE_INFO:
-      return GIMP_STOCK_INFO;
+      return GIMP_ICON_DIALOG_INFORMATION;
 
     case GIMP_MESSAGE_WARNING:
-      return GIMP_STOCK_WARNING;
+      return GIMP_ICON_DIALOG_WARNING;
 
     case GIMP_MESSAGE_ERROR:
-      return GIMP_STOCK_ERROR;
+      return GIMP_ICON_DIALOG_ERROR;
     }
 
-  g_return_val_if_reached (GIMP_STOCK_WARNING);
+  g_return_val_if_reached (GIMP_ICON_DIALOG_WARNING);
 }
 
 gboolean
diff --git a/icons/icon-list.mk b/icons/icon-list.mk
index 336e333..805d66d 100644
--- a/icons/icon-list.mk
+++ b/icons/icon-list.mk
@@ -1,1053 +1,1052 @@
 scalable_images = \
        scalable/dialog-information.svg                         \
-       scalable/document-new.svg                                       \
-       scalable/document-open.svg                                      \
+       scalable/document-new.svg                               \
+       scalable/document-open.svg                              \
        scalable/document-open-recent.svg                       \
-       scalable/document-print.svg                                     \
+       scalable/document-print.svg                             \
        scalable/document-revert.svg                            \
-       scalable/document-save.svg                                      \
+       scalable/document-save.svg                              \
        scalable/document-save-as.svg                           \
-       scalable/edit-clear.svg                                         \
-       scalable/edit-copy.svg                                          \
-       scalable/edit-cut.svg                                           \
-       scalable/edit-delete.svg                                        \
-       scalable/edit-paste.svg                                         \
-       scalable/edit-redo.svg                                          \
-       scalable/edit-undo.svg                                          \
-       scalable/folder.svg                                                     \
-       scalable/folder-new.svg                                         \
+       scalable/edit-clear.svg                                 \
+       scalable/edit-copy.svg                                  \
+       scalable/edit-cut.svg                                   \
+       scalable/edit-delete.svg                                \
+       scalable/edit-paste.svg                                 \
+       scalable/edit-redo.svg                                  \
+       scalable/edit-undo.svg                                  \
+       scalable/folder.svg                                     \
+       scalable/folder-new.svg                                 \
        scalable/format-indent-more.svg                         \
-       scalable/go-bottom.svg                                          \
-       scalable/go-down.svg                                            \
-       scalable/go-first.svg                                           \
-       scalable/go-home.svg                                            \
-       scalable/go-last.svg                                            \
-       scalable/go-next.svg                                            \
-       scalable/go-previous.svg                                        \
-       scalable/go-top.svg                                                     \
-       scalable/go-up.svg                                                      \
-       scalable/help-about.svg                                         \
-       scalable/list-add.svg                                           \
-       scalable/list-remove.svg                                        \
-       scalable/media-floppy.svg                                       \
-       scalable/media-optical.svg                                      \
+       scalable/format-justify-fill.svg                        \
+       scalable/format-justify-center.svg                      \
+       scalable/format-justify-left.svg                        \
+       scalable/format-justify-right.svg                       \
+       scalable/go-bottom.svg                                  \
+       scalable/go-down.svg                                    \
+       scalable/go-first.svg                                   \
+       scalable/go-home.svg                                    \
+       scalable/go-last.svg                                    \
+       scalable/go-next.svg                                    \
+       scalable/go-previous.svg                                \
+       scalable/go-top.svg                                     \
+       scalable/go-up.svg                                      \
+       scalable/help-about.svg                                 \
+       scalable/list-add.svg                                   \
+       scalable/list-remove.svg                                \
+       scalable/media-floppy.svg                               \
+       scalable/media-optical.svg                              \
        scalable/media-playback-pause.svg                       \
        scalable/media-playback-start.svg                       \
        scalable/media-seek-backward.svg                        \
        scalable/media-skip-backward.svg                        \
        scalable/media-skip-forward.svg                         \
        scalable/preferences-system.svg                         \
-       scalable/process-stop.svg                                       \
-       scalable/system-run.svg                                         \
+       scalable/process-stop.svg                               \
+       scalable/system-run.svg                                 \
        scalable/view-fullscreen.svg                            \
-       scalable/view-refresh.svg                                       \
-       scalable/window-close.svg                                       \
-       scalable/window-new.svg                                         \
-       scalable/zoom-fit-best.svg                                      \
-       scalable/zoom-in.svg                                            \
-       scalable/zoom-original.svg                                      \
-       scalable/zoom-out.svg                                           \
-                                                                                               \
-       scalable/gtk-cancel.svg                                         \
-       scalable/gtk-edit.svg                                           \
-       scalable/gtk-justify-fill.svg                           \
-       scalable/gtk-justify-center.svg                         \
-       scalable/gtk-justify-left.svg                           \
-       scalable/gtk-justify-right.svg                          \
-       scalable/gtk-no.svg                                                     \
-       scalable/gtk-ok.svg                                                     \
+       scalable/view-refresh.svg                               \
+       scalable/window-close.svg                               \
+       scalable/window-new.svg                                 \
+       scalable/zoom-fit-best.svg                              \
+       scalable/zoom-in.svg                                    \
+       scalable/zoom-original.svg                              \
+       scalable/zoom-out.svg                                   \
+       \
+       scalable/gtk-cancel.svg                                 \
+       scalable/gtk-edit.svg                                   \
+       scalable/gtk-no.svg                                     \
+       scalable/gtk-ok.svg                                     \
        scalable/gtk-select-color.svg                           \
        scalable/gtk-select-font.svg                            \
-       scalable/gtk-yes.svg                                            \
-                                                                                               \
-       scalable/gimp-anchor.svg                        \
-       scalable/gimp-cap-butt.svg                      \
-       scalable/gimp-cap-round.svg                     \
-       scalable/gimp-cap-square.svg                    \
-       scalable/gimp-center.svg                        \
-       scalable/gimp-channel-alpha.svg                 \
-       scalable/gimp-channel-blue.svg                  \
-       scalable/gimp-channel-gray.svg                  \
-       scalable/gimp-channel-green.svg                 \
-       scalable/gimp-channel-indexed.svg               \
-       scalable/gimp-channel-red.svg                   \
-       scalable/gimp-channels.svg                      \
-       scalable/gimp-channel.svg                       \
-       scalable/gimp-char-picker.svg                   \
-       scalable/gimp-clipboard.svg                     \
-       scalable/gimp-close.svg                         \
-       scalable/gimp-close-all.svg                     \
-       scalable/gimp-colormap.svg                      \
-       scalable/gimp-color-picker-black.svg            \
-       scalable/gimp-color-picker-gray.svg             \
-       scalable/gimp-color-picker-white.svg            \
-       scalable/gimp-color-pick-from-screen.svg        \
-       scalable/gimp-color-cmyk.svg                    \
-       scalable/gimp-color-triangle.svg                \
-       scalable/gimp-color-water.svg                   \
-       scalable/gimp-controller-keyboard.svg           \
-       scalable/gimp-controller-linux-input.svg        \
-       scalable/gimp-controller-midi.svg               \
-       scalable/gimp-controller.svg                    \
-       scalable/gimp-controller-wheel.svg              \
-       scalable/gimp-convert-grayscale.svg             \
-       scalable/gimp-convert-indexed.svg               \
-       scalable/gimp-convert-rgb.svg                   \
-       scalable/gimp-cursor.svg                        \
-       scalable/gimp-curve-free.svg                    \
-       scalable/gimp-curve-smooth.svg                  \
-       scalable/gimp-default-colors.svg                \
-       scalable/gimp-device-status.svg                 \
-       scalable/gimp-display-filter-colorblind.svg     \
-       scalable/gimp-display-filter-contrast.svg       \
-       scalable/gimp-display-filter-gamma.svg          \
-       scalable/gimp-display-filter-lcms.svg           \
-       scalable/gimp-display-filter-proof.svg          \
-       scalable/gimp-display-filter.svg                \
-       scalable/gimp-duplicate.svg                     \
-       scalable/gimp-dynamics.svg                      \
-       scalable/gimp-error.svg                         \
-       scalable/gimp-file-manager.svg                  \
-       scalable/gimp-flip-horizontal.svg               \
-       scalable/gimp-flip-vertical.svg                 \
-       scalable/gimp-floating-selection.svg            \
-       scalable/gimp-gegl.svg                          \
-       scalable/gimp-gradient-bilinear.svg             \
-       scalable/gimp-gradient-conical-asymmetric.svg   \
-       scalable/gimp-gradient-conical-symmetric.svg    \
-       scalable/gimp-gradient-linear.svg               \
-       scalable/gimp-gradient-radial.svg               \
-       scalable/gimp-gradient-shapeburst-angular.svg   \
-       scalable/gimp-gradient-shapeburst-dimpled.svg   \
-       scalable/gimp-gradient-shapeburst-spherical.svg \
-       scalable/gimp-gradient-spiral-anticlockwise.svg \
-       scalable/gimp-gradient-spiral-clockwise.svg     \
-       scalable/gimp-gradient-square.svg               \
-       scalable/gimp-gravity-east.svg                  \
-       scalable/gimp-gravity-north-east.svg            \
-       scalable/gimp-gravity-north.svg                 \
-       scalable/gimp-gravity-north-west.svg            \
-       scalable/gimp-gravity-south-east.svg            \
-       scalable/gimp-gravity-south.svg                 \
-       scalable/gimp-gravity-south-west.svg            \
-       scalable/gimp-gravity-west.svg                  \
-       scalable/gimp-grid.svg                          \
-       scalable/gimp-group-layer.svg                   \
-       scalable/gimp-hcenter.svg                       \
-       scalable/gimp-hchain-broken.svg                 \
-       scalable/gimp-hchain.svg                        \
-       scalable/gimp-hfill.svg                         \
-       scalable/gimp-histogram-linear.svg              \
-       scalable/gimp-histogram-logarithmic.svg         \
-       scalable/gimp-histogram.svg                     \
-       scalable/gimp-images.svg                        \
-       scalable/gimp-image.svg                         \
-       scalable/gimp-image-open.svg                    \
-       scalable/gimp-image-reload.svg                  \
-       scalable/gimp-info.svg                          \
-       scalable/gimp-input-device.svg                  \
-       scalable/gimp-invert.svg                        \
-       scalable/gimp-join-bevel.svg                    \
-       scalable/gimp-join-miter.svg                    \
-       scalable/gimp-join-round.svg                    \
-       scalable/gimp-landscape.svg                     \
-       scalable/gimp-layer-mask.svg                    \
-       scalable/gimp-layers.svg                        \
-       scalable/gimp-layer.svg                         \
-       scalable/gimp-layer-to-imagesize.svg            \
-       scalable/gimp-letter-spacing.svg                \
-       scalable/gimp-line-spacing.svg                  \
-       scalable/gimp-linked.svg                        \
-       scalable/gimp-list.svg                          \
-       scalable/gimp-menu-left.svg                     \
-       scalable/gimp-menu-right.svg                    \
-       scalable/gimp-merge-down.svg                    \
-       scalable/gimp-move-to-screen.svg                \
-       scalable/gimp-navigation.svg                    \
-       scalable/gimp-paste-as-new.svg                  \
-       scalable/gimp-paste-into.svg                    \
-       scalable/gimp-path.svg                          \
-       scalable/gimp-paths.svg                         \
-       scalable/gimp-path-stroke.svg                   \
-       scalable/gimp-pattern.svg                       \
-       scalable/gimp-plugin.svg                        \
-       scalable/gimp-portrait.svg                      \
-       scalable/gimp-prefs-color-management.svg        \
-       scalable/gimp-prefs-controllers.svg             \
-       scalable/gimp-prefs-default-comment.svg         \
-       scalable/gimp-prefs-default-grid.svg            \
-       scalable/gimp-prefs-display.svg                 \
-       scalable/gimp-prefs-folders.svg                                 \
-       scalable/gimp-prefs-folders-brushes.svg         \
-       scalable/gimp-prefs-folders-dynamics.svg        \
-       scalable/gimp-prefs-folders-environ.svg         \
-       scalable/gimp-prefs-folders-fonts.svg           \
-       scalable/gimp-prefs-folders-gradients.svg       \
-       scalable/gimp-prefs-folders-icon-themes.svg     \
-       scalable/gimp-prefs-folders-interp.svg          \
-       scalable/gimp-prefs-folders-modules.svg         \
-       scalable/gimp-prefs-folders-mypaint-brushes.svg \
-       scalable/gimp-prefs-folders-palettes.svg        \
-       scalable/gimp-prefs-folders-patterns.svg        \
-       scalable/gimp-prefs-folders-plug-ins.svg        \
-       scalable/gimp-prefs-folders-scripts.svg         \
-       scalable/gimp-prefs-folders-themes.svg          \
-       scalable/gimp-prefs-folders-tool-plug-ins.svg   \
-       scalable/gimp-prefs-folders-tool-presets.svg    \
-       scalable/gimp-prefs-folders-tools.svg           \
-       scalable/gimp-prefs-help-system.svg             \
-       scalable/gimp-prefs-icon-theme.svg              \
-       scalable/gimp-prefs-image-title.svg             \
-       scalable/gimp-prefs-image-windows.svg           \
+       scalable/gtk-yes.svg                                    \
+       \
+       scalable/gimp-anchor.svg                                \
+       scalable/gimp-cap-butt.svg                              \
+       scalable/gimp-cap-round.svg                             \
+       scalable/gimp-cap-square.svg                            \
+       scalable/gimp-center.svg                                \
+       scalable/gimp-channel-alpha.svg                         \
+       scalable/gimp-channel-blue.svg                          \
+       scalable/gimp-channel-gray.svg                          \
+       scalable/gimp-channel-green.svg                         \
+       scalable/gimp-channel-indexed.svg                       \
+       scalable/gimp-channel-red.svg                           \
+       scalable/gimp-channels.svg                              \
+       scalable/gimp-channel.svg                               \
+       scalable/gimp-char-picker.svg                           \
+       scalable/gimp-clipboard.svg                             \
+       scalable/gimp-close.svg                                 \
+       scalable/gimp-close-all.svg                             \
+       scalable/gimp-colormap.svg                              \
+       scalable/gimp-color-picker-black.svg                    \
+       scalable/gimp-color-picker-gray.svg                     \
+       scalable/gimp-color-picker-white.svg                    \
+       scalable/gimp-color-pick-from-screen.svg                \
+       scalable/gimp-color-cmyk.svg                            \
+       scalable/gimp-color-triangle.svg                        \
+       scalable/gimp-color-water.svg                           \
+       scalable/gimp-controller-keyboard.svg                   \
+       scalable/gimp-controller-linux-input.svg                \
+       scalable/gimp-controller-midi.svg                       \
+       scalable/gimp-controller.svg                            \
+       scalable/gimp-controller-wheel.svg                      \
+       scalable/gimp-convert-grayscale.svg                     \
+       scalable/gimp-convert-indexed.svg                       \
+       scalable/gimp-convert-rgb.svg                           \
+       scalable/gimp-cursor.svg                                \
+       scalable/gimp-curve-free.svg                            \
+       scalable/gimp-curve-smooth.svg                          \
+       scalable/gimp-default-colors.svg                        \
+       scalable/gimp-device-status.svg                         \
+       scalable/gimp-display-filter-colorblind.svg             \
+       scalable/gimp-display-filter-contrast.svg               \
+       scalable/gimp-display-filter-gamma.svg                  \
+       scalable/gimp-display-filter-lcms.svg                   \
+       scalable/gimp-display-filter-proof.svg                  \
+       scalable/gimp-display-filter.svg                        \
+       scalable/gimp-duplicate.svg                             \
+       scalable/gimp-dynamics.svg                              \
+       scalable/gimp-error.svg                                 \
+       scalable/gimp-file-manager.svg                          \
+       scalable/gimp-flip-horizontal.svg                       \
+       scalable/gimp-flip-vertical.svg                         \
+       scalable/gimp-floating-selection.svg                    \
+       scalable/gimp-gegl.svg                                  \
+       scalable/gimp-gradient-bilinear.svg                     \
+       scalable/gimp-gradient-conical-asymmetric.svg           \
+       scalable/gimp-gradient-conical-symmetric.svg            \
+       scalable/gimp-gradient-linear.svg                       \
+       scalable/gimp-gradient-radial.svg                       \
+       scalable/gimp-gradient-shapeburst-angular.svg           \
+       scalable/gimp-gradient-shapeburst-dimpled.svg           \
+       scalable/gimp-gradient-shapeburst-spherical.svg         \
+       scalable/gimp-gradient-spiral-anticlockwise.svg         \
+       scalable/gimp-gradient-spiral-clockwise.svg             \
+       scalable/gimp-gradient-square.svg                       \
+       scalable/gimp-gravity-east.svg                          \
+       scalable/gimp-gravity-north-east.svg                    \
+       scalable/gimp-gravity-north.svg                         \
+       scalable/gimp-gravity-north-west.svg                    \
+       scalable/gimp-gravity-south-east.svg                    \
+       scalable/gimp-gravity-south.svg                         \
+       scalable/gimp-gravity-south-west.svg                    \
+       scalable/gimp-gravity-west.svg                          \
+       scalable/gimp-grid.svg                                  \
+       scalable/gimp-group-layer.svg                           \
+       scalable/gimp-hcenter.svg                               \
+       scalable/gimp-hchain-broken.svg                         \
+       scalable/gimp-hchain.svg                                \
+       scalable/gimp-hfill.svg                                 \
+       scalable/gimp-histogram-linear.svg                      \
+       scalable/gimp-histogram-logarithmic.svg                 \
+       scalable/gimp-histogram.svg                             \
+       scalable/gimp-images.svg                                \
+       scalable/gimp-image.svg                                 \
+       scalable/gimp-image-open.svg                            \
+       scalable/gimp-image-reload.svg                          \
+       scalable/gimp-info.svg                                  \
+       scalable/gimp-input-device.svg                          \
+       scalable/gimp-invert.svg                                \
+       scalable/gimp-join-bevel.svg                            \
+       scalable/gimp-join-miter.svg                            \
+       scalable/gimp-join-round.svg                            \
+       scalable/gimp-landscape.svg                             \
+       scalable/gimp-layer-mask.svg                            \
+       scalable/gimp-layers.svg                                \
+       scalable/gimp-layer.svg                                 \
+       scalable/gimp-layer-to-imagesize.svg                    \
+       scalable/gimp-letter-spacing.svg                        \
+       scalable/gimp-line-spacing.svg                          \
+       scalable/gimp-linked.svg                                \
+       scalable/gimp-list.svg                                  \
+       scalable/gimp-menu-left.svg                             \
+       scalable/gimp-menu-right.svg                            \
+       scalable/gimp-merge-down.svg                            \
+       scalable/gimp-move-to-screen.svg                        \
+       scalable/gimp-navigation.svg                            \
+       scalable/gimp-paste-as-new.svg                          \
+       scalable/gimp-paste-into.svg                            \
+       scalable/gimp-path.svg                                  \
+       scalable/gimp-paths.svg                                 \
+       scalable/gimp-path-stroke.svg                           \
+       scalable/gimp-pattern.svg                               \
+       scalable/gimp-plugin.svg                                \
+       scalable/gimp-portrait.svg                              \
+       scalable/gimp-prefs-color-management.svg                \
+       scalable/gimp-prefs-controllers.svg                     \
+       scalable/gimp-prefs-default-comment.svg                 \
+       scalable/gimp-prefs-default-grid.svg                    \
+       scalable/gimp-prefs-display.svg                         \
+       scalable/gimp-prefs-folders.svg                         \
+       scalable/gimp-prefs-folders-brushes.svg                 \
+       scalable/gimp-prefs-folders-dynamics.svg                \
+       scalable/gimp-prefs-folders-environ.svg                 \
+       scalable/gimp-prefs-folders-fonts.svg                   \
+       scalable/gimp-prefs-folders-gradients.svg               \
+       scalable/gimp-prefs-folders-icon-themes.svg             \
+       scalable/gimp-prefs-folders-interp.svg                  \
+       scalable/gimp-prefs-folders-modules.svg                 \
+       scalable/gimp-prefs-folders-mypaint-brushes.svg         \
+       scalable/gimp-prefs-folders-palettes.svg                \
+       scalable/gimp-prefs-folders-patterns.svg                \
+       scalable/gimp-prefs-folders-plug-ins.svg                \
+       scalable/gimp-prefs-folders-scripts.svg                 \
+       scalable/gimp-prefs-folders-themes.svg                  \
+       scalable/gimp-prefs-folders-tool-plug-ins.svg           \
+       scalable/gimp-prefs-folders-tool-presets.svg            \
+       scalable/gimp-prefs-folders-tools.svg                   \
+       scalable/gimp-prefs-help-system.svg                     \
+       scalable/gimp-prefs-icon-theme.svg                      \
+       scalable/gimp-prefs-image-title.svg                     \
+       scalable/gimp-prefs-image-windows.svg                   \
        scalable/gimp-prefs-image-windows-appearance.svg        \
        scalable/gimp-prefs-image-windows-snapping.svg          \
-       scalable/gimp-prefs-import-export.svg           \
-       scalable/gimp-prefs-input-devices.svg           \
-       scalable/gimp-prefs-interface.svg               \
-       scalable/gimp-prefs-new-image.svg               \
-       scalable/gimp-prefs-playground.svg              \
-       scalable/gimp-prefs-session.svg                 \
-       scalable/gimp-prefs-system-resources.svg        \
-       scalable/gimp-prefs-theme.svg                   \
-       scalable/gimp-prefs-toolbox.svg                 \
-       scalable/gimp-prefs-tool-options.svg            \
-       scalable/gimp-prefs-window-management.svg       \
-       scalable/gimp-question.svg                      \
-       scalable/gimp-quick-mask-off.svg                \
-       scalable/gimp-quick-mask-on.svg                 \
-       scalable/gimp-reset.svg                         \
-       scalable/gimp-reshow-filter.svg                 \
-       scalable/gimp-resize.svg                        \
-       scalable/gimp-rotate-180.svg                    \
-       scalable/gimp-rotate-270.svg                    \
-       scalable/gimp-rotate-90.svg                     \
-       scalable/gimp-sample-point.svg                  \
-       scalable/gimp-scale.svg                         \
-       scalable/gimp-selection.svg                     \
-       scalable/gimp-selection-add.svg                 \
-       scalable/gimp-selection-all.svg                 \
-       scalable/gimp-selection-border.svg              \
-       scalable/gimp-selection-grow.svg                \
-       scalable/gimp-selection-intersect.svg           \
-       scalable/gimp-selection-none.svg                \
-       scalable/gimp-selection-replace.svg             \
-       scalable/gimp-selection-shrink.svg              \
-       scalable/gimp-selection-stroke.svg              \
-       scalable/gimp-selection-subtract.svg            \
-       scalable/gimp-selection-to-channel.svg          \
-       scalable/gimp-selection-to-path.svg             \
-       scalable/gimp-shape-circle.svg                  \
-       scalable/gimp-shape-diamond.svg                 \
-       scalable/gimp-shape-square.svg                  \
-       scalable/gimp-shred.svg                         \
-       scalable/gimp-swap-colors.svg                   \
-       scalable/gimp-symmetry.svg                      \
-       scalable/gimp-template.svg                      \
-       scalable/gimp-text-dir-ltr.svg                  \
-       scalable/gimp-text-dir-rtl.svg                  \
-       scalable/gimp-text-layer.svg                    \
-       scalable/gimp-toilet-paper.svg                  \
-       scalable/gimp-tool-airbrush.svg                 \
-       scalable/gimp-tool-align.svg                    \
-       scalable/gimp-tool-blend.svg                    \
-       scalable/gimp-tool-blur.svg                     \
-       scalable/gimp-tool-brightness-contrast.svg      \
-       scalable/gimp-tool-bucket-fill.svg              \
-       scalable/gimp-tool-by-color-select.svg          \
-       scalable/gimp-tool-cage.svg                     \
-       scalable/gimp-tool-clone.svg                    \
-       scalable/gimp-tool-color-balance.svg            \
-       scalable/gimp-tool-colorize.svg                 \
-       scalable/gimp-tool-color-picker.svg             \
-       scalable/gimp-tool-crop.svg                     \
-       scalable/gimp-tool-curves.svg                   \
-       scalable/gimp-tool-desaturate.svg               \
-       scalable/gimp-tool-dodge.svg                    \
-       scalable/gimp-tool-ellipse-select.svg           \
-       scalable/gimp-tool-eraser.svg                   \
-       scalable/gimp-tool-flip.svg                     \
-       scalable/gimp-tool-foreground-select.svg        \
-       scalable/gimp-tool-free-select.svg              \
-       scalable/gimp-tool-fuzzy-select.svg             \
-       scalable/gimp-tool-handle-transform.svg         \
-       scalable/gimp-tool-heal.svg                     \
-       scalable/gimp-tool-hue-saturation.svg           \
-       scalable/gimp-tool-ink.svg                      \
-       scalable/gimp-tool-iscissors.svg                \
-       scalable/gimp-tool-levels.svg                   \
-       scalable/gimp-tool-measure.svg                  \
-       scalable/gimp-tool-move.svg                     \
-       scalable/gimp-tool-mypaint-brush.svg            \
-       scalable/gimp-tool-n-point-deformation.svg      \
-       scalable/gimp-tool-options.svg                  \
-       scalable/gimp-tool-paintbrush.svg               \
-       scalable/gimp-tool-path.svg                     \
-       scalable/gimp-tool-pencil.svg                   \
-       scalable/gimp-tool-perspective-clone.svg        \
-       scalable/gimp-tool-perspective.svg              \
-       scalable/gimp-tool-posterize.svg                \
-       scalable/gimp-tool-preset.svg                   \
-       scalable/gimp-tool-rect-select.svg              \
-       scalable/gimp-tool-rotate.svg                   \
-       scalable/gimp-tool-scale.svg                    \
-       scalable/gimp-tool-seamless-clone.svg           \
-       scalable/gimp-tool-shear.svg                    \
-       scalable/gimp-tool-smudge.svg                   \
-       scalable/gimp-tools.svg                         \
-       scalable/gimp-tool-text.svg                     \
-       scalable/gimp-tool-threshold.svg                \
-       scalable/gimp-tool-unified-transform.svg        \
-       scalable/gimp-tool-warp.svg                     \
-       scalable/gimp-tool-zoom.svg                     \
-       scalable/gimp-transparency.svg                  \
-       scalable/gimp-undo-history.svg                  \
-       scalable/gimp-user-manual.svg                   \
-       scalable/gimp-vcenter.svg                       \
-       scalable/gimp-vchain.svg                        \
-       scalable/gimp-vchain-broken.svg                 \
-       scalable/gimp-vfill.svg                         \
-       scalable/gimp-video.svg                         \
-       scalable/gimp-visible.svg                       \
-       scalable/gimp-warning.svg                       \
-       scalable/gimp-web.svg                           \
-       scalable/gimp-wilber.svg                        \
-       scalable/gimp-wilber-eek.svg                    \
-       scalable/gimp-wilber-outline.svg                \
+       scalable/gimp-prefs-import-export.svg                   \
+       scalable/gimp-prefs-input-devices.svg                   \
+       scalable/gimp-prefs-interface.svg                       \
+       scalable/gimp-prefs-new-image.svg                       \
+       scalable/gimp-prefs-playground.svg                      \
+       scalable/gimp-prefs-session.svg                         \
+       scalable/gimp-prefs-system-resources.svg                \
+       scalable/gimp-prefs-theme.svg                           \
+       scalable/gimp-prefs-toolbox.svg                         \
+       scalable/gimp-prefs-tool-options.svg                    \
+       scalable/gimp-prefs-window-management.svg               \
+       scalable/gimp-question.svg                              \
+       scalable/gimp-quick-mask-off.svg                        \
+       scalable/gimp-quick-mask-on.svg                         \
+       scalable/gimp-reset.svg                                 \
+       scalable/gimp-reshow-filter.svg                         \
+       scalable/gimp-resize.svg                                \
+       scalable/gimp-rotate-180.svg                            \
+       scalable/gimp-rotate-270.svg                            \
+       scalable/gimp-rotate-90.svg                             \
+       scalable/gimp-sample-point.svg                          \
+       scalable/gimp-scale.svg                                 \
+       scalable/gimp-selection.svg                             \
+       scalable/gimp-selection-add.svg                         \
+       scalable/gimp-selection-all.svg                         \
+       scalable/gimp-selection-border.svg                      \
+       scalable/gimp-selection-grow.svg                        \
+       scalable/gimp-selection-intersect.svg                   \
+       scalable/gimp-selection-none.svg                        \
+       scalable/gimp-selection-replace.svg                     \
+       scalable/gimp-selection-shrink.svg                      \
+       scalable/gimp-selection-stroke.svg                      \
+       scalable/gimp-selection-subtract.svg                    \
+       scalable/gimp-selection-to-channel.svg                  \
+       scalable/gimp-selection-to-path.svg                     \
+       scalable/gimp-shape-circle.svg                          \
+       scalable/gimp-shape-diamond.svg                         \
+       scalable/gimp-shape-square.svg                          \
+       scalable/gimp-shred.svg                                 \
+       scalable/gimp-swap-colors.svg                           \
+       scalable/gimp-symmetry.svg                              \
+       scalable/gimp-template.svg                              \
+       scalable/gimp-text-dir-ltr.svg                          \
+       scalable/gimp-text-dir-rtl.svg                          \
+       scalable/gimp-text-layer.svg                            \
+       scalable/gimp-toilet-paper.svg                          \
+       scalable/gimp-tool-airbrush.svg                         \
+       scalable/gimp-tool-align.svg                            \
+       scalable/gimp-tool-blend.svg                            \
+       scalable/gimp-tool-blur.svg                             \
+       scalable/gimp-tool-brightness-contrast.svg              \
+       scalable/gimp-tool-bucket-fill.svg                      \
+       scalable/gimp-tool-by-color-select.svg                  \
+       scalable/gimp-tool-cage.svg                             \
+       scalable/gimp-tool-clone.svg                            \
+       scalable/gimp-tool-color-balance.svg                    \
+       scalable/gimp-tool-colorize.svg                         \
+       scalable/gimp-tool-color-picker.svg                     \
+       scalable/gimp-tool-crop.svg                             \
+       scalable/gimp-tool-curves.svg                           \
+       scalable/gimp-tool-desaturate.svg                       \
+       scalable/gimp-tool-dodge.svg                            \
+       scalable/gimp-tool-ellipse-select.svg                   \
+       scalable/gimp-tool-eraser.svg                           \
+       scalable/gimp-tool-flip.svg                             \
+       scalable/gimp-tool-foreground-select.svg                \
+       scalable/gimp-tool-free-select.svg                      \
+       scalable/gimp-tool-fuzzy-select.svg                     \
+       scalable/gimp-tool-handle-transform.svg                 \
+       scalable/gimp-tool-heal.svg                             \
+       scalable/gimp-tool-hue-saturation.svg                   \
+       scalable/gimp-tool-ink.svg                              \
+       scalable/gimp-tool-iscissors.svg                        \
+       scalable/gimp-tool-levels.svg                           \
+       scalable/gimp-tool-measure.svg                          \
+       scalable/gimp-tool-move.svg                             \
+       scalable/gimp-tool-mypaint-brush.svg                    \
+       scalable/gimp-tool-n-point-deformation.svg              \
+       scalable/gimp-tool-options.svg                          \
+       scalable/gimp-tool-paintbrush.svg                       \
+       scalable/gimp-tool-path.svg                             \
+       scalable/gimp-tool-pencil.svg                           \
+       scalable/gimp-tool-perspective-clone.svg                \
+       scalable/gimp-tool-perspective.svg                      \
+       scalable/gimp-tool-posterize.svg                        \
+       scalable/gimp-tool-preset.svg                           \
+       scalable/gimp-tool-rect-select.svg                      \
+       scalable/gimp-tool-rotate.svg                           \
+       scalable/gimp-tool-scale.svg                            \
+       scalable/gimp-tool-seamless-clone.svg                   \
+       scalable/gimp-tool-shear.svg                            \
+       scalable/gimp-tool-smudge.svg                           \
+       scalable/gimp-tools.svg                                 \
+       scalable/gimp-tool-text.svg                             \
+       scalable/gimp-tool-threshold.svg                        \
+       scalable/gimp-tool-unified-transform.svg                \
+       scalable/gimp-tool-warp.svg                             \
+       scalable/gimp-tool-zoom.svg                             \
+       scalable/gimp-transparency.svg                          \
+       scalable/gimp-undo-history.svg                          \
+       scalable/gimp-user-manual.svg                           \
+       scalable/gimp-vcenter.svg                               \
+       scalable/gimp-vchain.svg                                \
+       scalable/gimp-vchain-broken.svg                         \
+       scalable/gimp-vfill.svg                                 \
+       scalable/gimp-video.svg                                 \
+       scalable/gimp-visible.svg                               \
+       scalable/gimp-warning.svg                               \
+       scalable/gimp-web.svg                                   \
+       scalable/gimp-wilber.svg                                \
+       scalable/gimp-wilber-eek.svg                            \
+       scalable/gimp-wilber-outline.svg                        \
        scalable/gimp-zoom-follow-window.svg
 
 vector24_images = \
-       24/dialog-information.svg                                       \
-       24/document-print.svg                                           \
-       24/media-floppy.svg                                             \
-       24/media-optical.svg                                            \
-                                                                                               \
-       24/gtk-select-color.svg                                         \
-                                                                                               \
-       24/gimp-center.svg                              \
-       24/gimp-channel.svg                             \
-       24/gimp-channel-alpha.svg                       \
-       24/gimp-channel-blue.svg                        \
-       24/gimp-channel-gray.svg                        \
-       24/gimp-channel-green.svg                       \
-       24/gimp-channel-indexed.svg                     \
-       24/gimp-channel-red.svg                         \
-       24/gimp-channels.svg                            \
-       24/gimp-char-picker.svg                         \
-       24/gimp-colormap.svg                            \
-       24/gimp-controller.svg                          \
-       24/gimp-controller-keyboard.svg                 \
-       24/gimp-controller-linux-input.svg              \
-       24/gimp-controller-midi.svg                     \
-       24/gimp-controller-wheel.svg                    \
-       24/gimp-cursor.svg                              \
-       24/gimp-device-status.svg                       \
-       24/gimp-display-filter.svg                      \
-       24/gimp-display-filter-colorblind.svg           \
-       24/gimp-display-filter-contrast.svg             \
-       24/gimp-display-filter-gamma.svg                \
-       24/gimp-display-filter-lcms.svg                 \
-       24/gimp-display-filter-proof.svg                \
-       24/gimp-dynamics.svg                            \
-       24/gimp-error.svg                               \
-       24/gimp-floating-selection.svg                  \
-       24/gimp-gegl.svg                                \
-       24/gimp-grid.svg                                \
-       24/gimp-histogram.svg                           \
-       24/gimp-image.svg                               \
-       24/gimp-images.svg                              \
-       24/gimp-info.svg                                \
-       24/gimp-landscape.svg                           \
-       24/gimp-layer.svg                               \
-       24/gimp-layer-mask.svg                          \
-       24/gimp-layers.svg                              \
-       24/gimp-letter-spacing.svg                      \
-       24/gimp-line-spacing.svg                        \
-       24/gimp-move-to-screen.svg                      \
-       24/gimp-navigation.svg                          \
-       24/gimp-path.svg                                \
-       24/gimp-paths.svg                               \
-       24/gimp-portrait.svg                            \
-       24/gimp-prefs-color-management.svg              \
-       24/gimp-prefs-controllers.svg                   \
-       24/gimp-prefs-default-comment.svg               \
-       24/gimp-prefs-default-grid.svg                  \
-       24/gimp-prefs-display.svg                       \
-       24/gimp-prefs-folders.svg                       \
-       24/gimp-prefs-folders-brushes.svg               \
-       24/gimp-prefs-folders-dynamics.svg              \
-       24/gimp-prefs-folders-environ.svg               \
-       24/gimp-prefs-folders-fonts.svg                 \
-       24/gimp-prefs-folders-gradients.svg             \
-       24/gimp-prefs-folders-icon-themes.svg           \
-       24/gimp-prefs-folders-interp.svg                \
-       24/gimp-prefs-folders-modules.svg               \
-       24/gimp-prefs-folders-mypaint-brushes.svg       \
-       24/gimp-prefs-folders-palettes.svg              \
-       24/gimp-prefs-folders-patterns.svg              \
-       24/gimp-prefs-folders-plug-ins.svg              \
-       24/gimp-prefs-folders-scripts.svg               \
-       24/gimp-prefs-folders-themes.svg                \
-       24/gimp-prefs-folders-tool-plug-ins.svg         \
-       24/gimp-prefs-folders-tool-presets.svg          \
-       24/gimp-prefs-folders-tools.svg                 \
-       24/gimp-prefs-help-system.svg                   \
-       24/gimp-prefs-icon-theme.svg                    \
-       24/gimp-prefs-image-title.svg                   \
-       24/gimp-prefs-image-windows.svg                 \
-       24/gimp-prefs-image-windows-appearance.svg      \
-       24/gimp-prefs-image-windows-snapping.svg        \
-       24/gimp-prefs-import-export.svg         \
-       24/gimp-prefs-input-devices.svg                 \
-       24/gimp-prefs-interface.svg                     \
-       24/gimp-prefs-new-image.svg                     \
-       24/gimp-prefs-playground.svg                    \
-       24/gimp-prefs-session.svg                       \
-       24/gimp-prefs-system-resources.svg              \
-       24/gimp-prefs-theme.svg                         \
-       24/gimp-prefs-toolbox.svg                       \
-       24/gimp-prefs-tool-options.svg                  \
-       24/gimp-prefs-window-management.svg             \
-       24/gimp-question.svg                            \
-       24/gimp-resize.svg                              \
-       24/gimp-sample-point.svg                        \
-       24/gimp-scale.svg                               \
-       24/gimp-selection.svg                           \
-       24/gimp-symmetry.svg                            \
-       24/gimp-template.svg                            \
-       24/gimp-text-layer.svg                          \
-       24/gimp-tool-airbrush.svg                       \
-       24/gimp-tool-align.svg                          \
-       24/gimp-tool-blend.svg                          \
-       24/gimp-tool-blur.svg                           \
-       24/gimp-tool-brightness-contrast.svg            \
-       24/gimp-tool-bucket-fill.svg                    \
-       24/gimp-tool-by-color-select.svg                \
-       24/gimp-tool-cage.svg                           \
-       24/gimp-tool-clone.svg                          \
-       24/gimp-tool-color-balance.svg                  \
-       24/gimp-tool-color-picker.svg                   \
-       24/gimp-tool-colorize.svg                       \
-       24/gimp-tool-crop.svg                           \
-       24/gimp-tool-curves.svg                         \
-       24/gimp-tool-desaturate.svg                     \
-       24/gimp-tool-dodge.svg                          \
-       24/gimp-tool-eraser.svg                         \
-       24/gimp-tool-ellipse-select.svg                 \
-       24/gimp-tool-flip.svg                           \
-       24/gimp-tool-foreground-select.svg              \
-       24/gimp-tool-free-select.svg                    \
-       24/gimp-tool-fuzzy-select.svg                   \
-       24/gimp-tool-handle-transform.svg               \
-       24/gimp-tool-heal.svg                           \
-       24/gimp-tool-hue-saturation.svg                 \
-       24/gimp-tool-ink.svg                            \
-       24/gimp-tool-iscissors.svg                      \
-       24/gimp-tool-levels.svg                         \
-       24/gimp-tool-mypaint-brush.svg                  \
-       24/gimp-tool-measure.svg                        \
-       24/gimp-tool-n-point-deformation.svg            \
-       24/gimp-tool-options.svg                        \
-       24/gimp-tool-paintbrush.svg                     \
-       24/gimp-tool-path.svg                           \
-       24/gimp-tool-pencil.svg                         \
-       24/gimp-tool-perspective.svg                    \
-       24/gimp-tool-perspective-clone.svg              \
-       24/gimp-tool-posterize.svg                      \
-       24/gimp-tool-preset.svg                         \
-       24/gimp-tool-rect-select.svg                    \
-       24/gimp-tool-rotate.svg                         \
-       24/gimp-tools.svg                               \
-       24/gimp-tool-scale.svg                          \
-       24/gimp-tool-seamless-clone.svg                 \
-       24/gimp-tool-shear.svg                          \
-       24/gimp-tool-smudge.svg                         \
-       24/gimp-tool-threshold.svg                      \
-       24/gimp-tool-unified-transform.svg              \
-       24/gimp-tool-text.svg                           \
-       24/gimp-tool-warp.svg                           \
-       24/gimp-tool-zoom.svg                           \
-       24/gimp-transparency.svg                        \
-       24/gimp-undo-history.svg                        \
-       24/gimp-user-manual.svg                         \
-       24/gimp-video.svg                               \
-       24/gimp-warning.svg                             \
-       24/gimp-web.svg                                 \
+       24/dialog-information.svg                               \
+       24/document-print.svg                                   \
+       24/media-floppy.svg                                     \
+       24/media-optical.svg                                    \
+       \
+       24/gtk-select-color.svg                                 \
+       \
+       24/gimp-center.svg                                      \
+       24/gimp-channel.svg                                     \
+       24/gimp-channel-alpha.svg                               \
+       24/gimp-channel-blue.svg                                \
+       24/gimp-channel-gray.svg                                \
+       24/gimp-channel-green.svg                               \
+       24/gimp-channel-indexed.svg                             \
+       24/gimp-channel-red.svg                                 \
+       24/gimp-channels.svg                                    \
+       24/gimp-char-picker.svg                                 \
+       24/gimp-colormap.svg                                    \
+       24/gimp-controller.svg                                  \
+       24/gimp-controller-keyboard.svg                         \
+       24/gimp-controller-linux-input.svg                      \
+       24/gimp-controller-midi.svg                             \
+       24/gimp-controller-wheel.svg                            \
+       24/gimp-cursor.svg                                      \
+       24/gimp-device-status.svg                               \
+       24/gimp-display-filter.svg                              \
+       24/gimp-display-filter-colorblind.svg                   \
+       24/gimp-display-filter-contrast.svg                     \
+       24/gimp-display-filter-gamma.svg                        \
+       24/gimp-display-filter-lcms.svg                         \
+       24/gimp-display-filter-proof.svg                        \
+       24/gimp-dynamics.svg                                    \
+       24/gimp-error.svg                                       \
+       24/gimp-floating-selection.svg                          \
+       24/gimp-gegl.svg                                        \
+       24/gimp-grid.svg                                        \
+       24/gimp-histogram.svg                                   \
+       24/gimp-image.svg                                       \
+       24/gimp-images.svg                                      \
+       24/gimp-info.svg                                        \
+       24/gimp-landscape.svg                                   \
+       24/gimp-layer.svg                                       \
+       24/gimp-layer-mask.svg                                  \
+       24/gimp-layers.svg                                      \
+       24/gimp-letter-spacing.svg                              \
+       24/gimp-line-spacing.svg                                \
+       24/gimp-move-to-screen.svg                              \
+       24/gimp-navigation.svg                                  \
+       24/gimp-path.svg                                        \
+       24/gimp-paths.svg                                       \
+       24/gimp-portrait.svg                                    \
+       24/gimp-prefs-color-management.svg                      \
+       24/gimp-prefs-controllers.svg                           \
+       24/gimp-prefs-default-comment.svg                       \
+       24/gimp-prefs-default-grid.svg                          \
+       24/gimp-prefs-display.svg                               \
+       24/gimp-prefs-folders.svg                               \
+       24/gimp-prefs-folders-brushes.svg                       \
+       24/gimp-prefs-folders-dynamics.svg                      \
+       24/gimp-prefs-folders-environ.svg                       \
+       24/gimp-prefs-folders-fonts.svg                         \
+       24/gimp-prefs-folders-gradients.svg                     \
+       24/gimp-prefs-folders-icon-themes.svg                   \
+       24/gimp-prefs-folders-interp.svg                        \
+       24/gimp-prefs-folders-modules.svg                       \
+       24/gimp-prefs-folders-mypaint-brushes.svg               \
+       24/gimp-prefs-folders-palettes.svg                      \
+       24/gimp-prefs-folders-patterns.svg                      \
+       24/gimp-prefs-folders-plug-ins.svg                      \
+       24/gimp-prefs-folders-scripts.svg                       \
+       24/gimp-prefs-folders-themes.svg                        \
+       24/gimp-prefs-folders-tool-plug-ins.svg                 \
+       24/gimp-prefs-folders-tool-presets.svg                  \
+       24/gimp-prefs-folders-tools.svg                         \
+       24/gimp-prefs-help-system.svg                           \
+       24/gimp-prefs-icon-theme.svg                            \
+       24/gimp-prefs-image-title.svg                           \
+       24/gimp-prefs-image-windows.svg                         \
+       24/gimp-prefs-image-windows-appearance.svg              \
+       24/gimp-prefs-image-windows-snapping.svg                \
+       24/gimp-prefs-import-export.svg                         \
+       24/gimp-prefs-input-devices.svg                         \
+       24/gimp-prefs-interface.svg                             \
+       24/gimp-prefs-new-image.svg                             \
+       24/gimp-prefs-playground.svg                            \
+       24/gimp-prefs-session.svg                               \
+       24/gimp-prefs-system-resources.svg                      \
+       24/gimp-prefs-theme.svg                                 \
+       24/gimp-prefs-toolbox.svg                               \
+       24/gimp-prefs-tool-options.svg                          \
+       24/gimp-prefs-window-management.svg                     \
+       24/gimp-question.svg                                    \
+       24/gimp-resize.svg                                      \
+       24/gimp-sample-point.svg                                \
+       24/gimp-scale.svg                                       \
+       24/gimp-selection.svg                                   \
+       24/gimp-symmetry.svg                                    \
+       24/gimp-template.svg                                    \
+       24/gimp-text-layer.svg                                  \
+       24/gimp-tool-airbrush.svg                               \
+       24/gimp-tool-align.svg                                  \
+       24/gimp-tool-blend.svg                                  \
+       24/gimp-tool-blur.svg                                   \
+       24/gimp-tool-brightness-contrast.svg                    \
+       24/gimp-tool-bucket-fill.svg                            \
+       24/gimp-tool-by-color-select.svg                        \
+       24/gimp-tool-cage.svg                                   \
+       24/gimp-tool-clone.svg                                  \
+       24/gimp-tool-color-balance.svg                          \
+       24/gimp-tool-color-picker.svg                           \
+       24/gimp-tool-colorize.svg                               \
+       24/gimp-tool-crop.svg                                   \
+       24/gimp-tool-curves.svg                                 \
+       24/gimp-tool-desaturate.svg                             \
+       24/gimp-tool-dodge.svg                                  \
+       24/gimp-tool-eraser.svg                                 \
+       24/gimp-tool-ellipse-select.svg                         \
+       24/gimp-tool-flip.svg                                   \
+       24/gimp-tool-foreground-select.svg                      \
+       24/gimp-tool-free-select.svg                            \
+       24/gimp-tool-fuzzy-select.svg                           \
+       24/gimp-tool-handle-transform.svg                       \
+       24/gimp-tool-heal.svg                                   \
+       24/gimp-tool-hue-saturation.svg                         \
+       24/gimp-tool-ink.svg                                    \
+       24/gimp-tool-iscissors.svg                              \
+       24/gimp-tool-levels.svg                                 \
+       24/gimp-tool-mypaint-brush.svg                          \
+       24/gimp-tool-measure.svg                                \
+       24/gimp-tool-n-point-deformation.svg                    \
+       24/gimp-tool-options.svg                                \
+       24/gimp-tool-paintbrush.svg                             \
+       24/gimp-tool-path.svg                                   \
+       24/gimp-tool-pencil.svg                                 \
+       24/gimp-tool-perspective.svg                            \
+       24/gimp-tool-perspective-clone.svg                      \
+       24/gimp-tool-posterize.svg                              \
+       24/gimp-tool-preset.svg                                 \
+       24/gimp-tool-rect-select.svg                            \
+       24/gimp-tool-rotate.svg                                 \
+       24/gimp-tools.svg                                       \
+       24/gimp-tool-scale.svg                                  \
+       24/gimp-tool-seamless-clone.svg                         \
+       24/gimp-tool-shear.svg                                  \
+       24/gimp-tool-smudge.svg                                 \
+       24/gimp-tool-threshold.svg                              \
+       24/gimp-tool-unified-transform.svg                      \
+       24/gimp-tool-text.svg                                   \
+       24/gimp-tool-warp.svg                                   \
+       24/gimp-tool-zoom.svg                                   \
+       24/gimp-transparency.svg                                \
+       24/gimp-undo-history.svg                                \
+       24/gimp-user-manual.svg                                 \
+       24/gimp-video.svg                                       \
+       24/gimp-warning.svg                                     \
+       24/gimp-web.svg                                         \
        24/gimp-wilber.svg
 
 icons12_images = \
-       12/gimp-close.png                       \
-       12/gimp-default-colors.png              \
-       12/gimp-linked.png                      \
-       12/gimp-menu-left.png                   \
-       12/gimp-menu-right.png                  \
-       12/gimp-quick-mask-off.png              \
-       12/gimp-quick-mask-on.png               \
-       12/gimp-swap-colors.png                 \
-       12/gimp-visible.png                     \
+       12/gimp-close.png                                       \
+       12/gimp-default-colors.png                              \
+       12/gimp-linked.png                                      \
+       12/gimp-menu-left.png                                   \
+       12/gimp-menu-right.png                                  \
+       12/gimp-quick-mask-off.png                              \
+       12/gimp-quick-mask-on.png                               \
+       12/gimp-swap-colors.png                                 \
+       12/gimp-visible.png                                     \
        12/gimp-zoom-follow-window.png
 
 icons16_images = \
-       16/dialog-information.png                                       \
-       16/document-new.png                                                     \
-       16/document-open.png                                            \
-       16/document-open-recent.png                                     \
-       16/document-print.png                                           \
-       16/document-revert.png                                          \
-       16/document-save.png                                            \
-       16/document-save-as.png                                         \
-       16/edit-clear.png                                                       \
-       16/edit-copy.png                                                        \
-       16/edit-cut.png                                                         \
-       16/edit-delete.png                                                      \
-       16/edit-paste.png                                                       \
-       16/edit-redo.png                                                        \
-       16/edit-undo.png                                                        \
-       16/folder.png                                                           \
-       16/folder-new.png                                                       \
-       16/go-bottom.png                                                        \
-       16/go-down.png                                                          \
-       16/go-first.png                                                         \
-       16/go-home.png                                                          \
-       16/go-last.png                                                          \
-       16/go-next.png                                                          \
-       16/go-previous.png                                                      \
-       16/go-top.png                                                           \
-       16/go-up.png                                                            \
-       16/help-about.png                                                       \
-       16/list-add.png                                                         \
-       16/list-remove.png                                                      \
-       16/media-floppy.png                                                     \
-       16/media-optical.png                                            \
-       16/media-playback-pause.png                                     \
-       16/media-playback-start.png                                     \
-       16/media-seek-backward.png                                      \
-       16/media-skip-backward.png                                      \
-       16/media-skip-forward.png                                       \
-       16/preferences-system.png                                       \
-       16/process-stop.png                                                     \
-       16/system-run.png                                                       \
-       16/view-fullscreen.png                                          \
-       16/view-refresh.png                                                     \
-       16/window-close.png                                                     \
-       16/window-new.png                                                       \
-       16/zoom-fit-best.png                                            \
-       16/zoom-in.png                                                          \
-       16/zoom-original.png                                            \
-       16/zoom-out.png                                                         \
-                                                                                               \
-       16/gtk-cancel.png                                                       \
-       16/gtk-edit.png                                                         \
-       16/gtk-no.png                                                           \
-       16/gtk-ok.png                                                           \
-       16/gtk-select-color.png                                         \
-       16/gtk-select-font.png                                          \
-       16/gtk-yes.png                                                          \
-                                                                                               \
-       16/gimp-anchor.png                                                      \
-       16/gimp-cap-butt.png                                            \
-       16/gimp-cap-round.png                                           \
-       16/gimp-cap-square.png                                          \
-       16/gimp-center.png                                                      \
-       16/gimp-channel-alpha.png                                       \
-       16/gimp-channel-blue.png                                        \
-       16/gimp-channel-gray.png                                        \
-       16/gimp-channel-green.png                                       \
-       16/gimp-channel-indexed.png                                     \
-       16/gimp-channel-red.png                                         \
-       16/gimp-channel.png                                                     \
-       16/gimp-channels.png                                            \
-       16/gimp-char-picker.png                                         \
-       16/gimp-clipboard.png                                           \
-       16/gimp-close-all.png                                           \
+       16/dialog-information.png                               \
+       16/document-new.png                                     \
+       16/document-open.png                                    \
+       16/document-open-recent.png                             \
+       16/document-print.png                                   \
+       16/document-revert.png                                  \
+       16/document-save.png                                    \
+       16/document-save-as.png                                 \
+       16/edit-clear.png                                       \
+       16/edit-copy.png                                        \
+       16/edit-cut.png                                         \
+       16/edit-delete.png                                      \
+       16/edit-paste.png                                       \
+       16/edit-redo.png                                        \
+       16/edit-undo.png                                        \
+       16/folder.png                                           \
+       16/folder-new.png                                       \
+       16/go-bottom.png                                        \
+       16/go-down.png                                          \
+       16/go-first.png                                         \
+       16/go-home.png                                          \
+       16/go-last.png                                          \
+       16/go-next.png                                          \
+       16/go-previous.png                                      \
+       16/go-top.png                                           \
+       16/go-up.png                                            \
+       16/help-about.png                                       \
+       16/list-add.png                                         \
+       16/list-remove.png                                      \
+       16/media-floppy.png                                     \
+       16/media-optical.png                                    \
+       16/media-playback-pause.png                             \
+       16/media-playback-start.png                             \
+       16/media-seek-backward.png                              \
+       16/media-skip-backward.png                              \
+       16/media-skip-forward.png                               \
+       16/preferences-system.png                               \
+       16/process-stop.png                                     \
+       16/system-run.png                                       \
+       16/view-fullscreen.png                                  \
+       16/view-refresh.png                                     \
+       16/window-close.png                                     \
+       16/window-new.png                                       \
+       16/zoom-fit-best.png                                    \
+       16/zoom-in.png                                          \
+       16/zoom-original.png                                    \
+       16/zoom-out.png                                         \
+       \
+       16/gtk-cancel.png                                       \
+       16/gtk-edit.png                                         \
+       16/gtk-no.png                                           \
+       16/gtk-ok.png                                           \
+       16/gtk-select-color.png                                 \
+       16/gtk-select-font.png                                  \
+       16/gtk-yes.png                                          \
+       \
+       16/gimp-anchor.png                                      \
+       16/gimp-cap-butt.png                                    \
+       16/gimp-cap-round.png                                   \
+       16/gimp-cap-square.png                                  \
+       16/gimp-center.png                                      \
+       16/gimp-channel-alpha.png                               \
+       16/gimp-channel-blue.png                                \
+       16/gimp-channel-gray.png                                \
+       16/gimp-channel-green.png                               \
+       16/gimp-channel-indexed.png                             \
+       16/gimp-channel-red.png                                 \
+       16/gimp-channel.png                                     \
+       16/gimp-channels.png                                    \
+       16/gimp-char-picker.png                                 \
+       16/gimp-clipboard.png                                   \
+       16/gimp-close-all.png                                   \
        16/gimp-color-pick-from-screen.png                      \
-       16/gimp-color-cmyk.png                                          \
-       16/gimp-color-triangle.png                                      \
-       16/gimp-color-water.png                                         \
-       16/gimp-colormap.png                                            \
+       16/gimp-color-cmyk.png                                  \
+       16/gimp-color-triangle.png                              \
+       16/gimp-color-water.png                                 \
+       16/gimp-colormap.png                                    \
        16/gimp-controller-keyboard.png                         \
        16/gimp-controller-linux-input.png                      \
-       16/gimp-controller-midi.png                                     \
+       16/gimp-controller-midi.png                             \
        16/gimp-controller-wheel.png                            \
-       16/gimp-controller.png                                          \
+       16/gimp-controller.png                                  \
        16/gimp-convert-grayscale.png                           \
-       16/gimp-convert-indexed.png                                     \
-       16/gimp-convert-rgb.png                                         \
-       16/gimp-cursor.png                                                      \
-       16/gimp-curve-free.png                                          \
-       16/gimp-curve-smooth.png                                        \
-       16/gimp-device-status.png                                       \
-       16/gimp-display-filter-colorblind.png           \
+       16/gimp-convert-indexed.png                             \
+       16/gimp-convert-rgb.png                                 \
+       16/gimp-cursor.png                                      \
+       16/gimp-curve-free.png                                  \
+       16/gimp-curve-smooth.png                                \
+       16/gimp-device-status.png                               \
+       16/gimp-display-filter-colorblind.png                   \
        16/gimp-display-filter-contrast.png                     \
        16/gimp-display-filter-gamma.png                        \
        16/gimp-display-filter-lcms.png                         \
        16/gimp-display-filter-proof.png                        \
-       16/gimp-display-filter.png                                      \
-       16/gimp-duplicate.png                                           \
-       16/gimp-dynamics.png                                            \
-       16/gimp-error.png                                                       \
-       16/gimp-file-manager.png                                        \
-       16/gimp-flip-horizontal.png                                     \
-       16/gimp-flip-vertical.png                                       \
+       16/gimp-display-filter.png                              \
+       16/gimp-duplicate.png                                   \
+       16/gimp-dynamics.png                                    \
+       16/gimp-error.png                                       \
+       16/gimp-file-manager.png                                \
+       16/gimp-flip-horizontal.png                             \
+       16/gimp-flip-vertical.png                               \
        16/gimp-floating-selection.png                          \
-       16/gimp-gegl.png                                                        \
+       16/gimp-gegl.png                                        \
        16/gimp-gradient-bilinear.png                           \
-       16/gimp-gradient-conical-asymmetric.png         \
-       16/gimp-gradient-conical-symmetric.png          \
-       16/gimp-gradient-linear.png                                     \
-       16/gimp-gradient-radial.png                                     \
-       16/gimp-gradient-shapeburst-angular.png         \
-       16/gimp-gradient-shapeburst-dimpled.png         \
-       16/gimp-gradient-shapeburst-spherical.png       \
-       16/gimp-gradient-spiral-anticlockwise.png       \
-       16/gimp-gradient-spiral-clockwise.png           \
-       16/gimp-gradient-square.png                                     \
-       16/gimp-grid.png                                                        \
-       16/gimp-group-layer.png                                         \
+       16/gimp-gradient-conical-asymmetric.png                 \
+       16/gimp-gradient-conical-symmetric.png                  \
+       16/gimp-gradient-linear.png                             \
+       16/gimp-gradient-radial.png                             \
+       16/gimp-gradient-shapeburst-angular.png                 \
+       16/gimp-gradient-shapeburst-dimpled.png                 \
+       16/gimp-gradient-shapeburst-spherical.png               \
+       16/gimp-gradient-spiral-anticlockwise.png               \
+       16/gimp-gradient-spiral-clockwise.png                   \
+       16/gimp-gradient-square.png                             \
+       16/gimp-grid.png                                        \
+       16/gimp-group-layer.png                                 \
        16/gimp-histogram-linear.png                            \
        16/gimp-histogram-logarithmic.png                       \
-       16/gimp-histogram.png                                           \
-       16/gimp-image.png                                                       \
-       16/gimp-images.png                                                      \
-       16/gimp-image-open.png                                          \
-       16/gimp-image-reload.png                                        \
-       16/gimp-info.png                                                        \
-       16/gimp-input-device.png                                        \
-       16/gimp-invert.png                                                      \
-       16/gimp-join-bevel.png                                          \
-       16/gimp-join-miter.png                                          \
-       16/gimp-join-round.png                                          \
-       16/gimp-landscape.png                                           \
-       16/gimp-layer-mask.png                                          \
+       16/gimp-histogram.png                                   \
+       16/gimp-image.png                                       \
+       16/gimp-images.png                                      \
+       16/gimp-image-open.png                                  \
+       16/gimp-image-reload.png                                \
+       16/gimp-info.png                                        \
+       16/gimp-input-device.png                                \
+       16/gimp-invert.png                                      \
+       16/gimp-join-bevel.png                                  \
+       16/gimp-join-miter.png                                  \
+       16/gimp-join-round.png                                  \
+       16/gimp-landscape.png                                   \
+       16/gimp-layer-mask.png                                  \
        16/gimp-layer-to-imagesize.png                          \
-       16/gimp-layer.png                                                       \
-       16/gimp-layers.png                                                      \
-       16/gimp-list.png                                                        \
-       16/gimp-merge-down.png                                          \
-       16/gimp-move-to-screen.png                                      \
-       16/gimp-navigation.png                                          \
-       16/gimp-paste-as-new.png                                        \
-       16/gimp-paste-into.png                                          \
-       16/gimp-path-stroke.png                                         \
-       16/gimp-path.png                                                        \
-       16/gimp-paths.png                                                       \
-       16/gimp-pattern.png                                                     \
-       16/gimp-plugin.png                                                      \
-       16/gimp-portrait.png                                            \
+       16/gimp-layer.png                                       \
+       16/gimp-layers.png                                      \
+       16/gimp-list.png                                        \
+       16/gimp-merge-down.png                                  \
+       16/gimp-move-to-screen.png                              \
+       16/gimp-navigation.png                                  \
+       16/gimp-paste-as-new.png                                \
+       16/gimp-paste-into.png                                  \
+       16/gimp-path-stroke.png                                 \
+       16/gimp-path.png                                        \
+       16/gimp-paths.png                                       \
+       16/gimp-pattern.png                                     \
+       16/gimp-plugin.png                                      \
+       16/gimp-portrait.png                                    \
        16/gimp-prefs-folders-brushes.png                       \
        16/gimp-prefs-folders-dynamics.png                      \
        16/gimp-prefs-folders-environ.png                       \
        16/gimp-prefs-folders-fonts.png                         \
        16/gimp-prefs-folders-gradients.png                     \
-       16/gimp-prefs-folders-icon-themes.png           \
+       16/gimp-prefs-folders-icon-themes.png                   \
        16/gimp-prefs-folders-interp.png                        \
        16/gimp-prefs-folders-modules.png                       \
-       16/gimp-prefs-folders-mypaint-brushes.png       \
+       16/gimp-prefs-folders-mypaint-brushes.png               \
        16/gimp-prefs-folders-palettes.png                      \
        16/gimp-prefs-folders-patterns.png                      \
        16/gimp-prefs-folders-plug-ins.png                      \
        16/gimp-prefs-folders-scripts.png                       \
        16/gimp-prefs-folders-themes.png                        \
-       16/gimp-prefs-folders-tool-plug-ins.png         \
-       16/gimp-prefs-folders-tool-presets.png          \
+       16/gimp-prefs-folders-tool-plug-ins.png                 \
+       16/gimp-prefs-folders-tool-presets.png                  \
        16/gimp-prefs-folders-tools.png                         \
        16/gimp-prefs-icon-theme.png                            \
        16/gimp-prefs-image-windows.png                         \
        16/gimp-prefs-import-export.png                         \
-       16/gimp-prefs-interface.png                                     \
-       16/gimp-prefs-theme.png                                         \
-       16/gimp-prefs-toolbox.png                                       \
+       16/gimp-prefs-interface.png                             \
+       16/gimp-prefs-theme.png                                 \
+       16/gimp-prefs-toolbox.png                               \
        16/gimp-prefs-window-management.png                     \
-       16/gimp-question.png                                            \
-       16/gimp-reset.png                                                       \
-       16/gimp-reshow-filter.png                                       \
-       16/gimp-resize.png                                                      \
-       16/gimp-rotate-180.png                                          \
-       16/gimp-rotate-270.png                                          \
-       16/gimp-rotate-90.png                                           \
-       16/gimp-sample-point.png                                        \
-       16/gimp-scale.png                                                       \
-       16/gimp-selection-add.png                                       \
-       16/gimp-selection-all.png                                       \
+       16/gimp-question.png                                    \
+       16/gimp-reset.png                                       \
+       16/gimp-reshow-filter.png                               \
+       16/gimp-resize.png                                      \
+       16/gimp-rotate-180.png                                  \
+       16/gimp-rotate-270.png                                  \
+       16/gimp-rotate-90.png                                   \
+       16/gimp-sample-point.png                                \
+       16/gimp-scale.png                                       \
+       16/gimp-selection-add.png                               \
+       16/gimp-selection-all.png                               \
        16/gimp-selection-border.png                            \
-       16/gimp-selection-grow.png                                      \
+       16/gimp-selection-grow.png                              \
        16/gimp-selection-intersect.png                         \
-       16/gimp-selection-none.png                                      \
+       16/gimp-selection-none.png                              \
        16/gimp-selection-replace.png                           \
        16/gimp-selection-shrink.png                            \
        16/gimp-selection-stroke.png                            \
        16/gimp-selection-subtract.png                          \
        16/gimp-selection-to-channel.png                        \
        16/gimp-selection-to-path.png                           \
-       16/gimp-selection.png                                           \
-       16/gimp-shape-circle.png                                        \
-       16/gimp-shape-diamond.png                                       \
-       16/gimp-shape-square.png                                        \
-       16/gimp-shred.png                                                       \
-       16/gimp-symmetry.png                                            \
-       16/gimp-template.png                                            \
-       16/gimp-text-layer.png                                          \
-       16/gimp-toilet-paper.png                                        \
-       16/gimp-tool-airbrush.png                                       \
-       16/gimp-tool-align.png                                          \
-       16/gimp-tool-blend.png                                          \
-       16/gimp-tool-blur.png                                           \
-       16/gimp-tool-brightness-contrast.png            \
+       16/gimp-selection.png                                   \
+       16/gimp-shape-circle.png                                \
+       16/gimp-shape-diamond.png                               \
+       16/gimp-shape-square.png                                \
+       16/gimp-shred.png                                       \
+       16/gimp-symmetry.png                                    \
+       16/gimp-template.png                                    \
+       16/gimp-text-layer.png                                  \
+       16/gimp-toilet-paper.png                                \
+       16/gimp-tool-airbrush.png                               \
+       16/gimp-tool-align.png                                  \
+       16/gimp-tool-blend.png                                  \
+       16/gimp-tool-blur.png                                   \
+       16/gimp-tool-brightness-contrast.png                    \
        16/gimp-tool-bucket-fill.png                            \
        16/gimp-tool-by-color-select.png                        \
-       16/gimp-tool-cage.png                                           \
-       16/gimp-tool-clone.png                                          \
+       16/gimp-tool-cage.png                                   \
+       16/gimp-tool-clone.png                                  \
        16/gimp-tool-color-balance.png                          \
        16/gimp-tool-color-picker.png                           \
-       16/gimp-tool-colorize.png                                       \
-       16/gimp-tool-crop.png                                           \
-       16/gimp-tool-curves.png                                         \
-       16/gimp-tool-desaturate.png                                     \
-       16/gimp-tool-dodge.png                                          \
+       16/gimp-tool-colorize.png                               \
+       16/gimp-tool-crop.png                                   \
+       16/gimp-tool-curves.png                                 \
+       16/gimp-tool-desaturate.png                             \
+       16/gimp-tool-dodge.png                                  \
        16/gimp-tool-ellipse-select.png                         \
-       16/gimp-tool-eraser.png                                         \
-       16/gimp-tool-flip.png                                           \
+       16/gimp-tool-eraser.png                                 \
+       16/gimp-tool-flip.png                                   \
        16/gimp-tool-foreground-select.png                      \
        16/gimp-tool-free-select.png                            \
        16/gimp-tool-fuzzy-select.png                           \
        16/gimp-tool-handle-transform.png                       \
-       16/gimp-tool-heal.png                                           \
+       16/gimp-tool-heal.png                                   \
        16/gimp-tool-hue-saturation.png                         \
-       16/gimp-tool-ink.png                                            \
-       16/gimp-tool-iscissors.png                                      \
-       16/gimp-tool-levels.png                                         \
-       16/gimp-tool-measure.png                                        \
-       16/gimp-tool-move.png                                           \
+       16/gimp-tool-ink.png                                    \
+       16/gimp-tool-iscissors.png                              \
+       16/gimp-tool-levels.png                                 \
+       16/gimp-tool-measure.png                                \
+       16/gimp-tool-move.png                                   \
        16/gimp-tool-mypaint-brush.png                          \
-       16/gimp-tool-n-point-deformation.png            \
-       16/gimp-tool-options.png                                        \
-       16/gimp-tool-paintbrush.png                                     \
-       16/gimp-tool-path.png                                           \
-       16/gimp-tool-pencil.png                                         \
+       16/gimp-tool-n-point-deformation.png                    \
+       16/gimp-tool-options.png                                \
+       16/gimp-tool-paintbrush.png                             \
+       16/gimp-tool-path.png                                   \
+       16/gimp-tool-pencil.png                                 \
        16/gimp-tool-perspective-clone.png                      \
        16/gimp-tool-perspective.png                            \
-       16/gimp-tool-posterize.png                                      \
-       16/gimp-tool-preset.png                                         \
+       16/gimp-tool-posterize.png                              \
+       16/gimp-tool-preset.png                                 \
        16/gimp-tool-rect-select.png                            \
-       16/gimp-tool-rotate.png                                         \
-       16/gimp-tool-scale.png                                          \
+       16/gimp-tool-rotate.png                                 \
+       16/gimp-tool-scale.png                                  \
        16/gimp-tool-seamless-clone.png                         \
-       16/gimp-tool-shear.png                                          \
-       16/gimp-tool-smudge.png                                         \
-       16/gimp-tool-text.png                                           \
-       16/gimp-tool-threshold.png                                      \
+       16/gimp-tool-shear.png                                  \
+       16/gimp-tool-smudge.png                                 \
+       16/gimp-tool-text.png                                   \
+       16/gimp-tool-threshold.png                              \
        16/gimp-tool-unified-transform.png                      \
-       16/gimp-tool-warp.png                                           \
-       16/gimp-tool-zoom.png                                           \
-       16/gimp-tools.png                                                       \
-       16/gimp-transparency.png                                        \
-       16/gimp-undo-history.png                                        \
-       16/gimp-user-manual.png                                         \
-       16/gimp-video.png                                                       \
-       16/gimp-warning.png                                                     \
-       16/gimp-web.png                                                         \
+       16/gimp-tool-warp.png                                   \
+       16/gimp-tool-zoom.png                                   \
+       16/gimp-tools.png                                       \
+       16/gimp-transparency.png                                \
+       16/gimp-undo-history.png                                \
+       16/gimp-user-manual.png                                 \
+       16/gimp-video.png                                       \
+       16/gimp-warning.png                                     \
+       16/gimp-web.png                                         \
        16/gimp-wilber.png
 
 icons18_images = \
-       18/gimp-color-picker-black.png          \
-       18/gimp-color-picker-gray.png           \
+       18/gimp-color-picker-black.png                          \
+       18/gimp-color-picker-gray.png                           \
        18/gimp-color-picker-white.png
 
 icons20_images = \
-       20/gimp-linked.png                      \
+       20/gimp-linked.png                                      \
        20/gimp-visible.png
 
 icons22_images = \
-       22/folder.png                                                           \
-       22/format-indent-more.png                                       \
-                                                                                               \
-       22/gtk-justify-center.png                                       \
-       22/gtk-justify-fill.png                                         \
-       22/gtk-justify-left.png                                         \
-       22/gtk-justify-right.png                                        \
-                                                                                               \
-       22/gimp-char-picker.png                 \
-       22/gimp-dynamics.png                    \
-       22/gimp-histogram.png                   \
-       22/gimp-input-device.png                \
-       22/gimp-landscape.png                   \
-       22/gimp-letter-spacing.png              \
-       22/gimp-line-spacing.png                \
-       22/gimp-path.png                        \
-       22/gimp-paths.png                       \
-       22/gimp-portrait.png                    \
-       22/gimp-prefs-color-management.png      \
-       22/gimp-prefs-controllers.png           \
-       22/gimp-prefs-default-grid.png          \
-       22/gimp-prefs-display.png               \
-       22/gimp-prefs-folders.png                                       \
-       22/gimp-prefs-folders-brushes.png       \
-       22/gimp-prefs-folders-dynamics.png      \
-       22/gimp-prefs-folders-environ.png       \
-       22/gimp-prefs-folders-fonts.png         \
-       22/gimp-prefs-folders-gradients.png     \
-       22/gimp-prefs-folders-icon-themes.png   \
-       22/gimp-prefs-folders-interp.png        \
-       22/gimp-prefs-folders-modules.png       \
-       22/gimp-prefs-folders-mypaint-brushes.png       \
-       22/gimp-prefs-folders-palettes.png      \
-       22/gimp-prefs-folders-patterns.png      \
-       22/gimp-prefs-folders-plug-ins.png      \
-       22/gimp-prefs-folders-scripts.png       \
-       22/gimp-prefs-folders-themes.png        \
-       22/gimp-prefs-folders-tool-plug-ins.png \
-       22/gimp-prefs-folders-tool-presets.png  \
-       22/gimp-prefs-folders-tools.png         \
-       22/gimp-prefs-help-system.png           \
-       22/gimp-prefs-icon-theme.png            \
-       22/gimp-prefs-image-title.png           \
-       22/gimp-prefs-image-windows.png         \
-       22/gimp-prefs-image-windows-appearance.png      \
-       22/gimp-prefs-image-windows-snapping.png        \
+       22/folder.png                                           \
+       22/format-indent-more.png                               \
+       22/format-justify-center.png                            \
+       22/format-justify-fill.png                              \
+       22/format-justify-left.png                              \
+       22/format-justify-right.png                             \
+       \
+       22/gimp-char-picker.png                                 \
+       22/gimp-dynamics.png                                    \
+       22/gimp-histogram.png                                   \
+       22/gimp-input-device.png                                \
+       22/gimp-landscape.png                                   \
+       22/gimp-letter-spacing.png                              \
+       22/gimp-line-spacing.png                                \
+       22/gimp-path.png                                        \
+       22/gimp-paths.png                                       \
+       22/gimp-portrait.png                                    \
+       22/gimp-prefs-color-management.png                      \
+       22/gimp-prefs-controllers.png                           \
+       22/gimp-prefs-default-grid.png                          \
+       22/gimp-prefs-display.png                               \
+       22/gimp-prefs-folders.png                               \
+       22/gimp-prefs-folders-brushes.png                       \
+       22/gimp-prefs-folders-dynamics.png                      \
+       22/gimp-prefs-folders-environ.png                       \
+       22/gimp-prefs-folders-fonts.png                         \
+       22/gimp-prefs-folders-gradients.png                     \
+       22/gimp-prefs-folders-icon-themes.png                   \
+       22/gimp-prefs-folders-interp.png                        \
+       22/gimp-prefs-folders-modules.png                       \
+       22/gimp-prefs-folders-mypaint-brushes.png               \
+       22/gimp-prefs-folders-palettes.png                      \
+       22/gimp-prefs-folders-patterns.png                      \
+       22/gimp-prefs-folders-plug-ins.png                      \
+       22/gimp-prefs-folders-scripts.png                       \
+       22/gimp-prefs-folders-themes.png                        \
+       22/gimp-prefs-folders-tool-plug-ins.png                 \
+       22/gimp-prefs-folders-tool-presets.png                  \
+       22/gimp-prefs-folders-tools.png                         \
+       22/gimp-prefs-help-system.png                           \
+       22/gimp-prefs-icon-theme.png                            \
+       22/gimp-prefs-image-title.png                           \
+       22/gimp-prefs-image-windows.png                         \
+       22/gimp-prefs-image-windows-appearance.png              \
+       22/gimp-prefs-image-windows-snapping.png                \
        22/gimp-prefs-import-export.png                         \
-       22/gimp-prefs-input-devices.png         \
-       22/gimp-prefs-interface.png             \
-       22/gimp-prefs-new-image.png             \
-       22/gimp-prefs-playground.png            \
-       22/gimp-prefs-session.png               \
-       22/gimp-prefs-system-resources.png      \
-       22/gimp-prefs-theme.png                 \
-       22/gimp-prefs-tool-options.png          \
-       22/gimp-prefs-toolbox.png               \
-       22/gimp-prefs-window-management.png     \
-       22/gimp-tool-preset.png                 \
+       22/gimp-prefs-input-devices.png                         \
+       22/gimp-prefs-interface.png                             \
+       22/gimp-prefs-new-image.png                             \
+       22/gimp-prefs-playground.png                            \
+       22/gimp-prefs-session.png                               \
+       22/gimp-prefs-system-resources.png                      \
+       22/gimp-prefs-theme.png                                 \
+       22/gimp-prefs-tool-options.png                          \
+       22/gimp-prefs-toolbox.png                               \
+       22/gimp-prefs-window-management.png                     \
+       22/gimp-tool-preset.png                                 \
        22/gimp-wilber.png
 
 icons24_images = \
-       24/dialog-information.png                                       \
-       24/document-print.png                                           \
-       24/media-floppy.png                                                     \
-       24/media-optical.png                                            \
-                                                                                               \
+       24/dialog-information.png                               \
+       24/document-print.png                                   \
+       24/media-floppy.png                                     \
+       24/media-optical.png                                    \
+       \
        24/gtk-select-color.png                                 \
-                                                                                       \
-       24/gimp-center.png                      \
-       24/gimp-channel-alpha.png               \
-       24/gimp-channel-blue.png                \
-       24/gimp-channel-gray.png                \
-       24/gimp-channel-green.png               \
-       24/gimp-channel-indexed.png             \
-       24/gimp-channel-red.png                 \
-       24/gimp-channel.png                     \
-       24/gimp-channels.png                    \
-       24/gimp-colormap.png                    \
-       24/gimp-controller-keyboard.png         \
-       24/gimp-controller-linux-input.png      \
-       24/gimp-controller-midi.png             \
-       24/gimp-controller-wheel.png            \
-       24/gimp-controller.png                  \
-       24/gimp-cursor.png                      \
-       24/gimp-device-status.png               \
-       24/gimp-display-filter-colorblind.png   \
-       24/gimp-display-filter-contrast.png     \
-       24/gimp-display-filter-gamma.png        \
-       24/gimp-display-filter-lcms.png         \
-       24/gimp-display-filter-proof.png        \
-       24/gimp-display-filter.png              \
-       24/gimp-error.png                       \
-       24/gimp-floating-selection.png          \
-       24/gimp-gegl.png                        \
-       24/gimp-grid.png                        \
-       24/gimp-gravity-east.png                \
-       24/gimp-gravity-north-east.png          \
-       24/gimp-gravity-north-west.png          \
-       24/gimp-gravity-north.png               \
-       24/gimp-gravity-south-east.png          \
-       24/gimp-gravity-south-west.png          \
-       24/gimp-gravity-south.png               \
-       24/gimp-gravity-west.png                \
-       24/gimp-hcenter.png                     \
-       24/gimp-hchain-broken.png               \
-       24/gimp-hchain.png                      \
-       24/gimp-hfill.png                       \
-       24/gimp-image.png                       \
-       24/gimp-images.png                      \
-       24/gimp-info.png                        \
-       24/gimp-layer-mask.png                  \
-       24/gimp-layer.png                       \
-       24/gimp-layers.png                      \
-       24/gimp-move-to-screen.png              \
-       24/gimp-navigation.png                  \
-       24/gimp-question.png                    \
-       24/gimp-resize.png                      \
-       24/gimp-sample-point.png                \
-       24/gimp-scale.png                       \
-       24/gimp-selection.png                   \
-       24/gimp-symmetry.png                    \
-       24/gimp-template.png                    \
-       24/gimp-text-dir-ltr.png                \
-       24/gimp-text-dir-rtl.png                \
-       24/gimp-text-layer.png                  \
-       24/gimp-toilet-paper.png                \
-       24/gimp-tool-airbrush.png               \
-       24/gimp-tool-align.png                  \
-       24/gimp-tool-blend.png                  \
-       24/gimp-tool-blur.png                   \
-       24/gimp-tool-brightness-contrast.png    \
-       24/gimp-tool-bucket-fill.png            \
-       24/gimp-tool-by-color-select.png        \
-       24/gimp-tool-cage.png                   \
-       24/gimp-tool-clone.png                  \
-       24/gimp-tool-color-balance.png          \
-       24/gimp-tool-color-picker.png           \
-       24/gimp-tool-colorize.png               \
-       24/gimp-tool-crop.png                   \
-       24/gimp-tool-curves.png                 \
-       24/gimp-tool-desaturate.png             \
-       24/gimp-tool-dodge.png                  \
-       24/gimp-tool-ellipse-select.png         \
-       24/gimp-tool-eraser.png                 \
-       24/gimp-tool-flip.png                   \
-       24/gimp-tool-foreground-select.png      \
-       24/gimp-tool-free-select.png            \
-       24/gimp-tool-fuzzy-select.png           \
-       24/gimp-tool-handle-transform.png       \
-       24/gimp-tool-heal.png                   \
-       24/gimp-tool-hue-saturation.png         \
-       24/gimp-tool-ink.png                    \
-       24/gimp-tool-iscissors.png              \
-       24/gimp-tool-levels.png                 \
-       24/gimp-tool-measure.png                \
-       24/gimp-tool-move.png                   \
-       24/gimp-tool-mypaint-brush.png          \
-       24/gimp-tool-n-point-deformation.png    \
-       24/gimp-tool-paintbrush.png             \
-       24/gimp-tool-path.png                   \
-       24/gimp-tool-pencil.png                 \
-       24/gimp-tool-perspective-clone.png      \
-       24/gimp-tool-perspective.png            \
-       24/gimp-tool-preset.png                 \
-       24/gimp-tool-posterize.png              \
-       24/gimp-tool-rect-select.png            \
-       24/gimp-tool-rotate.png                 \
-       24/gimp-tool-scale.png                  \
-       24/gimp-tool-seamless-clone.png         \
-       24/gimp-tool-shear.png                  \
-       24/gimp-tool-smudge.png                 \
-       24/gimp-tool-text.png                   \
-       24/gimp-tool-threshold.png              \
-       24/gimp-tool-unified-transform.png      \
-       24/gimp-tool-warp.png                   \
-       24/gimp-tool-zoom.png                   \
-       24/gimp-tool-options.png                \
-       24/gimp-tools.png                       \
-       24/gimp-transparency.png                \
-       24/gimp-undo-history.png                \
-       24/gimp-user-manual.png                 \
-       24/gimp-vcenter.png                     \
-       24/gimp-vchain-broken.png               \
-       24/gimp-vchain.png                      \
-       24/gimp-vfill.png                       \
-       24/gimp-video.png                       \
-       24/gimp-warning.png                     \
+       \
+       24/gimp-center.png                                      \
+       24/gimp-channel-alpha.png                               \
+       24/gimp-channel-blue.png                                \
+       24/gimp-channel-gray.png                                \
+       24/gimp-channel-green.png                               \
+       24/gimp-channel-indexed.png                             \
+       24/gimp-channel-red.png                                 \
+       24/gimp-channel.png                                     \
+       24/gimp-channels.png                                    \
+       24/gimp-colormap.png                                    \
+       24/gimp-controller-keyboard.png                         \
+       24/gimp-controller-linux-input.png                      \
+       24/gimp-controller-midi.png                             \
+       24/gimp-controller-wheel.png                            \
+       24/gimp-controller.png                                  \
+       24/gimp-cursor.png                                      \
+       24/gimp-device-status.png                               \
+       24/gimp-display-filter-colorblind.png                   \
+       24/gimp-display-filter-contrast.png                     \
+       24/gimp-display-filter-gamma.png                        \
+       24/gimp-display-filter-lcms.png                         \
+       24/gimp-display-filter-proof.png                        \
+       24/gimp-display-filter.png                              \
+       24/gimp-error.png                                       \
+       24/gimp-floating-selection.png                          \
+       24/gimp-gegl.png                                        \
+       24/gimp-grid.png                                        \
+       24/gimp-gravity-east.png                                \
+       24/gimp-gravity-north-east.png                          \
+       24/gimp-gravity-north-west.png                          \
+       24/gimp-gravity-north.png                               \
+       24/gimp-gravity-south-east.png                          \
+       24/gimp-gravity-south-west.png                          \
+       24/gimp-gravity-south.png                               \
+       24/gimp-gravity-west.png                                \
+       24/gimp-hcenter.png                                     \
+       24/gimp-hchain-broken.png                               \
+       24/gimp-hchain.png                                      \
+       24/gimp-hfill.png                                       \
+       24/gimp-image.png                                       \
+       24/gimp-images.png                                      \
+       24/gimp-info.png                                        \
+       24/gimp-layer-mask.png                                  \
+       24/gimp-layer.png                                       \
+       24/gimp-layers.png                                      \
+       24/gimp-move-to-screen.png                              \
+       24/gimp-navigation.png                                  \
+       24/gimp-question.png                                    \
+       24/gimp-resize.png                                      \
+       24/gimp-sample-point.png                                \
+       24/gimp-scale.png                                       \
+       24/gimp-selection.png                                   \
+       24/gimp-symmetry.png                                    \
+       24/gimp-template.png                                    \
+       24/gimp-text-dir-ltr.png                                \
+       24/gimp-text-dir-rtl.png                                \
+       24/gimp-text-layer.png                                  \
+       24/gimp-toilet-paper.png                                \
+       24/gimp-tool-airbrush.png                               \
+       24/gimp-tool-align.png                                  \
+       24/gimp-tool-blend.png                                  \
+       24/gimp-tool-blur.png                                   \
+       24/gimp-tool-brightness-contrast.png                    \
+       24/gimp-tool-bucket-fill.png                            \
+       24/gimp-tool-by-color-select.png                        \
+       24/gimp-tool-cage.png                                   \
+       24/gimp-tool-clone.png                                  \
+       24/gimp-tool-color-balance.png                          \
+       24/gimp-tool-color-picker.png                           \
+       24/gimp-tool-colorize.png                               \
+       24/gimp-tool-crop.png                                   \
+       24/gimp-tool-curves.png                                 \
+       24/gimp-tool-desaturate.png                             \
+       24/gimp-tool-dodge.png                                  \
+       24/gimp-tool-ellipse-select.png                         \
+       24/gimp-tool-eraser.png                                 \
+       24/gimp-tool-flip.png                                   \
+       24/gimp-tool-foreground-select.png                      \
+       24/gimp-tool-free-select.png                            \
+       24/gimp-tool-fuzzy-select.png                           \
+       24/gimp-tool-handle-transform.png                       \
+       24/gimp-tool-heal.png                                   \
+       24/gimp-tool-hue-saturation.png                         \
+       24/gimp-tool-ink.png                                    \
+       24/gimp-tool-iscissors.png                              \
+       24/gimp-tool-levels.png                                 \
+       24/gimp-tool-measure.png                                \
+       24/gimp-tool-move.png                                   \
+       24/gimp-tool-mypaint-brush.png                          \
+       24/gimp-tool-n-point-deformation.png                    \
+       24/gimp-tool-paintbrush.png                             \
+       24/gimp-tool-path.png                                   \
+       24/gimp-tool-pencil.png                                 \
+       24/gimp-tool-perspective-clone.png                      \
+       24/gimp-tool-perspective.png                            \
+       24/gimp-tool-preset.png                                 \
+       24/gimp-tool-posterize.png                              \
+       24/gimp-tool-rect-select.png                            \
+       24/gimp-tool-rotate.png                                 \
+       24/gimp-tool-scale.png                                  \
+       24/gimp-tool-seamless-clone.png                         \
+       24/gimp-tool-shear.png                                  \
+       24/gimp-tool-smudge.png                                 \
+       24/gimp-tool-text.png                                   \
+       24/gimp-tool-threshold.png                              \
+       24/gimp-tool-unified-transform.png                      \
+       24/gimp-tool-warp.png                                   \
+       24/gimp-tool-zoom.png                                   \
+       24/gimp-tool-options.png                                \
+       24/gimp-tools.png                                       \
+       24/gimp-transparency.png                                \
+       24/gimp-undo-history.png                                \
+       24/gimp-user-manual.png                                 \
+       24/gimp-vcenter.png                                     \
+       24/gimp-vchain-broken.png                               \
+       24/gimp-vchain.png                                      \
+       24/gimp-vfill.png                                       \
+       24/gimp-video.png                                       \
+       24/gimp-warning.png                                     \
        24/gimp-web.png
 
 icons32_images = \
-       32/gimp-channel-alpha.png       \
-       32/gimp-channel-blue.png        \
-       32/gimp-channel-gray.png        \
-       32/gimp-channel-green.png       \
-       32/gimp-channel-indexed.png     \
-       32/gimp-channel-red.png         \
-       32/gimp-channel.png             \
-       32/gimp-floating-selection.png  \
-       32/gimp-image.png               \
-       32/gimp-layer-mask.png          \
-       32/gimp-layer.png               \
-       32/gimp-text-layer.png          \
-       32/gimp-user-manual.png         \
+       32/gimp-channel-alpha.png                               \
+       32/gimp-channel-blue.png                                \
+       32/gimp-channel-gray.png                                \
+       32/gimp-channel-green.png                               \
+       32/gimp-channel-indexed.png                             \
+       32/gimp-channel-red.png                                 \
+       32/gimp-channel.png                                     \
+       32/gimp-floating-selection.png                          \
+       32/gimp-image.png                                       \
+       32/gimp-layer-mask.png                                  \
+       32/gimp-layer.png                                       \
+       32/gimp-text-layer.png                                  \
+       32/gimp-user-manual.png                                 \
        32/gimp-wilber.png
 
 icons48_images = \
-       48/folder.png                                                           \
-                                                                                               \
-       48/gimp-channel-alpha.png               \
-       48/gimp-channel-blue.png                \
-       48/gimp-channel-gray.png                \
-       48/gimp-channel-green.png               \
-       48/gimp-channel-indexed.png             \
-       48/gimp-channel-red.png                 \
-       48/gimp-channel.png                     \
-       48/gimp-floating-selection.png          \
-       48/gimp-image.png                       \
-       48/gimp-layer-mask.png                  \
-       48/gimp-layer.png                       \
-       48/gimp-prefs-color-management.png      \
-       48/gimp-prefs-controllers.png           \
-       48/gimp-prefs-default-comment.png       \
-       48/gimp-prefs-default-grid.png          \
-       48/gimp-prefs-display.png               \
-       48/gimp-prefs-folders.png                                       \
-       48/gimp-prefs-folders-brushes.png       \
-       48/gimp-prefs-folders-dynamics.png      \
-       48/gimp-prefs-folders-environ.png       \
-       48/gimp-prefs-folders-fonts.png         \
-       48/gimp-prefs-folders-gradients.png     \
-       48/gimp-prefs-folders-icon-themes.png   \
-       48/gimp-prefs-folders-interp.png        \
-       48/gimp-prefs-folders-modules.png       \
-       48/gimp-prefs-folders-mypaint-brushes.png       \
-       48/gimp-prefs-folders-palettes.png      \
-       48/gimp-prefs-folders-patterns.png      \
-       48/gimp-prefs-folders-plug-ins.png      \
-       48/gimp-prefs-folders-scripts.png       \
-       48/gimp-prefs-folders-themes.png        \
-       48/gimp-prefs-folders-tool-plug-ins.png \
-       48/gimp-prefs-folders-tool-presets.png  \
-       48/gimp-prefs-folders-tools.png         \
-       48/gimp-prefs-help-system.png           \
-       48/gimp-prefs-icon-theme.png            \
-       48/gimp-prefs-image-title.png           \
-       48/gimp-prefs-image-windows.png         \
-       48/gimp-prefs-image-windows-appearance.png      \
-       48/gimp-prefs-image-windows-snapping.png        \
+       48/folder.png                                           \
+       \
+       48/gimp-channel-alpha.png                               \
+       48/gimp-channel-blue.png                                \
+       48/gimp-channel-gray.png                                \
+       48/gimp-channel-green.png                               \
+       48/gimp-channel-indexed.png                             \
+       48/gimp-channel-red.png                                 \
+       48/gimp-channel.png                                     \
+       48/gimp-floating-selection.png                          \
+       48/gimp-image.png                                       \
+       48/gimp-layer-mask.png                                  \
+       48/gimp-layer.png                                       \
+       48/gimp-prefs-color-management.png                      \
+       48/gimp-prefs-controllers.png                           \
+       48/gimp-prefs-default-comment.png                       \
+       48/gimp-prefs-default-grid.png                          \
+       48/gimp-prefs-display.png                               \
+       48/gimp-prefs-folders.png                               \
+       48/gimp-prefs-folders-brushes.png                       \
+       48/gimp-prefs-folders-dynamics.png                      \
+       48/gimp-prefs-folders-environ.png                       \
+       48/gimp-prefs-folders-fonts.png                         \
+       48/gimp-prefs-folders-gradients.png                     \
+       48/gimp-prefs-folders-icon-themes.png                   \
+       48/gimp-prefs-folders-interp.png                        \
+       48/gimp-prefs-folders-modules.png                       \
+       48/gimp-prefs-folders-mypaint-brushes.png               \
+       48/gimp-prefs-folders-palettes.png                      \
+       48/gimp-prefs-folders-patterns.png                      \
+       48/gimp-prefs-folders-plug-ins.png                      \
+       48/gimp-prefs-folders-scripts.png                       \
+       48/gimp-prefs-folders-themes.png                        \
+       48/gimp-prefs-folders-tool-plug-ins.png                 \
+       48/gimp-prefs-folders-tool-presets.png                  \
+       48/gimp-prefs-folders-tools.png                         \
+       48/gimp-prefs-help-system.png                           \
+       48/gimp-prefs-icon-theme.png                            \
+       48/gimp-prefs-image-title.png                           \
+       48/gimp-prefs-image-windows.png                         \
+       48/gimp-prefs-image-windows-appearance.png              \
+       48/gimp-prefs-image-windows-snapping.png                \
        48/gimp-prefs-import-export.png                         \
-       48/gimp-prefs-input-devices.png         \
-       48/gimp-prefs-interface.png             \
-       48/gimp-prefs-new-image.png             \
-       48/gimp-prefs-playground.png            \
-       48/gimp-prefs-session.png               \
-       48/gimp-prefs-system-resources.png      \
-       48/gimp-prefs-theme.png                 \
-       48/gimp-prefs-tool-options.png          \
-       48/gimp-prefs-toolbox.png               \
-       48/gimp-prefs-window-management.png     \
-       48/gimp-text-layer.png                  \
+       48/gimp-prefs-input-devices.png                         \
+       48/gimp-prefs-interface.png                             \
+       48/gimp-prefs-new-image.png                             \
+       48/gimp-prefs-playground.png                            \
+       48/gimp-prefs-session.png                               \
+       48/gimp-prefs-system-resources.png                      \
+       48/gimp-prefs-theme.png                                 \
+       48/gimp-prefs-tool-options.png                          \
+       48/gimp-prefs-toolbox.png                               \
+       48/gimp-prefs-window-management.png                     \
+       48/gimp-text-layer.png                                  \
        48/gimp-wilber.png
 
 icons64_images = \
-       64/dialog-information.png            \
-       64/gimp-error.png               \
-       64/gimp-frame.png               \
-       64/gimp-info.png                \
-       64/gimp-question.png            \
-       64/gimp-texture.png             \
-       64/gimp-user-manual.png         \
-       64/gimp-warning.png             \
-       64/gimp-wilber-eek.png          \
-       64/gimp-wilber.png              \
+       64/dialog-information.png                               \
+       64/gimp-error.png                                       \
+       64/gimp-frame.png                                       \
+       64/gimp-info.png                                        \
+       64/gimp-question.png                                    \
+       64/gimp-texture.png                                     \
+       64/gimp-user-manual.png                                 \
+       64/gimp-warning.png                                     \
+       64/gimp-wilber-eek.png                                  \
+       64/gimp-wilber.png                                      \
        64/gimp-wilber-outline.png
 
 icons96_images = \
-       96/gimp-wilber.png              \
+       96/gimp-wilber.png                                      \
        96/gimp-wilber-outline.png
 
-icons128_images =                                      \
-       128/folder.png                                  \
-       128/gimp-wilber.png                             \
+icons128_images =                                              \
+       128/folder.png                                          \
+       128/gimp-wilber.png                                     \
        128/gimp-wilber-outline.png
 
 icons192_images = \
-       192/gimp-wilber.png             \
+       192/gimp-wilber.png                                     \
        192/gimp-wilber-outline.png
 
-icons256_images =                                      \
-       256/folder.png                                  \
-       256/gimp-wilber.png                             \
+icons256_images = \
+       256/folder.png                                          \
+       256/gimp-wilber.png                                     \
        256/gimp-wilber-outline.png
 
 if ENABLE_VECTOR_ICONS
diff --git a/libgimp/gimpfontselectbutton.c b/libgimp/gimpfontselectbutton.c
index def55ed..d2b90f4 100644
--- a/libgimp/gimpfontselectbutton.c
+++ b/libgimp/gimpfontselectbutton.c
@@ -447,7 +447,8 @@ gimp_font_select_button_create_inside (GimpFontSelectButton *font_button)
   hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4);
   gtk_container_add (GTK_CONTAINER (button), hbox);
 
-  image = gtk_image_new_from_icon_name ("gtk-select-font", GTK_ICON_SIZE_BUTTON);
+  image = gtk_image_new_from_icon_name (GIMP_ICON_FONT,
+                                        GTK_ICON_SIZE_BUTTON);
   gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, FALSE, 0);
 
   priv->label = gtk_label_new (priv->font_name);
diff --git a/libgimp/gimppaletteselectbutton.c b/libgimp/gimppaletteselectbutton.c
index 2f48261..e1b6fb8 100644
--- a/libgimp/gimppaletteselectbutton.c
+++ b/libgimp/gimppaletteselectbutton.c
@@ -464,7 +464,8 @@ gimp_palette_select_button_create_inside (GimpPaletteSelectButton *palette_butto
   hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4);
   gtk_container_add (GTK_CONTAINER (button), hbox);
 
-  image = gtk_image_new_from_icon_name (GIMP_STOCK_PALETTE, GTK_ICON_SIZE_BUTTON);
+  image = gtk_image_new_from_icon_name (GIMP_ICON_PALETTE,
+                                        GTK_ICON_SIZE_BUTTON);
   gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, FALSE, 0);
 
   priv->label = gtk_label_new (priv->palette_name);
diff --git a/libgimpwidgets/gimpchainbutton.c b/libgimpwidgets/gimpchainbutton.c
index aedd36c..3e884c6 100644
--- a/libgimpwidgets/gimpchainbutton.c
+++ b/libgimpwidgets/gimpchainbutton.c
@@ -89,10 +89,10 @@ static guint gimp_chain_button_signals[LAST_SIGNAL] = { 0 };
 
 static const gchar * const gimp_chain_icon_names[] =
 {
-  GIMP_STOCK_HCHAIN,
-  GIMP_STOCK_HCHAIN_BROKEN,
-  GIMP_STOCK_VCHAIN,
-  GIMP_STOCK_VCHAIN_BROKEN
+  GIMP_ICON_CHAIN_HORIZONTAL,
+  GIMP_ICON_CHAIN_HORIZONTAL_BROKEN,
+  GIMP_ICON_CHAIN_VERTICAL,
+  GIMP_ICON_CHAIN_VERTICAL_BROKEN
 };
 
 
diff --git a/libgimpwidgets/gimpcolordisplay.c b/libgimpwidgets/gimpcolordisplay.c
index 69f5796..546fcbd 100644
--- a/libgimpwidgets/gimpcolordisplay.c
+++ b/libgimpwidgets/gimpcolordisplay.c
@@ -136,7 +136,7 @@ gimp_color_display_class_init (GimpColorDisplayClass *klass)
 
   klass->name            = "Unnamed";
   klass->help_id         = NULL;
-  klass->icon_name       = GIMP_STOCK_DISPLAY_FILTER;
+  klass->icon_name       = GIMP_ICON_DISPLAY_FILTER;
 
   klass->clone           = NULL;
   klass->convert_buffer  = NULL;
diff --git a/libgimpwidgets/gimpcolorscales.c b/libgimpwidgets/gimpcolorscales.c
index 721f141..c583f3c 100644
--- a/libgimpwidgets/gimpcolorscales.c
+++ b/libgimpwidgets/gimpcolorscales.c
@@ -110,7 +110,7 @@ gimp_color_scales_class_init (GimpColorScalesClass *klass)
 
   selector_class->name                  = _("Scales");
   selector_class->help_id               = "gimp-colorselector-scales";
-  selector_class->icon_name             = GIMP_STOCK_TOOL_OPTIONS;
+  selector_class->icon_name             = GIMP_ICON_DIALOG_TOOL_OPTIONS;
   selector_class->set_toggles_visible   = gimp_color_scales_togg_visible;
   selector_class->set_toggles_sensitive = gimp_color_scales_togg_sensitive;
   selector_class->set_show_alpha        = gimp_color_scales_set_show_alpha;
diff --git a/libgimpwidgets/gimpcolorselect.c b/libgimpwidgets/gimpcolorselect.c
index 2e1f486..cbf1d92 100644
--- a/libgimpwidgets/gimpcolorselect.c
+++ b/libgimpwidgets/gimpcolorselect.c
@@ -240,7 +240,7 @@ gimp_color_select_class_init (GimpColorSelectClass *klass)
 
   selector_class->name                  = "GIMP";
   selector_class->help_id               = "gimp-colorselector-gimp";
-  selector_class->icon_name             = GIMP_STOCK_WILBER;
+  selector_class->icon_name             = GIMP_ICON_WILBER;
   selector_class->set_toggles_visible   = gimp_color_select_togg_visible;
   selector_class->set_toggles_sensitive = gimp_color_select_togg_sensitive;
   selector_class->set_color             = gimp_color_select_set_color;
diff --git a/libgimpwidgets/gimpcolorselector.c b/libgimpwidgets/gimpcolorselector.c
index 534e88a..4fcbc25 100644
--- a/libgimpwidgets/gimpcolorselector.c
+++ b/libgimpwidgets/gimpcolorselector.c
@@ -34,6 +34,7 @@
 #include "gimpwidgetstypes.h"
 
 #include "gimpcolorselector.h"
+#include "gimpicons.h"
 #include "gimpwidgetsmarshal.h"
 
 
@@ -96,7 +97,7 @@ gimp_color_selector_class_init (GimpColorSelectorClass *klass)
 
   klass->name                  = "Unnamed";
   klass->help_id               = NULL;
-  klass->icon_name             = "gtk-select-color";
+  klass->icon_name             = GIMP_ICON_PALETTE;
 
   klass->set_toggles_visible   = NULL;
   klass->set_toggles_sensitive = NULL;
diff --git a/libgimpwidgets/gimpcontroller.c b/libgimpwidgets/gimpcontroller.c
index b519d7b..89d683a 100644
--- a/libgimpwidgets/gimpcontroller.c
+++ b/libgimpwidgets/gimpcontroller.c
@@ -90,7 +90,7 @@ gimp_controller_class_init (GimpControllerClass *klass)
   klass->name                = "Unnamed";
   klass->help_domain         = NULL;
   klass->help_id             = NULL;
-  klass->icon_name           = GIMP_STOCK_CONTROLLER;
+  klass->icon_name           = GIMP_ICON_CONTROLLER;
 
   klass->get_n_events        = NULL;
   klass->get_event_name      = NULL;
diff --git a/libgimpwidgets/gimphintbox.c b/libgimpwidgets/gimphintbox.c
index c32e5a2..eac09e3 100644
--- a/libgimpwidgets/gimphintbox.c
+++ b/libgimpwidgets/gimphintbox.c
@@ -88,12 +88,12 @@ gimp_hint_box_class_init (GimpHintBoxClass *klass)
 
   g_object_class_install_property (object_class, PROP_ICON_NAME,
                                    g_param_spec_string ("icon-name", NULL, NULL,
-                                                        GIMP_STOCK_INFO,
+                                                        GIMP_ICON_DIALOG_INFORMATION,
                                                         G_PARAM_CONSTRUCT_ONLY |
                                                         GIMP_PARAM_READWRITE));
   g_object_class_install_property (object_class, PROP_STOCK_ID,
                                    g_param_spec_string ("stock-id", NULL, NULL,
-                                                        GIMP_STOCK_INFO,
+                                                        GIMP_ICON_DIALOG_INFORMATION,
                                                         G_PARAM_CONSTRUCT_ONLY |
                                                         GIMP_PARAM_READWRITE));
   g_object_class_install_property (object_class, PROP_HINT,
diff --git a/libgimpwidgets/gimpicons.c b/libgimpwidgets/gimpicons.c
index eb9a6bc..e636228 100644
--- a/libgimpwidgets/gimpicons.c
+++ b/libgimpwidgets/gimpicons.c
@@ -25,6 +25,7 @@
 
 #include "libgimpbase/gimpbase.h"
 
+#undef GIMP_DISABLE_DEPRECATED
 #include "gimpicons.h"
 
 #include "icons/Color/gimp-icon-pixbufs.c"
diff --git a/libgimpwidgets/gimpicons.h b/libgimpwidgets/gimpicons.h
index be0dec0..27878cf 100644
--- a/libgimpwidgets/gimpicons.h
+++ b/libgimpwidgets/gimpicons.h
@@ -31,30 +31,354 @@ G_BEGIN_DECLS
 /* For information look into the C source or the html documentation */
 
 
-#define GIMP_ICON_IMAGE_OPEN               "gimp-image-open"
-#define GIMP_ICON_IMAGE_RELOAD             "gimp-image-reload"
-#define GIMP_ICON_CLOSE_ALL                "gimp-close-all"
-#define GIMP_ICON_FILE_MANAGER             "gimp-file-manager"
-#define GIMP_ICON_SHRED                    "gimp-shred"
+/*  random actions that don't fit in any category  */
 
-#define GIMP_ICON_HFILL                    "gimp-hfill"
-#define GIMP_ICON_VFILL                    "gimp-vfill"
+#define GIMP_ICON_DETACH                    "gtk-convert"
+#define GIMP_ICON_INVERT                    "gimp-invert"
+#define GIMP_ICON_RESET                     "gimp-reset"
+#define GIMP_ICON_SHRED                     "gimp-shred"
 
-#define GIMP_ICON_COLOR_CMYK               "gimp-color-cmyk"
-#define GIMP_ICON_COLOR_WATER              "gimp-color-water"
 
-#define GIMP_ICON_TOOL_HANDLE_TRANSFORM    "gimp-tool-handle-transform"
-#define GIMP_ICON_TOOL_MYPAINT_BRUSH       "gimp-tool-mypaint-brush"
-#define GIMP_ICON_TOOL_N_POINT_DEFORMATION "gimp-tool-n-point-deformation"
-#define GIMP_ICON_TOOL_SEAMLESS_CLONE      "gimp-tool-seamless-clone"
-#define GIMP_ICON_TOOL_UNIFIED_TRANSFORM   "gimp-tool-unified-transform"
-#define GIMP_ICON_TOOL_WARP                "gimp-tool-warp"
+/*  random states/things that don't fit in any category  */
 
-#define GIMP_ICON_SYMMETRY                 "gimp-symmetry"
+#define GIMP_ICON_CHAR_PICKER               "gimp-char-picker"
+#define GIMP_ICON_CURSOR                    "gimp-cursor"
+#define GIMP_ICON_GEGL                      "gimp-gegl"
+#define GIMP_ICON_LINKED                    "gimp-linked"
+#define GIMP_ICON_TRANSPARENCY              "gimp-transparency"
+#define GIMP_ICON_VIDEO                     "gimp-video"
+#define GIMP_ICON_VISIBLE                   "gimp-visible"
+#define GIMP_ICON_WEB                       "gimp-web"
 
-#define GIMP_ICON_MYPAINT_BRUSH            GIMP_ICON_TOOL_MYPAINT_BRUSH
-#define GIMP_ICON_CONVERT_PRECISION        GIMP_STOCK_CONVERT_RGB
 
+/*  random objects/entities that don't fit in any category  */
+
+#define GIMP_ICON_BRUSH                     GIMP_ICON_TOOL_PAINTBRUSH
+#define GIMP_ICON_BUFFER                    GIMP_ICON_EDIT_PASTE
+#define GIMP_ICON_COLORMAP                  "gimp-colormap"
+#define GIMP_ICON_DYNAMICS                  "gimp-dynamics"
+#define GIMP_ICON_FILE_MANAGER              "gimp-file-manager"
+#define GIMP_ICON_FONT                      "gtk-select-font"
+#define GIMP_ICON_GRADIENT                  GIMP_ICON_TOOL_BLEND
+#define GIMP_ICON_GRID                      "gimp-grid"
+#define GIMP_ICON_INPUT_DEVICE              "gimp-input-device"
+#define GIMP_ICON_MYPAINT_BRUSH             GIMP_ICON_TOOL_MYPAINT_BRUSH
+#define GIMP_ICON_PALETTE                   "gtk-select-color"
+#define GIMP_ICON_PATTERN                   "gimp-pattern"
+#define GIMP_ICON_PLUGIN                    "gimp-plugin"
+#define GIMP_ICON_SAMPLE_POINT              "gimp-sample-point"
+#define GIMP_ICON_SYMMETRY                  "gimp-symmetry"
+#define GIMP_ICON_TEMPLATE                  "gimp-template"
+#define GIMP_ICON_TOOL_PRESET               "gimp-tool-preset"
+
+
+/*  not really icons  */
+
+#define GIMP_ICON_FRAME                     "gimp-frame"
+#define GIMP_ICON_TEXTURE                   "gimp-texture"
+
+
+/*  icons that follow, or at least try to follow the FDO naming and
+ *  category conventions; and groups of icons with a common prefix;
+ *  all sorted alphabetically
+ *
+ *  see also:
+ *  https://specifications.freedesktop.org/icon-naming-spec/latest/ar01s04.html
+ *
+ *  some icons are marked with "use FDO", these shall be renamed in 3.0
+ *  because we duplicated FDO standard icon names
+ */
+
+#define GIMP_ICON_APPLICATION_EXIT          "application-exit"
+
+#define GIMP_ICON_ASPECT_PORTRAIT           "gimp-portrait"
+#define GIMP_ICON_ASPECT_LANDSCAPE          "gimp-landscape"
+
+#define GIMP_ICON_CAP_BUTT                  "gimp-cap-butt"
+#define GIMP_ICON_CAP_ROUND                 "gimp-cap-round"
+#define GIMP_ICON_CAP_SQUARE                "gimp-cap-square"
+
+#define GIMP_ICON_CENTER                    "gimp-center"
+#define GIMP_ICON_CENTER_HORIZONTAL         "gimp-hcenter"
+#define GIMP_ICON_CENTER_VERTICAL           "gimp-vcenter"
+
+#define GIMP_ICON_CHAIN_HORIZONTAL          "gimp-hchain"
+#define GIMP_ICON_CHAIN_HORIZONTAL_BROKEN   "gimp-hchain-broken"
+#define GIMP_ICON_CHAIN_VERTICAL            "gimp-vchain"
+#define GIMP_ICON_CHAIN_VERTICAL_BROKEN     "gimp-vchain-broken"
+
+#define GIMP_ICON_CHANNEL                   "gimp-channel"
+#define GIMP_ICON_CHANNEL_ALPHA             "gimp-channel-alpha"
+#define GIMP_ICON_CHANNEL_BLUE              "gimp-channel-blue"
+#define GIMP_ICON_CHANNEL_GRAY              "gimp-channel-gray"
+#define GIMP_ICON_CHANNEL_GREEN             "gimp-channel-green"
+#define GIMP_ICON_CHANNEL_INDEXED           "gimp-channel-indexed"
+#define GIMP_ICON_CHANNEL_RED               "gimp-channel-red"
+
+#define GIMP_ICON_CLOSE                     "gimp-close"
+#define GIMP_ICON_CLOSE_ALL                 "gimp-close-all"
+
+#define GIMP_ICON_COLOR_PICKER_BLACK        "gimp-color-picker-black"
+#define GIMP_ICON_COLOR_PICKER_GRAY         "gimp-color-picker-gray"
+#define GIMP_ICON_COLOR_PICKER_WHITE        "gimp-color-picker-white"
+#define GIMP_ICON_COLOR_PICK_FROM_SCREEN    "gimp-color-pick-from-screen"
+
+#define GIMP_ICON_COLOR_SELECTOR_CMYK       "gimp-color-cmyk"
+#define GIMP_ICON_COLOR_SELECTOR_TRIANGLE   "gimp-color-triangle"
+#define GIMP_ICON_COLOR_SELECTOR_WATER      "gimp-color-water"
+
+#define GIMP_ICON_COLORS_DEFAULT            "gimp-default-colors"
+#define GIMP_ICON_COLORS_SWAP               "gimp-swap-colors"
+
+#define GIMP_ICON_CONTROLLER                "gimp-controller"
+#define GIMP_ICON_CONTROLLER_KEYBOARD       "gimp-controller-keyboard"
+#define GIMP_ICON_CONTROLLER_LINUX_INPUT    "gimp-controller-linux-input"
+#define GIMP_ICON_CONTROLLER_MIDI           "gimp-controller-midi"
+#define GIMP_ICON_CONTROLLER_MOUSE          GIMP_ICON_CURSOR
+#define GIMP_ICON_CONTROLLER_WHEEL          "gimp-controller-wheel"
+
+#define GIMP_ICON_CONVERT_RGB               "gimp-convert-rgb"
+#define GIMP_ICON_CONVERT_GRAYSCALE         "gimp-convert-grayscale"
+#define GIMP_ICON_CONVERT_INDEXED           "gimp-convert-indexed"
+#define GIMP_ICON_CONVERT_PRECISION         GIMP_ICON_CONVERT_RGB
+
+#define GIMP_ICON_CURVE_FREE                "gimp-curve-free"
+#define GIMP_ICON_CURVE_SMOOTH              "gimp-curve-smooth"
+
+#define GIMP_ICON_DIALOG_CHANNELS           "gimp-channels"
+#define GIMP_ICON_DIALOG_DEVICE_STATUS      "gimp-device-status"
+#define GIMP_ICON_DIALOG_ERROR              "gimp-error" /* use FDO */
+#define GIMP_ICON_DIALOG_IMAGES             "gimp-images"
+#define GIMP_ICON_DIALOG_INFORMATION        "gimp-info" /* use FDO */
+#define GIMP_ICON_DIALOG_LAYERS             "gimp-layers"
+#define GIMP_ICON_DIALOG_NAVIGATION         "gimp-navigation"
+#define GIMP_ICON_DIALOG_PATHS              "gimp-paths"
+#define GIMP_ICON_DIALOG_QUESTION           "gimp-question" /* use FDO */
+#define GIMP_ICON_DIALOG_RESHOW_FILTER      "gimp-reshow-filter"
+#define GIMP_ICON_DIALOG_TOOLS              "gimp-tools"
+#define GIMP_ICON_DIALOG_TOOL_OPTIONS       "gimp-tool-options"
+#define GIMP_ICON_DIALOG_UNDO_HISTORY       "gimp-undo-history"
+#define GIMP_ICON_DIALOG_WARNING            "gimp-warning" /* use FDO */
+
+#define GIMP_ICON_DISPLAY_FILTER            "gimp-display-filter"
+#define GIMP_ICON_DISPLAY_FILTER_COLORBLIND "gimp-display-filter-colorblind"
+#define GIMP_ICON_DISPLAY_FILTER_CONTRAST   "gimp-display-filter-contrast"
+#define GIMP_ICON_DISPLAY_FILTER_GAMMA      "gimp-display-filter-gamma"
+#define GIMP_ICON_DISPLAY_FILTER_LCMS       "gimp-display-filter-lcms"
+#define GIMP_ICON_DISPLAY_FILTER_PROOF      "gimp-display-filter-proof"
+
+#define GIMP_ICON_DOCUMENT_NEW              "document-new"
+#define GIMP_ICON_DOCUMENT_OPEN             "document-open"
+#define GIMP_ICON_DOCUMENT_OPEN_RECENT      "document-open-recent"
+#define GIMP_ICON_DOCUMENT_PAGE_SETUP       "document-page-setup"
+#define GIMP_ICON_DOCUMENT_PRINT            "document-print"
+#define GIMP_ICON_DOCUMENT_PRINT_RESOLUTION "document-print"
+#define GIMP_ICON_DOCUMENT_PROPERTIES       "document-properties"
+#define GIMP_ICON_DOCUMENT_REVERT           "document-revert"
+#define GIMP_ICON_DOCUMENT_SAVE             "document-save"
+#define GIMP_ICON_DOCUMENT_SAVE_AS          "document-save-as"
+
+#define GIMP_ICON_EDIT                      "gtk-edit"
+#define GIMP_ICON_EDIT_CLEAR                "edit-clear"
+#define GIMP_ICON_EDIT_COPY                 "edit-copy"
+#define GIMP_ICON_EDIT_CUT                  "edit-cut"
+#define GIMP_ICON_EDIT_DELETE               "edit-delete"
+#define GIMP_ICON_EDIT_FIND                 "edit-find"
+#define GIMP_ICON_EDIT_PASTE                "edit-paste"
+#define GIMP_ICON_EDIT_PASTE_AS_NEW         "gimp-paste-as-new"
+#define GIMP_ICON_EDIT_PASTE_INTO           "gimp-paste-into"
+#define GIMP_ICON_EDIT_REDO                 "edit-redo"
+#define GIMP_ICON_EDIT_UNDO                 "edit-undo"
+
+#define GIMP_ICON_FILL_HORIZONTAL           "gimp-hfill"
+#define GIMP_ICON_FILL_VERTICAL             "gimp-vfill"
+
+#define GIMP_ICON_FOLDER_NEW                "folder-new"
+
+#define GIMP_ICON_FORMAT_INDENT_MORE         "format-indent-more"
+#define GIMP_ICON_FORMAT_INDENT_LESS         "format-indent-less"
+#define GIMP_ICON_FORMAT_JUSTIFY_CENTER      "format-justify-center"
+#define GIMP_ICON_FORMAT_JUSTIFY_FILL        "format-justify-fill"
+#define GIMP_ICON_FORMAT_JUSTIFY_LEFT        "format-justify-left"
+#define GIMP_ICON_FORMAT_JUSTIFY_RIGHT       "format-justify-right"
+#define GIMP_ICON_FORMAT_TEXT_BOLD           "format-text-bold"
+#define GIMP_ICON_FORMAT_TEXT_ITALIC         "format-text-italic"
+#define GIMP_ICON_FORMAT_TEXT_STRIKETHROUGH  "format-text-strikethrough"
+#define GIMP_ICON_FORMAT_TEXT_UNDERLINE      "format-text-underline"
+#define GIMP_ICON_FORMAT_TEXT_DIRECTION_LTR  "gimp-text-dir-ltr" /* use FDO */
+#define GIMP_ICON_FORMAT_TEXT_DIRECTION_RTL  "gimp-text-dir-rtl" /* use FDO */
+#define GIMP_ICON_FORMAT_TEXT_SPACING_LETTER "gimp-letter-spacing"
+#define GIMP_ICON_FORMAT_TEXT_SPACING_LINE   "gimp-line-spacing"
+
+#define GIMP_ICON_GRADIENT_LINEAR               "gimp-gradient-linear"
+#define GIMP_ICON_GRADIENT_BILINEAR             "gimp-gradient-bilinear"
+#define GIMP_ICON_GRADIENT_RADIAL               "gimp-gradient-radial"
+#define GIMP_ICON_GRADIENT_SQUARE               "gimp-gradient-square"
+#define GIMP_ICON_GRADIENT_CONICAL_SYMMETRIC    "gimp-gradient-conical-symmetric"
+#define GIMP_ICON_GRADIENT_CONICAL_ASYMMETRIC   "gimp-gradient-conical-asymmetric"
+#define GIMP_ICON_GRADIENT_SHAPEBURST_ANGULAR   "gimp-gradient-shapeburst-angular"
+#define GIMP_ICON_GRADIENT_SHAPEBURST_SPHERICAL "gimp-gradient-shapeburst-spherical"
+#define GIMP_ICON_GRADIENT_SHAPEBURST_DIMPLED   "gimp-gradient-shapeburst-dimpled"
+#define GIMP_ICON_GRADIENT_SPIRAL_CLOCKWISE     "gimp-gradient-spiral-clockwise"
+#define GIMP_ICON_GRADIENT_SPIRAL_ANTICLOCKWISE "gimp-gradient-spiral-anticlockwise"
+
+#define GIMP_ICON_GRAVITY_EAST              "gimp-gravity-east"
+#define GIMP_ICON_GRAVITY_NORTH             "gimp-gravity-north"
+#define GIMP_ICON_GRAVITY_NORTH_EAST        "gimp-gravity-north-east"
+#define GIMP_ICON_GRAVITY_NORTH_WEST        "gimp-gravity-north-west"
+#define GIMP_ICON_GRAVITY_SOUTH             "gimp-gravity-south"
+#define GIMP_ICON_GRAVITY_SOUTH_EAST        "gimp-gravity-south-east"
+#define GIMP_ICON_GRAVITY_SOUTH_WEST        "gimp-gravity-south-west"
+#define GIMP_ICON_GRAVITY_WEST              "gimp-gravity-west"
+
+#define GIMP_ICON_GO_BOTTOM                 "go-bottom"
+#define GIMP_ICON_GO_DOWN                   "go-down"
+#define GIMP_ICON_GO_FIRST                  "go-first"
+#define GIMP_ICON_GO_HOME                   "go-home"
+#define GIMP_ICON_GO_LAST                   "go-last"
+#define GIMP_ICON_GO_TOP                    "go-top"
+#define GIMP_ICON_GO_UP                     "go-up"
+#define GIMP_ICON_GO_PREVIOUS               "go-previous"
+#define GIMP_ICON_GO_NEXT                   "go-next"
+
+#define GIMP_ICON_HELP                      "help"
+#define GIMP_ICON_HELP_ABOUT                "help-about"
+#define GIMP_ICON_HELP_USER_MANUAL          "gimp-user-manual"
+
+#define GIMP_ICON_HISTOGRAM                 "gimp-histogram"
+#define GIMP_ICON_HISTOGRAM_LINEAR          "gimp-histogram-linear"
+#define GIMP_ICON_HISTOGRAM_LOGARITHMIC     "gimp-histogram-logarithmic"
+
+#define GIMP_ICON_IMAGE                     "gimp-image"
+#define GIMP_ICON_IMAGE_OPEN                "gimp-image-open"
+#define GIMP_ICON_IMAGE_RELOAD              "gimp-image-reload"
+
+#define GIMP_ICON_JOIN_MITER                "gimp-join-miter"
+#define GIMP_ICON_JOIN_ROUND                "gimp-join-round"
+#define GIMP_ICON_JOIN_BEVEL                "gimp-join-bevel"
+
+#define GIMP_ICON_LAYER                     "gimp-layer"
+#define GIMP_ICON_LAYER_ANCHOR              "gimp-anchor"
+#define GIMP_ICON_LAYER_FLOATING_SELECTION  "gimp-floating-selection"
+#define GIMP_ICON_LAYER_MASK                "gimp-layer-mask"
+#define GIMP_ICON_LAYER_MERGE_DOWN          "gimp-merge-down"
+#define GIMP_ICON_LAYER_TEXT_LAYER          "gimp-text-layer"
+#define GIMP_ICON_LAYER_TO_IMAGESIZE        "gimp-layer-to-imagesize"
+
+#define GIMP_ICON_LIST                      "gimp-list"
+#define GIMP_ICON_LIST_ADD                  "list-add"
+#define GIMP_ICON_LIST_REMOVE               "list-remove"
+
+#define GIMP_ICON_MENU_LEFT                 "gimp-menu-left"
+#define GIMP_ICON_MENU_RIGHT                "gimp-menu-right"
+
+#define GIMP_ICON_OBJECT_DUPLICATE          "gimp-duplicate"
+#define GIMP_ICON_OBJECT_FLIP_HORIZONTAL    "gimp-flip-horizontal" /* use FDO */
+#define GIMP_ICON_OBJECT_FLIP_VERTICAL      "gimp-flip-vertical" /* use FDO */
+#define GIMP_ICON_OBJECT_RESIZE             "gimp-resize"
+#define GIMP_ICON_OBJECT_ROTATE_180         "gimp-rotate-180"
+#define GIMP_ICON_OBJECT_ROTATE_270         "gimp-rotate-270" /* use FDO */
+#define GIMP_ICON_OBJECT_ROTATE_90          "gimp-rotate-90" /* use FDO */
+#define GIMP_ICON_OBJECT_SCALE              "gimp-scale"
+
+#define GIMP_ICON_PATH                      "gimp-path"
+#define GIMP_ICON_PATH_STROKE               "gimp-path-stroke"
+
+#define GIMP_ICON_PREFERENCES_SYSTEM        "preferences-system"
+
+#define GIMP_ICON_PROCESS_STOP              "process-stop"
+
+#define GIMP_ICON_QUICK_MASK_OFF            "gimp-quick-mask-off"
+#define GIMP_ICON_QUICK_MASK_ON             "gimp-quick-mask-on"
+
+#define GIMP_ICON_SELECTION                 "gimp-selection"
+#define GIMP_ICON_SELECTION_ADD             "gimp-selection-add"
+#define GIMP_ICON_SELECTION_ALL             "gimp-selection-all"
+#define GIMP_ICON_SELECTION_BORDER          "gimp-selection-border"
+#define GIMP_ICON_SELECTION_GROW            "gimp-selection-grow"
+#define GIMP_ICON_SELECTION_INTERSECT       "gimp-selection-intersect"
+#define GIMP_ICON_SELECTION_NONE            "gimp-selection-none"
+#define GIMP_ICON_SELECTION_REPLACE         "gimp-selection-replace"
+#define GIMP_ICON_SELECTION_SHRINK          "gimp-selection-shrink"
+#define GIMP_ICON_SELECTION_STROKE          "gimp-selection-stroke"
+#define GIMP_ICON_SELECTION_SUBTRACT        "gimp-selection-subtract"
+#define GIMP_ICON_SELECTION_TO_CHANNEL      "gimp-selection-to-channel"
+#define GIMP_ICON_SELECTION_TO_PATH         "gimp-selection-to-path"
+
+#define GIMP_ICON_SHAPE_CIRCLE              "gimp-shape-circle"
+#define GIMP_ICON_SHAPE_DIAMOND             "gimp-shape-diamond"
+#define GIMP_ICON_SHAPE_SQUARE              "gimp-shape-square"
+
+#define GIMP_ICON_SYSTEM_RUN                "system-run"
+
+#define GIMP_ICON_TOOL_AIRBRUSH             "gimp-tool-airbrush"
+#define GIMP_ICON_TOOL_ALIGN                "gimp-tool-align"
+#define GIMP_ICON_TOOL_BLEND                "gimp-tool-blend"
+#define GIMP_ICON_TOOL_BLUR                 "gimp-tool-blur"
+#define GIMP_ICON_TOOL_BRIGHTNESS_CONTRAST  "gimp-tool-brightness-contrast"
+#define GIMP_ICON_TOOL_BUCKET_FILL          "gimp-tool-bucket-fill"
+#define GIMP_ICON_TOOL_BY_COLOR_SELECT      "gimp-tool-by-color-select"
+#define GIMP_ICON_TOOL_CAGE                 "gimp-tool-cage"
+#define GIMP_ICON_TOOL_CLONE                "gimp-tool-clone"
+#define GIMP_ICON_TOOL_COLORIZE             "gimp-tool-colorize"
+#define GIMP_ICON_TOOL_COLOR_BALANCE        "gimp-tool-color-balance"
+#define GIMP_ICON_TOOL_COLOR_PICKER         "gimp-tool-color-picker"
+#define GIMP_ICON_TOOL_CROP                 "gimp-tool-crop"
+#define GIMP_ICON_TOOL_CURVES               "gimp-tool-curves"
+#define GIMP_ICON_TOOL_DESATURATE           "gimp-tool-desaturate"
+#define GIMP_ICON_TOOL_DODGE                "gimp-tool-dodge"
+#define GIMP_ICON_TOOL_ELLIPSE_SELECT       "gimp-tool-ellipse-select"
+#define GIMP_ICON_TOOL_ERASER               "gimp-tool-eraser"
+#define GIMP_ICON_TOOL_FLIP                 "gimp-tool-flip"
+#define GIMP_ICON_TOOL_FOREGROUND_SELECT    "gimp-tool-foreground-select"
+#define GIMP_ICON_TOOL_FREE_SELECT          "gimp-tool-free-select"
+#define GIMP_ICON_TOOL_FUZZY_SELECT         "gimp-tool-fuzzy-select"
+#define GIMP_ICON_TOOL_HANDLE_TRANSFORM     "gimp-tool-handle-transform"
+#define GIMP_ICON_TOOL_HEAL                 "gimp-tool-heal"
+#define GIMP_ICON_TOOL_HUE_SATURATION       "gimp-tool-hue-saturation"
+#define GIMP_ICON_TOOL_INK                  "gimp-tool-ink"
+#define GIMP_ICON_TOOL_ISCISSORS            "gimp-tool-iscissors"
+#define GIMP_ICON_TOOL_LEVELS               "gimp-tool-levels"
+#define GIMP_ICON_TOOL_MEASURE              "gimp-tool-measure"
+#define GIMP_ICON_TOOL_MOVE                 "gimp-tool-move"
+#define GIMP_ICON_TOOL_MYPAINT_BRUSH        "gimp-tool-mypaint-brush"
+#define GIMP_ICON_TOOL_N_POINT_DEFORMATION  "gimp-tool-n-point-deformation"
+#define GIMP_ICON_TOOL_PAINTBRUSH           "gimp-tool-paintbrush"
+#define GIMP_ICON_TOOL_PATH                 "gimp-tool-path"
+#define GIMP_ICON_TOOL_PENCIL               "gimp-tool-pencil"
+#define GIMP_ICON_TOOL_PERSPECTIVE          "gimp-tool-perspective"
+#define GIMP_ICON_TOOL_PERSPECTIVE_CLONE    "gimp-tool-perspective-clone"
+#define GIMP_ICON_TOOL_POSTERIZE            "gimp-tool-posterize"
+#define GIMP_ICON_TOOL_RECT_SELECT          "gimp-tool-rect-select"
+#define GIMP_ICON_TOOL_ROTATE               "gimp-tool-rotate"
+#define GIMP_ICON_TOOL_SCALE                "gimp-tool-scale"
+#define GIMP_ICON_TOOL_SEAMLESS_CLONE       "gimp-tool-seamless-clone"
+#define GIMP_ICON_TOOL_SHEAR                "gimp-tool-shear"
+#define GIMP_ICON_TOOL_SMUDGE               "gimp-tool-smudge"
+#define GIMP_ICON_TOOL_TEXT                 "gimp-tool-text"
+#define GIMP_ICON_TOOL_THRESHOLD            "gimp-tool-threshold"
+#define GIMP_ICON_TOOL_UNIFIED_TRANSFORM    "gimp-tool-unified-transform"
+#define GIMP_ICON_TOOL_WARP                 "gimp-tool-warp"
+#define GIMP_ICON_TOOL_ZOOM                 "gimp-tool-zoom"
+
+#define GIMP_ICON_VIEW_REFRESH              "view-refresh"
+#define GIMP_ICON_VIEW_FULLSCREEN           "view-fullscreen"
+
+#define GIMP_ICON_WILBER                    "gimp-wilber"
+#define GIMP_ICON_WILBER_EEK                "gimp-wilber-eek"
+
+#define GIMP_ICON_WINDOW_CLOSE              "window-close"
+#define GIMP_ICON_WINDOW_MOVE_TO_SCREEN     "gimp-move-to-screen"
+#define GIMP_ICON_WINDOW_NEW                "window-new"
+
+#define GIMP_ICON_ZOOM_IN                   "zoom-in"
+#define GIMP_ICON_ZOOM_ORIGINAL             "zoom-original"
+#define GIMP_ICON_ZOOM_OUT                  "zoom-out"
+#define GIMP_ICON_ZOOM_FIT_BEST             "zoom-fit-best"
+#define GIMP_ICON_ZOOM_FOLLOW_WINDOW        "gimp-zoom-follow-window"
+
+
+#ifndef GIMP_DISABLE_DEPRECATED
 
 /*  in button size:  */
 
@@ -168,7 +492,6 @@ G_BEGIN_DECLS
 #define GIMP_STOCK_TOOL_THRESHOLD           "gimp-tool-threshold"
 #define GIMP_STOCK_TOOL_ZOOM                "gimp-tool-zoom"
 
-
 /*  in menu size:  */
 
 #define GIMP_STOCK_CONVERT_RGB              "gimp-convert-rgb"
@@ -205,9 +528,7 @@ G_BEGIN_DECLS
 #define GIMP_STOCK_TRANSPARENCY             "gimp-transparency"
 #define GIMP_STOCK_COLORMAP                 "gimp-colormap"
 
-#ifndef GIMP_DISABLE_DEPRECATED
 #define GIMP_STOCK_INDEXED_PALETTE          "gimp-colormap"
-#endif /* GIMP_DISABLE_DEPRECATED */
 
 #define GIMP_STOCK_IMAGES                   "gimp-images"
 #define GIMP_STOCK_LAYERS                   "gimp-layers"
@@ -224,10 +545,8 @@ G_BEGIN_DECLS
 #define GIMP_STOCK_QUICK_MASK_OFF           "gimp-quick-mask-off"
 #define GIMP_STOCK_QUICK_MASK_ON            "gimp-quick-mask-on"
 
-#ifndef GIMP_DISABLE_DEPRECATED
 #define GIMP_STOCK_QMASK_OFF                "gimp-quick-mask-off"
 #define GIMP_STOCK_QMASK_ON                 "gimp-quick-mask-on"
-#endif /* GIMP_DISABLE_DEPRECATED */
 
 #define GIMP_STOCK_HISTOGRAM                "gimp-histogram"
 #define GIMP_STOCK_HISTOGRAM_LINEAR         "gimp-histogram-linear"
@@ -297,7 +616,6 @@ G_BEGIN_DECLS
 #define GIMP_STOCK_TEXTURE                  "gimp-texture"
 #define GIMP_STOCK_USER_MANUAL              "gimp-user-manual"
 
-
 /*  missing icons:  */
 
 #define GIMP_STOCK_BRUSH                    GIMP_STOCK_TOOL_PAINTBRUSH
@@ -309,10 +627,11 @@ G_BEGIN_DECLS
 #define GIMP_STOCK_CONTROLLER_MOUSE         GIMP_STOCK_CURSOR
 #define GIMP_STOCK_PRINT_RESOLUTION         "document-print"
 
-/* Deprecated icons: */
-
 #define GIMP_STOCK_EDIT                     "gtk-edit"
 
+#endif /* GIMP_DISABLE_DEPRECATED */
+
+
 GIMP_DEPRECATED_FOR(gimp_icons_init)
 void   gimp_stock_init           (void);
 
diff --git a/libgimpwidgets/gimppageselector.c b/libgimpwidgets/gimppageselector.c
index b7f0bbf..ea96995 100644
--- a/libgimpwidgets/gimppageselector.c
+++ b/libgimpwidgets/gimppageselector.c
@@ -1300,7 +1300,7 @@ gimp_page_selector_add_frame (GtkWidget *widget,
   if (! frame)
     {
       frame = gtk_icon_theme_load_icon (gtk_icon_theme_get_default (),
-                                        GIMP_STOCK_FRAME, 64, 0, NULL);
+                                        GIMP_ICON_FRAME, 64, 0, NULL);
       g_object_set_data_full (G_OBJECT (widget), "frame", frame,
                               (GDestroyNotify) g_object_unref);
     }
diff --git a/libgimpwidgets/gimppatheditor.c b/libgimpwidgets/gimppatheditor.c
index 50caa3a..6a6625f 100644
--- a/libgimpwidgets/gimppatheditor.c
+++ b/libgimpwidgets/gimppatheditor.c
@@ -168,7 +168,8 @@ gimp_path_editor_init (GimpPathEditor *editor)
   gtk_box_pack_start (GTK_BOX (button_box), button, TRUE, TRUE, 0);
   gtk_widget_show (button);
 
-  image = gtk_image_new_from_icon_name ("document-new", GTK_ICON_SIZE_BUTTON);
+  image = gtk_image_new_from_icon_name (GIMP_ICON_DOCUMENT_NEW,
+                                        GTK_ICON_SIZE_BUTTON);
   gtk_container_add (GTK_CONTAINER (button), image);
   gtk_widget_show (image);
 
@@ -185,7 +186,8 @@ gimp_path_editor_init (GimpPathEditor *editor)
   gtk_box_pack_start (GTK_BOX (button_box), button, TRUE, TRUE, 0);
   gtk_widget_show (button);
 
-  image = gtk_image_new_from_icon_name ("go-up", GTK_ICON_SIZE_BUTTON);
+  image = gtk_image_new_from_icon_name (GIMP_ICON_GO_UP,
+                                        GTK_ICON_SIZE_BUTTON);
   gtk_container_add (GTK_CONTAINER (button), image);
   gtk_widget_show (image);
 
@@ -202,7 +204,8 @@ gimp_path_editor_init (GimpPathEditor *editor)
   gtk_box_pack_start (GTK_BOX (button_box), button, TRUE, TRUE, 0);
   gtk_widget_show (button);
 
-  image = gtk_image_new_from_icon_name ("go-down", GTK_ICON_SIZE_BUTTON);
+  image = gtk_image_new_from_icon_name (GIMP_ICON_GO_DOWN,
+                                        GTK_ICON_SIZE_BUTTON);
   gtk_container_add (GTK_CONTAINER (button), image);
   gtk_widget_show (image);
 
@@ -219,7 +222,8 @@ gimp_path_editor_init (GimpPathEditor *editor)
   gtk_box_pack_start (GTK_BOX (button_box), button, TRUE, TRUE, 0);
   gtk_widget_show (button);
 
-  image = gtk_image_new_from_icon_name ("edit-delete", GTK_ICON_SIZE_BUTTON);
+  image = gtk_image_new_from_icon_name (GIMP_ICON_EDIT_DELETE,
+                                        GTK_ICON_SIZE_BUTTON);
   gtk_container_add (GTK_CONTAINER (button), image);
   gtk_widget_show (image);
 
diff --git a/libgimpwidgets/gimppickbutton.c b/libgimpwidgets/gimppickbutton.c
index 3807f55..e34497f 100644
--- a/libgimpwidgets/gimppickbutton.c
+++ b/libgimpwidgets/gimppickbutton.c
@@ -101,7 +101,7 @@ gimp_pick_button_init (GimpPickButton *button)
 {
   GtkWidget *image;
 
-  image = gtk_image_new_from_icon_name (GIMP_STOCK_COLOR_PICK_FROM_SCREEN,
+  image = gtk_image_new_from_icon_name (GIMP_ICON_COLOR_PICK_FROM_SCREEN,
                                         GTK_ICON_SIZE_BUTTON);
   gtk_container_add (GTK_CONTAINER (button), image);
   gtk_widget_show (image);
diff --git a/libgimpwidgets/gimpscrolledpreview.c b/libgimpwidgets/gimpscrolledpreview.c
index 5924527..de92e84 100644
--- a/libgimpwidgets/gimpscrolledpreview.c
+++ b/libgimpwidgets/gimpscrolledpreview.c
@@ -216,7 +216,7 @@ gimp_scrolled_preview_init (GimpScrolledPreview *preview)
                     preview->nav_icon, 1,2, 1,2,
                     GTK_SHRINK, GTK_SHRINK, 0, 0);
 
-  image = gtk_image_new_from_icon_name (GIMP_STOCK_NAVIGATION,
+  image = gtk_image_new_from_icon_name (GIMP_ICON_DIALOG_NAVIGATION,
                                         GTK_ICON_SIZE_MENU);
   gtk_container_add (GTK_CONTAINER (preview->nav_icon), image);
   gtk_widget_show (image);
diff --git a/libgimpwidgets/gimpwidgets-private.c b/libgimpwidgets/gimpwidgets-private.c
index 8fab8b6..1ae1e5d 100644
--- a/libgimpwidgets/gimpwidgets-private.c
+++ b/libgimpwidgets/gimpwidgets-private.c
@@ -76,7 +76,7 @@ gimp_widgets_init (GimpHelpFunc          standard_help_func,
 
   gimp_icons_init ();
 
-  gtk_window_set_default_icon_name (GIMP_STOCK_WILBER);
+  gtk_window_set_default_icon_name (GIMP_ICON_WILBER);
 
   gimp_widgets_init_foreign_enums ();
 
diff --git a/modules/color-selector-cmyk.c b/modules/color-selector-cmyk.c
index 53a76ca..9069d8b 100644
--- a/modules/color-selector-cmyk.c
+++ b/modules/color-selector-cmyk.c
@@ -115,7 +115,7 @@ colorsel_cmyk_class_init (ColorselCmykClass *klass)
 
   selector_class->name       = _("CMYK");
   selector_class->help_id    = "gimp-colorselector-cmyk";
-  selector_class->icon_name  = GIMP_ICON_COLOR_CMYK;
+  selector_class->icon_name  = GIMP_ICON_COLOR_SELECTOR_CMYK;
   selector_class->set_color  = colorsel_cmyk_set_color;
   selector_class->set_config = colorsel_cmyk_set_config;
 }
diff --git a/modules/color-selector-water.c b/modules/color-selector-water.c
index de48b72..6c3065a 100644
--- a/modules/color-selector-water.c
+++ b/modules/color-selector-water.c
@@ -129,7 +129,7 @@ colorsel_water_class_init (ColorselWaterClass *klass)
 
   selector_class->name       = _("Watercolor");
   selector_class->help_id    = "gimp-colorselector-watercolor";
-  selector_class->icon_name  = GIMP_ICON_COLOR_WATER;
+  selector_class->icon_name  = GIMP_ICON_COLOR_SELECTOR_WATER;
   selector_class->set_config = colorsel_water_set_config;
 }
 
diff --git a/modules/color-selector-wheel.c b/modules/color-selector-wheel.c
index 00c3364..e8f539a 100644
--- a/modules/color-selector-wheel.c
+++ b/modules/color-selector-wheel.c
@@ -103,7 +103,7 @@ colorsel_wheel_class_init (ColorselWheelClass *klass)
 
   selector_class->name       = _("Wheel");
   selector_class->help_id    = "gimp-colorselector-triangle";
-  selector_class->icon_name  = GIMP_STOCK_COLOR_TRIANGLE;
+  selector_class->icon_name  = GIMP_ICON_COLOR_SELECTOR_TRIANGLE;
   selector_class->set_color  = colorsel_wheel_set_color;
   selector_class->set_config = colorsel_wheel_set_config;
 }
diff --git a/modules/controller-dx-dinput.c b/modules/controller-dx-dinput.c
index 18ec3cd..2e370be 100644
--- a/modules/controller-dx-dinput.c
+++ b/modules/controller-dx-dinput.c
@@ -205,7 +205,7 @@ controller_dx_dinput_class_init (ControllerDXDInputClass *klass)
 
   controller_class->name            = _("DirectX DirectInput");
   controller_class->help_id         = "gimp-controller-directx-directinput";
-  controller_class->icon_name       = GIMP_STOCK_CONTROLLER_LINUX_INPUT;
+  controller_class->icon_name       = GIMP_ICON_CONTROLLER_LINUX_INPUT;
 
   controller_class->get_n_events    = dx_dinput_get_n_events;
   controller_class->get_event_name  = dx_dinput_get_event_name;
diff --git a/modules/controller-linux-input.c b/modules/controller-linux-input.c
index 8759d10..968ad15 100644
--- a/modules/controller-linux-input.c
+++ b/modules/controller-linux-input.c
@@ -229,7 +229,7 @@ controller_linux_input_class_init (ControllerLinuxInputClass *klass)
 
   controller_class->name            = _("Linux Input");
   controller_class->help_id         = "gimp-controller-linux-input";
-  controller_class->icon_name       = GIMP_STOCK_CONTROLLER_LINUX_INPUT;
+  controller_class->icon_name       = GIMP_ICON_CONTROLLER_LINUX_INPUT;
 
   controller_class->get_n_events    = linux_input_get_n_events;
   controller_class->get_event_name  = linux_input_get_event_name;
diff --git a/modules/controller-midi.c b/modules/controller-midi.c
index 501206d..cb6118d 100644
--- a/modules/controller-midi.c
+++ b/modules/controller-midi.c
@@ -225,7 +225,7 @@ controller_midi_class_init (ControllerMidiClass *klass)
 
   controller_class->name            = _("MIDI");
   controller_class->help_id         = "gimp-controller-midi";
-  controller_class->icon_name       = GIMP_STOCK_CONTROLLER_MIDI;
+  controller_class->icon_name       = GIMP_ICON_CONTROLLER_MIDI;
 
   controller_class->get_n_events    = midi_get_n_events;
   controller_class->get_event_name  = midi_get_event_name;
diff --git a/modules/display-filter-color-blind.c b/modules/display-filter-color-blind.c
index d66e8b4..fbb9468 100644
--- a/modules/display-filter-color-blind.c
+++ b/modules/display-filter-color-blind.c
@@ -259,7 +259,7 @@ cdisplay_colorblind_class_init (CdisplayColorblindClass *klass)
 
   display_class->name            = _("Color Deficient Vision");
   display_class->help_id         = "gimp-colordisplay-colorblind";
-  display_class->icon_name       = GIMP_STOCK_DISPLAY_FILTER_COLORBLIND;
+  display_class->icon_name       = GIMP_ICON_DISPLAY_FILTER_COLORBLIND;
 
   display_class->convert_buffer  = cdisplay_colorblind_convert_buffer;
   display_class->configure       = cdisplay_colorblind_configure;
diff --git a/modules/display-filter-gamma.c b/modules/display-filter-gamma.c
index a103735..6be2ce9 100644
--- a/modules/display-filter-gamma.c
+++ b/modules/display-filter-gamma.c
@@ -128,7 +128,7 @@ cdisplay_gamma_class_init (CdisplayGammaClass *klass)
 
   display_class->name            = _("Gamma");
   display_class->help_id         = "gimp-colordisplay-gamma";
-  display_class->icon_name       = GIMP_STOCK_DISPLAY_FILTER_GAMMA;
+  display_class->icon_name       = GIMP_ICON_DISPLAY_FILTER_GAMMA;
 
   display_class->convert_buffer  = cdisplay_gamma_convert_buffer;
   display_class->configure       = cdisplay_gamma_configure;
diff --git a/modules/display-filter-high-contrast.c b/modules/display-filter-high-contrast.c
index 34aacc4..06be217 100644
--- a/modules/display-filter-high-contrast.c
+++ b/modules/display-filter-high-contrast.c
@@ -128,7 +128,7 @@ cdisplay_contrast_class_init (CdisplayContrastClass *klass)
 
   display_class->name            = _("Contrast");
   display_class->help_id         = "gimp-colordisplay-contrast";
-  display_class->icon_name       = GIMP_STOCK_DISPLAY_FILTER_CONTRAST;
+  display_class->icon_name       = GIMP_ICON_DISPLAY_FILTER_CONTRAST;
 
   display_class->convert_buffer  = cdisplay_contrast_convert_buffer;
   display_class->configure       = cdisplay_contrast_configure;
diff --git a/modules/display-filter-lcms.c b/modules/display-filter-lcms.c
index dedc695..8b37b2f 100644
--- a/modules/display-filter-lcms.c
+++ b/modules/display-filter-lcms.c
@@ -123,7 +123,7 @@ cdisplay_lcms_class_init (CdisplayLcmsClass *klass)
 
   display_class->name            = _("Color Management");
   display_class->help_id         = "gimp-colordisplay-lcms";
-  display_class->icon_name       = GIMP_STOCK_DISPLAY_FILTER_LCMS;
+  display_class->icon_name       = GIMP_ICON_DISPLAY_FILTER_LCMS;
 
   display_class->configure       = cdisplay_lcms_configure;
   display_class->convert_buffer  = cdisplay_lcms_convert_buffer;
diff --git a/modules/display-filter-proof.c b/modules/display-filter-proof.c
index bd79ee0..0e923f4 100644
--- a/modules/display-filter-proof.c
+++ b/modules/display-filter-proof.c
@@ -148,7 +148,7 @@ cdisplay_proof_class_init (CdisplayProofClass *klass)
 
   display_class->name            = _("Color Proof");
   display_class->help_id         = "gimp-colordisplay-proof";
-  display_class->icon_name       = GIMP_STOCK_DISPLAY_FILTER_PROOF;
+  display_class->icon_name       = GIMP_ICON_DISPLAY_FILTER_PROOF;
 
   display_class->convert_buffer  = cdisplay_proof_convert_buffer;
   display_class->configure       = cdisplay_proof_configure;
diff --git a/plug-ins/common/animation-play.c b/plug-ins/common/animation-play.c
index ce0630c..cf4eef0 100644
--- a/plug-ins/common/animation-play.c
+++ b/plug-ins/common/animation-play.c
@@ -600,7 +600,7 @@ ui_manager_new (GtkWidget *window)
       NULL, NULL, N_("Rewind the animation"),
       G_CALLBACK (rewind_callback) },
 
-    { "refresh", "view-refresh",
+    { "refresh", GIMP_ICON_VIEW_REFRESH,
       NULL, "<control>R", N_("Reload the image"),
       G_CALLBACK (refresh_callback) },
 
@@ -640,7 +640,7 @@ ui_manager_new (GtkWidget *window)
       NULL, "space", N_("Start playback"),
       G_CALLBACK (play_callback), FALSE },
 
-    { "detach", GIMP_STOCK_DETACH,
+    { "detach", GIMP_ICON_DETACH,
       N_("Detach"), NULL,
       N_("Detach the animation from the dialog window"),
       G_CALLBACK (detach_callback), FALSE }
diff --git a/plug-ins/common/cml-explorer.c b/plug-ins/common/cml-explorer.c
index a456707..8f259ec 100644
--- a/plug-ins/common/cml-explorer.c
+++ b/plug-ins/common/cml-explorer.c
@@ -1266,7 +1266,7 @@ CML_explorer_dialog (void)
   gtk_box_pack_start (GTK_BOX (vbox), bbox, FALSE, FALSE, 0);
   gtk_widget_show (bbox);
 
-  button = gtk_button_new_from_stock (GTK_STOCK_OPEN);
+  button = gtk_button_new_with_mnemonic (_("_Open"));
   gtk_container_add (GTK_CONTAINER (bbox), button);
   gtk_widget_show (button);
 
@@ -1274,7 +1274,7 @@ CML_explorer_dialog (void)
                     G_CALLBACK (CML_load_from_file_callback),
                     &VALS);
 
-  button = gtk_button_new_from_stock (GTK_STOCK_SAVE);
+  button = gtk_button_new_with_mnemonic (_("_Save"));
   gtk_container_add (GTK_CONTAINER (bbox), button);
   gtk_widget_show (button);
 
diff --git a/plug-ins/common/colormap-remap.c b/plug-ins/common/colormap-remap.c
index d4eea52..30cf610 100644
--- a/plug-ins/common/colormap-remap.c
+++ b/plug-ins/common/colormap-remap.c
@@ -110,7 +110,7 @@ query (void)
   gimp_plugin_menu_register (PLUG_IN_PROC_REMAP, "<Image>/Colors/Map/Colormap");
   gimp_plugin_menu_register (PLUG_IN_PROC_REMAP, "<Colormap>");
   gimp_plugin_icon_register (PLUG_IN_PROC_REMAP, GIMP_ICON_TYPE_ICON_NAME,
-                             (const guint8 *) GIMP_STOCK_COLORMAP);
+                             (const guint8 *) GIMP_ICON_COLORMAP);
 
   gimp_install_procedure (PLUG_IN_PROC_SWAP,
                           N_("Swap two colors in the colormap"),
@@ -514,7 +514,7 @@ remap_ui_manager_new (GtkWidget    *window,
       G_CALLBACK (remap_reverse_callback)
     },
     {
-      "reset", GIMP_STOCK_RESET, N_("Reset Order"), NULL, NULL,
+      "reset", GIMP_ICON_RESET, N_("Reset Order"), NULL, NULL,
       G_CALLBACK (remap_reset_callback)
     },
   };
diff --git a/plug-ins/common/compose.c b/plug-ins/common/compose.c
index 31ab6fd..2c659b1 100644
--- a/plug-ins/common/compose.c
+++ b/plug-ins/common/compose.c
@@ -150,10 +150,10 @@ static void      type_combo_callback    (GimpIntComboBox *combo,
  * All the following values have to be kept in sync with those of decompose.c
  */
 
-#define CPN_RGBA_R { "R", N_("_Red:"),   GIMP_STOCK_CHANNEL_RED, 0.0, 1.0, FALSE}
-#define CPN_RGBA_G { "G", N_("_Green:"), GIMP_STOCK_CHANNEL_GREEN, 0.0, 1.0, FALSE}
-#define CPN_RGBA_B { "B", N_("_Blue:"),  GIMP_STOCK_CHANNEL_BLUE, 0.0, 1.0, FALSE}
-#define CPN_RGBA_A { "A", N_("_Alpha:"), GIMP_STOCK_CHANNEL_ALPHA, 0.0, 1.0, TRUE}
+#define CPN_RGBA_R { "R", N_("_Red:"),   GIMP_ICON_CHANNEL_RED, 0.0, 1.0, FALSE}
+#define CPN_RGBA_G { "G", N_("_Green:"), GIMP_ICON_CHANNEL_GREEN, 0.0, 1.0, FALSE}
+#define CPN_RGBA_B { "B", N_("_Blue:"),  GIMP_ICON_CHANNEL_BLUE, 0.0, 1.0, FALSE}
+#define CPN_RGBA_A { "A", N_("_Alpha:"), GIMP_ICON_CHANNEL_ALPHA, 0.0, 1.0, TRUE}
 
 #define CPN_HSV_H  { "hue",        N_("_Hue:"),        NULL, 0.0, 1.0, TRUE}
 #define CPN_HSV_S  { "saturation", N_("_Saturation:"), NULL, 0.0, 1.0, TRUE}
@@ -1195,7 +1195,7 @@ compose_dialog (const gchar *compose_type,
       composeint.channel_menu[j] = combo;
 
       ico = gtk_widget_render_icon (dialog,
-                                    GIMP_STOCK_CHANNEL_GRAY,
+                                    GIMP_ICON_CHANNEL_GRAY,
                                     GTK_ICON_SIZE_BUTTON, NULL);
       model = gtk_combo_box_get_model (GTK_COMBO_BOX (combo));
       gtk_list_store_append (GTK_LIST_STORE (model), &iter);
@@ -1390,8 +1390,8 @@ type_combo_callback (GimpIntComboBox *combo,
 
           if (icon)
             {
-              gtk_image_set_from_stock (GTK_IMAGE (image),
-                                        icon, GTK_ICON_SIZE_BUTTON);
+              gtk_image_set_from_icon_name (GTK_IMAGE (image),
+                                            icon, GTK_ICON_SIZE_BUTTON);
               gtk_widget_show (image);
             }
           else
diff --git a/plug-ins/common/curve-bend.c b/plug-ins/common/curve-bend.c
index 261f3cd..88245bd 100644
--- a/plug-ins/common/curve-bend.c
+++ b/plug-ins/common/curve-bend.c
@@ -1468,7 +1468,7 @@ bender_new_dialog (GimpDrawable *drawable)
                     cd);
 
   /*  The Reset button  */
-  button = gtk_button_new_from_stock (GIMP_STOCK_RESET);
+  button = gtk_button_new_with_mnemonic (_("_Reset"));
   gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE, 0);
   gtk_widget_show (button);
 
@@ -1485,7 +1485,7 @@ bender_new_dialog (GimpDrawable *drawable)
   gtk_widget_show (hbox);
 
   /*  The Load button  */
-  button = gtk_button_new_from_stock (GTK_STOCK_OPEN);
+  button = gtk_button_new_with_mnemonic (_("_Open"));
   gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE, 0);
   gtk_widget_show (button);
 
@@ -1497,7 +1497,7 @@ bender_new_dialog (GimpDrawable *drawable)
                     cd);
 
   /*  The Save button  */
-  button = gtk_button_new_from_stock (GTK_STOCK_SAVE);
+  button = gtk_button_new_with_mnemonic (_("_Save"));
   gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE, 0);
   gtk_widget_show (button);
 
diff --git a/plug-ins/common/file-gbr.c b/plug-ins/common/file-gbr.c
index 88aeb6b..802d646 100644
--- a/plug-ins/common/file-gbr.c
+++ b/plug-ins/common/file-gbr.c
@@ -136,7 +136,7 @@ query (void)
                           load_args, load_return_vals);
 
   gimp_plugin_icon_register (LOAD_PROC, GIMP_ICON_TYPE_ICON_NAME,
-                             (const guint8 *) GIMP_STOCK_BRUSH);
+                             (const guint8 *) GIMP_ICON_BRUSH);
   gimp_register_file_handler_mime (LOAD_PROC, "image/x-gimp-gbr");
   gimp_register_file_handler_uri (LOAD_PROC);
   gimp_register_magic_load_handler (LOAD_PROC,
@@ -157,7 +157,7 @@ query (void)
                           save_args, NULL);
 
   gimp_plugin_icon_register (SAVE_PROC, GIMP_ICON_TYPE_ICON_NAME,
-                             (const guint8 *) GIMP_STOCK_BRUSH);
+                             (const guint8 *) GIMP_ICON_BRUSH);
   gimp_register_file_handler_mime (SAVE_PROC, "image/x-gimp-gbr");
   gimp_register_file_handler_uri (SAVE_PROC);
   gimp_register_save_handler (SAVE_PROC, "gbr", "");
diff --git a/plug-ins/common/file-gih.c b/plug-ins/common/file-gih.c
index eaec3d5..b1b120f 100644
--- a/plug-ins/common/file-gih.c
+++ b/plug-ins/common/file-gih.c
@@ -194,7 +194,7 @@ query (void)
                           gih_load_args, gih_load_return_vals);
 
   gimp_plugin_icon_register (LOAD_PROC, GIMP_ICON_TYPE_ICON_NAME,
-                             (const guint8 *) GIMP_STOCK_BRUSH);
+                             (const guint8 *) GIMP_ICON_BRUSH);
   gimp_register_file_handler_mime (LOAD_PROC, "image/x-gimp-gih");
   gimp_register_file_handler_uri (LOAD_PROC);
   gimp_register_magic_load_handler (LOAD_PROC, "gih", "", "");
@@ -217,7 +217,7 @@ query (void)
                           gih_save_args, NULL);
 
   gimp_plugin_icon_register (SAVE_PROC, GIMP_ICON_TYPE_ICON_NAME,
-                             (const guint8 *) GIMP_STOCK_BRUSH);
+                             (const guint8 *) GIMP_ICON_BRUSH);
   gimp_register_file_handler_mime (SAVE_PROC, "image/x-gimp-gih");
   gimp_register_file_handler_uri (SAVE_PROC);
   gimp_register_save_handler (SAVE_PROC, "gih", "");
diff --git a/plug-ins/common/file-html-table.c b/plug-ins/common/file-html-table.c
index 92c771f..8d977dd 100644
--- a/plug-ins/common/file-html-table.c
+++ b/plug-ins/common/file-html-table.c
@@ -480,7 +480,7 @@ save_dialog (gint32 image_ID)
       hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
       gtk_container_add (GTK_CONTAINER (frame), hbox);
 
-      eek = gtk_image_new_from_icon_name (GIMP_STOCK_WILBER_EEK,
+      eek = gtk_image_new_from_icon_name (GIMP_ICON_WILBER_EEK,
                                           GTK_ICON_SIZE_DIALOG);
       gtk_box_pack_start (GTK_BOX (hbox), eek, FALSE, FALSE, 0);
 
diff --git a/plug-ins/common/file-pat.c b/plug-ins/common/file-pat.c
index dca8aa4..13a3f9f 100644
--- a/plug-ins/common/file-pat.c
+++ b/plug-ins/common/file-pat.c
@@ -108,7 +108,7 @@ query (void)
                           load_args, load_return_vals);
 
   gimp_plugin_icon_register (LOAD_PROC, GIMP_ICON_TYPE_ICON_NAME,
-                             (const guint8 *) GIMP_STOCK_PATTERN);
+                             (const guint8 *) GIMP_ICON_PATTERN);
   gimp_register_file_handler_mime (LOAD_PROC, "image/x-gimp-pat");
   gimp_register_file_handler_uri (LOAD_PROC);
   gimp_register_magic_load_handler (LOAD_PROC,
@@ -130,7 +130,7 @@ query (void)
                           save_args, NULL);
 
   gimp_plugin_icon_register (SAVE_PROC, GIMP_ICON_TYPE_ICON_NAME,
-                             (const guint8 *) GIMP_STOCK_PATTERN);
+                             (const guint8 *) GIMP_ICON_PATTERN);
   gimp_register_file_handler_mime (SAVE_PROC, "image/x-gimp-pat");
   gimp_register_file_handler_uri (SAVE_PROC);
   gimp_register_save_handler (SAVE_PROC, "pat", "");
diff --git a/plug-ins/common/file-pdf-save.c b/plug-ins/common/file-pdf-save.c
index 0fb98ad..5cdc6c6 100644
--- a/plug-ins/common/file-pdf-save.c
+++ b/plug-ins/common/file-pdf-save.c
@@ -924,9 +924,10 @@ gui_multi (void)
     gtk_entry_set_text (GTK_ENTRY (file_entry), file_name);
   file_browse = gtk_button_new_with_label (_("Browse..."));
   file_choose = gtk_file_chooser_dialog_new (_("Multipage PDF export"),
-                                             GTK_WINDOW (window), GTK_FILE_CHOOSER_ACTION_SAVE,
-                                             "gtk-save", GTK_RESPONSE_OK,
-                                             "gtk-cancel", GTK_RESPONSE_CANCEL,
+                                             GTK_WINDOW (window),
+                                             GTK_FILE_CHOOSER_ACTION_SAVE,
+                                             _("_Save"),   GTK_RESPONSE_OK,
+                                             _("_Cancel"), GTK_RESPONSE_CANCEL,
                                              NULL);
 
   gtk_box_pack_start (GTK_BOX (file_hbox), file_label, FALSE, FALSE, 0);
diff --git a/plug-ins/common/file-png.c b/plug-ins/common/file-png.c
index 6ca88b2..a670d95 100644
--- a/plug-ins/common/file-png.c
+++ b/plug-ins/common/file-png.c
@@ -1409,7 +1409,7 @@ offsets_dialog (gint offset_x,
                       hbox, FALSE, FALSE, 0);
   gtk_widget_show (hbox);
 
-  image = gtk_image_new_from_icon_name (GIMP_STOCK_QUESTION,
+  image = gtk_image_new_from_icon_name (GIMP_ICON_DIALOG_QUESTION,
                                         GTK_ICON_SIZE_DIALOG);
   gtk_misc_set_alignment (GTK_MISC (image), 0.5, 0.0);
   gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, FALSE, 0);
diff --git a/plug-ins/common/film.c b/plug-ins/common/film.c
index 9fdfac2..34b3ab1 100644
--- a/plug-ins/common/film.c
+++ b/plug-ins/common/film.c
@@ -927,8 +927,8 @@ add_image_list (gboolean   add_box_flag,
       g_free (name);
     }
 
-  button = gtk_button_new_from_stock (add_box_flag ?
-                                      GTK_STOCK_ADD : GTK_STOCK_REMOVE);
+  button = gtk_button_new_with_mnemonic (add_box_flag ?
+                                         _("_Add") : _("_Remove"));
   gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
   gtk_widget_show (button);
 
@@ -1236,7 +1236,7 @@ create_advanced_tab (GtkWidget *notebook)
   gtk_box_pack_end (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
   gtk_widget_show (hbox);
 
-  button = gtk_button_new_from_stock (GIMP_STOCK_RESET);
+  button = gtk_button_new_with_mnemonic (_("Re_set"));
   gtk_box_pack_end (GTK_BOX (hbox), button, FALSE, FALSE, 0);
   gtk_widget_show (button);
 
diff --git a/plug-ins/common/mail.c b/plug-ins/common/mail.c
index c34ac51..d882ed9 100644
--- a/plug-ins/common/mail.c
+++ b/plug-ins/common/mail.c
@@ -173,7 +173,7 @@ query (void)
 
   gimp_plugin_menu_register (PLUG_IN_PROC, "<Image>/File/Send");
   gimp_plugin_icon_register (PLUG_IN_PROC, GIMP_ICON_TYPE_ICON_NAME,
-                             (const guint8 *) GTK_STOCK_EDIT);
+                             (const guint8 *) GIMP_ICON_EDIT);
 
   g_free (email_bin);
 }
diff --git a/plug-ins/common/plugin-browser.c b/plug-ins/common/plugin-browser.c
index a19ee7b..b321ef8 100644
--- a/plug-ins/common/plugin-browser.c
+++ b/plug-ins/common/plugin-browser.c
@@ -149,7 +149,7 @@ query (void)
 
   gimp_plugin_menu_register (PLUG_IN_PROC, "<Image>/Help/Programming");
   gimp_plugin_icon_register (PLUG_IN_PROC, GIMP_ICON_TYPE_ICON_NAME,
-                             (const guint8 *) GIMP_STOCK_PLUGIN);
+                             (const guint8 *) GIMP_ICON_PLUGIN);
 }
 
 static void
diff --git a/plug-ins/common/qbist.c b/plug-ins/common/qbist.c
index f8689e9..510c522 100644
--- a/plug-ins/common/qbist.c
+++ b/plug-ins/common/qbist.c
@@ -877,7 +877,7 @@ dialog_run (void)
   gtk_box_pack_start (GTK_BOX (vbox), bbox, FALSE, FALSE, 0);
   gtk_widget_show (bbox);
 
-  button = gtk_button_new_from_stock (GTK_STOCK_UNDO);
+  button = gtk_button_new_with_mnemonic (_("_Undo"));
   gtk_container_add (GTK_CONTAINER (bbox), button);
   gtk_widget_show (button);
 
@@ -885,7 +885,7 @@ dialog_run (void)
                     G_CALLBACK (dialog_undo),
                     NULL);
 
-  button = gtk_button_new_from_stock (GTK_STOCK_OPEN);
+  button = gtk_button_new_with_mnemonic (_("_Open"));
   gtk_container_add (GTK_CONTAINER (bbox), button);
   gtk_widget_show (button);
 
@@ -893,7 +893,7 @@ dialog_run (void)
                     G_CALLBACK (dialog_load),
                     NULL);
 
-  button = gtk_button_new_from_stock (GTK_STOCK_SAVE);
+  button = gtk_button_new_with_mnemonic (_("_Save"));
   gtk_container_add (GTK_CONTAINER (bbox), button);
   gtk_widget_show (button);
 
diff --git a/plug-ins/common/sample-colorize.c b/plug-ins/common/sample-colorize.c
index 570aefa..c15a609 100644
--- a/plug-ins/common/sample-colorize.c
+++ b/plug-ins/common/sample-colorize.c
@@ -1381,14 +1381,14 @@ smp_dialog (void)
   combo = gimp_layer_combo_box_new (smp_constrain, NULL);
 
   gimp_int_combo_box_prepend (GIMP_INT_COMBO_BOX (combo),
-                              GIMP_INT_STORE_VALUE,    SMP_INV_GRADIENT,
-                              GIMP_INT_STORE_LABEL,    _("From reverse gradient"),
-                              GIMP_INT_STORE_STOCK_ID, GIMP_STOCK_GRADIENT,
+                              GIMP_INT_STORE_VALUE,     SMP_INV_GRADIENT,
+                              GIMP_INT_STORE_LABEL,     _("From reverse gradient"),
+                              GIMP_INT_STORE_ICON_NAME, GIMP_ICON_GRADIENT,
                               -1);
   gimp_int_combo_box_prepend (GIMP_INT_COMBO_BOX (combo),
-                              GIMP_INT_STORE_VALUE,    SMP_GRADIENT,
-                              GIMP_INT_STORE_LABEL,    _("From gradient"),
-                              GIMP_INT_STORE_STOCK_ID, GIMP_STOCK_GRADIENT,
+                              GIMP_INT_STORE_VALUE,     SMP_GRADIENT,
+                              GIMP_INT_STORE_LABEL,     _("From gradient"),
+                              GIMP_INT_STORE_ICON_NAME, GIMP_ICON_GRADIENT,
                               -1);
 
   gimp_int_combo_box_connect (GIMP_INT_COMBO_BOX (combo), g_values.sample_id,
diff --git a/plug-ins/common/sphere-designer.c b/plug-ins/common/sphere-designer.c
index 3f7b5b6..8df40d8 100644
--- a/plug-ins/common/sphere-designer.c
+++ b/plug-ins/common/sphere-designer.c
@@ -2607,7 +2607,7 @@ makewindow (void)
   gtk_box_pack_end (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
   gtk_widget_show (hbox);
 
-  button = gtk_button_new_from_stock (GTK_STOCK_OPEN);
+  button = gtk_button_new_with_mnemonic (_("_Open"));
   gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE, 0);
   gtk_widget_show (button);
 
@@ -2615,7 +2615,7 @@ makewindow (void)
                     G_CALLBACK (loadpreset),
                     window);
 
-  button = gtk_button_new_from_stock (GTK_STOCK_SAVE);
+  button = gtk_button_new_with_mnemonic (_("_Save"));
   gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE, 0);
   gtk_widget_show (button);
 
@@ -2665,19 +2665,19 @@ makewindow (void)
   gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
   gtk_widget_show (hbox);
 
-  button = gtk_button_new_from_stock (GTK_STOCK_NEW);
+  button = gtk_button_new_with_mnemonic (_("_New"));
   gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE, 0);
   g_signal_connect_swapped (button, "clicked",
                             G_CALLBACK (addtexture), NULL);
   gtk_widget_show (button);
 
-  button = gtk_button_new_from_stock (GIMP_STOCK_DUPLICATE);
+  button = gtk_button_new_with_mnemonic (_("D_uplicate"));
   gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE, 0);
   g_signal_connect_swapped (button, "clicked",
                             G_CALLBACK (duptexture), NULL);
   gtk_widget_show (button);
 
-  button = gtk_button_new_from_stock (GTK_STOCK_DELETE);
+  button = gtk_button_new_with_mnemonic (_("_Delete"));
   gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE, 0);
   g_signal_connect_swapped (button, "clicked",
                             G_CALLBACK (deltexture), NULL);
diff --git a/plug-ins/common/tile-small.c b/plug-ins/common/tile-small.c
index cf34bd0..8026350 100644
--- a/plug-ins/common/tile-small.c
+++ b/plug-ins/common/tile-small.c
@@ -449,7 +449,7 @@ tileit_dialog (void)
 
   res_call.vtoggle = toggle;
 
-  button = gtk_button_new_from_stock (GIMP_STOCK_RESET);
+  button = gtk_button_new_with_mnemonic (_("_Reset"));
   gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE, 0);
   gtk_widget_show (button);
 
@@ -558,7 +558,7 @@ tileit_dialog (void)
                     G_CALLBACK (tileit_radio_update),
                     &exp_call.type);
 
-  button = gtk_button_new_from_stock (GTK_STOCK_APPLY);
+  button = gtk_button_new_with_mnemonic (_("_Apply"));
   gtk_table_attach (GTK_TABLE (table), button, 3, 4, 2, 4, 0, 0, 0, 0);
   gtk_widget_show (button);
 
diff --git a/plug-ins/common/unit-editor.c b/plug-ins/common/unit-editor.c
index f5872b2..34c1eb1 100644
--- a/plug-ins/common/unit-editor.c
+++ b/plug-ins/common/unit-editor.c
@@ -116,13 +116,13 @@ static GtkActionEntry actions[] =
     "Unit Editor Toolbar", NULL, NULL, NULL
   },
 
-  { "unit-editor-new", "document-new",
+  { "unit-editor-new", GIMP_ICON_DOCUMENT_NEW,
     NULL, "<control>N",
     N_("Create a new unit from scratch"),
     G_CALLBACK (new_callback)
   },
 
-  { "unit-editor-duplicate", GIMP_STOCK_DUPLICATE,
+  { "unit-editor-duplicate", GIMP_ICON_OBJECT_DUPLICATE,
     NULL,  "<control>D",
     N_("Create a new unit using the currently selected unit as template"),
     G_CALLBACK (duplicate_callback)
@@ -155,7 +155,7 @@ query (void)
 
   gimp_plugin_menu_register (PLUG_IN_PROC, "<Image>/Edit/Preferences");
   gimp_plugin_icon_register (PLUG_IN_PROC, GIMP_ICON_TYPE_ICON_NAME,
-                             (const guint8 *) GIMP_STOCK_TOOL_MEASURE);
+                             (const guint8 *) GIMP_ICON_TOOL_MEASURE);
 }
 
 static void
diff --git a/plug-ins/common/web-page.c b/plug-ins/common/web-page.c
index 331c918..10a4676 100644
--- a/plug-ins/common/web-page.c
+++ b/plug-ins/common/web-page.c
@@ -252,7 +252,8 @@ webpage_dialog (void)
   gtk_box_pack_start (GTK_BOX (hbox), vbox, FALSE, FALSE, 0);
   gtk_widget_show (vbox);
 
-  image = gtk_image_new_from_icon_name (GIMP_STOCK_WEB, GTK_ICON_SIZE_BUTTON);
+  image = gtk_image_new_from_icon_name (GIMP_ICON_WEB,
+                                        GTK_ICON_SIZE_BUTTON);
   gtk_box_pack_start (GTK_BOX (vbox), image, FALSE, FALSE, 0);
   gtk_widget_show (image);
 
diff --git a/plug-ins/file-ico/ico-dialog.c b/plug-ins/file-ico/ico-dialog.c
index c06b55f..f796cfe 100644
--- a/plug-ins/file-ico/ico-dialog.c
+++ b/plug-ins/file-ico/ico-dialog.c
@@ -92,7 +92,7 @@ ico_dialog_new (IcoSaveInfo *info)
   gtk_widget_show (vbox);
 
   warning = g_object_new (GIMP_TYPE_HINT_BOX,
-                          "stock-id", GIMP_STOCK_WARNING,
+                          "icon-name", GIMP_ICON_DIALOG_WARNING,
                           "hint",
                           _("Large icons and compression are not supported "
                             "by all programs. Older applications may not "
diff --git a/plug-ins/flame/flame.c b/plug-ins/flame/flame.c
index 050840f..5754d11 100644
--- a/plug-ins/flame/flame.c
+++ b/plug-ins/flame/flame.c
@@ -1034,7 +1034,7 @@ flame_dialog (void)
     gtk_box_pack_start (GTK_BOX (vbox), vbbox, FALSE, FALSE, 0);
     gtk_widget_show (vbbox);
 
-    button = gtk_button_new_from_stock (GTK_STOCK_EDIT);
+    button = gtk_button_new_with_mnemonic (_("_Edit"));
     gtk_box_pack_start (GTK_BOX (vbbox), button, FALSE, FALSE, 0);
     gtk_widget_show (button);
 
@@ -1042,7 +1042,7 @@ flame_dialog (void)
                       G_CALLBACK (edit_callback),
                       dialog);
 
-    load_button = button = gtk_button_new_from_stock (GTK_STOCK_OPEN);
+    load_button = button = gtk_button_new_with_mnemonic (_("_Open"));
     gtk_box_pack_start (GTK_BOX (vbbox), button, FALSE, FALSE, 0);
     gtk_widget_show (button);
 
@@ -1050,7 +1050,7 @@ flame_dialog (void)
                       G_CALLBACK (load_callback),
                       NULL);
 
-    save_button = button = gtk_button_new_from_stock (GTK_STOCK_SAVE);
+    save_button = button = gtk_button_new_with_mnemonic (_("_Save"));
     gtk_box_pack_start (GTK_BOX (vbbox), button, FALSE, FALSE, 0);
     gtk_widget_show (button);
 
@@ -1201,9 +1201,9 @@ flame_dialog (void)
     }
 
     gimp_int_combo_box_prepend (GIMP_INT_COMBO_BOX (combo),
-                                GIMP_INT_STORE_VALUE,    GRADIENT_DRAWABLE,
-                                GIMP_INT_STORE_LABEL,    _("Custom gradient"),
-                                GIMP_INT_STORE_STOCK_ID, GIMP_STOCK_GRADIENT,
+                                GIMP_INT_STORE_VALUE,     GRADIENT_DRAWABLE,
+                                GIMP_INT_STORE_LABEL,     _("Custom gradient"),
+                                GIMP_INT_STORE_ICON_NAME, GIMP_ICON_GRADIENT,
                                 -1);
 
     gimp_int_combo_box_connect (GIMP_INT_COMBO_BOX (combo),
diff --git a/plug-ins/fractal-explorer/fractal-explorer-dialogs.c 
b/plug-ins/fractal-explorer/fractal-explorer-dialogs.c
index 593484c..487849e 100644
--- a/plug-ins/fractal-explorer/fractal-explorer-dialogs.c
+++ b/plug-ins/fractal-explorer/fractal-explorer-dialogs.c
@@ -666,7 +666,7 @@ explorer_dialog (void)
   gtk_box_pack_start (GTK_BOX (vbox), bbox, FALSE, FALSE, 0);
   gtk_widget_show (bbox);
 
-  button = gtk_button_new_from_stock (GTK_STOCK_ZOOM_IN);
+  button = gtk_button_new_with_mnemonic (_("Zoom _In"));
   gtk_box_pack_start (GTK_BOX (bbox), button, TRUE, TRUE, 0);
   gtk_widget_show (button);
 
@@ -674,7 +674,7 @@ explorer_dialog (void)
                     G_CALLBACK (dialog_step_in_callback),
                     dialog);
 
-  button = gtk_button_new_from_stock (GTK_STOCK_ZOOM_OUT);
+  button = gtk_button_new_with_mnemonic (_("Zoom _Out"));
   gtk_box_pack_start (GTK_BOX (bbox), button, TRUE, TRUE, 0);
   gtk_widget_show (button);
 
@@ -687,7 +687,7 @@ explorer_dialog (void)
   gtk_box_pack_start (GTK_BOX (vbox), bbox, FALSE, FALSE, 0);
   gtk_widget_show (bbox);
 
-  button = gtk_button_new_from_stock (GTK_STOCK_UNDO);
+  button = gtk_button_new_with_mnemonic (_("_Undo"));
   gtk_box_pack_start (GTK_BOX (bbox), button, TRUE, TRUE, 0);
   gtk_widget_show (button);
 
@@ -697,7 +697,7 @@ explorer_dialog (void)
                     G_CALLBACK (dialog_undo_zoom_callback),
                     dialog);
 
-  button = gtk_button_new_from_stock (GTK_STOCK_REDO);
+  button = gtk_button_new_with_mnemonic (_("_Redo"));
   gtk_box_pack_start (GTK_BOX (bbox), button, TRUE, TRUE, 0);
   gtk_widget_show (button);
 
@@ -802,7 +802,7 @@ explorer_dialog (void)
   gtk_table_attach_defaults (GTK_TABLE (table), bbox, 0, 3, 7, 8);
   gtk_widget_show (bbox);
 
-  button = gtk_button_new_from_stock (GTK_STOCK_OPEN);
+  button = gtk_button_new_with_mnemonic (_("_Open"));
   gtk_box_pack_start (GTK_BOX (bbox), button, TRUE, TRUE, 0);
   g_signal_connect (button, "clicked",
                     G_CALLBACK (create_load_file_chooser),
@@ -810,7 +810,7 @@ explorer_dialog (void)
   gtk_widget_show (button);
   gimp_help_set_help_data (button, _("Load a fractal from file"), NULL);
 
-  button = gtk_button_new_from_stock (GIMP_STOCK_RESET);
+  button = gtk_button_new_with_mnemonic (_("_Reset"));
   gtk_box_pack_start (GTK_BOX (bbox), button, TRUE, TRUE, 0);
   g_signal_connect (button, "clicked",
                     G_CALLBACK (dialog_reset_callback),
@@ -819,7 +819,7 @@ explorer_dialog (void)
   gimp_help_set_help_data (button, _("Reset parameters to default values"),
                            NULL);
 
-  button = gtk_button_new_from_stock (GTK_STOCK_SAVE);
+  button = gtk_button_new_with_mnemonic (_("_Save"));
   gtk_box_pack_start (GTK_BOX (bbox), button, TRUE, TRUE, 0);
   g_signal_connect (button, "clicked",
                     G_CALLBACK (create_save_file_chooser),
diff --git a/plug-ins/fractal-explorer/fractal-explorer.c b/plug-ins/fractal-explorer/fractal-explorer.c
index af4b351..654a57a 100644
--- a/plug-ins/fractal-explorer/fractal-explorer.c
+++ b/plug-ins/fractal-explorer/fractal-explorer.c
@@ -756,9 +756,9 @@ delete_fractal_callback (GtkWidget *widget,
       delete_dialog = gimp_query_boolean_box (_("Delete Fractal"),
                                               gtk_widget_get_toplevel (view),
                                               gimp_standard_help_func, NULL,
-                                              GTK_STOCK_DIALOG_QUESTION,
+                                              GIMP_ICON_DIALOG_QUESTION,
                                               str,
-                                              GTK_STOCK_DELETE, GTK_STOCK_CANCEL,
+                                              _("_Delete"), _("_Cancel"),
                                               G_OBJECT (widget), "destroy",
                                               delete_dialog_callback,
                                               data);
@@ -1055,7 +1055,7 @@ add_objects_list (void)
   g_object_unref (list_store); /* destroy model automatically with view */
 
   /* Put buttons in */
-  button = gtk_button_new_from_stock (GTK_STOCK_REFRESH);
+  button = gtk_button_new_with_mnemonic (_("_Refresh"));
   gtk_table_attach (GTK_TABLE (table), button, 0, 1, 1, 2,
                     GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0);
   gtk_widget_show (button);
@@ -1067,7 +1067,7 @@ add_objects_list (void)
                     G_CALLBACK (fractalexplorer_rescan_list),
                     view);
 
-  button = gtk_button_new_from_stock (GTK_STOCK_APPLY);
+  button = gtk_button_new_with_mnemonic (_("_Apply"));
   gtk_table_attach (GTK_TABLE (table), button, 1, 2, 1, 2,
                     GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0);
   gtk_widget_show (button);
@@ -1079,7 +1079,7 @@ add_objects_list (void)
                     G_CALLBACK (apply_fractal_callback),
                     view);
 
-  button = gtk_button_new_from_stock (GTK_STOCK_DELETE);
+  button = gtk_button_new_with_mnemonic (_("_Delete"));
   gtk_table_attach (GTK_TABLE (table), button, 2, 3, 1, 2,
                     GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0);
   gtk_widget_show (button);
diff --git a/plug-ins/gfig/gfig-dialog.c b/plug-ins/gfig/gfig-dialog.c
index 5b75b44..4b8ccc3 100644
--- a/plug-ins/gfig/gfig-dialog.c
+++ b/plug-ins/gfig/gfig-dialog.c
@@ -867,62 +867,62 @@ create_ui_manager (GtkWidget *window)
 
     { "gfig-file-menu", NULL, "_File" },
 
-    { "open", GTK_STOCK_OPEN,
-      NULL, "<control>O", NULL,
+    { "open", GIMP_ICON_DOCUMENT_OPEN,
+      N_("_Open..."), "<control>O", NULL,
       G_CALLBACK (gfig_load_action_callback) },
 
-    { "save", GTK_STOCK_SAVE,
-      NULL, "<control>S", NULL,
+    { "save", GIMP_ICON_DOCUMENT_SAVE,
+      N_("_Save..."), "<control>S", NULL,
       G_CALLBACK (gfig_save_action_callback) },
 
-    { "close", GTK_STOCK_CLOSE,
-      NULL, "<control>C", NULL,
+    { "close", GIMP_ICON_CLOSE,
+      N_("_Close"), "<control>C", NULL,
       G_CALLBACK (gfig_close_action_callback) },
 
     { "gfig-edit-menu", NULL, "_Edit" },
 
-    { "undo", GTK_STOCK_UNDO,
+    { "undo", GIMP_ICON_EDIT_UNDO,
       N_("_Undo"), "<control>Z", NULL,
       G_CALLBACK (gfig_undo_action_callback) },
 
-    { "clear", GTK_STOCK_CLEAR,
+    { "clear", GIMP_ICON_EDIT_CLEAR,
       N_("_Clear"), NULL, NULL,
       G_CALLBACK (gfig_clear_action_callback) },
 
-    { "grid", GIMP_STOCK_GRID,
+    { "grid", GIMP_ICON_GRID,
       N_("_Grid"), "<control>G", NULL,
       G_CALLBACK (gfig_grid_action_callback) },
 
-    { "prefs", GTK_STOCK_PREFERENCES,
-      NULL, "<control>P", NULL,
+    { "prefs", GIMP_ICON_PREFERENCES_SYSTEM,
+      N_("_Preferences..."), "<control>P", NULL,
       G_CALLBACK (gfig_prefs_action_callback) },
 
-    { "raise", GTK_STOCK_GO_UP,
-      NULL, "<control>U", N_("Raise selected object"),
+    { "raise", GIMP_ICON_GO_UP,
+      N_("_Raise"), "<control>U", N_("Raise selected object"),
       G_CALLBACK (raise_selected_obj) },
 
-    { "lower", GTK_STOCK_GO_DOWN,
-      NULL, "<control>D", N_("Lower selected object"),
+    { "lower", GIMP_ICON_GO_DOWN,
+      N_("_Lower"), "<control>D", N_("Lower selected object"),
       G_CALLBACK (lower_selected_obj) },
 
-    { "top", GTK_STOCK_GOTO_TOP,
-      NULL, "<control>T", N_("Raise selected object to top"),
+    { "top", GIMP_ICON_GO_TOP,
+      N_("Raise to _top"), "<control>T", N_("Raise selected object to top"),
       G_CALLBACK (raise_selected_obj_to_top) },
 
-    { "bottom", GTK_STOCK_GOTO_BOTTOM,
-      NULL, "<control>B", N_("Lower selected object to bottom"),
+    { "bottom", GIMP_ICON_GO_BOTTOM,
+      N_("Lower to _bottom"), "<control>B", N_("Lower selected object to bottom"),
       G_CALLBACK (lower_selected_obj_to_bottom) },
 
-    { "show_previous", GTK_STOCK_GO_BACK,
-      NULL, "<control>H", N_("Show previous object"),
+    { "show_previous", GIMP_ICON_GO_PREVIOUS,
+      N_("_Previous"), "<control>H", N_("Show previous object"),
       G_CALLBACK (select_button_clicked_lt) },
 
-    { "show_next", GTK_STOCK_GO_FORWARD,
-      NULL, "<control>L", N_("Show next object"),
+    { "show_next", GIMP_ICON_GO_NEXT,
+      N_("_Next"), "<control>L", N_("Show next object"),
       G_CALLBACK (select_button_clicked_gt) },
 
     { "show_all", GFIG_STOCK_SHOW_ALL,
-      NULL, "<control>A", N_("Show all objects"),
+      N_("Show _all"), "<control>A", N_("Show all objects"),
       G_CALLBACK (select_button_clicked_eq) }
   };
   static GtkRadioActionEntry radio_actions[] =
diff --git a/plug-ins/gimpressionist/brush.c b/plug-ins/gimpressionist/brush.c
index e277236..42f7f2a 100644
--- a/plug-ins/gimpressionist/brush.c
+++ b/plug-ins/gimpressionist/brush.c
@@ -583,7 +583,7 @@ create_brushpage (GtkNotebook *notebook)
   gtk_box_pack_start (GTK_BOX (box3), combo, TRUE, TRUE, 0);
   gtk_widget_show (combo);
 
-  tmpw = gtk_button_new_from_stock (GTK_STOCK_SAVE_AS);
+  tmpw = gtk_button_new_with_mnemonic (_("Save _as"));
   gtk_box_pack_start (GTK_BOX (box3),tmpw, FALSE, FALSE, 0);
   g_signal_connect (tmpw, "clicked", G_CALLBACK (savebrush), NULL);
   gtk_widget_show (tmpw);
diff --git a/plug-ins/gimpressionist/orientation.c b/plug-ins/gimpressionist/orientation.c
index b84cf8e..6558c8e 100644
--- a/plug-ins/gimpressionist/orientation.c
+++ b/plug-ins/gimpressionist/orientation.c
@@ -194,7 +194,7 @@ create_orientationpage (GtkNotebook *notebook)
 
   orientation_restore ();
 
-  tmpw = gtk_button_new_from_stock (GTK_STOCK_EDIT);
+  tmpw = gtk_button_new_with_mnemonic (_("_Edit"));
   gtk_box_pack_start (GTK_BOX (box4), tmpw, FALSE, FALSE, 0);
   gtk_widget_show (tmpw);
   g_signal_connect (tmpw, "clicked",
diff --git a/plug-ins/gimpressionist/presets.c b/plug-ins/gimpressionist/presets.c
index c34583b..569ca53 100644
--- a/plug-ins/gimpressionist/presets.c
+++ b/plug-ins/gimpressionist/presets.c
@@ -1028,7 +1028,7 @@ create_presetpage (GtkNotebook *notebook)
 
   presetsavebutton = tmpw = gtk_button_new_with_label ( _("Save Current..."));
   gtk_button_set_image (GTK_BUTTON (presetsavebutton),
-                        gtk_image_new_from_icon_name ("document-save",
+                        gtk_image_new_from_icon_name (GIMP_ICON_DOCUMENT_SAVE,
                                                       GTK_ICON_SIZE_BUTTON));
   gtk_box_pack_start (GTK_BOX (box1), tmpw, FALSE, FALSE, 0);
   gtk_widget_show (tmpw);
@@ -1057,20 +1057,20 @@ create_presetpage (GtkNotebook *notebook)
   gtk_box_pack_start (GTK_BOX (hbox), box2, FALSE, FALSE, 0);
   gtk_widget_show (box2);
 
-  tmpw = gtk_button_new_from_stock (GTK_STOCK_APPLY);
+  tmpw = gtk_button_new_with_mnemonic (_("_Apply"));
   gtk_box_pack_start (GTK_BOX (box2), tmpw, FALSE, FALSE, 0);
   gtk_widget_show (tmpw);
   g_signal_connect (tmpw, "clicked", G_CALLBACK (apply_preset), selection);
   gimp_help_set_help_data
     (tmpw, _("Reads the selected Preset into memory"), NULL);
 
-  tmpw = delete_button = gtk_button_new_from_stock (GTK_STOCK_DELETE);
+  tmpw = delete_button = gtk_button_new_with_mnemonic (_("_Delete"));
   gtk_box_pack_start (GTK_BOX (box2), tmpw, FALSE, FALSE,0);
   gtk_widget_show (tmpw);
   g_signal_connect (tmpw, "clicked", G_CALLBACK (delete_preset), selection);
   gimp_help_set_help_data (tmpw, _("Deletes the selected Preset"), NULL);
 
-  tmpw = gtk_button_new_from_stock (GTK_STOCK_REFRESH);
+  tmpw = gtk_button_new_with_mnemonic (_("_Refresh"));
   gtk_box_pack_start (GTK_BOX (box2), tmpw, FALSE, FALSE,0);
   gtk_widget_show (tmpw);
   g_signal_connect (tmpw, "clicked", G_CALLBACK (preset_refresh_presets), NULL);
diff --git a/plug-ins/gimpressionist/preview.c b/plug-ins/gimpressionist/preview.c
index 5782c3d..e9bacbc 100644
--- a/plug-ins/gimpressionist/preview.c
+++ b/plug-ins/gimpressionist/preview.c
@@ -179,7 +179,7 @@ create_preview (void)
   gimp_help_set_help_data (button,
                            _("Refresh the Preview window"), NULL);
 
-  button = gtk_button_new_from_stock (GIMP_STOCK_RESET);
+  button = gtk_button_new_with_mnemonic (_("_Reset"));
   g_signal_connect (button, "clicked",
                     G_CALLBACK (updatepreview), (gpointer) 2);
   gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE, 0);
diff --git a/plug-ins/gimpressionist/size.c b/plug-ins/gimpressionist/size.c
index 86f75f5..45e7a4d 100644
--- a/plug-ins/gimpressionist/size.c
+++ b/plug-ins/gimpressionist/size.c
@@ -199,7 +199,7 @@ create_sizepage (GtkNotebook *notebook)
 
   size_type_restore ();
 
-  tmpw = gtk_button_new_from_stock (GTK_STOCK_EDIT);
+  tmpw = gtk_button_new_with_mnemonic (_("_Edit"));
   gtk_box_pack_start (GTK_BOX (box4), tmpw, FALSE, FALSE, 0);
   gtk_widget_show (tmpw);
   g_signal_connect (tmpw, "clicked",
diff --git a/plug-ins/gradient-flare/gradient-flare.c b/plug-ins/gradient-flare/gradient-flare.c
index 74f1ccc..1ef2f72 100644
--- a/plug-ins/gradient-flare/gradient-flare.c
+++ b/plug-ins/gradient-flare/gradient-flare.c
@@ -2923,10 +2923,10 @@ dlg_make_page_selector (GFlareDialog *dlg,
   }
   buttons[] =
   {
-    { GTK_STOCK_NEW,    G_CALLBACK (dlg_selector_new_callback)    },
-    { GTK_STOCK_EDIT,   G_CALLBACK (dlg_selector_edit_callback)   },
-    { GTK_STOCK_COPY,   G_CALLBACK (dlg_selector_copy_callback)   },
-    { GTK_STOCK_DELETE, G_CALLBACK (dlg_selector_delete_callback) }
+    { N_("_New"),    G_CALLBACK (dlg_selector_new_callback)    },
+    { N_("_Edit"),   G_CALLBACK (dlg_selector_edit_callback)   },
+    { N_("_Copy"),   G_CALLBACK (dlg_selector_copy_callback)   },
+    { N_("_Delete"), G_CALLBACK (dlg_selector_delete_callback) }
   };
 
   DEBUG_PRINT (("dlg_make_page_selector\n"));
@@ -2981,7 +2981,7 @@ dlg_make_page_selector (GFlareDialog *dlg,
 
   for (i = 0; i < G_N_ELEMENTS (buttons); i++)
     {
-      button = gtk_button_new_from_stock (buttons[i].label);
+      button = gtk_button_new_with_mnemonic (gettext (buttons[i].label));
       gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE, 0);
       gtk_widget_show (button);
 
@@ -3205,9 +3205,9 @@ dlg_selector_delete_callback (GtkWidget *widget,
   dialog = gimp_query_boolean_box (_("Delete Gradient Flare"),
                                    dlg->shell,
                                    gimp_standard_help_func, PLUG_IN_PROC,
-                                   GTK_STOCK_DIALOG_QUESTION,
+                                   GIMP_ICON_DIALOG_QUESTION,
                                    str,
-                                   GTK_STOCK_DELETE, GTK_STOCK_CANCEL,
+                                   _("_Delete"), _("_Cancel"),
                                    NULL, NULL,
                                    dlg_selector_do_delete_callback,
                                    NULL);
diff --git a/plug-ins/help-browser/dialog.c b/plug-ins/help-browser/dialog.c
index 60b9edd..50c48a4 100644
--- a/plug-ins/help-browser/dialog.c
+++ b/plug-ins/help-browser/dialog.c
@@ -179,7 +179,7 @@ browser_dialog_open (const gchar *plug_in_binary)
   window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
   gtk_window_set_title (GTK_WINDOW (window), _("GIMP Help Browser"));
   gtk_window_set_role (GTK_WINDOW (window), plug_in_binary);
-  gtk_window_set_icon_name (GTK_WINDOW (window), GIMP_STOCK_USER_MANUAL);
+  gtk_window_set_icon_name (GTK_WINDOW (window), GIMP_ICON_HELP_USER_MANUAL);
 
   gtk_window_set_default_size (GTK_WINDOW (window), data.width, data.height);
 
@@ -552,53 +552,53 @@ ui_manager_new (GtkWidget *window)
   static const GtkActionEntry actions[] =
   {
     {
-      "back", "go-previous",
+      "back", GIMP_ICON_GO_PREVIOUS,
       NULL, "<alt>Left", N_("Go back one page"),
       G_CALLBACK (back_callback)
     },
     {
-      "forward", "go-next",
+      "forward", GIMP_ICON_GO_NEXT,
       NULL, "<alt>Right", N_("Go forward one page"),
       G_CALLBACK (forward_callback)
     },
     {
-      "reload", "view-refresh",
+      "reload", GIMP_ICON_VIEW_REFRESH,
        N_("_Reload"), "<control>R", N_("Reload current page"),
       G_CALLBACK (reload_callback)
     },
     {
-      "stop", "process-stop",
+      "stop", GIMP_ICON_PROCESS_STOP,
        N_("_Stop"), "Escape", N_("Stop loading this page"),
       G_CALLBACK (stop_callback)
     },
     {
-      "home", "go-home",
+      "home", GIMP_ICON_GO_HOME,
       NULL, "<alt>Home", N_("Go to the index page"),
       G_CALLBACK (home_callback)
     },
     {
-      "copy-location", "edit-copy",
+      "copy-location", GIMP_ICON_EDIT_COPY,
       N_("C_opy location"), "",
       N_("Copy the location of this page to the clipboard"),
       G_CALLBACK (copy_location_callback)
     },
     {
-      "copy-selection", "edit-copy",
+      "copy-selection", GIMP_ICON_EDIT_COPY,
       NULL, "<control>C", NULL,
       G_CALLBACK (copy_selection_callback)
     },
     {
-      "zoom-in", "zoom-in",
+      "zoom-in", GIMP_ICON_ZOOM_IN,
       NULL, "<control>plus", NULL,
       G_CALLBACK (zoom_in_callback)
     },
     {
-      "zoom-out", "zoom-out",
+      "zoom-out", GIMP_ICON_ZOOM_OUT,
       NULL, "<control>minus", NULL,
       G_CALLBACK (zoom_out_callback)
     },
     {
-      "find", "edit-find",
+      "find", GIMP_ICON_EDIT_FIND,
       NULL, "<control>F", N_("Find text in current page"),
       G_CALLBACK (find_callback)
     },
@@ -608,12 +608,12 @@ ui_manager_new (GtkWidget *window)
       G_CALLBACK (find_again_callback)
     },
     {
-      "close", "window-close",
+      "close", GIMP_ICON_WINDOW_CLOSE,
       NULL, "<control>W", NULL,
       G_CALLBACK (close_callback)
     },
     {
-      "quit", "application-exit",
+      "quit", GIMP_ICON_APPLICATION_EXIT,
       NULL, "<control>Q", NULL,
       G_CALLBACK (close_callback)
     }
@@ -646,7 +646,7 @@ ui_manager_new (GtkWidget *window)
   action = gimp_throbber_action_new ("website",
                                      "docs.gimp.org",
                                      _("Visit the GIMP documentation website"),
-                                     GIMP_STOCK_USER_MANUAL);
+                                     GIMP_ICON_HELP_USER_MANUAL);
   g_signal_connect_closure (action, "activate",
                             g_cclosure_new (G_CALLBACK (website_callback),
                                             NULL, NULL),
@@ -1138,7 +1138,6 @@ static GtkWidget *
 build_searchbar (void)
 {
   GtkWidget *button;
-  GtkWidget *image;
   GtkWidget *entry;
   GtkWidget *hbox;
   GtkWidget *label;
@@ -1165,10 +1164,10 @@ build_searchbar (void)
   button = gtk_button_new_with_mnemonic (C_("search", "_Previous"));
   gtk_button_set_relief (GTK_BUTTON (button), GTK_RELIEF_NONE);
   gtk_button_set_image (GTK_BUTTON (button),
-                        gtk_image_new_from_icon_name ("go-previous",
+                        gtk_image_new_from_icon_name (GIMP_ICON_GO_PREVIOUS,
                                                       GTK_ICON_SIZE_BUTTON));
-  gtk_widget_show (button);
   gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 0);
+  gtk_widget_show (button);
 
   g_signal_connect (button, "clicked",
                     G_CALLBACK (search_prev_clicked),
@@ -1177,24 +1176,19 @@ build_searchbar (void)
   button = gtk_button_new_with_mnemonic (C_("search", "_Next"));
   gtk_button_set_relief (GTK_BUTTON (button), GTK_RELIEF_NONE);
   gtk_button_set_image (GTK_BUTTON (button),
-                        gtk_image_new_from_icon_name ("go-next",
+                        gtk_image_new_from_icon_name (GIMP_ICON_GO_NEXT,
                                                       GTK_ICON_SIZE_BUTTON));
-  gtk_widget_show (button);
   gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 0);
+  gtk_widget_show (button);
 
   g_signal_connect (button, "clicked",
                     G_CALLBACK (search_next_clicked),
                     entry);
 
-  button = gtk_button_new_from_stock (GTK_STOCK_CLOSE);
+  button = gtk_button_new_with_mnemonic (C_("search", "_Close"));
   gtk_button_set_relief (GTK_BUTTON (button), GTK_RELIEF_NONE);
-
-  g_object_get (button, "image", &image, NULL);
-  g_object_set (image, "icon-size", GTK_ICON_SIZE_MENU, NULL);
-  g_object_unref (image);
-
-  gtk_widget_show (button);
   gtk_box_pack_end (GTK_BOX (hbox), button, FALSE, FALSE, 0);
+  gtk_widget_show (button);
 
   g_signal_connect (button, "clicked",
                     G_CALLBACK (search_close_clicked),
diff --git a/plug-ins/ifs-compose/ifs-compose.c b/plug-ins/ifs-compose/ifs-compose.c
index f821812..c53f184 100644
--- a/plug-ins/ifs-compose/ifs-compose.c
+++ b/plug-ins/ifs-compose/ifs-compose.c
@@ -1023,43 +1023,43 @@ design_op_menu_create (GtkWidget *window)
   {
     { "ifs-compose-menu", NULL, "IFS Fractal Menu" },
 
-    { "new", "document-new",
-      NULL, "<control>N", NULL,
+    { "new", GIMP_ICON_DOCUMENT_NEW,
+      N_("_New"), "<primary>N", NULL,
       G_CALLBACK (ifs_compose_new_callback) },
 
-    { "delete", "edit-delete",
-      NULL, "<control>D", NULL,
+    { "delete", GIMP_ICON_EDIT_DELETE,
+      N_("_Delete"), "<primary>D", NULL,
       G_CALLBACK (ifs_compose_delete_callback) },
 
-    { "undo", "edit-undo",
-      NULL, "<control>Z", NULL,
+    { "undo", GIMP_ICON_EDIT_UNDO,
+      N_("_Undo"), "<primary>Z", NULL,
       G_CALLBACK (undo) },
 
-    { "redo", "edit-redo",
-      NULL, "<control>Y", NULL,
+    { "redo", GIMP_ICON_EDIT_REDO,
+      N_("_Redo"), "<primary>Y", NULL,
       G_CALLBACK (redo) },
 
-    { "select-all", GIMP_STOCK_SELECTION_ALL,
-      N_("Select _All"), "<control>A", NULL,
+    { "select-all", GIMP_ICON_SELECTION_ALL,
+      N_("Select _All"), "<primary>A", NULL,
       G_CALLBACK (design_area_select_all_callback) },
 
-    { "center", GIMP_STOCK_CENTER,
-      N_("Re_center"), "<control>C", N_("Recompute Center"),
+    { "center", GIMP_ICON_CENTER,
+      N_("Re_center"), "<primary>C", N_("Recompute Center"),
       G_CALLBACK (recompute_center_cb) },
 
-    { "options", "preferences-system",
+    { "options", GIMP_ICON_PREFERENCES_SYSTEM,
       N_("Render Options"), NULL, NULL,
       G_CALLBACK (ifs_compose_options_callback) }
   };
   static GtkRadioActionEntry radio_actions[] =
   {
-    { "move", GIMP_STOCK_TOOL_MOVE,
+    { "move", GIMP_ICON_TOOL_MOVE,
       N_("Move"), "M", NULL, OP_TRANSLATE },
 
-    { "rotate", GIMP_STOCK_TOOL_ROTATE,
+    { "rotate", GIMP_ICON_TOOL_ROTATE,
       N_("Rotate"), "R", N_("Rotate / Scale"), OP_ROTATE },
 
-    { "stretch", GIMP_STOCK_TOOL_PERSPECTIVE,
+    { "stretch", GIMP_ICON_TOOL_PERSPECTIVE,
       N_("Stretch"), "S", NULL, OP_STRETCH }
   };
 
diff --git a/plug-ins/imagemap/imap_browse.c b/plug-ins/imagemap/imap_browse.c
index 33f6954..574ee6d 100644
--- a/plug-ins/imagemap/imap_browse.c
+++ b/plug-ins/imagemap/imap_browse.c
@@ -144,7 +144,8 @@ browse_widget_new (const gchar *name)
    gtk_widget_show (browse->file);
 
    browse->button = button = gtk_button_new ();
-   icon = gtk_image_new_from_icon_name ("document-open", GTK_ICON_SIZE_BUTTON);
+   icon = gtk_image_new_from_icon_name (GIMP_ICON_DOCUMENT_OPEN,
+                                        GTK_ICON_SIZE_BUTTON);
    gtk_container_add (GTK_CONTAINER (button), icon);
    gtk_widget_show (icon);
 
diff --git a/plug-ins/imagemap/imap_edit_area_info.c b/plug-ins/imagemap/imap_edit_area_info.c
index 5ccacd2..19f7d35 100644
--- a/plug-ins/imagemap/imap_edit_area_info.c
+++ b/plug-ins/imagemap/imap_edit_area_info.c
@@ -281,7 +281,7 @@ create_link_tab(AreaInfoDialog_t *dialog, GtkWidget *notebook)
    label = create_label_in_table(table, 9, 0, _("ALT te_xt: (optional)"));
    dialog->comment = create_entry_in_table(table, label, 10, 0);
 
-   append_page (notebook, table, GIMP_STOCK_WEB, _("_Link"));
+   append_page (notebook, table, GIMP_ICON_WEB, _("_Link"));
 }
 
 static void
diff --git a/plug-ins/imagemap/imap_menu.c b/plug-ins/imagemap/imap_menu.c
index f335f1d..c184319 100644
--- a/plug-ins/imagemap/imap_menu.c
+++ b/plug-ins/imagemap/imap_menu.c
@@ -140,50 +140,66 @@ paste_buffer_removed(Object_t *obj, gpointer data)
 }
 
 /* Normal items */
-static const GtkActionEntry entries[] = {
-  { "FileMenu", NULL, N_("_File") },
-  { "Open", GTK_STOCK_OPEN, N_("_Open..."), NULL, N_("Open"),
+static const GtkActionEntry entries[] =
+{
+  { "FileMenu", NULL,
+    N_("_File") },
+  { "Open", GIMP_ICON_DOCUMENT_OPEN,
+    N_("_Open..."), NULL, N_("Open"),
     do_file_open_dialog},
-  { "Save", GTK_STOCK_SAVE, N_("_Save..."), NULL, N_("Save"),
+  { "Save", GIMP_ICON_DOCUMENT_SAVE,
+    N_("_Save..."), NULL, N_("Save"),
     save},
-  { "SaveAs", GTK_STOCK_SAVE_AS, N_("Save _As..."), "<shift><control>S", NULL,
+  { "SaveAs", GIMP_ICON_DOCUMENT_SAVE_AS,
+    N_("Save _As..."), "<shift><control>S", NULL,
     do_file_save_as_dialog},
-  { "Close", GTK_STOCK_CLOSE, NULL, NULL, NULL, do_close},
-  { "Quit", GTK_STOCK_QUIT, NULL, NULL, NULL, do_quit},
+  { "Close", GIMP_ICON_CLOSE, NULL, NULL, NULL, do_close},
+  { "Quit", GIMP_ICON_APPLICATION_EXIT,
+    NULL, NULL, NULL, do_quit},
 
   { "EditMenu", NULL, N_("_Edit") },
-  { "Undo", GTK_STOCK_UNDO, NULL, NULL, N_("Undo"), do_undo},
-  { "Redo", GTK_STOCK_REDO, NULL, NULL, N_("Redo"), do_redo},
-  { "Cut", GTK_STOCK_CUT, NULL, NULL, N_("Cut"), do_cut},
-  { "Copy", GTK_STOCK_COPY, NULL, NULL, N_("Copy"), do_copy},
-  { "Paste", GTK_STOCK_PASTE, NULL, NULL, N_("Paste"), do_paste},
-  { "Clear", GTK_STOCK_DELETE, NULL, N_("Delete"), NULL, do_clear},
-  { "SelectAll", NULL, N_("Select _All"), "<control>A", NULL, do_select_all},
-  { "DeselectAll", NULL, N_("D_eselect All"), "<shift><control>A", NULL,
+  { "Undo", GIMP_ICON_EDIT_UNDO,
+    NULL, NULL, N_("Undo"), do_undo},
+  { "Redo", GIMP_ICON_EDIT_REDO,
+    NULL, NULL, N_("Redo"), do_redo},
+  { "Cut", GIMP_ICON_EDIT_CUT,
+    NULL, NULL, N_("Cut"), do_cut},
+  { "Copy", GIMP_ICON_EDIT_COPY,
+    NULL, NULL, N_("Copy"), do_copy},
+  { "Paste", GIMP_ICON_EDIT_PASTE,
+    NULL, NULL, N_("Paste"), do_paste},
+  { "Clear", GIMP_ICON_EDIT_DELETE,
+    NULL, N_("Delete"), NULL, do_clear},
+  { "SelectAll", NULL,
+    N_("Select _All"), "<control>A", NULL, do_select_all},
+  { "DeselectAll", NULL,
+    N_("D_eselect All"), "<shift><control>A", NULL,
     do_deselect_all},
-  { "EditAreaInfo", GTK_STOCK_EDIT, N_("Edit Area _Info..."), NULL,
+  { "EditAreaInfo", GIMP_ICON_EDIT
+    , N_("Edit Area _Info..."), NULL,
     N_("Edit selected area info"), do_edit_selected_shape},
-  { "Preferences", GTK_STOCK_PREFERENCES, NULL, NULL, N_("Preferences"),
+  { "Preferences", GIMP_ICON_PREFERENCES_SYSTEM,
+    NULL, NULL, N_("Preferences"),
     do_preferences_dialog},
   { "MoveToFront", IMAP_STOCK_TO_FRONT, "", NULL, N_("Move Area to Front"),
     do_move_to_front},
   { "SendToBack", IMAP_STOCK_TO_BACK, "", NULL, N_("Move Area to Bottom"),
     do_send_to_back},
   { "DeleteArea", NULL, N_("Delete Area"), NULL, NULL, NULL},
-  { "MoveUp", GTK_STOCK_GO_UP, N_("Move Up"), NULL, NULL, NULL},
-  { "MoveDown", GTK_STOCK_GO_DOWN, N_("Move Down"), NULL, NULL, NULL},
+  { "MoveUp", GIMP_ICON_GO_UP, N_("Move Up"), NULL, NULL, NULL},
+  { "MoveDown", GIMP_ICON_GO_DOWN, N_("Move Down"), NULL, NULL, NULL},
 
   { "InsertPoint", NULL, N_("Insert Point"), NULL, NULL, polygon_insert_point},
   { "DeletePoint", NULL, N_("Delete Point"), NULL, NULL, polygon_delete_point},
 
   { "ViewMenu", NULL, N_("_View") },
   { "Source", NULL, N_("Source..."), NULL, NULL, do_source_dialog},
-  { "ZoomIn", GTK_STOCK_ZOOM_IN, NULL, "plus", N_("Zoom in"), do_zoom_in},
-  { "ZoomOut", GTK_STOCK_ZOOM_OUT, NULL, "minus", N_("Zoom out"), do_zoom_out},
+  { "ZoomIn", GIMP_ICON_ZOOM_IN, NULL, "plus", N_("Zoom in"), do_zoom_in},
+  { "ZoomOut", GIMP_ICON_ZOOM_OUT, NULL, "minus", N_("Zoom out"), do_zoom_out},
   { "ZoomToMenu", NULL, N_("_Zoom To") },
 
   { "MappingMenu", NULL, N_("_Mapping") },
-  { "EditMapInfo", GTK_STOCK_INFO, N_("Edit Map Info..."), NULL,
+  { "EditMapInfo", GIMP_ICON_DIALOG_INFORMATION, N_("Edit Map Info..."), NULL,
     N_("Edit Map Info"), do_settings_dialog},
 
   { "ToolsMenu", NULL, N_("_Tools") },
@@ -195,8 +211,8 @@ static const GtkActionEntry entries[] = {
     do_create_guides_dialog},
 
   { "HelpMenu", NULL, N_("_Help") },
-  { "Contents", GTK_STOCK_HELP, N_("_Contents"), NULL, NULL, imap_help},
-  { "About", GTK_STOCK_ABOUT, NULL, NULL, NULL, do_about_dialog},
+  { "Contents", GIMP_ICON_HELP, N_("_Contents"), NULL, NULL, imap_help},
+  { "About", GIMP_ICON_HELP_ABOUT, NULL, NULL, NULL, do_about_dialog},
 
   { "ZoomMenu", NULL, N_("_Zoom") },
 };
@@ -204,7 +220,7 @@ static const GtkActionEntry entries[] = {
 /* Toggle items */
 static const GtkToggleActionEntry toggle_entries[] = {
   { "AreaList", NULL, N_("Area List"), NULL, NULL, NULL, TRUE },
-  { "Grid", GIMP_STOCK_GRID, N_("_Grid"), NULL, N_("Grid"), toggle_grid, FALSE }
+  { "Grid", GIMP_ICON_GRID, N_("_Grid"), NULL, N_("Grid"), toggle_grid, FALSE }
 };
 
 static const GtkRadioActionEntry color_entries[] = {
@@ -213,7 +229,7 @@ static const GtkRadioActionEntry color_entries[] = {
 };
 
 static const GtkRadioActionEntry mapping_entries[] = {
-  { "Arrow", GIMP_STOCK_CURSOR, N_("Arrow"), NULL,
+  { "Arrow", GIMP_ICON_CURSOR, N_("Arrow"), NULL,
     N_("Select existing area"), 0},
   { "Rectangle", IMAP_STOCK_RECTANGLE, N_("Rectangle"), NULL,
     N_("Define Rectangle area"), 1},
diff --git a/plug-ins/lighting/lighting-ui.c b/plug-ins/lighting/lighting-ui.c
index 7274fb2..20dae53 100644
--- a/plug-ins/lighting/lighting-ui.c
+++ b/plug-ins/lighting/lighting-ui.c
@@ -590,14 +590,14 @@ create_light_page (void)
   gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 2, 6, 7);
   gtk_widget_show (label);
 
-  button = gtk_button_new_from_stock (GTK_STOCK_SAVE);
+  button = gtk_button_new_with_mnemonic (_("_Save"));
   gtk_table_attach_defaults (GTK_TABLE (table), button, 2, 4, 6, 7);
   g_signal_connect (button, "clicked",
                     G_CALLBACK (save_lighting_preset),
                     NULL);
   gtk_widget_show (button);
 
-  button = gtk_button_new_from_stock (GTK_STOCK_OPEN);
+  button = gtk_button_new_with_mnemonic (_("_Open"));
   gtk_table_attach_defaults (GTK_TABLE (table), button, 4, 6, 6, 7);
   g_signal_connect (button, "clicked",
                     G_CALLBACK (load_lighting_preset),
diff --git a/plug-ins/pagecurl/pagecurl.c b/plug-ins/pagecurl/pagecurl.c
index f1484e4..0f534c3 100644
--- a/plug-ins/pagecurl/pagecurl.c
+++ b/plug-ins/pagecurl/pagecurl.c
@@ -573,19 +573,19 @@ dialog (void)
   combo = g_object_new (GIMP_TYPE_INT_COMBO_BOX, NULL);
 
   gimp_int_combo_box_prepend (GIMP_INT_COMBO_BOX (combo),
-                              GIMP_INT_STORE_VALUE,    CURL_COLORS_GRADIENT_REVERSE,
-                              GIMP_INT_STORE_LABEL,    _("Current gradient (reversed)"),
-                              GIMP_INT_STORE_STOCK_ID, GIMP_STOCK_GRADIENT,
+                              GIMP_INT_STORE_VALUE,     CURL_COLORS_GRADIENT_REVERSE,
+                              GIMP_INT_STORE_LABEL,     _("Current gradient (reversed)"),
+                              GIMP_INT_STORE_ICON_NAME, GIMP_ICON_GRADIENT,
                               -1);
   gimp_int_combo_box_prepend (GIMP_INT_COMBO_BOX (combo),
-                              GIMP_INT_STORE_VALUE,    CURL_COLORS_GRADIENT,
-                              GIMP_INT_STORE_LABEL,    _("Current gradient"),
-                              GIMP_INT_STORE_STOCK_ID, GIMP_STOCK_GRADIENT,
+                              GIMP_INT_STORE_VALUE,     CURL_COLORS_GRADIENT,
+                              GIMP_INT_STORE_LABEL,     _("Current gradient"),
+                              GIMP_INT_STORE_ICON_NAME, GIMP_ICON_GRADIENT,
                               -1);
   gimp_int_combo_box_prepend (GIMP_INT_COMBO_BOX (combo),
-                              GIMP_INT_STORE_VALUE,    CURL_COLORS_FG_BG,
-                              GIMP_INT_STORE_LABEL,    _("Foreground / background colors"),
-                              GIMP_INT_STORE_STOCK_ID, GIMP_STOCK_DEFAULT_COLORS,
+                              GIMP_INT_STORE_VALUE,     CURL_COLORS_FG_BG,
+                              GIMP_INT_STORE_LABEL,     _("Foreground / background colors"),
+                              GIMP_INT_STORE_ICON_NAME, GIMP_ICON_COLORS_DEFAULT,
                               -1);
 
   gtk_box_pack_start (GTK_BOX (vbox), combo, FALSE, FALSE, 0);
diff --git a/plug-ins/print/print.c b/plug-ins/print/print.c
index 2eabc3b..02c01be 100644
--- a/plug-ins/print/print.c
+++ b/plug-ins/print/print.c
@@ -118,7 +118,7 @@ query (void)
 
   gimp_plugin_menu_register (PRINT_PROC_NAME, "<Image>/File/Send");
   gimp_plugin_icon_register (PRINT_PROC_NAME, GIMP_ICON_TYPE_ICON_NAME,
-                             (const guint8 *) "document-print");
+                             (const guint8 *) GIMP_ICON_DOCUMENT_PRINT);
 
 #ifndef EMBED_PAGE_SETUP
   gimp_install_procedure (PAGE_SETUP_PROC_NAME,
@@ -136,7 +136,7 @@ query (void)
 
   gimp_plugin_menu_register (PAGE_SETUP_PROC_NAME, "<Image>/File/Send");
   gimp_plugin_icon_register (PAGE_SETUP_PROC_NAME, GIMP_ICON_TYPE_ICON_NAME,
-                             (const guint8 *) "document-page-setup");
+                             (const guint8 *) GIMP_ICON_DOCUMENT_PAGE_SETUP);
 #endif
 }
 
diff --git a/plug-ins/script-fu/script-fu-server.c b/plug-ins/script-fu/script-fu-server.c
index b2dc4b8..483eebc 100644
--- a/plug-ins/script-fu/script-fu-server.c
+++ b/plug-ins/script-fu/script-fu-server.c
@@ -886,7 +886,7 @@ server_interface (void)
   gtk_box_pack_start (GTK_BOX (main_vbox), hbox, FALSE, FALSE, 0);
   gtk_widget_show (hbox);
 
-  image = gtk_image_new_from_icon_name (GIMP_STOCK_WARNING,
+  image = gtk_image_new_from_icon_name (GIMP_ICON_DIALOG_WARNING,
                                         GTK_ICON_SIZE_DIALOG);
   gtk_box_pack_start (GTK_BOX (hbox), image, TRUE, TRUE, 0);
   gtk_widget_show (image);



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]