icons: Color & Symbolic

sync ...tool-preset with master

turn edit-cut to avoid mistake with tool-iscissors

app/actions/actions.c

@@ -152,13 +152,13 @@ static const GimpActionFactoryEntry action_groups[] =
   { "dynamics-editor", N_("Paint Dynamics Editor"), GIMP_STOCK_DYNAMICS,
     dynamics_editor_actions_setup,
     dynamics_editor_actions_update },
-  { "edit", N_("Edit"), "gtk-edit",
+  { "edit", N_("Edit"), GIMP_STOCK_EDIT,
     edit_actions_setup,
     edit_actions_update },
   { "error-console", N_("Error Console"), GIMP_STOCK_WARNING,
     error_console_actions_setup,
     error_console_actions_update },
-  { "file", N_("File"), "text-x-generic",
+  { "file", N_("File"), GIMP_STOCK_DOCUMENT,
     file_actions_setup,
     file_actions_update },
   { "filters", N_("Filters"), GIMP_STOCK_GEGL,
@@ -179,7 +179,7 @@ static const GimpActionFactoryEntry action_groups[] =
   { "tool-preset-editor", N_("Tool Preset Editor"), GIMP_STOCK_TOOL_PRESET,
     tool_preset_editor_actions_setup,
     tool_preset_editor_actions_update },
-  { "help", N_("Help"), "help-browser",
+  { "help", N_("Help"), GIMP_STOCK_PREFS_HELP_SYSTEM,
     help_actions_setup,
     help_actions_update },
   { "image", N_("Image"), GIMP_STOCK_IMAGE,
@@ -218,10 +218,10 @@ static const GimpActionFactoryEntry action_groups[] =
   { "templates", N_("Templates"), GIMP_STOCK_TEMPLATE,
     templates_actions_setup,
     templates_actions_update },
-  { "text-tool", N_("Text Tool"), "gtk-edit",
+  { "text-tool", N_("Text Tool"), GIMP_STOCK_EDIT,
     text_tool_actions_setup,
     text_tool_actions_update },
-  { "text-editor", N_("Text Editor"), "gtk-edit",
+  { "text-editor", N_("Text Editor"), GIMP_STOCK_EDIT,
     text_editor_actions_setup,
     text_editor_actions_update },
   { "tool-options", N_("Tool Options"), GIMP_STOCK_TOOL_OPTIONS,

app/actions/brushes-actions.c

@@ -43,13 +43,13 @@ static const GimpActionEntry brushes_actions[] =
     NC_("brushes-action", "Brushes Menu"), NULL, NULL, NULL,
     GIMP_HELP_BRUSH_DIALOG },
 
-  { "brushes-open-as-image", "document-open",
+  { "brushes-open-as-image", GIMP_STOCK_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_STOCK_DOCUMENT_NEW,
     NC_("brushes-action", "_New Brush"), NULL,
     NC_("brushes-action", "Create a new brush"),
     G_CALLBACK (data_new_cmd_callback),
@@ -61,25 +61,25 @@ static const GimpActionEntry brushes_actions[] =
     G_CALLBACK (data_duplicate_cmd_callback),
     GIMP_HELP_BRUSH_DUPLICATE },
 
-  { "brushes-copy-location", "edit-copy",
+  { "brushes-copy-location", GIMP_STOCK_CLIPBOARD,
     NC_("brushes-action", "Copy Brush _Location"), NULL,
     NC_("brushes-action", "Copy brush file location to clipboard"),
     G_CALLBACK (data_copy_location_cmd_callback),
     GIMP_HELP_BRUSH_COPY_LOCATION },
 
-  { "brushes-show-in-file-manager", "gtk-directory",
+  { "brushes-show-in-file-manager", GIMP_STOCK_FILE_MANAGER,
     NC_("brushes-action", "Show in _File Manager"), NULL,
     NC_("brushes-action", "Show brush file location in the file manager"),
     G_CALLBACK (data_show_in_file_manager_cmd_callback),
     GIMP_HELP_BRUSH_SHOW_IN_FILE_MANAGER },
 
-  { "brushes-delete", "edit-delete",
+  { "brushes-delete", GIMP_STOCK_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_STOCK_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_STOCK_EDIT,
     NC_("brushes-action", "_Edit Brush..."), NULL,
     NC_("brushes-action", "Edit this brush"),
     "gimp-brush-editor",

app/actions/buffers-actions.c

@@ -42,7 +42,7 @@ static const GimpActionEntry buffers_actions[] =
     NC_("buffers-action", "Buffers Menu"), NULL, NULL, NULL,
     GIMP_HELP_BUFFER_DIALOG },
 
-  { "buffers-paste", "edit-paste",
+  { "buffers-paste", GIMP_STOCK_PASTE,
     NC_("buffers-action", "_Paste Buffer"), NULL,
     NC_("buffers-action", "Paste the selected buffer"),
     G_CALLBACK (buffers_paste_cmd_callback),
@@ -60,7 +60,7 @@ static const GimpActionEntry buffers_actions[] =
     G_CALLBACK (buffers_paste_as_new_cmd_callback),
     GIMP_HELP_BUFFER_PASTE_AS_NEW },
 
-  { "buffers-delete", "edit-delete",
+  { "buffers-delete", GIMP_STOCK_DELETE,
     NC_("buffers-action", "_Delete Buffer"), NULL,
     NC_("buffers-action", "Delete the selected buffer"),
     G_CALLBACK (buffers_delete_cmd_callback),

app/actions/channels-actions.c

@@ -44,19 +44,19 @@ static const GimpActionEntry channels_actions[] =
     NC_("channels-action", "Channels Menu"), NULL, NULL, NULL,
     GIMP_HELP_CHANNEL_DIALOG },
 
-  { "channels-edit-attributes", "gtk-edit",
+  { "channels-edit-attributes", GIMP_STOCK_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_STOCK_CHANNEL_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_STOCK_CHANNEL_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),
@@ -69,32 +69,32 @@ static const GimpActionEntry channels_actions[] =
     G_CALLBACK (channels_duplicate_cmd_callback),
     GIMP_HELP_CHANNEL_DUPLICATE },
 
-  { "channels-delete", "edit-delete",
+  { "channels-delete", GIMP_STOCK_CHANNEL_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_STOCK_CHANNEL_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_STOCK_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_STOCK_CHANNEL_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_STOCK_BOTTOM,
     NC_("channels-action", "Lower Channel to _Bottom"), NULL,
     NC_("channels-action",
         "Lower this channel to the bottom of the channel stack"),

app/actions/channels-commands.c

@@ -85,7 +85,7 @@ channels_edit_attributes_cmd_callback (GtkAction *action,
                                         gimp_object_get_name (channel),
                                         _("Channel Attributes"),
                                         "gimp-channel-edit",
-                                        "gtk-edit",
+                                        GIMP_STOCK_EDIT,
                                         _("Edit Channel Attributes"),
                                         GIMP_HELP_CHANNEL_EDIT,
                                         _("Edit Channel Color"),

app/actions/colormap-actions.c

@@ -45,7 +45,7 @@ static const GimpActionEntry colormap_actions[] =
     NC_("colormap-action", "Colormap Menu"), NULL, NULL, NULL,
     GIMP_HELP_INDEXED_PALETTE_DIALOG },
 
-  { "colormap-edit-color", "gtk-edit",
+  { "colormap-edit-color", GIMP_STOCK_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_STOCK_NEW,
     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_STOCK_NEW,
     NC_("colormap-action", "_Add Color from BG"), "",
     NC_("colormap-action", "Add current background color"),
     TRUE, FALSE,

app/actions/dialogs-actions.c

@@ -217,7 +217,7 @@ const GimpStringActionEntry dialogs_dockable_actions[] =
     "gimp-image-list|gimp-image-grid",
     GIMP_HELP_IMAGE_DIALOG },
 
-  { "dialogs-document-history", "document-open-recent",
+  { "dialogs-document-history", GIMP_STOCK_DOCUMENT_RECENT,
     NC_("dialogs-action", "Document Histor_y"), "",
     NC_("dialogs-action", "Open the document history dialog"),
     "gimp-document-list|gimp-document-grid",
@@ -240,7 +240,7 @@ gint n_dialogs_dockable_actions = G_N_ELEMENTS (dialogs_dockable_actions);
 
 static const GimpStringActionEntry dialogs_toplevel_actions[] =
 {
-  { "dialogs-preferences", "preferences-system",
+  { "dialogs-preferences", GIMP_STOCK_PREFS_SYSTEM,
     NC_("dialogs-action", "_Preferences"), NULL,
     NC_("dialogs-action", "Open the preferences dialog"),
     "gimp-preferences-dialog",
@@ -258,7 +258,7 @@ static const GimpStringActionEntry dialogs_toplevel_actions[] =
     "gimp-keyboard-shortcuts-dialog",
     GIMP_HELP_KEYBOARD_SHORTCUTS },
 
-  { "dialogs-module-dialog", "system-run",
+  { "dialogs-module-dialog", GIMP_STOCK_SYSTEM_RUN,
     NC_("dialogs-action", "_Modules"), NULL,
     NC_("dialogs-action", "Open the module manager dialog"),
     "gimp-module-dialog",
@@ -270,7 +270,7 @@ static const GimpStringActionEntry dialogs_toplevel_actions[] =
     "gimp-tips-dialog",
     GIMP_HELP_TIPS_DIALOG },
 
-  { "dialogs-about", "help-about",
+  { "dialogs-about", GIMP_STOCK_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_STOCK_TOOL_ZOOM,
     NC_("dialogs-action", "_Search and Run a Command"), "slash",
     NC_("dialogs-action", "Search commands by keyword, and run them"),
     "gimp-action-search-dialog",

app/actions/dock-actions.c

@@ -46,7 +46,7 @@ static const GimpActionEntry dock_actions[] =
     NC_("dock-action", "M_ove to Screen"), NULL, NULL, NULL,
     GIMP_HELP_DOCK_CHANGE_SCREEN },
 
-  { "dock-close", "window-close",
+  { "dock-close", GIMP_STOCK_QUIT,
     NC_("dock-action", "Close Dock"), "", NULL,
     G_CALLBACK (window_close_cmd_callback),
     GIMP_HELP_DOCK_CLOSE },

app/actions/dockable-actions.c

@@ -57,7 +57,7 @@ static const GimpActionEntry dockable_actions[] =
   { "dockable-tab-style-menu",    NULL, NC_("dockable-action",
                                             "_Tab Style")      },
 
-  { "dockable-close-tab", "window-close",
+  { "dockable-close-tab", GIMP_STOCK_QUIT,
     NC_("dockable-action", "_Close Tab"), "", NULL,
     G_CALLBACK (dockable_close_tab_cmd_callback),
     GIMP_HELP_DOCK_TAB_CLOSE },

app/actions/documents-actions.c

@@ -38,11 +38,11 @@
 
 static const GimpActionEntry documents_actions[] =
 {
-  { "documents-popup", "document-open-recent",
+  { "documents-popup", GIMP_STOCK_DOCUMENT_RECENT,
     NC_("documents-action", "Documents Menu"), NULL, NULL, NULL,
     GIMP_HELP_DOCUMENT_DIALOG },
 
-  { "documents-open", "document-open",
+  { "documents-open", GIMP_STOCK_OPEN,
     NC_("documents-action", "_Open Image"), NULL,
     NC_("documents-action", "Open the selected entry"),
     G_CALLBACK (documents_open_cmd_callback),
@@ -60,31 +60,31 @@ 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_STOCK_CLIPBOARD,
     NC_("documents-action", "Copy Image _Location"), NULL,
     NC_("documents-action", "Copy image location to clipboard"),
     G_CALLBACK (documents_copy_location_cmd_callback),
     GIMP_HELP_DOCUMENT_COPY_LOCATION },
 
-  { "documents-show-in-file-manager", "gtk-directory",
+  { "documents-show-in-file-manager", GIMP_STOCK_FILE_MANAGER,
     NC_("documents-action", "Show in _File Manager"), NULL,
     NC_("documents-action", "Show image location in the file manager"),
     G_CALLBACK (documents_show_in_file_manager_cmd_callback),
     GIMP_HELP_DOCUMENT_SHOW_IN_FILE_MANAGER },
 
-  { "documents-remove", "list-remove",
+  { "documents-remove", GIMP_STOCK_DELETE,
     NC_("documents-action", "Remove _Entry"), NULL,
     NC_("documents-action", "Remove the selected entry"),
     G_CALLBACK (documents_remove_cmd_callback),
     GIMP_HELP_DOCUMENT_REMOVE },
 
-  { "documents-clear", "edit-clear",
+  { "documents-clear", GIMP_STOCK_SHRED,
     NC_("documents-action", "_Clear History"), NULL,
     NC_("documents-action", "Clear the entire document history"),
     G_CALLBACK (documents_clear_cmd_callback),
     GIMP_HELP_DOCUMENT_CLEAR },
 
-  { "documents-recreate-preview", "view-refresh",
+  { "documents-recreate-preview", GIMP_STOCK_VIEW_REFRESH,
     NC_("documents-action", "Recreate _Preview"), NULL,
     NC_("documents-action", "Recreate preview"),
     G_CALLBACK (documents_recreate_preview_cmd_callback),

app/actions/documents-commands.c

@@ -221,7 +221,7 @@ documents_clear_cmd_callback (GtkAction *action,
   GtkWidget           *dialog;
 
   dialog = gimp_message_dialog_new (_("Clear Document History"),
-                                    "edit-clear",
+                                    GIMP_STOCK_SHRED,
                                     GTK_WIDGET (editor),
                                     GTK_DIALOG_MODAL |
                                     GTK_DIALOG_DESTROY_WITH_PARENT,

app/actions/dynamics-actions.c

@@ -43,7 +43,7 @@ static const GimpActionEntry dynamics_actions[] =
     NC_("dynamics-action", "Paint Dynamics Menu"), NULL, NULL, NULL,
     GIMP_HELP_DYNAMICS_DIALOG },
 
-  { "dynamics-new", "document-new",
+  { "dynamics-new", GIMP_STOCK_DOCUMENT_NEW,
     NC_("dynamics-action", "_New Dynamics"), NULL,
     NC_("dynamics-action", "Create a new dynamics"),
     G_CALLBACK (data_new_cmd_callback),
@@ -55,25 +55,25 @@ static const GimpActionEntry dynamics_actions[] =
     G_CALLBACK (data_duplicate_cmd_callback),
     GIMP_HELP_DYNAMICS_DUPLICATE },
 
-  { "dynamics-copy-location", "edit-copy",
+  { "dynamics-copy-location", GIMP_STOCK_CLIPBOARD,
     NC_("dynamics-action", "Copy Dynamics _Location"), NULL,
     NC_("dynamics-action", "Copy dynamics file location to clipboard"),
     G_CALLBACK (data_copy_location_cmd_callback),
     GIMP_HELP_DYNAMICS_COPY_LOCATION },
 
-  { "dynamics-show-in-file-manager", "gtk-directory",
+  { "dynamics-show-in-file-manager", GIMP_STOCK_FILE_MANAGER,
     NC_("dynamics-action", "Show in _File Manager"), NULL,
     NC_("dynamics-action", "Show dynamics file location in the file manager"),
     G_CALLBACK (data_show_in_file_manager_cmd_callback),
     GIMP_HELP_DYNAMICS_SHOW_IN_FILE_MANAGER },
 
-  { "dynamics-delete", "edit-delete",
+  { "dynamics-delete", GIMP_STOCK_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_STOCK_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_STOCK_EDIT,
     NC_("dynamics-action", "_Edit Dynamics..."), NULL,
     NC_("dynamics-action", "Edit dynamics"),
     "gimp-dynamics-editor",

app/actions/edit-actions.c

@@ -70,51 +70,51 @@ 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_STOCK_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_STOCK_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_STOCK_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_STOCK_REDO,
     NC_("edit-action", "Strong Redo"), "<primary><shift>Y",
     NC_("edit-action",
         "Redo the last operation that was undone, skipping visibility changes"),
     G_CALLBACK (edit_strong_redo_cmd_callback),
     GIMP_HELP_EDIT_STRONG_REDO },
 
-  { "edit-undo-clear", "edit-clear",
+  { "edit-undo-clear", GIMP_STOCK_SHRED,
     NC_("edit-action", "_Clear Undo History"), NULL,
     NC_("edit-action", "Remove all operations from the undo history"),
     G_CALLBACK (edit_undo_clear_cmd_callback),
     GIMP_HELP_EDIT_UNDO_CLEAR },
 
-  { "edit-fade", "edit-undo",
+  { "edit-fade", GIMP_STOCK_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_STOCK_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_STOCK_CLIPBOARD,
     NC_("edit-action", "_Copy"), "<primary>C",
     NC_("edit-action", "Copy the selected pixels to the clipboard"),
     G_CALLBACK (edit_copy_cmd_callback),
@@ -126,7 +126,7 @@ static const GimpActionEntry edit_actions[] =
     G_CALLBACK (edit_copy_visible_cmd_callback),
     GIMP_HELP_EDIT_COPY_VISIBLE },
 
-  { "edit-paste", "edit-paste",
+  { "edit-paste", GIMP_STOCK_PASTE,
     NC_("edit-action", "_Paste"), "<primary>V",
     NC_("edit-action", "Paste the content of the clipboard"),
     G_CALLBACK (edit_paste_cmd_callback),
@@ -157,13 +157,13 @@ static const GimpActionEntry edit_actions[] =
     G_CALLBACK (edit_paste_as_new_layer_cmd_callback),
     GIMP_HELP_EDIT_PASTE_AS_NEW_LAYER },
 
-  { "edit-named-cut", "edit-cut",
+  { "edit-named-cut", GIMP_STOCK_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_STOCK_DUPLICATE,
     NC_("edit-action", "_Copy Named..."), NULL,
     NC_("edit-action", "Copy the selected pixels to a named buffer"),
     G_CALLBACK (edit_named_copy_cmd_callback),
@@ -176,13 +176,13 @@ static const GimpActionEntry edit_actions[] =
     G_CALLBACK (edit_named_copy_visible_cmd_callback),
     GIMP_HELP_BUFFER_COPY },
 
-  { "edit-named-paste", "edit-paste",
+  { "edit-named-paste", GIMP_STOCK_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_STOCK_EDIT_CLEAR,
     NC_("edit-action", "Cl_ear"), "Delete",
     NC_("edit-action", "Clear the selected pixels"),
     G_CALLBACK (edit_clear_cmd_callback),
@@ -203,7 +203,7 @@ static const GimpEnumActionEntry edit_fill_actions[] =
     GIMP_FILL_BACKGROUND, FALSE,
     GIMP_HELP_EDIT_FILL_BG },
 
-  { "edit-fill-pattern", GIMP_STOCK_TOOL_BUCKET_FILL,
+  { "edit-fill-pattern", GIMP_STOCK_PATTERN,
     NC_("edit-action", "Fill _with Pattern"), "<primary>semicolon",
     NC_("edit-action", "Fill the selection using the active pattern"),
     GIMP_FILL_PATTERN, FALSE,

app/actions/error-console-actions.c

@@ -40,7 +40,7 @@ static const GimpActionEntry error_console_actions[] =
     NC_("error-console-action", "Error Console Menu"), NULL, NULL, NULL,
     GIMP_HELP_ERRORS_DIALOG },
 
-  { "error-console-clear", "edit-clear",
+  { "error-console-clear", GIMP_STOCK_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_STOCK_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_STOCK_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,

app/actions/file-actions.c

@@ -72,7 +72,7 @@ static const GimpActionEntry file_actions[] =
   { "file-create-menu",      NULL, NC_("file-action", "Crea_te")      },
   { "file-open-recent-menu", NULL, NC_("file-action", "Open _Recent") },
 
-  { "file-open", "document-open",
+  { "file-open", GIMP_STOCK_IMAGE_OPEN,
     NC_("file-action", "_Open..."), "<primary>O",
     NC_("file-action", "Open an image file"),
     G_CALLBACK (file_open_cmd_callback),
@@ -96,31 +96,31 @@ static const GimpActionEntry file_actions[] =
     G_CALLBACK (file_create_template_cmd_callback),
     GIMP_HELP_FILE_CREATE_TEMPLATE },
 
-  { "file-revert", "document-revert",
+  { "file-revert", GIMP_STOCK_IMAGE_RELOAD,
     NC_("file-action", "Re_vert"), NULL,
     NC_("file-action", "Reload the image file from disk"),
     G_CALLBACK (file_revert_cmd_callback),
     GIMP_HELP_FILE_REVERT },
 
-  { "file-close-all", "window-close",
+  { "file-close-all", GIMP_STOCK_CLOSE_ALL,
     NC_("file-action", "Close all"), "<primary><shift>W",
     NC_("file-action", "Close all opened images"),
     G_CALLBACK (file_close_all_cmd_callback),
     GIMP_HELP_FILE_CLOSE_ALL },
 
-  { "file-copy-location", "edit-copy",
+  { "file-copy-location", GIMP_STOCK_CLIPBOARD,
     NC_("file-action", "Copy _Image Location"), NULL,
     NC_("file-action", "Copy image file location to clipboard"),
     G_CALLBACK (file_copy_location_cmd_callback),
     GIMP_HELP_FILE_COPY_LOCATION },
 
-  { "file-show-in-file-manager", "gtk-directory",
+  { "file-show-in-file-manager", GIMP_STOCK_FILE_MANAGER,
     NC_("file-action", "Show in _File Manager"), "<primary><alt>F",
     NC_("file-action", "Show image file location in the file manager"),
     G_CALLBACK (file_show_in_file_manager_cmd_callback),
     GIMP_HELP_FILE_SHOW_IN_FILE_MANAGER },
 
-  { "file-quit", "application-exit",
+  { "file-quit", GIMP_STOCK_QUIT,
     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_STOCK_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_STOCK_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-open";
       entries[i].label          = entries[i].name;
       entries[i].tooltip        = NULL;
       entries[i].value          = i;

app/actions/filters-actions.c

@@ -535,7 +535,7 @@ static const GimpStringActionEntry filters_actions[] =
 
 static const GimpEnumActionEntry filters_repeat_actions[] =
 {
-  { "filters-repeat", "system-run",
+  { "filters-repeat", GIMP_STOCK_REPEAT_FILTER,
     NC_("filters-action", "Re_peat Last"), "<primary>F",
     NC_("filters-action",
         "Rerun the last used filter using the same settings"),

app/actions/fonts-actions.c

@@ -44,7 +44,7 @@ static const GimpActionEntry fonts_actions[] =
     NC_("fonts-action", "Fonts Menu"), NULL, NULL, NULL,
     GIMP_HELP_FONT_DIALOG },
 
-  { "fonts-refresh", "view-refresh",
+  { "fonts-refresh", GIMP_STOCK_VIEW_REFRESH,
     NC_("fonts-action", "_Rescan Font List"), NULL,
     NC_("fonts-action", "Rescan the installed fonts"),
     G_CALLBACK (fonts_refresh_cmd_callback),

app/actions/gradient-editor-actions.c

@@ -48,16 +48,16 @@ static const GimpActionEntry gradient_editor_actions[] =
 
   { "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_STOCK_REVERT,
     NC_("gradient-editor-action", "_Load Left Color From") },
-  { "gradient-editor-save-left-color", "document-save",
+  { "gradient-editor-save-left-color", GIMP_STOCK_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_STOCK_REVERT,
     NC_("gradient-editor-action", "Load Right Color Fr_om") },
-  { "gradient-editor-save-right-color", "document-save",
+  { "gradient-editor-save-right-color", GIMP_STOCK_SAVE,
     NC_("gradient-editor-action", "Sa_ve Right Color To") },
 
   { "gradient-editor-blending-func", NULL, "blending-function" },
@@ -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_STOCK_DELETE,
     "delete", "", NULL,
     G_CALLBACK (gradient_editor_delete_cmd_callback),
     GIMP_HELP_GRADIENT_EDITOR_DELETE },
@@ -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_STOCK_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_STOCK_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_STOCK_ZOOM_FIT_BEST,
     N_("Zoom All"), NULL,
     N_("Zoom all"),
     GIMP_ZOOM_OUT_MAX, FALSE,

app/actions/gradients-actions.c

@@ -44,7 +44,7 @@ static const GimpActionEntry gradients_actions[] =
     NC_("gradients-action", "Gradients Menu"), NULL, NULL, NULL,
     GIMP_HELP_GRADIENT_DIALOG },
 
-  { "gradients-new", "document-new",
+  { "gradients-new", GIMP_STOCK_DOCUMENT_NEW,
     NC_("gradients-action", "_New Gradient"), NULL,
     NC_("gradients-action", "Create a new gradient"),
     G_CALLBACK (data_new_cmd_callback),
@@ -56,31 +56,31 @@ static const GimpActionEntry gradients_actions[] =
     G_CALLBACK (data_duplicate_cmd_callback),
     GIMP_HELP_GRADIENT_DUPLICATE },
 
-  { "gradients-copy-location", "edit-copy",
+  { "gradients-copy-location", GIMP_STOCK_CLIPBOARD,
     NC_("gradients-action", "Copy Gradient _Location"), NULL,
     NC_("gradients-action", "Copy gradient file location to clipboard"),
     G_CALLBACK (data_copy_location_cmd_callback),
     GIMP_HELP_GRADIENT_COPY_LOCATION },
 
-  { "gradients-show-in-file-manager", "gtk-directory",
+  { "gradients-show-in-file-manager", GIMP_STOCK_FILE_MANAGER,
     NC_("gradients-action", "Show in _File Manager"), NULL,
     NC_("gradients-action", "Show gradient file location in the file manager"),
     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_STOCK_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_STOCK_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_STOCK_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_STOCK_EDIT,
     NC_("gradients-action", "_Edit Gradient..."), NULL,
     NC_("gradients-action", "Edit gradient"),
     "gimp-gradient-editor",

app/actions/help-actions.c

@@ -37,13 +37,13 @@ static const GimpActionEntry help_actions[] =
 {
   { "help-menu", NULL, NC_("help-action", "_Help") },
 
-  { "help-help", "help-browser",
+  { "help-help", GIMP_STOCK_PREFS_HELP_SYSTEM,
     NC_("help-action", "_Help"), "F1",
     NC_("help-action", "Open the GIMP user manual"),
     G_CALLBACK (help_help_cmd_callback),
     GIMP_HELP_HELP },
 
-  { "help-context-help", "help-browser",
+  { "help-context-help", GIMP_STOCK_PREFS_HELP_SYSTEM,
     NC_("help-action", "_Context Help"), "<shift>F1",
     NC_("help-action", "Show the help for a specific user interface item"),
     G_CALLBACK (help_context_help_cmd_callback),

app/actions/image-actions.c

@@ -70,7 +70,7 @@ 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_STOCK_IMAGE,
     NC_("image-action", "_New..."), "<primary>N",
     NC_("image-action", "Create a new image"),
     G_CALLBACK (image_new_cmd_callback),
@@ -166,7 +166,7 @@ static const GimpActionEntry image_actions[] =
     G_CALLBACK (image_configure_grid_cmd_callback),
     GIMP_HELP_IMAGE_GRID },
 
-  { "image-properties", "dialog-information",
+  { "image-properties", GIMP_STOCK_INFORMATION,
     NC_("image-action", "Image Pr_operties"), "<alt>Return",
     NC_("image-action", "Display information about this image"),
     G_CALLBACK (image_properties_cmd_callback),

app/actions/images-actions.c

@@ -43,19 +43,19 @@ static const GimpActionEntry images_actions[] =
     NC_("images-action", "Images Menu"), NULL, NULL, NULL,
     GIMP_HELP_IMAGE_DIALOG },
 
-  { "images-raise-views", "go-top",
+  { "images-raise-views", GIMP_STOCK_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_STOCK_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_STOCK_DELETE,
     NC_("images-action", "_Delete Image"), NULL,
     NC_("images-action", "Delete this image"),
     G_CALLBACK (images_delete_image_cmd_callback),

app/actions/layers-actions.c

@@ -72,19 +72,19 @@ static const GimpActionEntry layers_actions[] =
     G_CALLBACK (layers_text_tool_cmd_callback),
     GIMP_HELP_TOOL_TEXT },
 
-  { "layers-edit-attributes", "gtk-edit",
+  { "layers-edit-attributes", GIMP_STOCK_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_STOCK_LAYER_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_STOCK_LAYER_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),
@@ -97,7 +97,7 @@ static const GimpActionEntry layers_actions[] =
     G_CALLBACK (layers_new_from_visible_cmd_callback),
     GIMP_HELP_LAYER_NEW_FROM_VISIBLE },
 
-  { "layers-new-group", "folder",
+  { "layers-new-group", GIMP_STOCK_LAYER_GROUP_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),
@@ -110,31 +110,31 @@ static const GimpActionEntry layers_actions[] =
     G_CALLBACK (layers_duplicate_cmd_callback),
     GIMP_HELP_LAYER_DUPLICATE },
 
-  { "layers-delete", "edit-delete",
+  { "layers-delete", GIMP_STOCK_LAYER_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_STOCK_LAYER_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_STOCK_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_STOCK_LAYER_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_STOCK_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),
@@ -248,7 +248,7 @@ static const GimpToggleActionEntry layers_toggle_actions[] =
     FALSE,
     GIMP_HELP_LAYER_LOCK_ALPHA },
 
-  { "layers-mask-edit", "gtk-edit",
+  { "layers-mask-edit", GIMP_STOCK_EDIT,
     NC_("layers-action", "_Edit Layer Mask"), NULL,
     NC_("layers-action", "Work on the layer mask"),
     G_CALLBACK (layers_mask_edit_cmd_callback),
@@ -277,7 +277,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_STOCK_DELETE,
     NC_("layers-action", "Delete Layer Mas_k"), NULL,
     NC_("layers-action", "Remove the layer mask and its effect"),
     GIMP_MASK_DISCARD, FALSE,

app/actions/layers-commands.c

@@ -211,7 +211,7 @@ layers_edit_attributes_cmd_callback (GtkAction *action,
                                      layer_fill_type,
                                      _("Layer Attributes"),
                                      "gimp-layer-edit",
-                                     "gtk-edit",
+                                     GIMP_STOCK_EDIT,
                                      _("Edit Layer Attributes"),
                                      GIMP_HELP_LAYER_EDIT);
 

app/actions/mypaint-brushes-actions.c

@@ -43,7 +43,7 @@ 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_STOCK_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),
@@ -55,25 +55,25 @@ static const GimpActionEntry mypaint_brushes_actions[] =
     G_CALLBACK (data_duplicate_cmd_callback),
     GIMP_HELP_MYPAINT_BRUSH_DUPLICATE },
 
-  { "mypaint-brushes-copy-location", "edit-copy",
+  { "mypaint-brushes-copy-location", GIMP_STOCK_CLIPBOARD,
     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),
     GIMP_HELP_MYPAINT_BRUSH_COPY_LOCATION },
 
-  { "mypaint-brushes-show-in-file-manager", "gtk-directory",
+  { "mypaint-brushes-show-in-file-manager", GIMP_STOCK_FILE_MANAGER,
     NC_("mypaint-brushes-action", "Show in _File Manager"), NULL,
     NC_("mypaint-brushes-action", "Show MyPaint brush file location in the file manager"),
     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_STOCK_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_STOCK_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_STOCK_EDIT,
     NC_("mypaint-brushes-action", "_Edit MyPaint Brush..."), NULL,
     NC_("mypaint-brushes-action", "Edit MyPaint brush"),
     "gimp-mybrush-editor",

app/actions/palette-editor-actions.c

@@ -44,13 +44,13 @@ static const GimpActionEntry palette_editor_actions[] =
     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_STOCK_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_STOCK_DELETE,
     NC_("palette-editor-action", "_Delete Color"), NULL,
     NC_("palette-editor-action", "Delete this entry"),
     G_CALLBACK (palette_editor_delete_color_cmd_callback),
@@ -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_STOCK_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_STOCK_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_STOCK_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_STOCK_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_STOCK_ZOOM_FIT_BEST,
     N_("Zoom _All"), NULL,
     N_("Zoom all"),
     GIMP_ZOOM_OUT_MAX, FALSE,

app/actions/palettes-actions.c

@@ -44,13 +44,13 @@ static const GimpActionEntry palettes_actions[] =
     NC_("palettes-action", "Palettes Menu"), NULL, NULL, NULL,
     GIMP_HELP_PALETTE_DIALOG },
 
-  { "palettes-new", "document-new",
+  { "palettes-new", GIMP_STOCK_DOCUMENT_NEW,
     NC_("palettes-action", "_New Palette"), NULL,
     NC_("palettes-action", "Create a new palette"),
     G_CALLBACK (data_new_cmd_callback),
     GIMP_HELP_PALETTE_NEW },
 
-  { "palettes-import", "gtk-convert",
+  { "palettes-import", GIMP_STOCK_PALETTE,
     NC_("palettes-action", "_Import Palette..."), NULL,
     NC_("palettes-action", "Import palette"),
     G_CALLBACK (palettes_import_cmd_callback),
@@ -68,25 +68,25 @@ static const GimpActionEntry palettes_actions[] =
     G_CALLBACK (palettes_merge_cmd_callback),
     GIMP_HELP_PALETTE_MERGE },
 
-  { "palettes-copy-location", "edit-copy",
+  { "palettes-copy-location", GIMP_STOCK_CLIPBOARD,
     NC_("palettes-action", "Copy Palette _Location"), NULL,
     NC_("palettes-action", "Copy palette file location to clipboard"),
     G_CALLBACK (data_copy_location_cmd_callback),
     GIMP_HELP_PALETTE_COPY_LOCATION },
 
-  { "palettes-show-in-file-manager", "gtk-directory",
+  { "palettes-show-in-file-manager", GIMP_STOCK_FILE_MANAGER,
     NC_("palettes-action", "Show in _File Manager"), NULL,
     NC_("palettes-action", "Show palette file location in the file manager"),
     G_CALLBACK (data_show_in_file_manager_cmd_callback),
     GIMP_HELP_PALETTE_SHOW_IN_FILE_MANAGER },
 
-  { "palettes-delete", "edit-delete",
+  { "palettes-delete", GIMP_STOCK_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_STOCK_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_STOCK_EDIT,
     NC_("palettes-action", "_Edit Palette..."), NULL,
     NC_("palettes-action", "Edit palette"),
     "gimp-palette-editor",

app/actions/patterns-actions.c

@@ -43,13 +43,13 @@ static const GimpActionEntry patterns_actions[] =
     NC_("patterns-action", "Patterns Menu"), NULL, NULL, NULL,
     GIMP_HELP_PATTERN_DIALOG },
 
-  { "patterns-open-as-image", "document-open",
+  { "patterns-open-as-image", GIMP_STOCK_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_STOCK_DOCUMENT_NEW,
     NC_("patterns-action", "_New Pattern"), NULL,
     NC_("patterns-action", "Create a new pattern"),
     G_CALLBACK (data_new_cmd_callback),
@@ -61,25 +61,25 @@ static const GimpActionEntry patterns_actions[] =
     G_CALLBACK (data_duplicate_cmd_callback),
     GIMP_HELP_PATTERN_DUPLICATE },
 
-  { "patterns-copy-location", "edit-copy",
+  { "patterns-copy-location", GIMP_STOCK_CLIPBOARD,
     NC_("patterns-action", "Copy Pattern _Location"), NULL,
     NC_("patterns-action", "Copy pattern file location to clipboard"),
     G_CALLBACK (data_copy_location_cmd_callback),
     GIMP_HELP_PATTERN_COPY_LOCATION },
 
-  { "patterns-show-in-file-manager", "gtk-directory",
+  { "patterns-show-in-file-manager", GIMP_STOCK_FILE_MANAGER,
     NC_("patterns-action", "Show in _File Manager"), NULL,
     NC_("patterns-action", "Show pattern file location in the file manager"),
     G_CALLBACK (data_show_in_file_manager_cmd_callback),
     GIMP_HELP_PATTERN_SHOW_IN_FILE_MANAGER },
 
-  { "patterns-delete", "edit-delete",
+  { "patterns-delete", GIMP_STOCK_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_STOCK_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_STOCK_EDIT,
     NC_("patterns-action", "_Edit Pattern..."), NULL,
     NC_("patterns-action", "Edit pattern"),
     "gimp-pattern-editor",

app/actions/templates-actions.c

@@ -48,7 +48,7 @@ static const GimpActionEntry templates_actions[] =
     G_CALLBACK (templates_create_image_cmd_callback),
     GIMP_HELP_TEMPLATE_IMAGE_NEW },
 
-  { "templates-new", "document-new",
+  { "templates-new", GIMP_STOCK_DOCUMENT_NEW,
     NC_("templates-action", "_New Template..."), NULL,
     NC_("templates-action", "Create a new template"),
     G_CALLBACK (templates_new_cmd_callback),
@@ -60,13 +60,13 @@ static const GimpActionEntry templates_actions[] =
     G_CALLBACK (templates_duplicate_cmd_callback),
     GIMP_HELP_TEMPLATE_DUPLICATE },
 
-  { "templates-edit", "gtk-edit",
+  { "templates-edit", GIMP_STOCK_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_STOCK_DELETE,
     NC_("templates-action", "_Delete Template"), NULL,
     NC_("templates-action", "Delete this template"),
     G_CALLBACK (templates_delete_cmd_callback),

app/actions/templates-commands.c

@@ -182,7 +182,7 @@ templates_edit_cmd_callback (GtkAction *action,
                                              GTK_WIDGET (editor),
                                              _("Edit Template"),
                                              "gimp-template-edit",
-                                             "gtk-edit",
+                                             GIMP_STOCK_EDIT,
                                              _("Edit Template"),
                                              GIMP_HELP_TEMPLATE_EDIT);
 
@@ -218,7 +218,7 @@ templates_delete_cmd_callback (GtkAction *action,
       delete_data->template  = template;
 
       dialog =
-        gimp_message_dialog_new (_("Delete Template"), "edit-delete",
+        gimp_message_dialog_new (_("Delete Template"), GIMP_STOCK_DELETE,
                                  GTK_WIDGET (editor), 0,
                                  gimp_standard_help_func, NULL,
 

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_STOCK_EDIT,
     "Text Editor Toolbar", NULL, NULL, NULL,
     GIMP_HELP_TEXT_EDITOR_DIALOG },
 
-  { "text-editor-load", "document-open",
+  { "text-editor-load", GIMP_STOCK_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_STOCK_EDIT_CLEAR,
     NC_("text-editor-action", "Clear"), NULL,
     NC_("text-editor-action", "Clear all text"),
     G_CALLBACK (text_editor_clear_cmd_callback),

app/actions/text-tool-actions.c

@@ -54,32 +54,32 @@ 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_STOCK_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_STOCK_DUPLICATE,
     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_STOCK_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_STOCK_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_STOCK_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_STOCK_EDIT_CLEAR,
     NC_("text-tool-action", "Cl_ear"), NULL,
     NC_("text-tool-action", "Clear all text"),
     G_CALLBACK (text_tool_clear_cmd_callback),

app/actions/tool-options-actions.c

@@ -57,23 +57,23 @@ static const GimpActionEntry tool_options_actions[] =
     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_STOCK_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_STOCK_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_STOCK_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_STOCK_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_STOCK_DOCUMENT_NEW,
     NC_("tool-options-action", "_New Tool Preset..."), "", NULL,
     G_CALLBACK (tool_options_save_new_preset_cmd_callback),
     GIMP_HELP_TOOL_OPTIONS_SAVE },

app/actions/tool-presets-actions.c

@@ -46,7 +46,7 @@ static const GimpActionEntry tool_presets_actions[] =
     NC_("tool-presets-action", "Tool Presets Menu"), NULL, NULL, NULL,
     GIMP_HELP_TOOL_PRESET_DIALOG },
 
-  { "tool-presets-new", "document-new",
+  { "tool-presets-new", GIMP_STOCK_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),
@@ -58,31 +58,31 @@ static const GimpActionEntry tool_presets_actions[] =
     G_CALLBACK (data_duplicate_cmd_callback),
     GIMP_HELP_TOOL_PRESET_DUPLICATE },
 
-  { "tool-presets-copy-location", "edit-copy",
+  { "tool-presets-copy-location", GIMP_STOCK_CLIPBOARD,
     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),
     GIMP_HELP_TOOL_PRESET_COPY_LOCATION },
 
-  { "tool-presets-show-in-file-manager", "gtk-directory",
+  { "tool-presets-show-in-file-manager", GIMP_STOCK_FILE_MANAGER,
     NC_("tool-presets-action", "Show in _File Manager"), NULL,
     NC_("tool-presets-action", "Show tool preset file location in the file manager"),
     G_CALLBACK (data_show_in_file_manager_cmd_callback),
     GIMP_HELP_TOOL_PRESET_SHOW_IN_FILE_MANAGER },
 
-  { "tool-presets-restore", "document-revert",
+  { "tool-presets-restore", GIMP_STOCK_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_STOCK_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_STOCK_VIEW_REFRESH,
     NC_("tool-presets-action", "_Refresh Tool Presets"), NULL,
     NC_("tool-presets-action", "Refresh tool presets"),
     G_CALLBACK (data_refresh_cmd_callback),
@@ -91,7 +91,7 @@ static const GimpActionEntry tool_presets_actions[] =
 
 static const GimpStringActionEntry tool_presets_edit_actions[] =
 {
-  { "tool-presets-edit", "gtk-edit",
+  { "tool-presets-edit", GIMP_STOCK_EDIT,
     NC_("tool-presets-action", "_Edit Tool Preset..."), NULL,
     NC_("tool-presets-action", "Edit this tool preset"),
     "gimp-tool-preset-editor",

app/actions/vectors-actions.c

@@ -49,19 +49,19 @@ static const GimpActionEntry vectors_actions[] =
     G_CALLBACK (vectors_vectors_tool_cmd_callback),
     GIMP_HELP_TOOL_VECTORS },
 
-  { "vectors-edit-attributes", "gtk-edit",
+  { "vectors-edit-attributes", GIMP_STOCK_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_STOCK_PATH_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_STOCK_PATH_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),
@@ -73,7 +73,7 @@ static const GimpActionEntry vectors_actions[] =
     G_CALLBACK (vectors_duplicate_cmd_callback),
     GIMP_HELP_PATH_DUPLICATE },
 
-  { "vectors-delete", "edit-delete",
+  { "vectors-delete", GIMP_STOCK_PATH_DELETE,
     NC_("vectors-action", "_Delete Path"), NULL,
     NC_("vectors-action", "Delete this path"),
     G_CALLBACK (vectors_delete_cmd_callback),
@@ -84,25 +84,25 @@ static const GimpActionEntry vectors_actions[] =
     G_CALLBACK (vectors_merge_visible_cmd_callback),
     GIMP_HELP_PATH_MERGE_VISIBLE },
 
-  { "vectors-raise", "go-up",
+  { "vectors-raise", GIMP_STOCK_PATH_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_STOCK_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_STOCK_PATH_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_STOCK_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),
@@ -132,22 +132,22 @@ static const GimpActionEntry vectors_actions[] =
     G_CALLBACK (vectors_stroke_last_vals_cmd_callback),
     GIMP_HELP_PATH_STROKE },
 
-  { "vectors-copy", "edit-copy",
+  { "vectors-copy", GIMP_STOCK_CLIPBOARD,
     NC_("vectors-action", "Co_py Path"), "", NULL,
     G_CALLBACK (vectors_copy_cmd_callback),
     GIMP_HELP_PATH_COPY },
 
-  { "vectors-paste", "edit-paste",
+  { "vectors-paste", GIMP_STOCK_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_STOCK_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_STOCK_OPEN,
     NC_("vectors-action", "I_mport Path..."), "", NULL,
     G_CALLBACK (vectors_import_cmd_callback),
     GIMP_HELP_PATH_IMPORT }

app/actions/vectors-commands.c

@@ -138,7 +138,7 @@ vectors_edit_attributes_cmd_callback (GtkAction *action,
                                         gimp_object_get_name (vectors),
                                         _("Path Attributes"),
                                         "gimp-vectors-edit",
-                                        "gtk-edit",
+                                        GIMP_STOCK_EDIT,
                                         _("Edit Path Attributes"),
                                         GIMP_HELP_PATH_EDIT);
 

app/actions/view-actions.c

@@ -85,31 +85,31 @@ static const GimpActionEntry view_actions[] =
     NC_("view-action", "Move to Screen"), NULL, NULL, NULL,
     GIMP_HELP_VIEW_CHANGE_SCREEN },
 
-  { "view-new", "window-new",
+  { "view-new", GIMP_STOCK_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_STOCK_QUIT,
     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_STOCK_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_STOCK_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_STOCK_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),
@@ -146,7 +146,7 @@ static const GimpActionEntry view_actions[] =
     G_CALLBACK (view_color_management_reset_cmd_callback),
     GIMP_HELP_VIEW_COLOR_MANAGEMENT },
 
-  { "view-shrink-wrap", "zoom-fit-best",
+  { "view-shrink-wrap", GIMP_STOCK_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),
@@ -295,7 +295,7 @@ static const GimpToggleActionEntry view_toggle_actions[] =
     TRUE,
     GIMP_HELP_VIEW_SHOW_STATUSBAR },
 
-  { "view-fullscreen", "view-fullscreen",
+  { "view-fullscreen", GIMP_STOCK_VIEW_FULLSCREEN,
     NC_("view-action", "Fullscr_een"), "F11",
     NC_("view-action", "Toggle fullscreen view"),
     G_CALLBACK (view_fullscreen_cmd_callback),
@@ -310,23 +310,23 @@ static const GimpEnumActionEntry view_zoom_actions[] =
     GIMP_ACTION_SELECT_SET, TRUE,
     NULL },
 
-  { "view-zoom-minimum", "zoom-out",
+  { "view-zoom-minimum", GIMP_STOCK_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_STOCK_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_STOCK_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_STOCK_ZOOM_IN,
     NC_("view-zoom-action", "Zoom _In"), "plus",
     NC_("view-zoom-action", "Zoom in"),
     GIMP_ACTION_SELECT_NEXT, FALSE,
@@ -344,12 +344,12 @@ static const GimpEnumActionEntry view_zoom_actions[] =
     GIMP_ACTION_SELECT_NEXT, FALSE,
     GIMP_HELP_VIEW_ZOOM_IN },
 
-  { "view-zoom-out-skip", "zoom-out",
+  { "view-zoom-out-skip", GIMP_STOCK_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_STOCK_ZOOM_IN,
     "Zoom in a lot", NULL, NULL,
     GIMP_ACTION_SELECT_SKIP_NEXT, FALSE,
     GIMP_HELP_VIEW_ZOOM_IN }
@@ -405,13 +405,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_STOCK_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_STOCK_ZOOM_ORIGINAL,
     NC_("view-zoom-action", "_1:1  (100%)"), "KP_1",
     NC_("view-zoom-action", "Zoom 1:1"),
     10000,
@@ -585,7 +585,7 @@ 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_STOCK_TOOL_BY_COLOR_SELECT,
     NC_("view-padding-color", "_Custom Color..."), NULL,
     NC_("view-padding-color", "Use an arbitrary color"),
     GIMP_CANVAS_PADDING_MODE_CUSTOM, FALSE,

app/actions/view-commands.c

@@ -948,7 +948,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_STOCK_TOOL_BY_COLOR_SELECT,
                                      _("Set Custom Canvas Padding Color"),
                                      GTK_WIDGET (shell),
                                      NULL, NULL,

app/actions/windows-actions.c

@@ -135,22 +135,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_STOCK_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_STOCK_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_STOCK_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_STOCK_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 },

app/core/gimpgrouplayer.c

@@ -209,7 +209,7 @@ gimp_group_layer_class_init (GimpGroupLayerClass *klass)
 
   gimp_object_class->get_memsize    = gimp_group_layer_get_memsize;
 
-  viewable_class->default_icon_name = "gtk-directory";
+  viewable_class->default_icon_name = "gimp-group-layer";
   viewable_class->get_size          = gimp_group_layer_get_size;
   viewable_class->get_children      = gimp_group_layer_get_children;
   viewable_class->set_expanded      = gimp_group_layer_set_expanded;

app/core/gimpundo.c

@@ -137,7 +137,7 @@ gimp_undo_class_init (GimpUndoClass *klass)
 
   gimp_object_class->get_memsize    = gimp_undo_get_memsize;
 
-  viewable_class->default_icon_name = "edit-undo";
+  viewable_class->default_icon_name = "gimp-undo";
   viewable_class->get_popup_size    = gimp_undo_get_popup_size;
   viewable_class->get_new_preview   = gimp_undo_get_new_preview;
 

app/dialogs/data-delete-dialog.c

@@ -79,7 +79,7 @@ data_delete_dialog_new (GimpDataFactory *factory,
   delete_data->context = context;
   delete_data->parent  = parent;
 
-  dialog = gimp_message_dialog_new (_("Delete Object"), "edit-delete",
+  dialog = gimp_message_dialog_new (_("Delete Object"), GIMP_STOCK_DELETE,
                                     gtk_widget_get_toplevel (parent), 0,
                                     gimp_standard_help_func, NULL,
 

app/dialogs/dialogs.c

@@ -346,7 +346,7 @@ static const GimpDialogFactoryEntry entries[] =
             N_("Buffers"), NULL, GIMP_STOCK_BUFFER,
             GIMP_HELP_BUFFER_DIALOG, GIMP_VIEW_SIZE_MEDIUM),
   LISTGRID (document, document,
-            N_("History"), N_("Document History"), "document-open-recent",
+            N_("History"), N_("Document History"), GIMP_STOCK_DOCUMENT_RECENT,
             GIMP_HELP_DOCUMENT_DIALOG, GIMP_VIEW_SIZE_LARGE),
   LISTGRID (template, template,
             N_("Templates"), N_("Image Templates"), GIMP_STOCK_TEMPLATE,

app/dialogs/fade-dialog.c

@@ -112,7 +112,7 @@ fade_dialog_new (GimpImage *image,
   dialog = gimp_viewable_dialog_new (GIMP_VIEWABLE (drawable),
                                      private->context,
                                      title, "gimp-edit-fade",
-                                     "edit-undo", title,
+                                     GIMP_STOCK_UNDO, title,
                                      parent,
                                      gimp_standard_help_func,
                                      GIMP_HELP_EDIT_FADE,

app/dialogs/image-properties-dialog.c

@@ -59,7 +59,7 @@ image_properties_dialog_new (GimpImage   *image,
   dialog = gimp_viewable_dialog_new (GIMP_VIEWABLE (image), context,
                                      _("Image Properties"),
                                      "gimp-image-properties",
-                                     "dialog-information",
+                                      GIMP_STOCK_INFORMATION,
                                      _("Image Properties"),
                                      parent,
                                      gimp_standard_help_func,

app/dialogs/palette-import-dialog.c

@@ -163,7 +163,7 @@ palette_import_dialog_new (GimpContext *context)
   button = gtk_dialog_add_button (GTK_DIALOG (dialog->dialog),
                                   _("_Import"), GTK_RESPONSE_OK);
   gtk_button_set_image (GTK_BUTTON (button),
-                        gtk_image_new_from_icon_name ("gtk-convert",
+                        gtk_image_new_from_icon_name (GIMP_STOCK_PALETTE,
                                                       GTK_ICON_SIZE_BUTTON));
 
   gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog->dialog),

app/dialogs/preferences-dialog.c

@@ -1529,7 +1529,7 @@ prefs_dialog_new (Gimp       *gimp,
                           _("_Save tool options on exit"),
                           GTK_BOX (vbox2));
 
-  button = prefs_button_add ("document-save",
+  button = prefs_button_add (GIMP_STOCK_SAVE,
                              _("Save Tool Options _Now"),
                              GTK_BOX (vbox2));
   g_signal_connect (button, "clicked",
@@ -1704,7 +1704,7 @@ prefs_dialog_new (Gimp       *gimp,
                           _("_Use dynamic keyboard shortcuts"),
                           GTK_BOX (vbox2));
 
-  button = prefs_button_add ("preferences-system",
+  button = prefs_button_add (GIMP_STOCK_PREFS_SYSTEM,
                              _("Configure _Keyboard Shortcuts..."),
                              GTK_BOX (vbox2));
   g_signal_connect (button, "clicked",
@@ -1715,7 +1715,7 @@ prefs_dialog_new (Gimp       *gimp,
                           _("_Save keyboard shortcuts on exit"),
                           GTK_BOX (vbox2));
 
-  button = prefs_button_add ("document-save",
+  button = prefs_button_add (GIMP_STOCK_SAVE,
                              _("Save Keyboard Shortcuts _Now"),
                              GTK_BOX (vbox2));
   g_signal_connect (button, "clicked",
@@ -1731,7 +1731,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_STOCK_EDIT_CLEAR,
                              _("Remove _All Keyboard Shortcuts"),
                              GTK_BOX (vbox2));
   g_signal_connect (button, "clicked",
@@ -1831,7 +1831,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_STOCK_VIEW_REFRESH,
                              _("Reload C_urrent Theme"),
                              GTK_BOX (hbox));
   g_signal_connect (button, "clicked",
@@ -2084,7 +2084,7 @@ prefs_dialog_new (Gimp       *gimp,
                          _("Maximum History Size:"),
                          GTK_TABLE (table), 0, size_group);
 
-  button = prefs_button_add ("edit-clear",
+  button = prefs_button_add (GIMP_STOCK_SHRED,
                              _("Clear Action History"),
                              GTK_BOX (vbox2));
   g_signal_connect (button, "clicked",
@@ -2256,7 +2256,7 @@ 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_STOCK_SAVE,
                              _("Save Window Positions _Now"),
                              GTK_BOX (vbox2));
   g_signal_connect (button, "clicked",
@@ -2357,7 +2357,7 @@ prefs_dialog_new (Gimp       *gimp,
   /*  Image Windows / Appearance  */
   /********************************/
   vbox = gimp_prefs_box_add_page (GIMP_PREFS_BOX (prefs_box),
-                                  "gimp-prefs-image-windows",
+                                  "gimp-prefs-image-windows-appearance",
                                   _("Image Window Appearance"),
                                   _("Appearance"),
                                   GIMP_HELP_PREFS_IMAGE_WINDOW_APPEARANCE,
@@ -2502,7 +2502,7 @@ prefs_dialog_new (Gimp       *gimp,
   /*  Image Windows / Snapping  */
   /******************************/
   vbox = gimp_prefs_box_add_page (GIMP_PREFS_BOX (prefs_box),
-                                  "gimp-prefs-tool-options",
+                                  "gimp-prefs-image-windows-snapping",
                                   _("Image Window Snapping Behavior"),
                                   _("Snapping"),
                                   GIMP_HELP_PREFS_IMAGE_WINDOW_APPEARANCE,
@@ -2543,7 +2543,7 @@ prefs_dialog_new (Gimp       *gimp,
   vbox2 = prefs_frame_new (_("Extended Input Devices"),
                            GTK_CONTAINER (vbox), FALSE);
 
-  button = prefs_button_add ("preferences-system",
+  button = prefs_button_add (GIMP_STOCK_PREFS_SYSTEM,
                              _("Configure E_xtended Input Devices..."),
                              GTK_BOX (vbox2));
   g_signal_connect (button, "clicked",
@@ -2554,7 +2554,7 @@ 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_STOCK_SAVE,
                              _("Save Input Device Settings _Now"),
                              GTK_BOX (vbox2));
   g_signal_connect (button, "clicked",

app/dialogs/quit-dialog.c

@@ -335,7 +335,7 @@ quit_close_all_dialog_container_changed (GimpContainer  *images,
 
       gtk_widget_show (dialog->lost_label);
 
-      icon = gtk_image_new_from_icon_name ("edit-delete",
+      icon = gtk_image_new_from_icon_name (GIMP_STOCK_DELETE,
                                            GTK_ICON_SIZE_BUTTON);
       g_object_set (dialog->ok_button,
                     "label",     _("_Discard Changes"),

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_STOCK_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_STOCK_NEXT,
                                                       GTK_ICON_SIZE_BUTTON));
 
   gtk_dialog_set_response_sensitive (GTK_DIALOG (tips_dialog),

app/display/gimpdisplayshell-scale-dialog.c

@@ -113,7 +113,7 @@ gimp_display_shell_scale_dialog (GimpDisplayShell *shell)
     gimp_viewable_dialog_new (GIMP_VIEWABLE (image),
                               gimp_get_user_context (shell->display->gimp),
                               _("Zoom Ratio"), "display_scale",
-                              "zoom-original",
+                              GIMP_STOCK_ZOOM_ORIGINAL,
                               _("Select Zoom Ratio"),
                               GTK_WIDGET (shell),
                               gimp_standard_help_func,

app/display/gimpstatusbar.c

@@ -278,7 +278,7 @@ gimp_statusbar_init (GimpStatusbar *statusbar)
   gtk_container_add (GTK_CONTAINER (statusbar->cancel_button), hbox2);
   gtk_widget_show (hbox2);
 
-  image = gtk_image_new_from_icon_name ("gtk-cancel", GTK_ICON_SIZE_MENU);
+  image = gtk_image_new_from_icon_name (GIMP_STOCK_CANCEL, GTK_ICON_SIZE_MENU);
   gtk_box_pack_start (GTK_BOX (hbox2), image, FALSE, FALSE, 2);
   gtk_widget_show (image);
 

app/plug-in/gimppluginprocedure.c

@@ -121,7 +121,7 @@ gimp_plug_in_procedure_class_init (GimpPlugInProcedureClass *klass)
 
   gimp_object_class->get_memsize    = gimp_plug_in_procedure_get_memsize;
 
-  viewable_class->default_icon_name = "system-run";
+  viewable_class->default_icon_name = "gimp-system-run";
   viewable_class->get_description   = gimp_plug_in_procedure_get_description;
 
   proc_class->get_label             = gimp_plug_in_procedure_get_label;

app/text/gimpfont.c

@@ -122,7 +122,7 @@ gimp_font_class_init (GimpFontClass *klass)
   viewable_class->get_popup_size    = gimp_font_get_popup_size;
   viewable_class->get_new_preview   = gimp_font_get_new_preview;
 
-  viewable_class->default_icon_name = "gtk-select-font";
+  viewable_class->default_icon_name = "gimp-font";
 
   g_object_class_install_property (object_class, PROP_PANGO_CONTEXT,
                                    g_param_spec_object ("pango-context",

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", "gimp-justify", 0, 0);
   gimp_table_attach_aligned (GTK_TABLE (table), 0, row++,
                              _("Justify:"), 0.0, 0.5,
                              box, 2, TRUE);
@@ -612,7 +612,7 @@ 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_STOCK_INDENT, 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);

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_STOCK_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_STOCK_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_STOCK_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_STOCK_DOWN,
                             _("Move the selected filter down"),
                             NULL,
                             G_CALLBACK (gimp_color_display_editor_down_clicked),

app/widgets/gimpcombotagentry.c

@@ -92,7 +92,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-down");
 
   g_signal_connect (entry, "icon-press",
                     G_CALLBACK (gimp_combo_tag_entry_icon_press),

app/widgets/gimpcontainerpopup.c

@@ -347,12 +347,12 @@ gimp_container_popup_create_view (GimpContainerPopup *popup)
 
   editor = GIMP_EDITOR (popup->editor->view);
 
-  gimp_editor_add_button (editor, "zoom-out",
+  gimp_editor_add_button (editor, GIMP_STOCK_ZOOM_OUT,
                           _("Smaller Previews"), NULL,
                           G_CALLBACK (gimp_container_popup_smaller_clicked),
                           NULL,
                           popup);
-  gimp_editor_add_button (editor, "zoom-in",
+  gimp_editor_add_button (editor, GIMP_STOCK_ZOOM_IN,
                           _("Larger Previews"), NULL,
                           G_CALLBACK (gimp_container_popup_larger_clicked),
                           NULL,

app/widgets/gimpcontrollereditor.c

@@ -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_STOCK_EDIT,
                                   title,
                                   gtk_widget_get_toplevel (GTK_WIDGET (editor)),
                                   gimp_standard_help_func,

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_STOCK_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_STOCK_PREVIOUS,
                                         GTK_ICON_SIZE_BUTTON);
   gtk_container_add (GTK_CONTAINER (list->remove_button), image);
   gtk_widget_show (image);
@@ -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_STOCK_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_STOCK_DOWN,
                             _("Move the selected controller down"),
                             NULL,
                             G_CALLBACK (gimp_controller_list_down_clicked),

app/widgets/gimpdataeditor.c

@@ -211,7 +211,7 @@ gimp_data_editor_constructed (GObject *object)
 
   editor->save_button =
     gimp_editor_add_button (GIMP_EDITOR (editor),
-                            "document-save",
+                            GIMP_STOCK_SAVE,
                             _("Save"), NULL,
                             G_CALLBACK (gimp_data_editor_save_clicked),
                             NULL,
@@ -219,7 +219,7 @@ gimp_data_editor_constructed (GObject *object)
 
   editor->revert_button =
     gimp_editor_add_button (GIMP_EDITOR (editor),
-                            "document-revert",
+                            GIMP_STOCK_REVERT,
                             _("Revert"), NULL,
                             G_CALLBACK (gimp_data_editor_revert_clicked),
                             NULL,

app/widgets/gimpdeviceeditor.c

@@ -162,7 +162,7 @@ gimp_device_editor_init (GimpDeviceEditor *editor)
 
   private->delete_button =
     gimp_editor_add_button (GIMP_EDITOR (private->treeview),
-                            "edit-delete",
+                            GIMP_STOCK_DELETE,
                             _("Delete the selected device"),
                             NULL,
                             G_CALLBACK (gimp_device_editor_delete_clicked),

app/widgets/gimpdevicestatus.c

@@ -135,7 +135,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_STOCK_SAVE,
                             _("Save device status"), NULL,
                             G_CALLBACK (gimp_device_status_save_clicked),
                             NULL,

app/widgets/gimpsearchpopup.c

@@ -263,9 +263,9 @@ gimp_search_popup_add_result (GimpSearchPopup *popup,
   if (GTK_IS_TOGGLE_ACTION (action))
     {
       if (gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action)))
-        icon_name = "gtk-ok";
+        icon_name = GIMP_STOCK_OK;
       else
-        icon_name = "gtk-no";
+        icon_name = GIMP_STOCK_NO;
     }
   else
     {
@@ -357,7 +357,7 @@ gimp_search_popup_constructed (GObject *object)
 
   popup->priv->keyword_entry = gtk_entry_new ();
   gtk_entry_set_icon_from_icon_name (GTK_ENTRY (popup->priv->keyword_entry),
-                                     GTK_ENTRY_ICON_PRIMARY, "edit-find");
+                                     GTK_ENTRY_ICON_PRIMARY, GIMP_STOCK_TOOL_ZOOM);
   gtk_box_pack_start (GTK_BOX (main_vbox),
                       popup->priv->keyword_entry,
                       FALSE, FALSE, 0);

app/widgets/gimpsettingsbox.c

@@ -284,7 +284,7 @@ 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_STOCK_NEW, GTK_ICON_SIZE_MENU);
   gtk_container_add (GTK_CONTAINER (button), image);
   gtk_widget_show (image);
 
@@ -315,20 +315,20 @@ gimp_settings_box_constructed (GObject *object)
 
   private->import_item =
     gimp_settings_box_menu_item_add (box,
-                                     "document-open",
+                                     GIMP_STOCK_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_STOCK_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_STOCK_EDIT,
                                    _("_Manage Settings..."),
                                    G_CALLBACK (gimp_settings_box_manage_activate));
 }

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_STOCK_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_STOCK_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_STOCK_DELETE,
                             _("Delete the selected settings"),
                             NULL,
                             G_CALLBACK (gimp_settings_editor_delete_clicked),

app/widgets/gimptextstyleeditor.c

@@ -240,7 +240,7 @@ gimp_text_style_editor_init (GimpTextStyleEditor *editor)
                     G_CALLBACK (gimp_text_style_editor_clear_tags),
                     editor);
 
-  image = gtk_image_new_from_icon_name ("edit-clear", GTK_ICON_SIZE_MENU);
+  image = gtk_image_new_from_icon_name (GIMP_STOCK_EDIT_CLEAR, GTK_ICON_SIZE_MENU);
   gtk_container_add (GTK_CONTAINER (editor->clear_button), image);
   gtk_widget_show (image);
 

app/widgets/gimptooleditor.c

@@ -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_STOCK_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_STOCK_DOWN,
                             _("Lower this tool"),
                             _("Lower this tool to the bottom"),
                             G_CALLBACK (gimp_tool_editor_lower_clicked),

app/widgets/gimptooloptionseditor.c

@@ -198,7 +198,7 @@ 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_STOCK_SAVE,
                             _("Save Tool Preset..."),
                             GIMP_HELP_TOOL_OPTIONS_SAVE,
                             G_CALLBACK (gimp_tool_options_editor_save_clicked),
@@ -206,7 +206,7 @@ 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_STOCK_REVERT,
                             _("Restore Tool Preset..."),
                             GIMP_HELP_TOOL_OPTIONS_RESTORE,
                             G_CALLBACK (gimp_tool_options_editor_restore_clicked),
@@ -214,7 +214,7 @@ 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_STOCK_DELETE,
                             _("Delete Tool Preset..."),
                             GIMP_HELP_TOOL_OPTIONS_DELETE,
                             G_CALLBACK (gimp_tool_options_editor_delete_clicked),

app/widgets/gimpundoeditor.c

@@ -143,11 +143,11 @@ gimp_undo_editor_constructed (GObject *object)
 
   undo_editor->undo_button =
     gimp_editor_add_action_button (GIMP_EDITOR (undo_editor), "edit",
-                                   "edit-undo", NULL);
+                                   GIMP_STOCK_UNDO, NULL);
 
   undo_editor->redo_button =
     gimp_editor_add_action_button (GIMP_EDITOR (undo_editor), "edit",
-                                   "edit-redo", NULL);
+                                   GIMP_STOCK_REDO, NULL);
 
   undo_editor->clear_button =
     gimp_editor_add_action_button (GIMP_EDITOR (undo_editor), "edit",

app/widgets/gimpviewrendererimagefile.c

@@ -186,7 +186,7 @@ gimp_view_renderer_imagefile_get_icon (GimpImagefile *imagefile,
 
   if (! pixbuf)
     {
-      const gchar *icon_name = "text-x-generic";
+      const gchar *icon_name = GIMP_STOCK_DOCUMENT;
 
       if (thumbnail->image_state == GIMP_THUMB_STATE_FOLDER)
         icon_name = "folder";

etc/templaterc

@@ -1,6 +1,6 @@
-# GIMP templates
+# GIMP templaterc
 # 
-# A collection of image templates.
+# This file will be entirely rewritten each time you exit.
 
 (GimpTemplate "640x480"
     (width 640)
@@ -38,7 +38,7 @@
     (resolution-unit inches)
     (image-type rgb)
     (fill-type background-fill))
-(GimpTemplate "A3 (300ppi)"
+(GimpTemplate "A3 (300 ppi)"
     (width 3508)
     (height 4960)
     (unit millimeters)
@@ -47,7 +47,7 @@
     (resolution-unit inches)
     (image-type rgb)
     (fill-type background-fill))
-(GimpTemplate "A4 (300ppi)"
+(GimpTemplate "A4 (300 ppi)"
     (width 2480)
     (height 3508)
     (unit millimeters)
@@ -56,8 +56,8 @@
     (resolution-unit inches)
     (image-type rgb)
     (fill-type background-fill))
-(GimpTemplate "A5 (300ppi)"
-    (width 1754)
+(GimpTemplate "A5 (300 ppi)"
+    (width 1748)
     (height 2480)
     (unit millimeters)
     (xresolution 300.000000)
@@ -65,16 +65,16 @@
     (resolution-unit inches)
     (image-type rgb)
     (fill-type background-fill))
-(GimpTemplate "A6 (300ppi)"
+(GimpTemplate "A6 (300 ppi)"
     (width 1240)
-    (height 1754)
+    (height 1748)
     (unit millimeters)
     (xresolution 300.000000)
     (yresolution 300.000000)
     (resolution-unit inches)
     (image-type rgb)
     (fill-type background-fill))
-(GimpTemplate "B4 (300ppi)"
+(GimpTemplate "B4 (300 ppi)"
     (width 2953)
     (height 4169)
     (unit millimeters)
@@ -83,7 +83,7 @@
     (resolution-unit inches)
     (image-type rgb)
     (fill-type background-fill))
-(GimpTemplate "B5 (300ppi)"
+(GimpTemplate "B5 (300 ppi)"
     (width 2079)
     (height 2953)
     (unit millimeters)
@@ -92,7 +92,7 @@
     (resolution-unit inches)
     (image-type rgb)
     (fill-type background-fill))
-(GimpTemplate "B5-Japan (300ppi)"
+(GimpTemplate "B5-Japan (300 ppi)"
     (width 2150)
     (height 3035)
     (unit millimeters)
@@ -101,7 +101,7 @@
     (resolution-unit inches)
     (image-type rgb)
     (fill-type background-fill))
-(GimpTemplate "US-Letter (300ppi)"
+(GimpTemplate "US-Letter (300 ppi)"
     (width 2550)
     (height 3300)
     (unit inches)
@@ -110,7 +110,7 @@
     (resolution-unit inches)
     (image-type rgb)
     (fill-type background-fill))
-(GimpTemplate "US-Legal (300ppi)"
+(GimpTemplate "US-Legal (300 ppi)"
     (width 2550)
     (height 4200)
     (unit inches)
@@ -118,8 +118,118 @@
     (yresolution 300.000000)
     (resolution-unit inches)
     (image-type rgb)
+   (fill-type background-fill))
+(GimpTemplate "88.9x50.8 US Business Card"
+    (icon-name "gimp-business-card")
+    (width 1050)
+    (height 600)
+    (unit millimeters)
+    (xresolution 300.000000)
+    (yresolution 300.000000)
+    (resolution-unit inches)
+    (image-type rgb)
     (fill-type background-fill))
-(GimpTemplate "Toilet paper (US, 300ppi)"
+(GimpTemplate "85x55 Western Europe Business Card"
+    (icon-name "gimp-business-card")
+    (width 1004)
+    (height 650)
+    (unit millimeters)
+    (xresolution 300.000000)
+    (yresolution 300.000000)
+    (resolution-unit inches)
+    (image-type rgb)
+    (fill-type background-fill))
+(GimpTemplate "90x50 Eastern Europe Business Card"
+    (icon-name "gimp-business-card")
+    (width 1063)
+    (height 591)
+    (unit millimeters)
+    (xresolution 300.000000)
+    (yresolution 300.000000)
+    (resolution-unit inches)
+    (image-type rgb)
+    (fill-type background-fill))
+(GimpTemplate "90x55 Business Card, e.g. AU, IN ..."
+    (icon-name "gimp-business-card")
+    (width 1063)
+    (height 650)
+    (unit millimeters)
+    (xresolution 300.000000)
+    (yresolution 300.000000)
+    (resolution-unit inches)
+    (image-type rgb)
+    (fill-type background-fill))
+(GimpTemplate "87x49 Vistaprint Business Card"
+    (icon-name "gimp-business-card")
+    (width 1028)
+    (height 579)
+    (unit millimeters)
+    (xresolution 300.000000)
+    (yresolution 300.000000)
+    (resolution-unit inches)
+    (image-type rgb)
+    (fill-type background-fill))
+(GimpTemplate "Apple iPhone 6"
+    (icon-name "gimp-smartphone")
+    (width 750)
+    (height 1334)
+    (unit millimeters)
+    (xresolution 326.000000)
+    (yresolution 326.000000)
+    (resolution-unit inches)
+    (image-type rgb)
+    (fill-type background-fill))
+(GimpTemplate "Apple iPhone 5"
+    (icon-name "gimp-smartphone")
+    (width 640)
+    (height 1136)
+    (unit millimeters)
+    (xresolution 326.000000)
+    (yresolution 326.000000)
+    (resolution-unit inches)
+    (image-type rgb)
+    (fill-type background-fill))
+(GimpTemplate "Apple iPad 3&4, Air"
+    (icon-name "gimp-smartphone")
+    (width 2048)
+    (height 2732)
+    (unit millimeters)
+    (xresolution 264.000000)
+    (yresolution 264.000000)
+    (resolution-unit inches)
+    (image-type rgb)
+    (fill-type background-fill))
+(GimpTemplate "Samsung Galaxy S6"
+    (icon-name "gimp-smartphone")
+    (width 1440)
+    (height 2560)
+    (unit millimeters)
+    (xresolution 577.000000)
+    (yresolution 577.000000)
+    (resolution-unit inches)
+    (image-type rgb)
+    (fill-type background-fill))
+(GimpTemplate "Samsung Galaxy S5"
+    (icon-name "gimp-smartphone")
+    (width 1080)
+    (height 1920)
+    (unit millimeters)
+    (xresolution 360.000000)
+    (yresolution 360.000000)
+    (resolution-unit inches)
+    (image-type rgb)
+    (fill-type background-fill))
+(GimpTemplate "Samsung Galaxy Tab 2&3 10,1 inch"
+    (icon-name "gimp-smartphone")
+    (width 800)
+    (height 1280)
+    (unit millimeters)
+    (xresolution 149.000000)
+    (yresolution 149.000000)
+    (resolution-unit inches)
+    (image-type rgb)
+    (fill-type background-fill))
+(GimpTemplate "Toilet paper (US, 300 ppi)"
     (icon-name "gimp-toilet-paper")
     (width 1350)
     (height 1350)
@@ -129,8 +239,8 @@
     (resolution-unit inches)
     (image-type rgb)
     (fill-type background-fill))
-(GimpTemplate "CD cover (300ppi)"
-    (icon-name "gtk-cdrom")
+(GimpTemplate "CD cover (300 ppi)"
+    (icon-name "gimp-cdrom")
     (width 1429)
     (height 1417)
     (unit millimeters)
@@ -139,8 +249,8 @@
     (resolution-unit inches)
     (image-type rgb)
     (fill-type background-fill))
-(GimpTemplate "Floppy label (300ppi)"
-    (icon-name "gtk-floppy")
+(GimpTemplate "Floppy label (300 ppi)"
+    (icon-name "gimp-floppy")
     (width 825)
     (height 825)
     (unit millimeters)
@@ -149,7 +259,7 @@
     (resolution-unit inches)
     (image-type rgb)
     (fill-type background-fill))
-(GimpTemplate "Web banner common 468x60"
+(GimpTemplate "468x60 Full Web Banner"
     (icon-name "gimp-web")
     (width 468)
     (height 60)
@@ -159,7 +269,7 @@
     (resolution-unit inches)
     (image-type rgb)
     (fill-type background-fill))
-(GimpTemplate "Web banner huge 728x90"
+(GimpTemplate "728x90 Leaderboard Web Banner"
     (icon-name "gimp-web")
     (width 728)
     (height 90)
@@ -169,6 +279,136 @@
     (resolution-unit inches)
     (image-type rgb)
     (fill-type background-fill))
+(GimpTemplate "336x280 Square Web Banner"
+    (icon-name "gimp-web")
+    (width 336)
+    (height 280)
+    (unit pixels)
+    (xresolution 72.000000)
+    (yresolution 72.000000)
+    (resolution-unit inches)
+    (image-type rgb)
+    (fill-type background-fill))
+(GimpTemplate "300x250 Square Web Banner"
+    (icon-name "gimp-web")
+    (width 300)
+    (height 250)
+    (unit pixels)
+    (xresolution 72.000000)
+    (yresolution 72.000000)
+    (resolution-unit inches)
+    (image-type rgb)
+    (fill-type background-fill))
+(GimpTemplate "250x250 Square Web Banner"
+    (icon-name "gimp-web")
+    (width 250)
+    (height 250)
+    (unit pixels)
+    (xresolution 72.000000)
+    (yresolution 72.000000)
+    (resolution-unit inches)
+    (image-type rgb)
+    (fill-type background-fill))
+(GimpTemplate "160x600 Skyscraper Web Banner"
+    (icon-name "gimp-web")
+    (width 160)
+    (height 600)
+    (unit pixels)
+    (xresolution 72.000000)
+    (yresolution 72.000000)
+    (resolution-unit inches)
+    (image-type rgb)
+    (fill-type background-fill))
+(GimpTemplate "120x600 Skyscraper Web Banner"
+    (icon-name "gimp-web")
+    (width 120)
+    (height 600)
+    (unit pixels)
+    (xresolution 72.000000)
+    (yresolution 72.000000)
+    (resolution-unit inches)
+    (image-type rgb)
+    (fill-type background-fill))
+(GimpTemplate "120x240 Vertical/Small Skyscraper Web Banner"
+    (icon-name "gimp-web")
+    (width 120)
+    (height 240)
+    (unit pixels)
+    (xresolution 72.000000)
+    (yresolution 72.000000)
+    (resolution-unit inches)
+    (image-type rgb)
+    (fill-type background-fill))
+(GimpTemplate "240x400 Fat Skyscraper Web Banner"
+    (icon-name "gimp-web")
+    (width 240)
+    (height 400)
+    (unit pixels)
+    (xresolution 72.000000)
+    (yresolution 72.000000)
+    (resolution-unit inches)
+    (image-type rgb)
+    (fill-type background-fill))
+(GimpTemplate "234x60 Half Web Banner"
+    (icon-name "gimp-web")
+    (width 234)
+    (height 60)
+    (unit pixels)
+    (xresolution 72.000000)
+    (yresolution 72.000000)
+    (resolution-unit inches)
+    (image-type rgb)
+    (fill-type background-fill))
+(GimpTemplate "180x150 Rectangle Web Banner"
+    (icon-name "gimp-web")
+    (width 180)
+    (height 150)
+    (unit pixels)
+    (xresolution 72.000000)
+    (yresolution 72.000000)
+    (resolution-unit inches)
+    (image-type rgb)
+    (fill-type background-fill))
+(GimpTemplate "125x125 Square Button Web Banner"
+    (icon-name "gimp-web")
+    (width 125)
+    (height 125)
+    (unit pixels)
+    (xresolution 72.000000)
+    (yresolution 72.000000)
+    (resolution-unit inches)
+    (image-type rgb)
+    (fill-type background-fill))
+(GimpTemplate "120x90 Button Web Banner"
+    (icon-name "gimp-web")
+    (width 120)
+    (height 90)
+    (unit pixels)
+    (xresolution 72.000000)
+    (yresolution 72.000000)
+    (resolution-unit inches)
+    (image-type rgb)
+    (fill-type background-fill))
+(GimpTemplate "120x60 Button Web Banner"
+    (icon-name "gimp-web")
+    (width 120)
+    (height 60)
+    (unit pixels)
+    (xresolution 72.000000)
+    (yresolution 72.000000)
+    (resolution-unit inches)
+    (image-type rgb)
+    (fill-type background-fill))
+(GimpTemplate "88x31 Button Web Banner"
+    (icon-name "gimp-web")
+    (width 88)
+    (height 31)
+    (unit pixels)
+    (xresolution 72.000000)
+    (yresolution 72.000000)
+    (resolution-unit inches)
+    (image-type rgb)
+    (fill-type background-fill))
 (GimpTemplate "PAL - 720x576"
     (icon-name "gimp-video")
     (width 720)
@@ -179,10 +419,140 @@
     (resolution-unit inches)
     (image-type rgb)
     (fill-type background-fill))
-(GimpTemplate "NTSC - 720x486"
+(GimpTemplate "NTSC on DVD - 720x480"
     (icon-name "gimp-video")
     (width 720)
-    (height 486)
+    (height 480)
+    (unit pixels)
+    (xresolution 72.000000)
+    (yresolution 72.000000)
+    (resolution-unit inches)
+    (image-type rgb)
+    (fill-type background-fill))
+(GimpTemplate "1280x720 HDTV 720p"
+    (icon-name "gimp-video")
+    (width 1280)
+    (height 720)
+    (unit pixels)
+    (xresolution 72.000000)
+    (yresolution 72.000000)
+    (resolution-unit inches)
+    (image-type rgb)
+    (fill-type background-fill))
+(GimpTemplate "1920x1080 Full HDTV 1080p"
+    (icon-name "gimp-video")
+    (width 1920)
+    (height 1080)
+    (unit pixels)
+    (xresolution 72.000000)
+    (yresolution 72.000000)
+    (resolution-unit inches)
+    (image-type rgb)
+    (fill-type background-fill))
+(GimpTemplate "4096x2160 Digital Cinema Initiatives 4K"
+    (icon-name "gimp-video")
+    (width 4096)
+    (height 2160)
+    (unit pixels)
+    (xresolution 72.000000)
+    (yresolution 72.000000)
+    (resolution-unit inches)
+    (image-type rgb)
+    (fill-type background-fill))
+(GimpTemplate "7680x4320 UHD-2"
+    (icon-name "gimp-video")
+    (width 7680)
+    (height 4320)
+    (unit pixels)
+    (xresolution 72.000000)
+    (yresolution 72.000000)
+    (resolution-unit inches)
+    (image-type rgb)
+    (fill-type background-fill))
+(GimpTemplate "640x480 VGA"
+    (icon-name "gimp-display")
+    (width 640)
+    (height 480)
+    (unit pixels)
+    (xresolution 72.000000)
+    (yresolution 72.000000)
+    (resolution-unit inches)
+    (image-type rgb)
+    (fill-type background-fill))
+(GimpTemplate "800x600 SVGA"
+    (icon-name "gimp-display")
+    (width 800)
+    (height 600)
+    (unit pixels)
+    (xresolution 72.000000)
+    (yresolution 72.000000)
+    (resolution-unit inches)
+    (image-type rgb)
+    (fill-type background-fill))
+(GimpTemplate "1024x768 XGA"
+    (icon-name "gimp-display")
+    (width 1024)
+    (height 768)
+    (unit pixels)
+    (xresolution 72.000000)
+    (yresolution 72.000000)
+    (resolution-unit inches)
+    (image-type rgb)
+    (fill-type background-fill))
+(GimpTemplate "1366x768 HD"
+    (icon-name "gimp-display")
+    (width 1366)
+    (height 768)
+    (unit pixels)
+    (xresolution 72.000000)
+    (yresolution 72.000000)
+    (resolution-unit inches)
+    (image-type rgb)
+    (fill-type background-fill))
+(GimpTemplate "1600x900 HD+"
+    (icon-name "gimp-display")
+    (width 1600)
+    (height 900)
+    (unit pixels)
+    (xresolution 72.000000)
+    (yresolution 72.000000)
+    (resolution-unit inches)
+    (image-type rgb)
+    (fill-type background-fill))
+(GimpTemplate "1600x1200 UXGA"
+    (icon-name "gimp-display")
+    (width 1600)
+    (height 1200)
+    (unit pixels)
+    (xresolution 72.000000)
+    (yresolution 72.000000)
+    (resolution-unit inches)
+    (image-type rgb)
+    (fill-type background-fill))
+(GimpTemplate "1920x1200 WUXGA"
+    (icon-name "gimp-display")
+    (width 1920)
+    (height 1200)
+    (unit pixels)
+    (xresolution 72.000000)
+    (yresolution 72.000000)
+    (resolution-unit inches)
+    (image-type rgb)
+    (fill-type background-fill))
+(GimpTemplate "2560x1600 WQXGA"
+    (icon-name "gimp-display")
+    (width 2560)
+    (height 1600)
+    (unit pixels)
+    (xresolution 72.000000)
+    (yresolution 72.000000)
+    (resolution-unit inches)
+    (image-type rgb)
+    (fill-type background-fill))
+(GimpTemplate "3840x2160 4K UHD"
+    (icon-name "gimp-display")
+    (width 3840)
+    (height 2160)
     (unit pixels)
     (xresolution 72.000000)
     (yresolution 72.000000)
@@ -190,4 +560,4 @@
     (image-type rgb)
     (fill-type background-fill))
 
-# end of templates
+# end of templaterc