Make stock icons use standard icon names

At least where standard names are available, instead of relying
on a symlink forest in the icon theme directory. For directional
variants, we look up icons by the pair ("foo-rtl", "foo") or
("foo-ltr", "foo"). See bug 626474.

diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 4fdde840ebddc81e6e81b2dd25fcd9c8dfb8c2bb..222155d211bcb96b0f3d791fb52471f6ca1882b6 100644 (file)
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -988,247 +988,243 @@ files:
 
 STOCK_ICONS = \
        stock-icons/16/document-open-recent.png         \
-       stock-icons/16/gtk-about.png                    \
-       stock-icons/16/gtk-add.png                      \
-       stock-icons/16/gtk-cdrom.png                    \
-       stock-icons/16/gtk-close.png                    \
-       stock-icons/16/gtk-connect.png                  \
-       stock-icons/16/gtk-convert.png                  \
-       stock-icons/16/gtk-copy.png                     \
-       stock-icons/16/gtk-cut.png                      \
-       stock-icons/16/gtk-delete.png                   \
-       stock-icons/16/gtk-directory.png                \
-       stock-icons/16/gtk-disconnect.png               \
-       stock-icons/16/gtk-edit.png                     \
-       stock-icons/16/gtk-execute.png                  \
-       stock-icons/16/gtk-file.png                     \
-       stock-icons/16/gtk-find-and-replace.png         \
-       stock-icons/16/gtk-find.png                     \
-       stock-icons/16/gtk-floppy.png                   \
-       stock-icons/16/gtk-fullscreen.png               \
-       stock-icons/16/gtk-go-back-ltr.png              \
-       stock-icons/16/gtk-go-down.png                  \
-       stock-icons/16/gtk-go-forward-ltr.png           \
-       stock-icons/16/gtk-goto-bottom.png              \
-       stock-icons/16/gtk-goto-first-ltr.png           \
-       stock-icons/16/gtk-goto-last-ltr.png            \
-       stock-icons/16/gtk-goto-top.png                 \
-       stock-icons/16/gtk-go-up.png                    \
-       stock-icons/16/gtk-harddisk.png                 \
-       stock-icons/16/gtk-help.png                     \
-       stock-icons/16/gtk-home.png                     \
-       stock-icons/16/gtk-indent-ltr.png               \
-       stock-icons/16/gtk-indent-rtl.png               \
-       stock-icons/16/gtk-index.png                    \
-       stock-icons/16/gtk-info.png                     \
-       stock-icons/16/gtk-jump-to-ltr.png              \
-       stock-icons/16/gtk-jump-to-rtl.png              \
-       stock-icons/16/gtk-justify-center.png           \
-       stock-icons/16/gtk-justify-fill.png             \
-       stock-icons/16/gtk-justify-left.png             \
-       stock-icons/16/gtk-justify-right.png            \
-       stock-icons/16/gtk-leave-fullscreen.png         \
-       stock-icons/16/gtk-media-forward-ltr.png        \
-       stock-icons/16/gtk-media-next-ltr.png           \
-       stock-icons/16/gtk-media-pause.png              \
-       stock-icons/16/gtk-media-play-ltr.png           \
-       stock-icons/16/gtk-media-play-rtl.png           \
-       stock-icons/16/gtk-media-previous-ltr.png       \
-       stock-icons/16/gtk-media-record.png             \
-       stock-icons/16/gtk-media-rewind-ltr.png         \
-       stock-icons/16/gtk-media-stop.png               \
-       stock-icons/16/gtk-missing-image.png            \
-       stock-icons/16/gtk-network.png                  \
-       stock-icons/16/gtk-new.png                      \
-       stock-icons/16/gtk-open.png                     \
+       stock-icons/16/help-about.png                   \
+       stock-icons/16/list-add.png                     \
+       stock-icons/16/media-optical.png                \
+       stock-icons/16/window-close.png                 \
+       stock-icons/16/gtk-connect.png                  \
+       stock-icons/16/gtk-convert.png                  \
+       stock-icons/16/edit-copy.png                    \
+       stock-icons/16/edit-cut.png                     \
+       stock-icons/16/edit-delete.png                  \
+       stock-icons/16/folder.png                       \
+       stock-icons/16/gtk-disconnect.png               \
+       stock-icons/16/gtk-edit.png                     \
+       stock-icons/16/system-run.png                   \
+       stock-icons/16/document-x-generic.png           \
+       stock-icons/16/edit-find-replace.png            \
+       stock-icons/16/edit-find.png                    \
+       stock-icons/16/media-floppy.png                 \
+       stock-icons/16/view-fullscreen.png              \
+       stock-icons/16/go-previous-ltr.png              \
+       stock-icons/16/go-down.png                      \
+       stock-icons/16/go-next-ltr.png                  \
+       stock-icons/16/go-bottom.png                    \
+       stock-icons/16/go-first-ltr.png                 \
+       stock-icons/16/go-last-ltr.png                  \
+       stock-icons/16/go-top.png                       \
+       stock-icons/16/go-up.png                        \
+       stock-icons/16/drive-harddisk.png               \
+       stock-icons/16/help-contents.png                \
+       stock-icons/16/go-home.png                      \
+       stock-icons/16/format-indent-more-ltr.png       \
+       stock-icons/16/format-indent-more-rtl.png       \
+       stock-icons/16/gtk-index.png                    \
+       stock-icons/16/dialog-info.png                  \
+       stock-icons/16/go-jump-ltr.png                  \
+       stock-icons/16/go-jump-rtl.png                  \
+       stock-icons/16/format-justify-center.png        \
+       stock-icons/16/format-justify-fill.png          \
+       stock-icons/16/format-justify-left.png          \
+       stock-icons/16/format-justify-right.png         \
+       stock-icons/16/view-restore.png                 \
+       stock-icons/16/media-seek-forward-ltr.png       \
+       stock-icons/16/media-skip-forward-ltr.png       \
+       stock-icons/16/media-playback-pause.png         \
+       stock-icons/16/media-playback-start-ltr.png     \
+       stock-icons/16/media-playback-start-rtl.png     \
+       stock-icons/16/media-skip-backward-ltr.png      \
+       stock-icons/16/media-record.png                 \
+       stock-icons/16/media-seek-backward-ltr.png      \
+       stock-icons/16/media-playback-stop.png          \
+       stock-icons/16/image-missing.png                \
+       stock-icons/16/network-idle.png                 \
+       stock-icons/16/document-new.png                 \
+       stock-icons/16/document-open.png                \
        stock-icons/16/gtk-page-setup.png               \
-       stock-icons/16/gtk-paste.png                    \
-       stock-icons/16/gtk-preferences.png              \
-       stock-icons/16/gtk-print.png                    \
-       stock-icons/16/gtk-print-error.png              \
-       stock-icons/16/gtk-print-paused.png             \
-       stock-icons/16/gtk-print-preview.png            \
-       stock-icons/16/gtk-print-report.png             \
-       stock-icons/16/gtk-print-warning.png            \
-       stock-icons/16/gtk-properties.png               \
-       stock-icons/16/gtk-quit.png                     \
-       stock-icons/16/gtk-redo-ltr.png                 \
-       stock-icons/16/gtk-redo-rtl.png                 \
-       stock-icons/16/gtk-refresh.png                  \
-       stock-icons/16/gtk-remove.png                   \
-       stock-icons/16/gtk-revert-to-saved-ltr.png      \
-       stock-icons/16/gtk-revert-to-saved-rtl.png      \
-       stock-icons/16/gtk-save-as.png                  \
-       stock-icons/16/gtk-select-all.png               \
-       stock-icons/16/gtk-select-color.png             \
-       stock-icons/16/gtk-select-font.png              \
-       stock-icons/16/gtk-sort-ascending.png           \
-       stock-icons/16/gtk-sort-descending.png          \
-       stock-icons/16/gtk-spell-check.png              \
-       stock-icons/16/gtk-stop.png                     \
-       stock-icons/16/gtk-strikethrough.png            \
-       stock-icons/16/gtk-font.png                     \
-       stock-icons/16/gtk-undelete-ltr.png             \
-       stock-icons/16/gtk-undelete-rtl.png             \
-       stock-icons/16/gtk-underline.png                \
-       stock-icons/16/gtk-undo-ltr.png                 \
-       stock-icons/16/gtk-undo-rtl.png                 \
-       stock-icons/16/gtk-unindent-ltr.png             \
-       stock-icons/16/gtk-unindent-rtl.png             \
-       stock-icons/16/gtk-zoom-100.png                 \
-       stock-icons/16/gtk-zoom-fit.png                 \
-       stock-icons/16/gtk-zoom-in.png                  \
-       stock-icons/16/gtk-zoom-out.png                 \
-       stock-icons/16/gtk-italic.png                   \
-       stock-icons/16/gtk-bold.png                     \
+       stock-icons/16/edit-paste.png                   \
+       stock-icons/16/edit-preferences.png             \
+       stock-icons/16/document-print.png               \
+       stock-icons/16/printer-error.png                \
+       stock-icons/16/printer-paused.png               \
+       stock-icons/16/document-print-preview.png       \
+       stock-icons/16/printer-info.png                 \
+       stock-icons/16/printer-warning.png              \
+       stock-icons/16/document-properties.png          \
+       stock-icons/16/application-exit.png             \
+       stock-icons/16/edit-redo-ltr.png                \
+       stock-icons/16/edit-redo-rtl.png                \
+       stock-icons/16/view-refresh.png                 \
+       stock-icons/16/list-remove.png                  \
+       stock-icons/16/document-revert-ltr.png          \
+       stock-icons/16/document-revert-rtl.png          \
+       stock-icons/16/document-save-as.png             \
+       stock-icons/16/edit-select-all.png              \
+       stock-icons/16/gtk-select-color.png             \
+       stock-icons/16/gtk-select-font.png              \
+       stock-icons/16/view-sort-ascending.png          \
+       stock-icons/16/view-sort-descending.png         \
+       stock-icons/16/tools-check-spelling.png         \
+       stock-icons/16/process-stop.png                 \
+       stock-icons/16/format-text-strikethrough.png    \
+       stock-icons/16/gtk-font.png                     \
+       stock-icons/16/gtk-undelete-ltr.png             \
+       stock-icons/16/gtk-undelete-rtl.png             \
+       stock-icons/16/format-text-underline.png        \
+       stock-icons/16/edit-undo-ltr.png                \
+       stock-icons/16/edit-undo-rtl.png                \
+       stock-icons/16/format-indent-less-ltr.png       \
+       stock-icons/16/format-indent-less-rtl.png       \
+       stock-icons/16/zoom-original.png                \
+       stock-icons/16/zoom-fit-best.png                \
+       stock-icons/16/zoom-in.png                      \
+       stock-icons/16/zoom-out.png                     \
+       stock-icons/16/format-text-italic.png           \
+       stock-icons/16/format-text-bold.png             \
        stock-icons/20/gtk-apply.png                    \
        stock-icons/20/gtk-cancel.png                   \
-       stock-icons/20/gtk-close.png                    \
-       stock-icons/20/gtk-no.png                       \
-       stock-icons/20/gtk-ok.png                       \
-       stock-icons/20/gtk-yes.png                      \
+       stock-icons/20/window-close.png                 \
+       stock-icons/20/gtk-no.png                       \
+       stock-icons/20/gtk-ok.png                       \
+       stock-icons/20/gtk-yes.png                      \
        stock-icons/24/audio-volume-high.png            \
        stock-icons/24/audio-volume-low.png             \
        stock-icons/24/audio-volume-medium.png          \
        stock-icons/24/audio-volume-muted.png           \
        stock-icons/24/document-open-recent.png         \
-       stock-icons/24/gtk-about.png                    \
-       stock-icons/24/gtk-add.png                      \
-       stock-icons/24/gtk-bold.png                     \
-       stock-icons/24/gtk-cdrom.png                    \
-       stock-icons/24/gtk-clear.png                    \
-       stock-icons/24/gtk-close.png                    \
-       stock-icons/24/gtk-color-picker.png             \
-       stock-icons/24/gtk-connect.png                  \
-       stock-icons/24/gtk-convert.png                  \
-       stock-icons/24/gtk-copy.png                     \
-       stock-icons/24/gtk-cut.png                      \
-       stock-icons/24/gtk-directory.png                \
-       stock-icons/24/gtk-disconnect.png               \
-       stock-icons/24/gtk-edit.png                     \
-       stock-icons/24/gtk-execute.png                  \
-       stock-icons/24/gtk-file.png                     \
-       stock-icons/24/gtk-find-and-replace.png         \
-       stock-icons/24/gtk-find.png                     \
-       stock-icons/24/gtk-font.png                     \
-       stock-icons/24/gtk-fullscreen.png               \
-       stock-icons/24/gtk-go-back-ltr.png              \
-       stock-icons/24/gtk-goto-top.png                 \
-       stock-icons/24/gtk-go-down.png                  \
-       stock-icons/24/gtk-goto-bottom.png              \
-       stock-icons/24/gtk-goto-first-ltr.png           \
-       stock-icons/24/gtk-goto-last-ltr.png            \
-       stock-icons/24/gtk-go-up.png                    \
-       stock-icons/24/gtk-harddisk.png                 \
-       stock-icons/24/gtk-help.png                     \
-       stock-icons/24/gtk-home.png                     \
-       stock-icons/24/gtk-indent-ltr.png               \
-       stock-icons/24/gtk-indent-rtl.png               \
+       stock-icons/24/help-about.png                   \
+       stock-icons/24/list-add.png                     \
+       stock-icons/24/format-text-bold.png             \
+       stock-icons/24/media-optical.png                \
+       stock-icons/24/edit-clear.png                   \
+       stock-icons/24/window-close.png                 \
+       stock-icons/24/gtk-color-picker.png             \
+       stock-icons/24/gtk-connect.png                  \
+       stock-icons/24/gtk-convert.png                  \
+       stock-icons/24/edit-copy.png                    \
+       stock-icons/24/edit-cut.png                     \
+       stock-icons/24/folder.png                       \
+       stock-icons/24/gtk-disconnect.png               \
+       stock-icons/24/gtk-edit.png                     \
+       stock-icons/24/system-run.png                   \
+       stock-icons/24/document-x-generic.png           \
+       stock-icons/24/edit-find-replace.png            \
+       stock-icons/24/edit-find.png                    \
+       stock-icons/24/gtk-font.png                     \
+       stock-icons/24/view-fullscreen.png              \
+       stock-icons/24/go-previous-ltr.png              \
+       stock-icons/24/go-top.png                       \
+       stock-icons/24/go-down.png                      \
+       stock-icons/24/go-bottom.png                    \
+       stock-icons/24/go-first-ltr.png                 \
+       stock-icons/24/go-last-ltr.png                  \
+       stock-icons/24/go-up.png                        \
+       stock-icons/24/drive-harddisk.png               \
+       stock-icons/24/help-contents.png                \
+       stock-icons/24/go-home.png                      \
+       stock-icons/24/format-indent-more-ltr.png       \
+       stock-icons/24/format-indent-more-rtl.png       \
        stock-icons/24/gtk-index.png                    \
-       stock-icons/24/gtk-info.png                     \
-       stock-icons/24/gtk-italic.png                   \
-       stock-icons/24/gtk-jump-to-ltr.png              \
-       stock-icons/24/gtk-jump-to-rtl.png              \
-       stock-icons/24/gtk-justify-center.png           \
-       stock-icons/24/gtk-justify-fill.png             \
-       stock-icons/24/gtk-justify-left.png             \
-       stock-icons/24/gtk-justify-right.png            \
-       stock-icons/24/gtk-leave-fullscreen.png         \
-       stock-icons/24/gtk-media-forward-ltr.png        \
-       stock-icons/24/gtk-media-next-ltr.png           \
-       stock-icons/24/gtk-media-pause.png              \
-       stock-icons/24/gtk-media-play-ltr.png           \
-       stock-icons/24/gtk-media-play-rtl.png           \
-       stock-icons/24/gtk-media-previous-ltr.png       \
-       stock-icons/24/gtk-media-record.png             \
-       stock-icons/24/gtk-media-rewind-ltr.png         \
-       stock-icons/24/gtk-media-stop.png               \
-       stock-icons/24/gtk-missing-image.png            \
-       stock-icons/24/gtk-network.png                  \
-       stock-icons/24/gtk-new.png                      \
-       stock-icons/24/gtk-open.png                     \
+       stock-icons/24/dialog-info.png                  \
+       stock-icons/24/format-text-italic.png           \
+       stock-icons/24/go-jump-ltr.png                  \
+       stock-icons/24/go-jump-rtl.png                  \
+       stock-icons/24/format-justify-center.png        \
+       stock-icons/24/format-justify-fill.png          \
+       stock-icons/24/format-justify-left.png          \
+       stock-icons/24/format-justify-right.png         \
+       stock-icons/24/view-restore.png                 \
+       stock-icons/24/media-seek-forward-ltr.png       \
+       stock-icons/24/media-skip-forward-ltr.png       \
+       stock-icons/24/media-playback-pause.png         \
+       stock-icons/24/media-playback-start-ltr.png     \
+       stock-icons/24/media-playback-start-rtl.png     \
+       stock-icons/24/media-skip-backward-ltr.png      \
+       stock-icons/24/media-record.png                 \
+       stock-icons/24/media-seek-backward-ltr.png      \
+       stock-icons/24/media-playback-stop.png          \
+       stock-icons/24/image-missing.png                \
+       stock-icons/24/network-idle.png                 \
+       stock-icons/24/document-new.png                 \
+       stock-icons/24/document-open.png                \
        stock-icons/24/gtk-orientation-reverse-landscape.png \
        stock-icons/24/gtk-orientation-landscape.png    \
-       stock-icons/24/gtk-orientation-reverse-portrait.png     \
+       stock-icons/24/gtk-orientation-reverse-portrait.png \
        stock-icons/24/gtk-orientation-portrait.png     \
        stock-icons/24/gtk-page-setup.png               \
-       stock-icons/24/gtk-paste.png                    \
-       stock-icons/24/gtk-preferences.png              \
-       stock-icons/24/gtk-print.png                    \
-       stock-icons/24/gtk-print-error.png              \
-       stock-icons/24/gtk-print-paused.png             \
-       stock-icons/24/gtk-print-preview.png            \
-       stock-icons/24/gtk-print-report.png             \
-       stock-icons/24/gtk-print-warning.png            \
-       stock-icons/24/gtk-properties.png               \
-       stock-icons/24/gtk-quit.png                     \
-       stock-icons/24/gtk-redo-ltr.png                 \
-       stock-icons/24/gtk-redo-rtl.png                 \
-       stock-icons/24/gtk-refresh.png                  \
-       stock-icons/24/gtk-remove.png                   \
-       stock-icons/24/gtk-revert-to-saved-ltr.png      \
-       stock-icons/24/gtk-revert-to-saved-rtl.png      \
-       stock-icons/24/gtk-select-font.png              \
-       stock-icons/24/gtk-save-as.png                  \
-       stock-icons/24/gtk-floppy.png                   \
-       stock-icons/24/gtk-select-all.png               \
+       stock-icons/24/edit-paste.png                   \
+       stock-icons/24/edit-preferences.png             \
+       stock-icons/24/document-print.png               \
+       stock-icons/24/printer-error.png                \
+       stock-icons/24/printer-paused.png               \
+       stock-icons/24/document-print-preview.png       \
+       stock-icons/24/printer-info.png                 \
+       stock-icons/24/printer-warning.png              \
+       stock-icons/24/document-properties.png          \
+       stock-icons/24/application-exit.png             \
+       stock-icons/24/edit-redo-ltr.png                \
+       stock-icons/24/edit-redo-rtl.png                \
+       stock-icons/24/view-refresh.png                 \
+       stock-icons/24/list-remove.png                  \
+       stock-icons/24/document-revert-ltr.png          \
+       stock-icons/24/document-revert-rtl.png          \
+       stock-icons/24/gtk-select-font.png              \
+       stock-icons/24/document-save-as.png             \
+       stock-icons/24/media-floppy.png                 \
+       stock-icons/24/edit-select-all.png              \
        stock-icons/24/gtk-select-color.png             \
-       stock-icons/24/gtk-sort-ascending.png           \
-       stock-icons/24/gtk-sort-descending.png          \
-       stock-icons/24/gtk-spell-check.png              \
-       stock-icons/24/gtk-stop.png                     \
-       stock-icons/24/gtk-strikethrough.png            \
-       stock-icons/24/gtk-delete.png                   \
-       stock-icons/24/gtk-undelete-ltr.png             \
-       stock-icons/24/gtk-undelete-rtl.png             \
-       stock-icons/24/gtk-underline.png                \
-       stock-icons/24/gtk-undo-ltr.png                 \
-       stock-icons/24/gtk-undo-rtl.png                 \
-       stock-icons/24/gtk-unindent-ltr.png             \
-       stock-icons/24/gtk-unindent-rtl.png             \
-       stock-icons/24/gtk-zoom-100.png                 \
-       stock-icons/24/gtk-zoom-fit.png                 \
-       stock-icons/24/gtk-zoom-in.png                  \
-       stock-icons/24/gtk-zoom-out.png                 \
-       stock-icons/24/gtk-go-forward-ltr.png           \
-       stock-icons/32/gtk-dnd-multiple.png             \
-       stock-icons/32/gtk-dnd.png                      \
-       stock-icons/48/gtk-dialog-authentication.png    \
-       stock-icons/48/gtk-dialog-error.png             \
-       stock-icons/48/gtk-dialog-info.png              \
-       stock-icons/48/gtk-dialog-question.png          \
-       stock-icons/48/gtk-dialog-warning.png
+       stock-icons/24/view-sort-ascending.png          \
+       stock-icons/24/view-sort-descending.png         \
+       stock-icons/24/tools-check-spelling.png         \
+       stock-icons/24/process-stop.png                 \
+       stock-icons/24/format-text-strikethrough.png    \
+       stock-icons/24/edit-delete.png                  \
+       stock-icons/24/gtk-undelete-ltr.png             \
+       stock-icons/24/gtk-undelete-rtl.png             \
+       stock-icons/24/format-text-underline.png        \
+       stock-icons/24/edit-undo-ltr.png                \
+       stock-icons/24/edit-undo-rtl.png                \
+       stock-icons/24/format-indent-less-ltr.png       \
+       stock-icons/24/format-indent-less-rtl.png       \
+       stock-icons/24/zoom-original.png                \
+       stock-icons/24/zoom-fit-best.png                \
+       stock-icons/24/zoom-in.png                      \
+       stock-icons/24/zoom-out.png                     \
+       stock-icons/24/go-next-ltr.png                  \
+       stock-icons/32/gtk-dnd-multiple.png             \
+       stock-icons/32/gtk-dnd.png                      \
+       stock-icons/48/dialog-password.png              \
+       stock-icons/48/dialog-error.png                 \
+       stock-icons/48/dialog-info.png                  \
+       stock-icons/48/dialog-question.png              \
+       stock-icons/48/dialog-warning.png
 
 GENERATED_ICONS = \
-       stock-icons/16/gtk-go-back-rtl.png              \
-       stock-icons/16/gtk-go-forward-rtl.png           \
-       stock-icons/16/gtk-goto-first-rtl.png           \
-       stock-icons/16/gtk-goto-last-rtl.png            \
-       stock-icons/16/gtk-media-forward-rtl.png        \
-       stock-icons/16/gtk-media-next-rtl.png           \
-       stock-icons/16/gtk-media-previous-rtl.png       \
-       stock-icons/16/gtk-media-rewind-rtl.png         \
-       stock-icons/16/gtk-save.png                     \
-       stock-icons/16/drive-harddisk.png               \
-       stock-icons/16/folder.png                       \
-       stock-icons/16/folder-remote.png                \
-       stock-icons/16/user-home.png                    \
-       stock-icons/16/user-desktop.png                 \
-       stock-icons/16/text-x-generic.png               \
-       stock-icons/24/gtk-go-back-rtl.png              \
-       stock-icons/24/gtk-go-forward-rtl.png           \
-       stock-icons/24/gtk-goto-first-rtl.png           \
-       stock-icons/24/gtk-goto-last-rtl.png            \
-       stock-icons/24/gtk-media-forward-rtl.png        \
-       stock-icons/24/gtk-media-next-rtl.png           \
-       stock-icons/24/gtk-media-previous-rtl.png       \
-       stock-icons/24/gtk-media-rewind-rtl.png         \
-       stock-icons/24/gtk-save.png                     \
-       stock-icons/24/drive-harddisk.png               \
-       stock-icons/24/folder.png                       \
-       stock-icons/24/folder-remote.png                \
-       stock-icons/24/user-home.png                    \
-       stock-icons/24/user-desktop.png                 \
+       stock-icons/16/go-previous-rtl.png              \
+       stock-icons/16/go-next-rtl.png                  \
+       stock-icons/16/go-first-rtl.png                 \
+       stock-icons/16/go-last-rtl.png                  \
+       stock-icons/16/media-seek-forward-rtl.png       \
+       stock-icons/16/media-skip-forward-rtl.png       \
+       stock-icons/16/media-skip-backward-rtl.png      \
+       stock-icons/16/media-seek-backward-rtl.png      \
+       stock-icons/16/document-save.png                \
+       stock-icons/16/folder-remote.png                \
+       stock-icons/16/user-home.png                    \
+       stock-icons/16/user-desktop.png                 \
+       stock-icons/16/text-x-generic.png               \
+       stock-icons/24/go-previous-rtl.png              \
+       stock-icons/24/go-next-rtl.png                  \
+       stock-icons/24/go-first-rtl.png                 \
+       stock-icons/24/go-last-rtl.png                  \
+       stock-icons/24/media-seek-forward-rtl.png       \
+       stock-icons/24/media-skip-forward-rtl.png       \
+       stock-icons/24/media-skip-backward-rtl.png      \
+       stock-icons/24/media-seek-backward-rtl.png      \
+       stock-icons/24/document-save.png                \
+       stock-icons/24/folder-remote.png                \
+       stock-icons/24/user-home.png                    \
+       stock-icons/24/user-desktop.png                 \
        stock-icons/24/text-x-generic.png
 
 # need to copy the icons so that we can replace the generated ones with
@@ -1245,37 +1241,33 @@ stamp-icons: $(STOCK_ICONS)
         fi &&                                                          \
        for i in 16 24; do                                              \
           (cd stock-icons/$$i                                          \
-          && $(RM) gtk-go-back-rtl.png                                 \
-          && $(LN_S) gtk-go-forward-ltr.png gtk-go-back-rtl.png        \
-          && $(RM) gtk-go-forward-rtl.png                              \
-          && $(LN_S) gtk-go-back-ltr.png gtk-go-forward-rtl.png        \
-          && $(RM) gtk-goto-first-rtl.png                              \
-          && $(LN_S) gtk-goto-last-ltr.png gtk-goto-first-rtl.png      \
-          && $(RM) gtk-goto-last-rtl.png                               \
-          && $(LN_S) gtk-goto-first-ltr.png gtk-goto-last-rtl.png      \
-          && $(RM) gtk-media-forward-rtl.png                           \
-          && $(LN_S) gtk-media-rewind-ltr.png gtk-media-forward-rtl.png\
-          && $(RM) gtk-media-next-rtl.png                              \
-          && $(LN_S) gtk-media-previous-ltr.png gtk-media-next-rtl.png \
-          && $(RM) gtk-media-previous-rtl.png                          \
-          && $(LN_S) gtk-media-next-ltr.png gtk-media-previous-rtl.png \
-          && $(RM) gtk-media-rewind-rtl.png                            \
-          && $(LN_S) gtk-media-forward-ltr.png gtk-media-rewind-rtl.png\
-          && $(RM) gtk-save.png                                        \
-          && $(LN_S) gtk-floppy.png gtk-save.png                       \
-          && $(RM) drive-harddisk.png                                  \
-          && $(LN_S) gtk-harddisk.png drive-harddisk.png               \
-          && $(RM) folder.png                                          \
-          && $(LN_S) gtk-directory.png folder.png                      \
-          && $(RM) folder-remote.png                                   \
-          && $(LN_S) gtk-directory.png folder-remote.png               \
-          && $(RM) user-home.png                                       \
-          && $(LN_S) gtk-directory.png user-home.png                   \
-          && $(RM) user-desktop.png                                    \
-          && $(LN_S) gtk-directory.png user-desktop.png                \
-          && $(RM) text-x-generic.png                                  \
-          && $(LN_S) gtk-file.png text-x-generic.png                   \
-       ) done                                                          \
+          && $(RM) go-previous-rtl.png                                 \
+          && $(LN_S) go-next-ltr.png go-previous-rtl.png               \
+          && $(RM) go-next-rtl.png                                     \
+          && $(LN_S) go-previous-ltr.png go-next-rtl.png               \
+          && $(RM) go-first-rtl.png                                    \
+          && $(LN_S) go-last-ltr.png go-first-rtl.png                  \
+          && $(RM) go-last-rtl.png                                     \
+          && $(LN_S) go-first-ltr.png go-last-rtl.png                  \
+          && $(RM) media-seek-forward-rtl.png                          \
+          && $(LN_S) media-seek-backward-ltr.png media-seek-forward-rtl.png \
+          && $(RM) media-skip-forward-rtl.png                          \
+          && $(LN_S) media-skip-backward-ltr.png media-skip-forward-rtl.png \
+          && $(RM) media-skip-backward-rtl.png                         \
+          && $(LN_S) media-skip-forward-ltr.png media-skip-backward-rtl.png \
+          && $(RM) media-seek-backward-rtl.png                         \
+          && $(LN_S) media-seek-forward-ltr.png media-seek-backward-rtl.png \
+          && $(RM) document-save.png                                   \
+          && $(LN_S) media-floppy.png document-save.png                \
+          && $(RM) folder-remote.png                                   \
+          && $(LN_S) folder.png folder-remote.png                      \
+          && $(RM) user-home.png                                       \
+          && $(LN_S) folder.png user-home.png                          \
+          && $(RM) user-desktop.png                                    \
+          && $(LN_S) folder.png user-desktop.png                       \
+          && $(RM) text-x-generic.png                                  \
+          && $(LN_S) document-x-generic.png text-x-generic.png         \
+       ) done                                                          \
        && touch stamp-icons
 
 if CROSS_COMPILING

diff --git a/gtk/gtkiconfactory.c b/gtk/gtkiconfactory.c
index 8898988630019a8fabb1c78ed252e74c1ad8ec3a..1cfdefe1244e93c264872e7f26a9a8d492e16fd7 100644 (file)
--- a/gtk/gtkiconfactory.c
+++ b/gtk/gtkiconfactory.c
@@ -364,13 +364,15 @@ gtk_icon_factory_lookup_default (const gchar *stock_id)
 
 static void
 register_stock_icon (GtkIconFactory *factory,
-                    const gchar    *stock_id)
+                    const gchar    *stock_id,
+                     const gchar    *icon_name)
 {
   GtkIconSet *set = gtk_icon_set_new ();
   GtkIconSource source = GTK_ICON_SOURCE_INIT (TRUE, TRUE, TRUE);
 
   source.type = GTK_ICON_SOURCE_STATIC_ICON_NAME;
-  source.source.icon_name = (gchar *)stock_id;
+  source.source.icon_name = (gchar *)icon_name;
+  source.direction = GTK_TEXT_DIR_NONE;
   gtk_icon_set_add_source (set, &source);
 
   gtk_icon_factory_add (factory, stock_id, set);
@@ -380,19 +382,18 @@ register_stock_icon (GtkIconFactory *factory,
 static void
 register_bidi_stock_icon (GtkIconFactory *factory,
                          const gchar    *stock_id,
-                         const gchar    *stock_id_ltr,
-                         const gchar    *stock_id_rtl)
+                          const gchar    *icon_name)
 {
   GtkIconSet *set = gtk_icon_set_new ();
   GtkIconSource source = GTK_ICON_SOURCE_INIT (FALSE, TRUE, TRUE);
 
   source.type = GTK_ICON_SOURCE_STATIC_ICON_NAME;
-  source.source.icon_name = (gchar *)stock_id_ltr;
+  source.source.icon_name = (gchar *)icon_name;
   source.direction = GTK_TEXT_DIR_LTR;
   gtk_icon_set_add_source (set, &source);
 
   source.type = GTK_ICON_SOURCE_STATIC_ICON_NAME;
-  source.source.icon_name = (gchar *)stock_id_rtl;
+  source.source.icon_name = (gchar *)icon_name;
   source.direction = GTK_TEXT_DIR_RTL;
   gtk_icon_set_add_source (set, &source);
 
@@ -405,158 +406,110 @@ get_default_icons (GtkIconFactory *factory)
 {
   /* KEEP IN SYNC with gtkstock.c */
 
-  register_stock_icon (factory, GTK_STOCK_DIALOG_AUTHENTICATION);
-  register_stock_icon (factory, GTK_STOCK_DIALOG_ERROR);
-  register_stock_icon (factory, GTK_STOCK_DIALOG_INFO);
-  register_stock_icon (factory, GTK_STOCK_DIALOG_QUESTION);
-  register_stock_icon (factory, GTK_STOCK_DIALOG_WARNING);
-  register_stock_icon (factory, GTK_STOCK_DND);
-  register_stock_icon (factory, GTK_STOCK_DND_MULTIPLE);
-  register_stock_icon (factory, GTK_STOCK_APPLY);
-  register_stock_icon (factory, GTK_STOCK_CANCEL);
-  register_stock_icon (factory, GTK_STOCK_NO);
-  register_stock_icon (factory, GTK_STOCK_OK);
-  register_stock_icon (factory, GTK_STOCK_YES);
-  register_stock_icon (factory, GTK_STOCK_CLOSE);
-  register_stock_icon (factory, GTK_STOCK_ADD);
-  register_stock_icon (factory, GTK_STOCK_JUSTIFY_CENTER);
-  register_stock_icon (factory, GTK_STOCK_JUSTIFY_FILL);
-  register_stock_icon (factory, GTK_STOCK_JUSTIFY_LEFT);
-  register_stock_icon (factory, GTK_STOCK_JUSTIFY_RIGHT);
-  register_stock_icon (factory, GTK_STOCK_GOTO_BOTTOM);
-  register_stock_icon (factory, GTK_STOCK_CDROM);
-  register_stock_icon (factory, GTK_STOCK_CONVERT);
-  register_stock_icon (factory, GTK_STOCK_COPY);
-  register_stock_icon (factory, GTK_STOCK_CUT);
-  register_stock_icon (factory, GTK_STOCK_GO_DOWN);
-  register_stock_icon (factory, GTK_STOCK_EXECUTE);
-  register_stock_icon (factory, GTK_STOCK_QUIT);
-  register_bidi_stock_icon (factory,
-                           GTK_STOCK_GOTO_FIRST,
-                           GTK_STOCK_GOTO_FIRST "-ltr",
-                           GTK_STOCK_GOTO_FIRST "-rtl");
-  register_stock_icon (factory, GTK_STOCK_SELECT_FONT);
-  register_stock_icon (factory, GTK_STOCK_FULLSCREEN);
-  register_stock_icon (factory, GTK_STOCK_LEAVE_FULLSCREEN);
-  register_stock_icon (factory, GTK_STOCK_HARDDISK);
-  register_stock_icon (factory, GTK_STOCK_HELP);
-  register_stock_icon (factory, GTK_STOCK_HOME);
-  register_stock_icon (factory, GTK_STOCK_INFO);
-  register_bidi_stock_icon (factory,
-                           GTK_STOCK_JUMP_TO,
-                           GTK_STOCK_JUMP_TO "-ltr",
-                           GTK_STOCK_JUMP_TO "-rtl");
-  register_bidi_stock_icon (factory,
-                           GTK_STOCK_GOTO_LAST,
-                           GTK_STOCK_GOTO_LAST "-ltr",
-                           GTK_STOCK_GOTO_LAST "-rtl");
-  register_bidi_stock_icon (factory,
-                           GTK_STOCK_GO_BACK,
-                           GTK_STOCK_GO_BACK "-ltr",
-                           GTK_STOCK_GO_BACK "-rtl");
-  register_stock_icon (factory, GTK_STOCK_MISSING_IMAGE);
-  register_stock_icon (factory, GTK_STOCK_NETWORK);
-  register_stock_icon (factory, GTK_STOCK_NEW);
-  register_stock_icon (factory, GTK_STOCK_OPEN);
-  register_stock_icon (factory, GTK_STOCK_ORIENTATION_PORTRAIT);
-  register_stock_icon (factory, GTK_STOCK_ORIENTATION_LANDSCAPE);
-  register_stock_icon (factory, GTK_STOCK_ORIENTATION_REVERSE_PORTRAIT);
-  register_stock_icon (factory, GTK_STOCK_ORIENTATION_REVERSE_LANDSCAPE);
-  register_stock_icon (factory, GTK_STOCK_PAGE_SETUP);
-  register_stock_icon (factory, GTK_STOCK_PASTE);
-  register_stock_icon (factory, GTK_STOCK_PREFERENCES);
-  register_stock_icon (factory, GTK_STOCK_PRINT);
-  register_stock_icon (factory, GTK_STOCK_PRINT_ERROR);
-  register_stock_icon (factory, GTK_STOCK_PRINT_PAUSED);
-  register_stock_icon (factory, GTK_STOCK_PRINT_PREVIEW);
-  register_stock_icon (factory, GTK_STOCK_PRINT_REPORT);
-  register_stock_icon (factory, GTK_STOCK_PRINT_WARNING);
-  register_stock_icon (factory, GTK_STOCK_PROPERTIES);
-  register_bidi_stock_icon (factory,
-                           GTK_STOCK_REDO,
-                           GTK_STOCK_REDO "-ltr",
-                           GTK_STOCK_REDO "-rtl");
-  register_stock_icon (factory, GTK_STOCK_REMOVE);
-  register_stock_icon (factory, GTK_STOCK_REFRESH);
-  register_bidi_stock_icon (factory,
-                           GTK_STOCK_REVERT_TO_SAVED,
-                           GTK_STOCK_REVERT_TO_SAVED "-ltr",
-                           GTK_STOCK_REVERT_TO_SAVED "-rtl");
-  register_bidi_stock_icon (factory,
-                           GTK_STOCK_GO_FORWARD,
-                           GTK_STOCK_GO_FORWARD "-ltr",
-                           GTK_STOCK_GO_FORWARD "-rtl");
-  register_stock_icon (factory, GTK_STOCK_SAVE);
-  register_stock_icon (factory, GTK_STOCK_FLOPPY);
-  register_stock_icon (factory, GTK_STOCK_SAVE_AS);
-  register_stock_icon (factory, GTK_STOCK_FIND);
-  register_stock_icon (factory, GTK_STOCK_FIND_AND_REPLACE);
-  register_stock_icon (factory, GTK_STOCK_SORT_DESCENDING);
-  register_stock_icon (factory, GTK_STOCK_SORT_ASCENDING);
-  register_stock_icon (factory, GTK_STOCK_SPELL_CHECK);
-  register_stock_icon (factory, GTK_STOCK_STOP);
-  register_stock_icon (factory, GTK_STOCK_BOLD);
-  register_stock_icon (factory, GTK_STOCK_ITALIC);
-  register_stock_icon (factory, GTK_STOCK_STRIKETHROUGH);
-  register_stock_icon (factory, GTK_STOCK_UNDERLINE);
-  register_bidi_stock_icon (factory,
-                           GTK_STOCK_INDENT,
-                           GTK_STOCK_INDENT "-ltr",
-                           GTK_STOCK_INDENT "-rtl");
-  register_bidi_stock_icon (factory,
-                           GTK_STOCK_UNINDENT,
-                           GTK_STOCK_UNINDENT "-ltr",
-                           GTK_STOCK_UNINDENT "-rtl");
-  register_stock_icon (factory, GTK_STOCK_GOTO_TOP);
-  register_stock_icon (factory, GTK_STOCK_DELETE);
-  register_bidi_stock_icon (factory,
-                           GTK_STOCK_UNDELETE,
-                           GTK_STOCK_UNDELETE "-ltr",
-                           GTK_STOCK_UNDELETE "-rtl");
-  register_bidi_stock_icon (factory,
-                           GTK_STOCK_UNDO,
-                           GTK_STOCK_UNDO "-ltr",
-                           GTK_STOCK_UNDO "-rtl");
-  register_stock_icon (factory, GTK_STOCK_GO_UP);
-  register_stock_icon (factory, GTK_STOCK_FILE);
-  register_stock_icon (factory, GTK_STOCK_DIRECTORY);
-  register_stock_icon (factory, GTK_STOCK_ABOUT);
-  register_stock_icon (factory, GTK_STOCK_CONNECT);
-  register_stock_icon (factory, GTK_STOCK_DISCONNECT);
-  register_stock_icon (factory, GTK_STOCK_EDIT);
-  register_stock_icon (factory, GTK_STOCK_CAPS_LOCK_WARNING);
-  register_bidi_stock_icon (factory,
-                           GTK_STOCK_MEDIA_FORWARD,
-                           GTK_STOCK_MEDIA_FORWARD "-ltr",
-                           GTK_STOCK_MEDIA_FORWARD "-rtl");
-  register_bidi_stock_icon (factory,
-                           GTK_STOCK_MEDIA_NEXT,
-                           GTK_STOCK_MEDIA_NEXT "-ltr",
-                           GTK_STOCK_MEDIA_NEXT "-rtl");
-  register_stock_icon (factory, GTK_STOCK_MEDIA_PAUSE);
-  register_bidi_stock_icon (factory,
-                           GTK_STOCK_MEDIA_PLAY,
-                           GTK_STOCK_MEDIA_PLAY "-ltr",
-                           GTK_STOCK_MEDIA_PLAY "-rtl");
-  register_bidi_stock_icon (factory,
-                           GTK_STOCK_MEDIA_PREVIOUS,
-                           GTK_STOCK_MEDIA_PREVIOUS "-ltr",
-                           GTK_STOCK_MEDIA_PREVIOUS "-rtl");
-  register_stock_icon (factory, GTK_STOCK_MEDIA_RECORD);
-  register_bidi_stock_icon (factory,
-                           GTK_STOCK_MEDIA_REWIND,
-                           GTK_STOCK_MEDIA_REWIND "-ltr",
-                           GTK_STOCK_MEDIA_REWIND "-rtl");
-  register_stock_icon (factory, GTK_STOCK_MEDIA_STOP);
-  register_stock_icon (factory, GTK_STOCK_INDEX);
-  register_stock_icon (factory, GTK_STOCK_ZOOM_100);
-  register_stock_icon (factory, GTK_STOCK_ZOOM_IN);
-  register_stock_icon (factory, GTK_STOCK_ZOOM_OUT);
-  register_stock_icon (factory, GTK_STOCK_ZOOM_FIT);
-  register_stock_icon (factory, GTK_STOCK_SELECT_ALL);
-  register_stock_icon (factory, GTK_STOCK_CLEAR);
-  register_stock_icon (factory, GTK_STOCK_SELECT_COLOR);
-  register_stock_icon (factory, GTK_STOCK_COLOR_PICKER);
+  register_stock_icon (factory, GTK_STOCK_DIALOG_AUTHENTICATION, "dialog-password");
+  register_stock_icon (factory, GTK_STOCK_DIALOG_ERROR, "dialog-error");
+  register_stock_icon (factory, GTK_STOCK_DIALOG_INFO, "dialog-info");
+  register_stock_icon (factory, GTK_STOCK_DIALOG_QUESTION, "dialog-question");
+  register_stock_icon (factory, GTK_STOCK_DIALOG_WARNING, "dialog-warning");
+  register_stock_icon (factory, GTK_STOCK_DND, GTK_STOCK_DND);
+  register_stock_icon (factory, GTK_STOCK_DND_MULTIPLE, GTK_STOCK_DND_MULTIPLE);
+  register_stock_icon (factory, GTK_STOCK_APPLY, GTK_STOCK_APPLY);
+  register_stock_icon (factory, GTK_STOCK_CANCEL, GTK_STOCK_CANCEL);
+  register_stock_icon (factory, GTK_STOCK_NO, GTK_STOCK_NO);
+  register_stock_icon (factory, GTK_STOCK_OK, GTK_STOCK_OK);
+  register_stock_icon (factory, GTK_STOCK_YES, GTK_STOCK_YES);
+  register_stock_icon (factory, GTK_STOCK_CLOSE, "window-close");
+  register_stock_icon (factory, GTK_STOCK_ADD, "list-add");
+  register_stock_icon (factory, GTK_STOCK_JUSTIFY_CENTER, "format-justify-center");
+  register_stock_icon (factory, GTK_STOCK_JUSTIFY_FILL, "format-justify-fill");
+  register_stock_icon (factory, GTK_STOCK_JUSTIFY_LEFT, "format-justify-left");
+  register_stock_icon (factory, GTK_STOCK_JUSTIFY_RIGHT, "format-justify-right");
+  register_stock_icon (factory, GTK_STOCK_GOTO_BOTTOM, "go-bottom");
+  register_stock_icon (factory, GTK_STOCK_CDROM, "media-optical");
+  register_stock_icon (factory, GTK_STOCK_CONVERT, GTK_STOCK_CONVERT);
+  register_stock_icon (factory, GTK_STOCK_COPY, "edit-copy");
+  register_stock_icon (factory, GTK_STOCK_CUT, "edit-cut");
+  register_stock_icon (factory, GTK_STOCK_GO_DOWN, "go-down");
+  register_stock_icon (factory, GTK_STOCK_EXECUTE, "system-run");
+  register_stock_icon (factory, GTK_STOCK_QUIT, "application-exit");
+  register_bidi_stock_icon (factory, GTK_STOCK_GOTO_FIRST, "go-first");
+  register_stock_icon (factory, GTK_STOCK_SELECT_FONT, GTK_STOCK_SELECT_FONT);
+  register_stock_icon (factory, GTK_STOCK_FULLSCREEN, "view-fullscreen");
+  register_stock_icon (factory, GTK_STOCK_LEAVE_FULLSCREEN, "view-restore");
+  register_stock_icon (factory, GTK_STOCK_HARDDISK, "drive-harddisk");
+  register_stock_icon (factory, GTK_STOCK_HELP, "help-contents");
+  register_stock_icon (factory, GTK_STOCK_HOME, "go-home");
+  register_stock_icon (factory, GTK_STOCK_INFO, "dialog-info");
+  register_bidi_stock_icon (factory, GTK_STOCK_JUMP_TO, "go-jump");
+  register_bidi_stock_icon (factory, GTK_STOCK_GOTO_LAST, "go-last");
+  register_bidi_stock_icon (factory, GTK_STOCK_GO_BACK, "go-previous");
+  register_stock_icon (factory, GTK_STOCK_MISSING_IMAGE, "image-missing");
+  register_stock_icon (factory, GTK_STOCK_NETWORK, "network-idle");
+  register_stock_icon (factory, GTK_STOCK_NEW, "document-new");
+  register_stock_icon (factory, GTK_STOCK_OPEN, "document-open");
+  register_stock_icon (factory, GTK_STOCK_ORIENTATION_PORTRAIT, GTK_STOCK_ORIENTATION_PORTRAIT);
+  register_stock_icon (factory, GTK_STOCK_ORIENTATION_LANDSCAPE, GTK_STOCK_ORIENTATION_LANDSCAPE);
+  register_stock_icon (factory, GTK_STOCK_ORIENTATION_REVERSE_PORTRAIT, GTK_STOCK_ORIENTATION_REVERSE_PORTRAIT);
+  register_stock_icon (factory, GTK_STOCK_ORIENTATION_REVERSE_LANDSCAPE, GTK_STOCK_ORIENTATION_REVERSE_LANDSCAPE);
+  register_stock_icon (factory, GTK_STOCK_PAGE_SETUP, GTK_STOCK_PAGE_SETUP);
+  register_stock_icon (factory, GTK_STOCK_PASTE, "edit-paste");
+  register_stock_icon (factory, GTK_STOCK_PREFERENCES, "edit-preferences");
+  register_stock_icon (factory, GTK_STOCK_PRINT, "document-print");
+  register_stock_icon (factory, GTK_STOCK_PRINT_ERROR, "printer-error");
+  register_stock_icon (factory, GTK_STOCK_PRINT_PAUSED, "printer-paused");
+  register_stock_icon (factory, GTK_STOCK_PRINT_PREVIEW, "document-print-preview");
+  register_stock_icon (factory, GTK_STOCK_PRINT_REPORT, "printer-info");
+  register_stock_icon (factory, GTK_STOCK_PRINT_WARNING, "printer-warning");
+  register_stock_icon (factory, GTK_STOCK_PROPERTIES, "document-properties");
+  register_bidi_stock_icon (factory, GTK_STOCK_REDO, "edit-redo");
+  register_stock_icon (factory, GTK_STOCK_REMOVE, "list-remove");
+  register_stock_icon (factory, GTK_STOCK_REFRESH, "view-refresh");
+  register_bidi_stock_icon (factory, GTK_STOCK_REVERT_TO_SAVED, "document-revert");
+  register_bidi_stock_icon (factory, GTK_STOCK_GO_FORWARD, "go-next");
+  register_stock_icon (factory, GTK_STOCK_SAVE, "document-save");
+  register_stock_icon (factory, GTK_STOCK_FLOPPY, "media-floppy");
+  register_stock_icon (factory, GTK_STOCK_SAVE_AS, "document-save-as");
+  register_stock_icon (factory, GTK_STOCK_FIND, "edit-find");
+  register_stock_icon (factory, GTK_STOCK_FIND_AND_REPLACE, "edit-find-replace");
+  register_stock_icon (factory, GTK_STOCK_SORT_DESCENDING, "view-sort-descending");
+  register_stock_icon (factory, GTK_STOCK_SORT_ASCENDING, "view-sort-ascending");
+  register_stock_icon (factory, GTK_STOCK_SPELL_CHECK, "tools-check-spelling");
+  register_stock_icon (factory, GTK_STOCK_STOP, "process-stop");
+  register_stock_icon (factory, GTK_STOCK_BOLD, "format-text-bold");
+  register_stock_icon (factory, GTK_STOCK_ITALIC, "format-text-italic");
+  register_stock_icon (factory, GTK_STOCK_STRIKETHROUGH, "format-text-strikethrough");
+  register_stock_icon (factory, GTK_STOCK_UNDERLINE, "format-text-underline");
+  register_bidi_stock_icon (factory, GTK_STOCK_INDENT, "format-indent-more");
+  register_bidi_stock_icon (factory, GTK_STOCK_UNINDENT, "format-indent-less");
+  register_stock_icon (factory, GTK_STOCK_GOTO_TOP, "go-top");
+  register_stock_icon (factory, GTK_STOCK_DELETE, "edit-delete");
+  register_bidi_stock_icon (factory, GTK_STOCK_UNDELETE, GTK_STOCK_UNDELETE);
+  register_bidi_stock_icon (factory, GTK_STOCK_UNDO, "edit-undo");
+  register_stock_icon (factory, GTK_STOCK_GO_UP, "go-up");
+  register_stock_icon (factory, GTK_STOCK_FILE, "document-x-generic");
+  register_stock_icon (factory, GTK_STOCK_DIRECTORY, "folder");
+  register_stock_icon (factory, GTK_STOCK_ABOUT, "help-about");
+  register_stock_icon (factory, GTK_STOCK_CONNECT, GTK_STOCK_CONNECT);
+  register_stock_icon (factory, GTK_STOCK_DISCONNECT, GTK_STOCK_DISCONNECT);
+  register_stock_icon (factory, GTK_STOCK_EDIT, GTK_STOCK_EDIT);
+  register_stock_icon (factory, GTK_STOCK_CAPS_LOCK_WARNING, GTK_STOCK_CAPS_LOCK_WARNING);
+  register_bidi_stock_icon (factory, GTK_STOCK_MEDIA_FORWARD, "media-seek-forward");
+  register_bidi_stock_icon (factory, GTK_STOCK_MEDIA_NEXT, "media-skip-forward");
+  register_stock_icon (factory, GTK_STOCK_MEDIA_PAUSE, "media-playback-pause");
+  register_bidi_stock_icon (factory, GTK_STOCK_MEDIA_PLAY, "media-playback-start");
+  register_bidi_stock_icon (factory, GTK_STOCK_MEDIA_PREVIOUS, "media-skip-backward");
+  register_stock_icon (factory, GTK_STOCK_MEDIA_RECORD, "media-record");
+  register_bidi_stock_icon (factory, GTK_STOCK_MEDIA_REWIND, "media-seek-backward");
+  register_stock_icon (factory, GTK_STOCK_MEDIA_STOP, "media-playback-stop");
+  register_stock_icon (factory, GTK_STOCK_INDEX, GTK_STOCK_INDEX);
+  register_stock_icon (factory, GTK_STOCK_ZOOM_100, "zoom-original");
+  register_stock_icon (factory, GTK_STOCK_ZOOM_IN, "zoom-in");
+  register_stock_icon (factory, GTK_STOCK_ZOOM_OUT, "zoom-out");
+  register_stock_icon (factory, GTK_STOCK_ZOOM_FIT, "zoom-fit-best");
+  register_stock_icon (factory, GTK_STOCK_SELECT_ALL, "edit-select-all");
+  register_stock_icon (factory, GTK_STOCK_CLEAR, "edit-clear");
+  register_stock_icon (factory, GTK_STOCK_SELECT_COLOR, GTK_STOCK_SELECT_COLOR);
+  register_stock_icon (factory, GTK_STOCK_COLOR_PICKER, GTK_STOCK_COLOR_PICKER);
 }
 
 /************************************************************
@@ -1427,8 +1380,8 @@ render_icon_name_pixbuf (GtkIconSource    *icon_source,
                         GtkTextDirection  direction,
                         GtkStateType      state,
                         GtkIconSize       size,
-                        GtkWidget         *widget,
-                        const char        *detail)
+                        GtkWidget        *widget,
+                        const char       *detail)
 {
   GdkPixbuf *pixbuf;
   GdkPixbuf *tmp_pixbuf;
@@ -1498,10 +1451,35 @@ render_icon_name_pixbuf (GtkIconSource    *icon_source,
 
   pixel_size = MIN (width, height);
 
-  tmp_pixbuf = gtk_icon_theme_load_icon (icon_theme,
-                                        icon_source->source.icon_name,
-                                        pixel_size, 0,
-                                        &error);
+  if (icon_source->direction != GTK_TEXT_DIR_NONE)
+    {
+      gchar *suffix[3] = { NULL, "-ltr", "-rtl" };
+      gchar *names[3];
+      GtkIconInfo *info;
+
+      names[0] = g_strconcat (icon_source->source.icon_name, suffix[icon_source->direction], NULL);
+      names[1] = icon_source->source.icon_name;
+      names[2] = NULL;
+
+      g_print ("choose icon for %s\n", names[0]);
+      info = gtk_icon_theme_choose_icon (icon_theme,
+                                               names,
+                                               pixel_size, GTK_ICON_LOOKUP_USE_BUILTIN);
+      g_free (names[0]);
+      if (info)
+        {
+          tmp_pixbuf = gtk_icon_info_load_icon (info, &error);
+          gtk_icon_info_free (info);
+        }
+    }
+  else
+    {
+      g_print ("load icon for %s\n", icon_source->source.icon_name);
+      tmp_pixbuf = gtk_icon_theme_load_icon (icon_theme,
+                                             icon_source->source.icon_name,
+                                             pixel_size, 0,
+                                             &error);
+    }
 
   if (!tmp_pixbuf)
     {

diff --git a/gtk/stock-icons/16/gtk-quit.png b/gtk/stock-icons/16/application-exit.png
similarity index 100%
rename from gtk/stock-icons/16/gtk-quit.png
rename to gtk/stock-icons/16/application-exit.png

diff --git a/gtk/stock-icons/16/gtk-quit.svg b/gtk/stock-icons/16/application-exit.svg
similarity index 100%
rename from gtk/stock-icons/16/gtk-quit.svg
rename to gtk/stock-icons/16/application-exit.svg

diff --git a/gtk/stock-icons/16/gtk-info.png b/gtk/stock-icons/16/dialog-info.png
similarity index 100%
rename from gtk/stock-icons/16/gtk-info.png
rename to gtk/stock-icons/16/dialog-info.png

diff --git a/gtk/stock-icons/16/gtk-info.svg b/gtk/stock-icons/16/dialog-info.svg
similarity index 100%
rename from gtk/stock-icons/16/gtk-info.svg
rename to gtk/stock-icons/16/dialog-info.svg

diff --git a/gtk/stock-icons/16/gtk-file.png b/gtk/stock-icons/16/document-new.png
similarity index 100%
rename from gtk/stock-icons/16/gtk-file.png
rename to gtk/stock-icons/16/document-new.png

diff --git a/gtk/stock-icons/16/gtk-new.svg b/gtk/stock-icons/16/document-new.svg
similarity index 100%
rename from gtk/stock-icons/16/gtk-new.svg
rename to gtk/stock-icons/16/document-new.svg

diff --git a/gtk/stock-icons/16/gtk-open.png b/gtk/stock-icons/16/document-open.png
similarity index 100%
rename from gtk/stock-icons/16/gtk-open.png
rename to gtk/stock-icons/16/document-open.png

diff --git a/gtk/stock-icons/16/gtk-open.svg b/gtk/stock-icons/16/document-open.svg
similarity index 100%
rename from gtk/stock-icons/16/gtk-open.svg
rename to gtk/stock-icons/16/document-open.svg

diff --git a/gtk/stock-icons/16/gtk-print-preview.png b/gtk/stock-icons/16/document-print-preview.png
similarity index 100%
rename from gtk/stock-icons/16/gtk-print-preview.png
rename to gtk/stock-icons/16/document-print-preview.png

diff --git a/gtk/stock-icons/16/gtk-print-preview.svg b/gtk/stock-icons/16/document-print-preview.svg
similarity index 100%
rename from gtk/stock-icons/16/gtk-print-preview.svg
rename to gtk/stock-icons/16/document-print-preview.svg

diff --git a/gtk/stock-icons/16/gtk-print.png b/gtk/stock-icons/16/document-print.png
similarity index 100%
rename from gtk/stock-icons/16/gtk-print.png
rename to gtk/stock-icons/16/document-print.png

diff --git a/gtk/stock-icons/16/gtk-print.svg b/gtk/stock-icons/16/document-print.svg
similarity index 100%
rename from gtk/stock-icons/16/gtk-print.svg
rename to gtk/stock-icons/16/document-print.svg

diff --git a/gtk/stock-icons/16/gtk-properties.png b/gtk/stock-icons/16/document-properties.png
similarity index 100%
rename from gtk/stock-icons/16/gtk-properties.png
rename to gtk/stock-icons/16/document-properties.png

diff --git a/gtk/stock-icons/16/gtk-properties.svg b/gtk/stock-icons/16/document-properties.svg
similarity index 100%
rename from gtk/stock-icons/16/gtk-properties.svg
rename to gtk/stock-icons/16/document-properties.svg

diff --git a/gtk/stock-icons/16/gtk-revert-to-saved-ltr.png b/gtk/stock-icons/16/document-revert-ltr.png
similarity index 100%
rename from gtk/stock-icons/16/gtk-revert-to-saved-ltr.png
rename to gtk/stock-icons/16/document-revert-ltr.png

diff --git a/gtk/stock-icons/16/gtk-revert-to-saved-ltr.svg b/gtk/stock-icons/16/document-revert-ltr.svg
similarity index 100%
rename from gtk/stock-icons/16/gtk-revert-to-saved-ltr.svg
rename to gtk/stock-icons/16/document-revert-ltr.svg

diff --git a/gtk/stock-icons/16/gtk-revert-to-saved-rtl.png b/gtk/stock-icons/16/document-revert-rtl.png
similarity index 100%
rename from gtk/stock-icons/16/gtk-revert-to-saved-rtl.png
rename to gtk/stock-icons/16/document-revert-rtl.png

diff --git a/gtk/stock-icons/16/gtk-revert-to-saved-rtl.svg b/gtk/stock-icons/16/document-revert-rtl.svg
similarity index 100%
rename from gtk/stock-icons/16/gtk-revert-to-saved-rtl.svg
rename to gtk/stock-icons/16/document-revert-rtl.svg

diff --git a/gtk/stock-icons/16/gtk-save-as.png b/gtk/stock-icons/16/document-save-as.png
similarity index 100%
rename from gtk/stock-icons/16/gtk-save-as.png
rename to gtk/stock-icons/16/document-save-as.png

diff --git a/gtk/stock-icons/16/gtk-save-as.svg b/gtk/stock-icons/16/document-save-as.svg
similarity index 100%
rename from gtk/stock-icons/16/gtk-save-as.svg
rename to gtk/stock-icons/16/document-save-as.svg

diff --git a/gtk/stock-icons/16/gtk-new.png b/gtk/stock-icons/16/document-x-generic.png
similarity index 100%
rename from gtk/stock-icons/16/gtk-new.png
rename to gtk/stock-icons/16/document-x-generic.png

diff --git a/gtk/stock-icons/16/gtk-file.svg b/gtk/stock-icons/16/document-x-generic.svg
similarity index 100%
rename from gtk/stock-icons/16/gtk-file.svg
rename to gtk/stock-icons/16/document-x-generic.svg

diff --git a/gtk/stock-icons/16/gtk-harddisk.png b/gtk/stock-icons/16/drive-harddisk.png
similarity index 100%
rename from gtk/stock-icons/16/gtk-harddisk.png
rename to gtk/stock-icons/16/drive-harddisk.png

diff --git a/gtk/stock-icons/16/gtk-harddisk.svg b/gtk/stock-icons/16/drive-harddisk.svg
similarity index 100%
rename from gtk/stock-icons/16/gtk-harddisk.svg
rename to gtk/stock-icons/16/drive-harddisk.svg

diff --git a/gtk/stock-icons/16/gtk-clear.png b/gtk/stock-icons/16/edit-clear.png
similarity index 100%
rename from gtk/stock-icons/16/gtk-clear.png
rename to gtk/stock-icons/16/edit-clear.png

diff --git a/gtk/stock-icons/16/gtk-clear.svg b/gtk/stock-icons/16/edit-clear.svg
similarity index 100%
rename from gtk/stock-icons/16/gtk-clear.svg
rename to gtk/stock-icons/16/edit-clear.svg

diff --git a/gtk/stock-icons/16/gtk-copy.png b/gtk/stock-icons/16/edit-copy.png
similarity index 100%
rename from gtk/stock-icons/16/gtk-copy.png
rename to gtk/stock-icons/16/edit-copy.png

diff --git a/gtk/stock-icons/16/gtk-cut.png b/gtk/stock-icons/16/edit-cut.png
similarity index 100%
rename from gtk/stock-icons/16/gtk-cut.png
rename to gtk/stock-icons/16/edit-cut.png

diff --git a/gtk/stock-icons/16/gtk-cut.svg b/gtk/stock-icons/16/edit-cut.svg
similarity index 100%
rename from gtk/stock-icons/16/gtk-cut.svg
rename to gtk/stock-icons/16/edit-cut.svg

diff --git a/gtk/stock-icons/16/gtk-delete.png b/gtk/stock-icons/16/edit-delete.png
similarity index 100%
rename from gtk/stock-icons/16/gtk-delete.png
rename to gtk/stock-icons/16/edit-delete.png

diff --git a/gtk/stock-icons/16/gtk-delete.svg b/gtk/stock-icons/16/edit-delete.svg
similarity index 100%
rename from gtk/stock-icons/16/gtk-delete.svg
rename to gtk/stock-icons/16/edit-delete.svg

diff --git a/gtk/stock-icons/16/gtk-find-and-replace.png b/gtk/stock-icons/16/edit-find-replace.png
similarity index 100%
rename from gtk/stock-icons/16/gtk-find-and-replace.png
rename to gtk/stock-icons/16/edit-find-replace.png

diff --git a/gtk/stock-icons/16/gtk-find-and-replace.svg b/gtk/stock-icons/16/edit-find-replace.svg
similarity index 100%
rename from gtk/stock-icons/16/gtk-find-and-replace.svg
rename to gtk/stock-icons/16/edit-find-replace.svg

diff --git a/gtk/stock-icons/16/gtk-find.png b/gtk/stock-icons/16/edit-find.png
similarity index 100%
rename from gtk/stock-icons/16/gtk-find.png
rename to gtk/stock-icons/16/edit-find.png

diff --git a/gtk/stock-icons/16/gtk-find.svg b/gtk/stock-icons/16/edit-find.svg
similarity index 100%
rename from gtk/stock-icons/16/gtk-find.svg
rename to gtk/stock-icons/16/edit-find.svg

diff --git a/gtk/stock-icons/16/gtk-paste.png b/gtk/stock-icons/16/edit-paste.png
similarity index 100%
rename from gtk/stock-icons/16/gtk-paste.png
rename to gtk/stock-icons/16/edit-paste.png

diff --git a/gtk/stock-icons/16/gtk-preferences.png b/gtk/stock-icons/16/edit-preferences.png
similarity index 100%
rename from gtk/stock-icons/16/gtk-preferences.png
rename to gtk/stock-icons/16/edit-preferences.png

diff --git a/gtk/stock-icons/16/gtk-preferences.svg b/gtk/stock-icons/16/edit-preferences.svg
similarity index 100%
rename from gtk/stock-icons/16/gtk-preferences.svg
rename to gtk/stock-icons/16/edit-preferences.svg

diff --git a/gtk/stock-icons/16/gtk-redo-ltr.png b/gtk/stock-icons/16/edit-redo-ltr.png
similarity index 100%
rename from gtk/stock-icons/16/gtk-redo-ltr.png
rename to gtk/stock-icons/16/edit-redo-ltr.png

diff --git a/gtk/stock-icons/16/gtk-redo-ltr.svg b/gtk/stock-icons/16/edit-redo-ltr.svg
similarity index 100%
rename from gtk/stock-icons/16/gtk-redo-ltr.svg
rename to gtk/stock-icons/16/edit-redo-ltr.svg

diff --git a/gtk/stock-icons/16/gtk-redo-rtl.png b/gtk/stock-icons/16/edit-redo-rtl.png
similarity index 100%
rename from gtk/stock-icons/16/gtk-redo-rtl.png
rename to gtk/stock-icons/16/edit-redo-rtl.png

diff --git a/gtk/stock-icons/16/gtk-redo-rtl.svg b/gtk/stock-icons/16/edit-redo-rtl.svg
similarity index 100%
rename from gtk/stock-icons/16/gtk-redo-rtl.svg
rename to gtk/stock-icons/16/edit-redo-rtl.svg

diff --git a/gtk/stock-icons/16/gtk-select-all.png b/gtk/stock-icons/16/edit-select-all.png
similarity index 100%
rename from gtk/stock-icons/16/gtk-select-all.png
rename to gtk/stock-icons/16/edit-select-all.png

diff --git a/gtk/stock-icons/16/gtk-select-all.svg b/gtk/stock-icons/16/edit-select-all.svg
similarity index 100%
rename from gtk/stock-icons/16/gtk-select-all.svg
rename to gtk/stock-icons/16/edit-select-all.svg

diff --git a/gtk/stock-icons/16/gtk-undo-ltr.png b/gtk/stock-icons/16/edit-undo-ltr.png
similarity index 100%
rename from gtk/stock-icons/16/gtk-undo-ltr.png
rename to gtk/stock-icons/16/edit-undo-ltr.png

diff --git a/gtk/stock-icons/16/gtk-undo-ltr.svg b/gtk/stock-icons/16/edit-undo-ltr.svg
similarity index 100%
rename from gtk/stock-icons/16/gtk-undo-ltr.svg
rename to gtk/stock-icons/16/edit-undo-ltr.svg

diff --git a/gtk/stock-icons/16/gtk-undo-rtl.png b/gtk/stock-icons/16/edit-undo-rtl.png
similarity index 100%
rename from gtk/stock-icons/16/gtk-undo-rtl.png
rename to gtk/stock-icons/16/edit-undo-rtl.png

diff --git a/gtk/stock-icons/16/gtk-undo-rtl.svg b/gtk/stock-icons/16/edit-undo-rtl.svg
similarity index 100%
rename from gtk/stock-icons/16/gtk-undo-rtl.svg
rename to gtk/stock-icons/16/edit-undo-rtl.svg

diff --git a/gtk/stock-icons/16/gtk-directory.png b/gtk/stock-icons/16/folder.png
similarity index 100%
rename from gtk/stock-icons/16/gtk-directory.png
rename to gtk/stock-icons/16/folder.png

diff --git a/gtk/stock-icons/16/gtk-directory.svg b/gtk/stock-icons/16/folder.svg
similarity index 100%
rename from gtk/stock-icons/16/gtk-directory.svg
rename to gtk/stock-icons/16/folder.svg

diff --git a/gtk/stock-icons/16/gtk-unindent-ltr.png b/gtk/stock-icons/16/format-indent-less-ltr.png
similarity index 100%
rename from gtk/stock-icons/16/gtk-unindent-ltr.png
rename to gtk/stock-icons/16/format-indent-less-ltr.png

diff --git a/gtk/stock-icons/16/gtk-unindent-ltr.svg b/gtk/stock-icons/16/format-indent-less-ltr.svg
similarity index 100%
rename from gtk/stock-icons/16/gtk-unindent-ltr.svg
rename to gtk/stock-icons/16/format-indent-less-ltr.svg

diff --git a/gtk/stock-icons/16/gtk-unindent-rtl.png b/gtk/stock-icons/16/format-indent-less-rtl.png
similarity index 100%
rename from gtk/stock-icons/16/gtk-unindent-rtl.png
rename to gtk/stock-icons/16/format-indent-less-rtl.png

diff --git a/gtk/stock-icons/16/gtk-unindent-rtl.svg b/gtk/stock-icons/16/format-indent-less-rtl.svg
similarity index 100%
rename from gtk/stock-icons/16/gtk-unindent-rtl.svg
rename to gtk/stock-icons/16/format-indent-less-rtl.svg

diff --git a/gtk/stock-icons/16/gtk-indent-ltr.png b/gtk/stock-icons/16/format-indent-more-ltr.png
similarity index 100%
rename from gtk/stock-icons/16/gtk-indent-ltr.png
rename to gtk/stock-icons/16/format-indent-more-ltr.png

diff --git a/gtk/stock-icons/16/gtk-indent-ltr.svg b/gtk/stock-icons/16/format-indent-more-ltr.svg
similarity index 100%
rename from gtk/stock-icons/16/gtk-indent-ltr.svg
rename to gtk/stock-icons/16/format-indent-more-ltr.svg

diff --git a/gtk/stock-icons/16/gtk-indent-rtl.png b/gtk/stock-icons/16/format-indent-more-rtl.png
similarity index 100%
rename from gtk/stock-icons/16/gtk-indent-rtl.png
rename to gtk/stock-icons/16/format-indent-more-rtl.png

diff --git a/gtk/stock-icons/16/gtk-indent-rtl.svg b/gtk/stock-icons/16/format-indent-more-rtl.svg
similarity index 100%
rename from gtk/stock-icons/16/gtk-indent-rtl.svg
rename to gtk/stock-icons/16/format-indent-more-rtl.svg

diff --git a/gtk/stock-icons/16/gtk-justify-center.png b/gtk/stock-icons/16/format-justify-center.png
similarity index 100%
rename from gtk/stock-icons/16/gtk-justify-center.png
rename to gtk/stock-icons/16/format-justify-center.png

diff --git a/gtk/stock-icons/16/gtk-justify-center.svg b/gtk/stock-icons/16/format-justify-center.svg
similarity index 100%
rename from gtk/stock-icons/16/gtk-justify-center.svg
rename to gtk/stock-icons/16/format-justify-center.svg

diff --git a/gtk/stock-icons/16/gtk-justify-fill.png b/gtk/stock-icons/16/format-justify-fill.png
similarity index 100%
rename from gtk/stock-icons/16/gtk-justify-fill.png
rename to gtk/stock-icons/16/format-justify-fill.png

diff --git a/gtk/stock-icons/16/gtk-justify-fill.svg b/gtk/stock-icons/16/format-justify-fill.svg
similarity index 100%
rename from gtk/stock-icons/16/gtk-justify-fill.svg
rename to gtk/stock-icons/16/format-justify-fill.svg

diff --git a/gtk/stock-icons/16/gtk-justify-left.png b/gtk/stock-icons/16/format-justify-left.png
similarity index 100%
rename from gtk/stock-icons/16/gtk-justify-left.png
rename to gtk/stock-icons/16/format-justify-left.png

diff --git a/gtk/stock-icons/16/gtk-justify-left.svg b/gtk/stock-icons/16/format-justify-left.svg
similarity index 100%
rename from gtk/stock-icons/16/gtk-justify-left.svg
rename to gtk/stock-icons/16/format-justify-left.svg

diff --git a/gtk/stock-icons/16/gtk-justify-right.png b/gtk/stock-icons/16/format-justify-right.png
similarity index 100%
rename from gtk/stock-icons/16/gtk-justify-right.png
rename to gtk/stock-icons/16/format-justify-right.png

diff --git a/gtk/stock-icons/16/gtk-justify-right.svg b/gtk/stock-icons/16/format-justify-right.svg
similarity index 100%
rename from gtk/stock-icons/16/gtk-justify-right.svg
rename to gtk/stock-icons/16/format-justify-right.svg

diff --git a/gtk/stock-icons/16/gtk-bold.png b/gtk/stock-icons/16/format-text-bold.png
similarity index 100%
rename from gtk/stock-icons/16/gtk-bold.png
rename to gtk/stock-icons/16/format-text-bold.png

diff --git a/gtk/stock-icons/16/gtk-bold.svg b/gtk/stock-icons/16/format-text-bold.svg
similarity index 100%
rename from gtk/stock-icons/16/gtk-bold.svg
rename to gtk/stock-icons/16/format-text-bold.svg

diff --git a/gtk/stock-icons/16/gtk-italic.png b/gtk/stock-icons/16/format-text-italic.png
similarity index 100%
rename from gtk/stock-icons/16/gtk-italic.png
rename to gtk/stock-icons/16/format-text-italic.png

diff --git a/gtk/stock-icons/16/gtk-italic.svg b/gtk/stock-icons/16/format-text-italic.svg
similarity index 100%
rename from gtk/stock-icons/16/gtk-italic.svg
rename to gtk/stock-icons/16/format-text-italic.svg

diff --git a/gtk/stock-icons/16/gtk-strikethrough.png b/gtk/stock-icons/16/format-text-strikethrough.png
similarity index 100%
rename from gtk/stock-icons/16/gtk-strikethrough.png
rename to gtk/stock-icons/16/format-text-strikethrough.png

diff --git a/gtk/stock-icons/16/gtk-strikethrough.svg b/gtk/stock-icons/16/format-text-strikethrough.svg
similarity index 100%
rename from gtk/stock-icons/16/gtk-strikethrough.svg
rename to gtk/stock-icons/16/format-text-strikethrough.svg

diff --git a/gtk/stock-icons/16/gtk-underline.png b/gtk/stock-icons/16/format-text-underline.png
similarity index 100%
rename from gtk/stock-icons/16/gtk-underline.png
rename to gtk/stock-icons/16/format-text-underline.png

diff --git a/gtk/stock-icons/16/gtk-underline.svg b/gtk/stock-icons/16/format-text-underline.svg
similarity index 100%
rename from gtk/stock-icons/16/gtk-underline.svg
rename to gtk/stock-icons/16/format-text-underline.svg

diff --git a/gtk/stock-icons/16/gtk-go-back-rtl.svg b/gtk/stock-icons/16/go-back-rtl.svg
similarity index 100%
rename from gtk/stock-icons/16/gtk-go-back-rtl.svg
rename to gtk/stock-icons/16/go-back-rtl.svg

diff --git a/gtk/stock-icons/16/gtk-goto-bottom.png b/gtk/stock-icons/16/go-bottom.png
similarity index 100%
rename from gtk/stock-icons/16/gtk-goto-bottom.png
rename to gtk/stock-icons/16/go-bottom.png

diff --git a/gtk/stock-icons/16/gtk-goto-bottom.svg b/gtk/stock-icons/16/go-bottom.svg
similarity index 100%
rename from gtk/stock-icons/16/gtk-goto-bottom.svg
rename to gtk/stock-icons/16/go-bottom.svg

diff --git a/gtk/stock-icons/16/gtk-go-down.png b/gtk/stock-icons/16/go-down.png
similarity index 100%
rename from gtk/stock-icons/16/gtk-go-down.png
rename to gtk/stock-icons/16/go-down.png

diff --git a/gtk/stock-icons/16/gtk-go-down.svg b/gtk/stock-icons/16/go-down.svg
similarity index 100%
rename from gtk/stock-icons/16/gtk-go-down.svg
rename to gtk/stock-icons/16/go-down.svg

diff --git a/gtk/stock-icons/16/gtk-goto-first-ltr.png b/gtk/stock-icons/16/go-first-ltr.png
similarity index 100%
rename from gtk/stock-icons/16/gtk-goto-first-ltr.png
rename to gtk/stock-icons/16/go-first-ltr.png

diff --git a/gtk/stock-icons/16/gtk-goto-first-ltr.svg b/gtk/stock-icons/16/go-first-ltr.svg
similarity index 100%
rename from gtk/stock-icons/16/gtk-goto-first-ltr.svg
rename to gtk/stock-icons/16/go-first-ltr.svg

diff --git a/gtk/stock-icons/16/gtk-home.png b/gtk/stock-icons/16/go-home.png
similarity index 100%
rename from gtk/stock-icons/16/gtk-home.png
rename to gtk/stock-icons/16/go-home.png

diff --git a/gtk/stock-icons/16/gtk-home.svg b/gtk/stock-icons/16/go-home.svg
similarity index 100%
rename from gtk/stock-icons/16/gtk-home.svg
rename to gtk/stock-icons/16/go-home.svg

diff --git a/gtk/stock-icons/16/gtk-jump-to-ltr.png b/gtk/stock-icons/16/go-jump-ltr.png
similarity index 100%
rename from gtk/stock-icons/16/gtk-jump-to-ltr.png
rename to gtk/stock-icons/16/go-jump-ltr.png

diff --git a/gtk/stock-icons/16/gtk-jump-to-ltr.svg b/gtk/stock-icons/16/go-jump-ltr.svg
similarity index 100%
rename from gtk/stock-icons/16/gtk-jump-to-ltr.svg
rename to gtk/stock-icons/16/go-jump-ltr.svg

diff --git a/gtk/stock-icons/16/gtk-jump-to-rtl.png b/gtk/stock-icons/16/go-jump-rtl.png
similarity index 100%
rename from gtk/stock-icons/16/gtk-jump-to-rtl.png
rename to gtk/stock-icons/16/go-jump-rtl.png

diff --git a/gtk/stock-icons/16/gtk-jump-to-rtl.svg b/gtk/stock-icons/16/go-jump-rtl.svg
similarity index 100%
rename from gtk/stock-icons/16/gtk-jump-to-rtl.svg
rename to gtk/stock-icons/16/go-jump-rtl.svg

diff --git a/gtk/stock-icons/16/gtk-goto-last-ltr.png b/gtk/stock-icons/16/go-last-ltr.png
similarity index 100%
rename from gtk/stock-icons/16/gtk-goto-last-ltr.png
rename to gtk/stock-icons/16/go-last-ltr.png

diff --git a/gtk/stock-icons/16/gtk-goto-last-ltr.svg b/gtk/stock-icons/16/go-last-ltr.svg
similarity index 100%
rename from gtk/stock-icons/16/gtk-goto-last-ltr.svg
rename to gtk/stock-icons/16/go-last-ltr.svg

diff --git a/gtk/stock-icons/16/gtk-go-forward-ltr.png b/gtk/stock-icons/16/go-next-ltr.png
similarity index 100%
rename from gtk/stock-icons/16/gtk-go-forward-ltr.png
rename to gtk/stock-icons/16/go-next-ltr.png

diff --git a/gtk/stock-icons/16/gtk-go-forward-ltr.svg b/gtk/stock-icons/16/go-next-ltr.svg
similarity index 100%
rename from gtk/stock-icons/16/gtk-go-forward-ltr.svg
rename to gtk/stock-icons/16/go-next-ltr.svg

diff --git a/gtk/stock-icons/16/gtk-go-back-ltr.png b/gtk/stock-icons/16/go-previous-ltr.png
similarity index 100%
rename from gtk/stock-icons/16/gtk-go-back-ltr.png
rename to gtk/stock-icons/16/go-previous-ltr.png

diff --git a/gtk/stock-icons/16/gtk-go-back-ltr.svg b/gtk/stock-icons/16/go-previous-ltr.svg
similarity index 100%
rename from gtk/stock-icons/16/gtk-go-back-ltr.svg
rename to gtk/stock-icons/16/go-previous-ltr.svg

diff --git a/gtk/stock-icons/16/gtk-goto-top.png b/gtk/stock-icons/16/go-top.png
similarity index 100%
rename from gtk/stock-icons/16/gtk-goto-top.png
rename to gtk/stock-icons/16/go-top.png

diff --git a/gtk/stock-icons/16/gtk-goto-top.svg b/gtk/stock-icons/16/go-top.svg
similarity index 100%
rename from gtk/stock-icons/16/gtk-goto-top.svg
rename to gtk/stock-icons/16/go-top.svg

diff --git a/gtk/stock-icons/16/gtk-go-up.png b/gtk/stock-icons/16/go-up.png
similarity index 100%
rename from gtk/stock-icons/16/gtk-go-up.png
rename to gtk/stock-icons/16/go-up.png

diff --git a/gtk/stock-icons/16/gtk-go-up.svg b/gtk/stock-icons/16/go-up.svg
similarity index 100%
rename from gtk/stock-icons/16/gtk-go-up.svg
rename to gtk/stock-icons/16/go-up.svg

diff --git a/gtk/stock-icons/16/gtk-about.png b/gtk/stock-icons/16/help-about.png
similarity index 100%
rename from gtk/stock-icons/16/gtk-about.png
rename to gtk/stock-icons/16/help-about.png

diff --git a/gtk/stock-icons/16/gtk-about.svg b/gtk/stock-icons/16/help-about.svg
similarity index 100%
rename from gtk/stock-icons/16/gtk-about.svg
rename to gtk/stock-icons/16/help-about.svg

diff --git a/gtk/stock-icons/16/gtk-help.png b/gtk/stock-icons/16/help-contents.png
similarity index 100%
rename from gtk/stock-icons/16/gtk-help.png
rename to gtk/stock-icons/16/help-contents.png

diff --git a/gtk/stock-icons/16/gtk-help.svg b/gtk/stock-icons/16/help-contents.svg
similarity index 100%
rename from gtk/stock-icons/16/gtk-help.svg
rename to gtk/stock-icons/16/help-contents.svg

diff --git a/gtk/stock-icons/16/gtk-missing-image.png b/gtk/stock-icons/16/image-missing.png
similarity index 100%
rename from gtk/stock-icons/16/gtk-missing-image.png
rename to gtk/stock-icons/16/image-missing.png

diff --git a/gtk/stock-icons/16/gtk-missing-image.svg b/gtk/stock-icons/16/image-missing.svg
similarity index 100%
rename from gtk/stock-icons/16/gtk-missing-image.svg
rename to gtk/stock-icons/16/image-missing.svg

diff --git a/gtk/stock-icons/16/gtk-add.png b/gtk/stock-icons/16/list-add.png
similarity index 100%
rename from gtk/stock-icons/16/gtk-add.png
rename to gtk/stock-icons/16/list-add.png

diff --git a/gtk/stock-icons/16/gtk-add.svg b/gtk/stock-icons/16/list-add.svg
similarity index 100%
rename from gtk/stock-icons/16/gtk-add.svg
rename to gtk/stock-icons/16/list-add.svg

diff --git a/gtk/stock-icons/16/gtk-remove.png b/gtk/stock-icons/16/list-remove.png
similarity index 100%
rename from gtk/stock-icons/16/gtk-remove.png
rename to gtk/stock-icons/16/list-remove.png

diff --git a/gtk/stock-icons/16/gtk-remove.svg b/gtk/stock-icons/16/list-remove.svg
similarity index 100%
rename from gtk/stock-icons/16/gtk-remove.svg
rename to gtk/stock-icons/16/list-remove.svg

diff --git a/gtk/stock-icons/16/gtk-floppy.png b/gtk/stock-icons/16/media-floppy.png
similarity index 100%
rename from gtk/stock-icons/16/gtk-floppy.png
rename to gtk/stock-icons/16/media-floppy.png

diff --git a/gtk/stock-icons/16/gtk-floppy.svg b/gtk/stock-icons/16/media-floppy.svg
similarity index 100%
rename from gtk/stock-icons/16/gtk-floppy.svg
rename to gtk/stock-icons/16/media-floppy.svg

diff --git a/gtk/stock-icons/16/gtk-cdrom.png b/gtk/stock-icons/16/media-optical.png
similarity index 100%
rename from gtk/stock-icons/16/gtk-cdrom.png
rename to gtk/stock-icons/16/media-optical.png

diff --git a/gtk/stock-icons/16/gtk-cdrom.svg b/gtk/stock-icons/16/media-optical.svg
similarity index 100%
rename from gtk/stock-icons/16/gtk-cdrom.svg
rename to gtk/stock-icons/16/media-optical.svg

diff --git a/gtk/stock-icons/16/gtk-media-pause.png b/gtk/stock-icons/16/media-playback-pause.png
similarity index 100%
rename from gtk/stock-icons/16/gtk-media-pause.png
rename to gtk/stock-icons/16/media-playback-pause.png

diff --git a/gtk/stock-icons/16/gtk-media-pause.svg b/gtk/stock-icons/16/media-playback-pause.svg
similarity index 100%
rename from gtk/stock-icons/16/gtk-media-pause.svg
rename to gtk/stock-icons/16/media-playback-pause.svg

diff --git a/gtk/stock-icons/16/gtk-media-play-ltr.png b/gtk/stock-icons/16/media-playback-start-ltr.png
similarity index 100%
rename from gtk/stock-icons/16/gtk-media-play-ltr.png
rename to gtk/stock-icons/16/media-playback-start-ltr.png

diff --git a/gtk/stock-icons/16/gtk-media-play-ltr.svg b/gtk/stock-icons/16/media-playback-start-ltr.svg
similarity index 100%
rename from gtk/stock-icons/16/gtk-media-play-ltr.svg
rename to gtk/stock-icons/16/media-playback-start-ltr.svg

diff --git a/gtk/stock-icons/16/gtk-media-play-rtl.png b/gtk/stock-icons/16/media-playback-start-rtl.png
similarity index 100%
rename from gtk/stock-icons/16/gtk-media-play-rtl.png
rename to gtk/stock-icons/16/media-playback-start-rtl.png

diff --git a/gtk/stock-icons/16/gtk-media-play-rtl.svg b/gtk/stock-icons/16/media-playback-start-rtl.svg
similarity index 100%
rename from gtk/stock-icons/16/gtk-media-play-rtl.svg
rename to gtk/stock-icons/16/media-playback-start-rtl.svg

diff --git a/gtk/stock-icons/16/gtk-media-stop.png b/gtk/stock-icons/16/media-playback-stop.png
similarity index 100%
rename from gtk/stock-icons/16/gtk-media-stop.png
rename to gtk/stock-icons/16/media-playback-stop.png

diff --git a/gtk/stock-icons/16/gtk-media-stop.svg b/gtk/stock-icons/16/media-playback-stop.svg
similarity index 100%
rename from gtk/stock-icons/16/gtk-media-stop.svg
rename to gtk/stock-icons/16/media-playback-stop.svg

diff --git a/gtk/stock-icons/16/gtk-media-record.png b/gtk/stock-icons/16/media-record.png
similarity index 100%
rename from gtk/stock-icons/16/gtk-media-record.png
rename to gtk/stock-icons/16/media-record.png

diff --git a/gtk/stock-icons/16/gtk-media-record.svg b/gtk/stock-icons/16/media-record.svg
similarity index 100%
rename from gtk/stock-icons/16/gtk-media-record.svg
rename to gtk/stock-icons/16/media-record.svg

diff --git a/gtk/stock-icons/16/gtk-media-rewind-ltr.png b/gtk/stock-icons/16/media-seek-backward-ltr.png
similarity index 100%
rename from gtk/stock-icons/16/gtk-media-rewind-ltr.png
rename to gtk/stock-icons/16/media-seek-backward-ltr.png

diff --git a/gtk/stock-icons/16/gtk-media-rewind-ltr.svg b/gtk/stock-icons/16/media-seek-backward-ltr.svg
similarity index 100%
rename from gtk/stock-icons/16/gtk-media-rewind-ltr.svg
rename to gtk/stock-icons/16/media-seek-backward-ltr.svg

diff --git a/gtk/stock-icons/16/gtk-media-forward-ltr.png b/gtk/stock-icons/16/media-seek-forward-ltr.png
similarity index 100%
rename from gtk/stock-icons/16/gtk-media-forward-ltr.png
rename to gtk/stock-icons/16/media-seek-forward-ltr.png

diff --git a/gtk/stock-icons/16/gtk-media-forward-ltr.svg b/gtk/stock-icons/16/media-seek-forward-ltr.svg
similarity index 100%
rename from gtk/stock-icons/16/gtk-media-forward-ltr.svg
rename to gtk/stock-icons/16/media-seek-forward-ltr.svg

diff --git a/gtk/stock-icons/16/gtk-media-previous-ltr.png b/gtk/stock-icons/16/media-skip-backward-ltr.png
similarity index 100%
rename from gtk/stock-icons/16/gtk-media-previous-ltr.png
rename to gtk/stock-icons/16/media-skip-backward-ltr.png

diff --git a/gtk/stock-icons/16/gtk-media-previous-ltr.svg b/gtk/stock-icons/16/media-skip-backward-ltr.svg
similarity index 100%
rename from gtk/stock-icons/16/gtk-media-previous-ltr.svg
rename to gtk/stock-icons/16/media-skip-backward-ltr.svg

diff --git a/gtk/stock-icons/16/gtk-media-next-ltr.png b/gtk/stock-icons/16/media-skip-forward-ltr.png
similarity index 100%
rename from gtk/stock-icons/16/gtk-media-next-ltr.png
rename to gtk/stock-icons/16/media-skip-forward-ltr.png

diff --git a/gtk/stock-icons/16/gtk-media-next-ltr.svg b/gtk/stock-icons/16/media-skip-forward-ltr.svg
similarity index 100%
rename from gtk/stock-icons/16/gtk-media-next-ltr.svg
rename to gtk/stock-icons/16/media-skip-forward-ltr.svg

diff --git a/gtk/stock-icons/16/gtk-network.png b/gtk/stock-icons/16/network-idle.png
similarity index 100%
rename from gtk/stock-icons/16/gtk-network.png
rename to gtk/stock-icons/16/network-idle.png

diff --git a/gtk/stock-icons/16/gtk-network.svg b/gtk/stock-icons/16/network-idle.svg
similarity index 100%
rename from gtk/stock-icons/16/gtk-network.svg
rename to gtk/stock-icons/16/network-idle.svg

diff --git a/gtk/stock-icons/16/gtk-print-error.png b/gtk/stock-icons/16/printer-error.png
similarity index 100%
rename from gtk/stock-icons/16/gtk-print-error.png
rename to gtk/stock-icons/16/printer-error.png

diff --git a/gtk/stock-icons/16/gtk-print-error.svg b/gtk/stock-icons/16/printer-error.svg
similarity index 100%
rename from gtk/stock-icons/16/gtk-print-error.svg
rename to gtk/stock-icons/16/printer-error.svg

diff --git a/gtk/stock-icons/16/gtk-print-report.png b/gtk/stock-icons/16/printer-info.png
similarity index 100%
rename from gtk/stock-icons/16/gtk-print-report.png
rename to gtk/stock-icons/16/printer-info.png

diff --git a/gtk/stock-icons/16/gtk-print-report.svg b/gtk/stock-icons/16/printer-info.svg
similarity index 100%
rename from gtk/stock-icons/16/gtk-print-report.svg
rename to gtk/stock-icons/16/printer-info.svg

diff --git a/gtk/stock-icons/16/gtk-print-paused.png b/gtk/stock-icons/16/printer-paused.png
similarity index 100%
rename from gtk/stock-icons/16/gtk-print-paused.png
rename to gtk/stock-icons/16/printer-paused.png

diff --git a/gtk/stock-icons/16/gtk-print-paused.svg b/gtk/stock-icons/16/printer-paused.svg
similarity index 100%
rename from gtk/stock-icons/16/gtk-print-paused.svg
rename to gtk/stock-icons/16/printer-paused.svg

diff --git a/gtk/stock-icons/16/gtk-print-warning.png b/gtk/stock-icons/16/printer-warning.png
similarity index 100%
rename from gtk/stock-icons/16/gtk-print-warning.png
rename to gtk/stock-icons/16/printer-warning.png

diff --git a/gtk/stock-icons/16/gtk-print-warning.svg b/gtk/stock-icons/16/printer-warning.svg
similarity index 100%
rename from gtk/stock-icons/16/gtk-print-warning.svg
rename to gtk/stock-icons/16/printer-warning.svg

diff --git a/gtk/stock-icons/16/gtk-stop.png b/gtk/stock-icons/16/process-stop.png
similarity index 100%
rename from gtk/stock-icons/16/gtk-stop.png
rename to gtk/stock-icons/16/process-stop.png

diff --git a/gtk/stock-icons/16/gtk-stop.svg b/gtk/stock-icons/16/process-stop.svg
similarity index 100%
rename from gtk/stock-icons/16/gtk-stop.svg
rename to gtk/stock-icons/16/process-stop.svg

diff --git a/gtk/stock-icons/16/gtk-execute.png b/gtk/stock-icons/16/system-run.png
similarity index 100%
rename from gtk/stock-icons/16/gtk-execute.png
rename to gtk/stock-icons/16/system-run.png

diff --git a/gtk/stock-icons/16/gtk-execute.svg b/gtk/stock-icons/16/system-run.svg
similarity index 100%
rename from gtk/stock-icons/16/gtk-execute.svg
rename to gtk/stock-icons/16/system-run.svg

diff --git a/gtk/stock-icons/16/gtk-spell-check.png b/gtk/stock-icons/16/tools-check-spelling.png
similarity index 100%
rename from gtk/stock-icons/16/gtk-spell-check.png
rename to gtk/stock-icons/16/tools-check-spelling.png

diff --git a/gtk/stock-icons/16/gtk-spell-check.svg b/gtk/stock-icons/16/tools-check-spelling.svg
similarity index 100%
rename from gtk/stock-icons/16/gtk-spell-check.svg
rename to gtk/stock-icons/16/tools-check-spelling.svg

diff --git a/gtk/stock-icons/16/gtk-fullscreen.png b/gtk/stock-icons/16/view-fullscreen.png
similarity index 100%
rename from gtk/stock-icons/16/gtk-fullscreen.png
rename to gtk/stock-icons/16/view-fullscreen.png

diff --git a/gtk/stock-icons/16/gtk-fullscreen.svg b/gtk/stock-icons/16/view-fullscreen.svg
similarity index 100%
rename from gtk/stock-icons/16/gtk-fullscreen.svg
rename to gtk/stock-icons/16/view-fullscreen.svg

diff --git a/gtk/stock-icons/16/gtk-refresh.png b/gtk/stock-icons/16/view-refresh.png
similarity index 100%
rename from gtk/stock-icons/16/gtk-refresh.png
rename to gtk/stock-icons/16/view-refresh.png

diff --git a/gtk/stock-icons/16/gtk-refresh.svg b/gtk/stock-icons/16/view-refresh.svg
similarity index 100%
rename from gtk/stock-icons/16/gtk-refresh.svg
rename to gtk/stock-icons/16/view-refresh.svg

diff --git a/gtk/stock-icons/16/gtk-leave-fullscreen.png b/gtk/stock-icons/16/view-restore.png
similarity index 100%
rename from gtk/stock-icons/16/gtk-leave-fullscreen.png
rename to gtk/stock-icons/16/view-restore.png

diff --git a/gtk/stock-icons/16/gtk-leave-fullscreen.svg b/gtk/stock-icons/16/view-restore.svg
similarity index 100%
rename from gtk/stock-icons/16/gtk-leave-fullscreen.svg
rename to gtk/stock-icons/16/view-restore.svg

diff --git a/gtk/stock-icons/16/gtk-sort-ascending.png b/gtk/stock-icons/16/view-sort-ascending.png
similarity index 100%
rename from gtk/stock-icons/16/gtk-sort-ascending.png
rename to gtk/stock-icons/16/view-sort-ascending.png

diff --git a/gtk/stock-icons/16/gtk-sort-descending.png b/gtk/stock-icons/16/view-sort-descending.png
similarity index 100%
rename from gtk/stock-icons/16/gtk-sort-descending.png
rename to gtk/stock-icons/16/view-sort-descending.png

diff --git a/gtk/stock-icons/16/gtk-close.png b/gtk/stock-icons/16/window-close.png
similarity index 100%
rename from gtk/stock-icons/16/gtk-close.png
rename to gtk/stock-icons/16/window-close.png

diff --git a/gtk/stock-icons/16/gtk-close.svg b/gtk/stock-icons/16/window-close.svg
similarity index 100%
rename from gtk/stock-icons/16/gtk-close.svg
rename to gtk/stock-icons/16/window-close.svg

diff --git a/gtk/stock-icons/16/gtk-zoom-fit.png b/gtk/stock-icons/16/zoom-fit-best.png
similarity index 100%
rename from gtk/stock-icons/16/gtk-zoom-fit.png
rename to gtk/stock-icons/16/zoom-fit-best.png

diff --git a/gtk/stock-icons/16/gtk-zoom-fit.svg b/gtk/stock-icons/16/zoom-fit-best.svg
similarity index 100%
rename from gtk/stock-icons/16/gtk-zoom-fit.svg
rename to gtk/stock-icons/16/zoom-fit-best.svg

diff --git a/gtk/stock-icons/16/gtk-zoom-in.png b/gtk/stock-icons/16/zoom-in.png
similarity index 100%
rename from gtk/stock-icons/16/gtk-zoom-in.png
rename to gtk/stock-icons/16/zoom-in.png

diff --git a/gtk/stock-icons/16/gtk-zoom-in.svg b/gtk/stock-icons/16/zoom-in.svg
similarity index 100%
rename from gtk/stock-icons/16/gtk-zoom-in.svg
rename to gtk/stock-icons/16/zoom-in.svg

diff --git a/gtk/stock-icons/16/gtk-zoom-100.png b/gtk/stock-icons/16/zoom-original.png
similarity index 100%
rename from gtk/stock-icons/16/gtk-zoom-100.png
rename to gtk/stock-icons/16/zoom-original.png

diff --git a/gtk/stock-icons/16/gtk-zoom-100.svg b/gtk/stock-icons/16/zoom-original.svg
similarity index 100%
rename from gtk/stock-icons/16/gtk-zoom-100.svg
rename to gtk/stock-icons/16/zoom-original.svg

diff --git a/gtk/stock-icons/16/gtk-zoom-out.png b/gtk/stock-icons/16/zoom-out.png
similarity index 100%
rename from gtk/stock-icons/16/gtk-zoom-out.png
rename to gtk/stock-icons/16/zoom-out.png

diff --git a/gtk/stock-icons/16/gtk-zoom-out.svg b/gtk/stock-icons/16/zoom-out.svg
similarity index 100%
rename from gtk/stock-icons/16/gtk-zoom-out.svg
rename to gtk/stock-icons/16/zoom-out.svg

diff --git a/gtk/stock-icons/20/gtk-close.png b/gtk/stock-icons/20/window-close.png
similarity index 100%
rename from gtk/stock-icons/20/gtk-close.png
rename to gtk/stock-icons/20/window-close.png

diff --git a/gtk/stock-icons/20/gtk-close.svg b/gtk/stock-icons/20/window-close.svg
similarity index 100%
rename from gtk/stock-icons/20/gtk-close.svg
rename to gtk/stock-icons/20/window-close.svg

diff --git a/gtk/stock-icons/24/gtk-quit.png b/gtk/stock-icons/24/application-exit.png
similarity index 100%
rename from gtk/stock-icons/24/gtk-quit.png
rename to gtk/stock-icons/24/application-exit.png

diff --git a/gtk/stock-icons/24/gtk-quit.svg b/gtk/stock-icons/24/application-exit.svg
similarity index 100%
rename from gtk/stock-icons/24/gtk-quit.svg
rename to gtk/stock-icons/24/application-exit.svg

diff --git a/gtk/stock-icons/24/gtk-info.png b/gtk/stock-icons/24/dialog-info.png
similarity index 100%
rename from gtk/stock-icons/24/gtk-info.png
rename to gtk/stock-icons/24/dialog-info.png

diff --git a/gtk/stock-icons/24/gtk-info.svg b/gtk/stock-icons/24/dialog-info.svg
similarity index 100%
rename from gtk/stock-icons/24/gtk-info.svg
rename to gtk/stock-icons/24/dialog-info.svg

diff --git a/gtk/stock-icons/24/gtk-file.png b/gtk/stock-icons/24/document-new.png
similarity index 100%
rename from gtk/stock-icons/24/gtk-file.png
rename to gtk/stock-icons/24/document-new.png

diff --git a/gtk/stock-icons/24/gtk-new.svg b/gtk/stock-icons/24/document-new.svg
similarity index 100%
rename from gtk/stock-icons/24/gtk-new.svg
rename to gtk/stock-icons/24/document-new.svg

diff --git a/gtk/stock-icons/24/gtk-open.png b/gtk/stock-icons/24/document-open.png
similarity index 100%
rename from gtk/stock-icons/24/gtk-open.png
rename to gtk/stock-icons/24/document-open.png

diff --git a/gtk/stock-icons/24/gtk-open.svg b/gtk/stock-icons/24/document-open.svg
similarity index 100%
rename from gtk/stock-icons/24/gtk-open.svg
rename to gtk/stock-icons/24/document-open.svg

diff --git a/gtk/stock-icons/24/gtk-print-preview.png b/gtk/stock-icons/24/document-print-preview.png
similarity index 100%
rename from gtk/stock-icons/24/gtk-print-preview.png
rename to gtk/stock-icons/24/document-print-preview.png

diff --git a/gtk/stock-icons/24/gtk-print-preview.svg b/gtk/stock-icons/24/document-print-preview.svg
similarity index 100%
rename from gtk/stock-icons/24/gtk-print-preview.svg
rename to gtk/stock-icons/24/document-print-preview.svg

diff --git a/gtk/stock-icons/24/gtk-print.png b/gtk/stock-icons/24/document-print.png
similarity index 100%
rename from gtk/stock-icons/24/gtk-print.png
rename to gtk/stock-icons/24/document-print.png

diff --git a/gtk/stock-icons/24/gtk-print.svg b/gtk/stock-icons/24/document-print.svg
similarity index 100%
rename from gtk/stock-icons/24/gtk-print.svg
rename to gtk/stock-icons/24/document-print.svg

diff --git a/gtk/stock-icons/24/gtk-properties.png b/gtk/stock-icons/24/document-properties.png
similarity index 100%
rename from gtk/stock-icons/24/gtk-properties.png
rename to gtk/stock-icons/24/document-properties.png

diff --git a/gtk/stock-icons/24/gtk-properties.svg b/gtk/stock-icons/24/document-properties.svg
similarity index 100%
rename from gtk/stock-icons/24/gtk-properties.svg
rename to gtk/stock-icons/24/document-properties.svg

diff --git a/gtk/stock-icons/24/gtk-revert-to-saved-ltr.png b/gtk/stock-icons/24/document-revert-ltr.png
similarity index 100%
rename from gtk/stock-icons/24/gtk-revert-to-saved-ltr.png
rename to gtk/stock-icons/24/document-revert-ltr.png

diff --git a/gtk/stock-icons/24/gtk-revert-to-saved-ltr.svg b/gtk/stock-icons/24/document-revert-ltr.svg
similarity index 100%
rename from gtk/stock-icons/24/gtk-revert-to-saved-ltr.svg
rename to gtk/stock-icons/24/document-revert-ltr.svg

diff --git a/gtk/stock-icons/24/gtk-revert-to-saved-rtl.png b/gtk/stock-icons/24/document-revert-rtl.png
similarity index 100%
rename from gtk/stock-icons/24/gtk-revert-to-saved-rtl.png
rename to gtk/stock-icons/24/document-revert-rtl.png

diff --git a/gtk/stock-icons/24/gtk-revert-to-saved-rtl.svg b/gtk/stock-icons/24/document-revert-rtl.svg
similarity index 100%
rename from gtk/stock-icons/24/gtk-revert-to-saved-rtl.svg
rename to gtk/stock-icons/24/document-revert-rtl.svg

diff --git a/gtk/stock-icons/24/gtk-save-as.png b/gtk/stock-icons/24/document-save-as.png
similarity index 100%
rename from gtk/stock-icons/24/gtk-save-as.png
rename to gtk/stock-icons/24/document-save-as.png

diff --git a/gtk/stock-icons/24/gtk-save-as.svg b/gtk/stock-icons/24/document-save-as.svg
similarity index 100%
rename from gtk/stock-icons/24/gtk-save-as.svg
rename to gtk/stock-icons/24/document-save-as.svg

diff --git a/gtk/stock-icons/24/gtk-new.png b/gtk/stock-icons/24/document-x-generic.png
similarity index 100%
rename from gtk/stock-icons/24/gtk-new.png
rename to gtk/stock-icons/24/document-x-generic.png

diff --git a/gtk/stock-icons/24/gtk-file.svg b/gtk/stock-icons/24/document-x-generic.svg
similarity index 100%
rename from gtk/stock-icons/24/gtk-file.svg
rename to gtk/stock-icons/24/document-x-generic.svg

diff --git a/gtk/stock-icons/24/gtk-harddisk.png b/gtk/stock-icons/24/drive-harddisk.png
similarity index 100%
rename from gtk/stock-icons/24/gtk-harddisk.png
rename to gtk/stock-icons/24/drive-harddisk.png

diff --git a/gtk/stock-icons/24/gtk-harddisk.svg b/gtk/stock-icons/24/drive-harddisk.svg
similarity index 100%
rename from gtk/stock-icons/24/gtk-harddisk.svg
rename to gtk/stock-icons/24/drive-harddisk.svg

diff --git a/gtk/stock-icons/24/gtk-clear.png b/gtk/stock-icons/24/edit-clear.png
similarity index 100%
rename from gtk/stock-icons/24/gtk-clear.png
rename to gtk/stock-icons/24/edit-clear.png

diff --git a/gtk/stock-icons/24/gtk-clear.svg b/gtk/stock-icons/24/edit-clear.svg
similarity index 100%
rename from gtk/stock-icons/24/gtk-clear.svg
rename to gtk/stock-icons/24/edit-clear.svg

diff --git a/gtk/stock-icons/24/gtk-copy.png b/gtk/stock-icons/24/edit-copy.png
similarity index 100%
rename from gtk/stock-icons/24/gtk-copy.png
rename to gtk/stock-icons/24/edit-copy.png

diff --git a/gtk/stock-icons/24/gtk-cut.png b/gtk/stock-icons/24/edit-cut.png
similarity index 100%
rename from gtk/stock-icons/24/gtk-cut.png
rename to gtk/stock-icons/24/edit-cut.png

diff --git a/gtk/stock-icons/24/gtk-delete.png b/gtk/stock-icons/24/edit-delete.png
similarity index 100%
rename from gtk/stock-icons/24/gtk-delete.png
rename to gtk/stock-icons/24/edit-delete.png

diff --git a/gtk/stock-icons/24/gtk-delete.svg b/gtk/stock-icons/24/edit-delete.svg
similarity index 100%
rename from gtk/stock-icons/24/gtk-delete.svg
rename to gtk/stock-icons/24/edit-delete.svg

diff --git a/gtk/stock-icons/24/gtk-find-and-replace.png b/gtk/stock-icons/24/edit-find-replace.png
similarity index 100%
rename from gtk/stock-icons/24/gtk-find-and-replace.png
rename to gtk/stock-icons/24/edit-find-replace.png

diff --git a/gtk/stock-icons/24/gtk-find-and-replace.svg b/gtk/stock-icons/24/edit-find-replace.svg
similarity index 100%
rename from gtk/stock-icons/24/gtk-find-and-replace.svg
rename to gtk/stock-icons/24/edit-find-replace.svg

diff --git a/gtk/stock-icons/24/gtk-find.png b/gtk/stock-icons/24/edit-find.png
similarity index 100%
rename from gtk/stock-icons/24/gtk-find.png
rename to gtk/stock-icons/24/edit-find.png

diff --git a/gtk/stock-icons/24/gtk-find.svg b/gtk/stock-icons/24/edit-find.svg
similarity index 100%
rename from gtk/stock-icons/24/gtk-find.svg
rename to gtk/stock-icons/24/edit-find.svg

diff --git a/gtk/stock-icons/24/gtk-paste.png b/gtk/stock-icons/24/edit-paste.png
similarity index 100%
rename from gtk/stock-icons/24/gtk-paste.png
rename to gtk/stock-icons/24/edit-paste.png

diff --git a/gtk/stock-icons/24/gtk-preferences.png b/gtk/stock-icons/24/edit-preferences.png
similarity index 100%
rename from gtk/stock-icons/24/gtk-preferences.png
rename to gtk/stock-icons/24/edit-preferences.png

diff --git a/gtk/stock-icons/24/gtk-preferences.svg b/gtk/stock-icons/24/edit-preferences.svg
similarity index 100%
rename from gtk/stock-icons/24/gtk-preferences.svg
rename to gtk/stock-icons/24/edit-preferences.svg

diff --git a/gtk/stock-icons/24/gtk-redo-ltr.png b/gtk/stock-icons/24/edit-redo-ltr.png
similarity index 100%
rename from gtk/stock-icons/24/gtk-redo-ltr.png
rename to gtk/stock-icons/24/edit-redo-ltr.png

diff --git a/gtk/stock-icons/24/gtk-redo-ltr.svg b/gtk/stock-icons/24/edit-redo-ltr.svg
similarity index 100%
rename from gtk/stock-icons/24/gtk-redo-ltr.svg
rename to gtk/stock-icons/24/edit-redo-ltr.svg

diff --git a/gtk/stock-icons/24/gtk-redo-rtl.png b/gtk/stock-icons/24/edit-redo-rtl.png
similarity index 100%
rename from gtk/stock-icons/24/gtk-redo-rtl.png
rename to gtk/stock-icons/24/edit-redo-rtl.png

diff --git a/gtk/stock-icons/24/gtk-redo-rtl.svg b/gtk/stock-icons/24/edit-redo-rtl.svg
similarity index 100%
rename from gtk/stock-icons/24/gtk-redo-rtl.svg
rename to gtk/stock-icons/24/edit-redo-rtl.svg

diff --git a/gtk/stock-icons/24/gtk-select-all.png b/gtk/stock-icons/24/edit-select-all.png
similarity index 100%
rename from gtk/stock-icons/24/gtk-select-all.png
rename to gtk/stock-icons/24/edit-select-all.png

diff --git a/gtk/stock-icons/24/gtk-select-all.svg b/gtk/stock-icons/24/edit-select-all.svg
similarity index 100%
rename from gtk/stock-icons/24/gtk-select-all.svg
rename to gtk/stock-icons/24/edit-select-all.svg

diff --git a/gtk/stock-icons/24/gtk-undo-ltr.png b/gtk/stock-icons/24/edit-undo-ltr.png
similarity index 100%
rename from gtk/stock-icons/24/gtk-undo-ltr.png
rename to gtk/stock-icons/24/edit-undo-ltr.png

diff --git a/gtk/stock-icons/24/gtk-undo-ltr.svg b/gtk/stock-icons/24/edit-undo-ltr.svg
similarity index 100%
rename from gtk/stock-icons/24/gtk-undo-ltr.svg
rename to gtk/stock-icons/24/edit-undo-ltr.svg

diff --git a/gtk/stock-icons/24/gtk-undo-rtl.png b/gtk/stock-icons/24/edit-undo-rtl.png
similarity index 100%
rename from gtk/stock-icons/24/gtk-undo-rtl.png
rename to gtk/stock-icons/24/edit-undo-rtl.png

diff --git a/gtk/stock-icons/24/gtk-undo-rtl.svg b/gtk/stock-icons/24/edit-undo-rtl.svg
similarity index 100%
rename from gtk/stock-icons/24/gtk-undo-rtl.svg
rename to gtk/stock-icons/24/edit-undo-rtl.svg

diff --git a/gtk/stock-icons/24/gtk-directory.png b/gtk/stock-icons/24/folder.png
similarity index 100%
rename from gtk/stock-icons/24/gtk-directory.png
rename to gtk/stock-icons/24/folder.png

diff --git a/gtk/stock-icons/24/gtk-directory.svg b/gtk/stock-icons/24/folder.svg
similarity index 100%
rename from gtk/stock-icons/24/gtk-directory.svg
rename to gtk/stock-icons/24/folder.svg

diff --git a/gtk/stock-icons/24/gtk-unindent-ltr.png b/gtk/stock-icons/24/format-indent-less-ltr.png
similarity index 100%
rename from gtk/stock-icons/24/gtk-unindent-ltr.png
rename to gtk/stock-icons/24/format-indent-less-ltr.png

diff --git a/gtk/stock-icons/24/gtk-unindent-ltr.svg b/gtk/stock-icons/24/format-indent-less-ltr.svg
similarity index 100%
rename from gtk/stock-icons/24/gtk-unindent-ltr.svg
rename to gtk/stock-icons/24/format-indent-less-ltr.svg

diff --git a/gtk/stock-icons/24/gtk-unindent-rtl.png b/gtk/stock-icons/24/format-indent-less-rtl.png
similarity index 100%
rename from gtk/stock-icons/24/gtk-unindent-rtl.png
rename to gtk/stock-icons/24/format-indent-less-rtl.png

diff --git a/gtk/stock-icons/24/gtk-unindent-rtl.svg b/gtk/stock-icons/24/format-indent-less-rtl.svg
similarity index 100%
rename from gtk/stock-icons/24/gtk-unindent-rtl.svg
rename to gtk/stock-icons/24/format-indent-less-rtl.svg

diff --git a/gtk/stock-icons/24/gtk-indent-ltr.png b/gtk/stock-icons/24/format-indent-more-ltr.png
similarity index 100%
rename from gtk/stock-icons/24/gtk-indent-ltr.png
rename to gtk/stock-icons/24/format-indent-more-ltr.png

diff --git a/gtk/stock-icons/24/gtk-indent-ltr.svg b/gtk/stock-icons/24/format-indent-more-ltr.svg
similarity index 100%
rename from gtk/stock-icons/24/gtk-indent-ltr.svg
rename to gtk/stock-icons/24/format-indent-more-ltr.svg

diff --git a/gtk/stock-icons/24/gtk-indent-rtl.png b/gtk/stock-icons/24/format-indent-more-rtl.png
similarity index 100%
rename from gtk/stock-icons/24/gtk-indent-rtl.png
rename to gtk/stock-icons/24/format-indent-more-rtl.png

diff --git a/gtk/stock-icons/24/gtk-indent-rtl.svg b/gtk/stock-icons/24/format-indent-more-rtl.svg
similarity index 100%
rename from gtk/stock-icons/24/gtk-indent-rtl.svg
rename to gtk/stock-icons/24/format-indent-more-rtl.svg

diff --git a/gtk/stock-icons/24/gtk-justify-center.png b/gtk/stock-icons/24/format-justify-center.png
similarity index 100%
rename from gtk/stock-icons/24/gtk-justify-center.png
rename to gtk/stock-icons/24/format-justify-center.png

diff --git a/gtk/stock-icons/24/gtk-justify-center.svg b/gtk/stock-icons/24/format-justify-center.svg
similarity index 100%
rename from gtk/stock-icons/24/gtk-justify-center.svg
rename to gtk/stock-icons/24/format-justify-center.svg

diff --git a/gtk/stock-icons/24/gtk-justify-fill.png b/gtk/stock-icons/24/format-justify-fill.png
similarity index 100%
rename from gtk/stock-icons/24/gtk-justify-fill.png
rename to gtk/stock-icons/24/format-justify-fill.png

diff --git a/gtk/stock-icons/24/gtk-justify-fill.svg b/gtk/stock-icons/24/format-justify-fill.svg
similarity index 100%
rename from gtk/stock-icons/24/gtk-justify-fill.svg
rename to gtk/stock-icons/24/format-justify-fill.svg

diff --git a/gtk/stock-icons/24/gtk-justify-left.png b/gtk/stock-icons/24/format-justify-left.png
similarity index 100%
rename from gtk/stock-icons/24/gtk-justify-left.png
rename to gtk/stock-icons/24/format-justify-left.png

diff --git a/gtk/stock-icons/24/gtk-justify-left.svg b/gtk/stock-icons/24/format-justify-left.svg
similarity index 100%
rename from gtk/stock-icons/24/gtk-justify-left.svg
rename to gtk/stock-icons/24/format-justify-left.svg

diff --git a/gtk/stock-icons/24/gtk-justify-right.png b/gtk/stock-icons/24/format-justify-right.png
similarity index 100%
rename from gtk/stock-icons/24/gtk-justify-right.png
rename to gtk/stock-icons/24/format-justify-right.png

diff --git a/gtk/stock-icons/24/gtk-justify-right.svg b/gtk/stock-icons/24/format-justify-right.svg
similarity index 100%
rename from gtk/stock-icons/24/gtk-justify-right.svg
rename to gtk/stock-icons/24/format-justify-right.svg

diff --git a/gtk/stock-icons/24/gtk-bold.png b/gtk/stock-icons/24/format-text-bold.png
similarity index 100%
rename from gtk/stock-icons/24/gtk-bold.png
rename to gtk/stock-icons/24/format-text-bold.png

diff --git a/gtk/stock-icons/24/gtk-bold.svg b/gtk/stock-icons/24/format-text-bold.svg
similarity index 100%
rename from gtk/stock-icons/24/gtk-bold.svg
rename to gtk/stock-icons/24/format-text-bold.svg

diff --git a/gtk/stock-icons/24/gtk-italic.png b/gtk/stock-icons/24/format-text-italic.png
similarity index 100%
rename from gtk/stock-icons/24/gtk-italic.png
rename to gtk/stock-icons/24/format-text-italic.png

diff --git a/gtk/stock-icons/24/gtk-italic.svg b/gtk/stock-icons/24/format-text-italic.svg
similarity index 100%
rename from gtk/stock-icons/24/gtk-italic.svg
rename to gtk/stock-icons/24/format-text-italic.svg

diff --git a/gtk/stock-icons/24/gtk-strikethrough.png b/gtk/stock-icons/24/format-text-strikethrough.png
similarity index 100%
rename from gtk/stock-icons/24/gtk-strikethrough.png
rename to gtk/stock-icons/24/format-text-strikethrough.png

diff --git a/gtk/stock-icons/24/gtk-strikethrough.svg b/gtk/stock-icons/24/format-text-strikethrough.svg
similarity index 100%
rename from gtk/stock-icons/24/gtk-strikethrough.svg
rename to gtk/stock-icons/24/format-text-strikethrough.svg

diff --git a/gtk/stock-icons/24/gtk-underline.png b/gtk/stock-icons/24/format-text-underline.png
similarity index 100%
rename from gtk/stock-icons/24/gtk-underline.png
rename to gtk/stock-icons/24/format-text-underline.png

diff --git a/gtk/stock-icons/24/gtk-underline.svg b/gtk/stock-icons/24/format-text-underline.svg
similarity index 100%
rename from gtk/stock-icons/24/gtk-underline.svg
rename to gtk/stock-icons/24/format-text-underline.svg

diff --git a/gtk/stock-icons/24/gtk-goto-bottom.png b/gtk/stock-icons/24/go-bottom.png
similarity index 100%
rename from gtk/stock-icons/24/gtk-goto-bottom.png
rename to gtk/stock-icons/24/go-bottom.png

diff --git a/gtk/stock-icons/24/gtk-goto-bottom.svg b/gtk/stock-icons/24/go-bottom.svg
similarity index 100%
rename from gtk/stock-icons/24/gtk-goto-bottom.svg
rename to gtk/stock-icons/24/go-bottom.svg

diff --git a/gtk/stock-icons/24/gtk-go-down.png b/gtk/stock-icons/24/go-down.png
similarity index 100%
rename from gtk/stock-icons/24/gtk-go-down.png
rename to gtk/stock-icons/24/go-down.png

diff --git a/gtk/stock-icons/24/gtk-go-down.svg b/gtk/stock-icons/24/go-down.svg
similarity index 100%
rename from gtk/stock-icons/24/gtk-go-down.svg
rename to gtk/stock-icons/24/go-down.svg

diff --git a/gtk/stock-icons/24/gtk-goto-first-ltr.png b/gtk/stock-icons/24/go-first-ltr.png
similarity index 100%
rename from gtk/stock-icons/24/gtk-goto-first-ltr.png
rename to gtk/stock-icons/24/go-first-ltr.png

diff --git a/gtk/stock-icons/24/gtk-goto-first-ltr.svg b/gtk/stock-icons/24/go-first-ltr.svg
similarity index 100%
rename from gtk/stock-icons/24/gtk-goto-first-ltr.svg
rename to gtk/stock-icons/24/go-first-ltr.svg

diff --git a/gtk/stock-icons/24/gtk-home.png b/gtk/stock-icons/24/go-home.png
similarity index 100%
rename from gtk/stock-icons/24/gtk-home.png
rename to gtk/stock-icons/24/go-home.png

diff --git a/gtk/stock-icons/24/gtk-home.svg b/gtk/stock-icons/24/go-home.svg
similarity index 100%
rename from gtk/stock-icons/24/gtk-home.svg
rename to gtk/stock-icons/24/go-home.svg

diff --git a/gtk/stock-icons/24/gtk-jump-to-ltr.png b/gtk/stock-icons/24/go-jump-ltr.png
similarity index 100%
rename from gtk/stock-icons/24/gtk-jump-to-ltr.png
rename to gtk/stock-icons/24/go-jump-ltr.png

diff --git a/gtk/stock-icons/24/gtk-jump-to-ltr.svg b/gtk/stock-icons/24/go-jump-ltr.svg
similarity index 100%
rename from gtk/stock-icons/24/gtk-jump-to-ltr.svg
rename to gtk/stock-icons/24/go-jump-ltr.svg

diff --git a/gtk/stock-icons/24/gtk-jump-to-rtl.png b/gtk/stock-icons/24/go-jump-rtl.png
similarity index 100%
rename from gtk/stock-icons/24/gtk-jump-to-rtl.png
rename to gtk/stock-icons/24/go-jump-rtl.png

diff --git a/gtk/stock-icons/24/gtk-jump-to-rtl.svg b/gtk/stock-icons/24/go-jump-rtl.svg
similarity index 100%
rename from gtk/stock-icons/24/gtk-jump-to-rtl.svg
rename to gtk/stock-icons/24/go-jump-rtl.svg

diff --git a/gtk/stock-icons/24/gtk-goto-last-ltr.png b/gtk/stock-icons/24/go-last-ltr.png
similarity index 100%
rename from gtk/stock-icons/24/gtk-goto-last-ltr.png
rename to gtk/stock-icons/24/go-last-ltr.png

diff --git a/gtk/stock-icons/24/gtk-goto-last-ltr.svg b/gtk/stock-icons/24/go-last-ltr.svg
similarity index 100%
rename from gtk/stock-icons/24/gtk-goto-last-ltr.svg
rename to gtk/stock-icons/24/go-last-ltr.svg

diff --git a/gtk/stock-icons/24/gtk-go-forward-ltr.png b/gtk/stock-icons/24/go-next-ltr.png
similarity index 100%
rename from gtk/stock-icons/24/gtk-go-forward-ltr.png
rename to gtk/stock-icons/24/go-next-ltr.png

diff --git a/gtk/stock-icons/24/gtk-go-forward-ltr.svg b/gtk/stock-icons/24/go-next-ltr.svg
similarity index 100%
rename from gtk/stock-icons/24/gtk-go-forward-ltr.svg
rename to gtk/stock-icons/24/go-next-ltr.svg

diff --git a/gtk/stock-icons/24/gtk-go-back-ltr.png b/gtk/stock-icons/24/go-previous-ltr.png
similarity index 100%
rename from gtk/stock-icons/24/gtk-go-back-ltr.png
rename to gtk/stock-icons/24/go-previous-ltr.png

diff --git a/gtk/stock-icons/24/gtk-go-back-ltr.svg b/gtk/stock-icons/24/go-previous-ltr.svg
similarity index 100%
rename from gtk/stock-icons/24/gtk-go-back-ltr.svg
rename to gtk/stock-icons/24/go-previous-ltr.svg

diff --git a/gtk/stock-icons/24/gtk-go-back-rtl.svg b/gtk/stock-icons/24/go-previous-rtl.svg
similarity index 100%
rename from gtk/stock-icons/24/gtk-go-back-rtl.svg
rename to gtk/stock-icons/24/go-previous-rtl.svg

diff --git a/gtk/stock-icons/24/gtk-goto-top.png b/gtk/stock-icons/24/go-top.png
similarity index 100%
rename from gtk/stock-icons/24/gtk-goto-top.png
rename to gtk/stock-icons/24/go-top.png

diff --git a/gtk/stock-icons/24/gtk-goto-top.svg b/gtk/stock-icons/24/go-top.svg
similarity index 100%
rename from gtk/stock-icons/24/gtk-goto-top.svg
rename to gtk/stock-icons/24/go-top.svg

diff --git a/gtk/stock-icons/24/gtk-go-up.png b/gtk/stock-icons/24/go-up.png
similarity index 100%
rename from gtk/stock-icons/24/gtk-go-up.png
rename to gtk/stock-icons/24/go-up.png

diff --git a/gtk/stock-icons/24/gtk-go-up.svg b/gtk/stock-icons/24/go-up.svg
similarity index 100%
rename from gtk/stock-icons/24/gtk-go-up.svg
rename to gtk/stock-icons/24/go-up.svg

diff --git a/gtk/stock-icons/24/gtk-about.png b/gtk/stock-icons/24/help-about.png
similarity index 100%
rename from gtk/stock-icons/24/gtk-about.png
rename to gtk/stock-icons/24/help-about.png

diff --git a/gtk/stock-icons/24/gtk-about.svg b/gtk/stock-icons/24/help-about.svg
similarity index 100%
rename from gtk/stock-icons/24/gtk-about.svg
rename to gtk/stock-icons/24/help-about.svg

diff --git a/gtk/stock-icons/24/gtk-help.png b/gtk/stock-icons/24/help-contents.png
similarity index 100%
rename from gtk/stock-icons/24/gtk-help.png
rename to gtk/stock-icons/24/help-contents.png

diff --git a/gtk/stock-icons/24/gtk-help.svg b/gtk/stock-icons/24/help-contents.svg
similarity index 100%
rename from gtk/stock-icons/24/gtk-help.svg
rename to gtk/stock-icons/24/help-contents.svg

diff --git a/gtk/stock-icons/24/gtk-missing-image.png b/gtk/stock-icons/24/image-missing.png
similarity index 100%
rename from gtk/stock-icons/24/gtk-missing-image.png
rename to gtk/stock-icons/24/image-missing.png

diff --git a/gtk/stock-icons/24/gtk-missing-image.svg b/gtk/stock-icons/24/image-missing.svg
similarity index 100%
rename from gtk/stock-icons/24/gtk-missing-image.svg
rename to gtk/stock-icons/24/image-missing.svg

diff --git a/gtk/stock-icons/24/gtk-add.png b/gtk/stock-icons/24/list-add.png
similarity index 100%
rename from gtk/stock-icons/24/gtk-add.png
rename to gtk/stock-icons/24/list-add.png

diff --git a/gtk/stock-icons/24/gtk-add.svg b/gtk/stock-icons/24/list-add.svg
similarity index 100%
rename from gtk/stock-icons/24/gtk-add.svg
rename to gtk/stock-icons/24/list-add.svg

diff --git a/gtk/stock-icons/24/gtk-remove.png b/gtk/stock-icons/24/list-remove.png
similarity index 100%
rename from gtk/stock-icons/24/gtk-remove.png
rename to gtk/stock-icons/24/list-remove.png

diff --git a/gtk/stock-icons/24/gtk-remove.svg b/gtk/stock-icons/24/list-remove.svg
similarity index 100%
rename from gtk/stock-icons/24/gtk-remove.svg
rename to gtk/stock-icons/24/list-remove.svg

diff --git a/gtk/stock-icons/24/gtk-floppy.png b/gtk/stock-icons/24/media-floppy.png
similarity index 100%
rename from gtk/stock-icons/24/gtk-floppy.png
rename to gtk/stock-icons/24/media-floppy.png

diff --git a/gtk/stock-icons/24/gtk-floppy.svg b/gtk/stock-icons/24/media-floppy.svg
similarity index 100%
rename from gtk/stock-icons/24/gtk-floppy.svg
rename to gtk/stock-icons/24/media-floppy.svg

diff --git a/gtk/stock-icons/24/gtk-cdrom.png b/gtk/stock-icons/24/media-optical.png
similarity index 100%
rename from gtk/stock-icons/24/gtk-cdrom.png
rename to gtk/stock-icons/24/media-optical.png

diff --git a/gtk/stock-icons/24/gtk-cdrom.svg b/gtk/stock-icons/24/media-optical.svg
similarity index 100%
rename from gtk/stock-icons/24/gtk-cdrom.svg
rename to gtk/stock-icons/24/media-optical.svg

diff --git a/gtk/stock-icons/24/gtk-media-pause.png b/gtk/stock-icons/24/media-playback-pause.png
similarity index 100%
rename from gtk/stock-icons/24/gtk-media-pause.png
rename to gtk/stock-icons/24/media-playback-pause.png

diff --git a/gtk/stock-icons/24/gtk-media-pause.svg b/gtk/stock-icons/24/media-playback-pause.svg
similarity index 100%
rename from gtk/stock-icons/24/gtk-media-pause.svg
rename to gtk/stock-icons/24/media-playback-pause.svg

diff --git a/gtk/stock-icons/24/gtk-media-play-ltr.png b/gtk/stock-icons/24/media-playback-start-ltr.png
similarity index 100%
rename from gtk/stock-icons/24/gtk-media-play-ltr.png
rename to gtk/stock-icons/24/media-playback-start-ltr.png

diff --git a/gtk/stock-icons/24/gtk-media-play-ltr.svg b/gtk/stock-icons/24/media-playback-start-ltr.svg
similarity index 100%
rename from gtk/stock-icons/24/gtk-media-play-ltr.svg
rename to gtk/stock-icons/24/media-playback-start-ltr.svg

diff --git a/gtk/stock-icons/24/gtk-media-play-rtl.png b/gtk/stock-icons/24/media-playback-start-rtl.png
similarity index 100%
rename from gtk/stock-icons/24/gtk-media-play-rtl.png
rename to gtk/stock-icons/24/media-playback-start-rtl.png

diff --git a/gtk/stock-icons/24/gtk-media-play-rtl.svg b/gtk/stock-icons/24/media-playback-start-rtl.svg
similarity index 100%
rename from gtk/stock-icons/24/gtk-media-play-rtl.svg
rename to gtk/stock-icons/24/media-playback-start-rtl.svg

diff --git a/gtk/stock-icons/24/gtk-media-stop.png b/gtk/stock-icons/24/media-playback-stop.png
similarity index 100%
rename from gtk/stock-icons/24/gtk-media-stop.png
rename to gtk/stock-icons/24/media-playback-stop.png

diff --git a/gtk/stock-icons/24/gtk-media-stop.svg b/gtk/stock-icons/24/media-playback-stop.svg
similarity index 100%
rename from gtk/stock-icons/24/gtk-media-stop.svg
rename to gtk/stock-icons/24/media-playback-stop.svg

diff --git a/gtk/stock-icons/24/gtk-media-record.png b/gtk/stock-icons/24/media-record.png
similarity index 100%
rename from gtk/stock-icons/24/gtk-media-record.png
rename to gtk/stock-icons/24/media-record.png

diff --git a/gtk/stock-icons/24/gtk-media-record.svg b/gtk/stock-icons/24/media-record.svg
similarity index 100%
rename from gtk/stock-icons/24/gtk-media-record.svg
rename to gtk/stock-icons/24/media-record.svg

diff --git a/gtk/stock-icons/24/gtk-media-rewind-ltr.png b/gtk/stock-icons/24/media-seek-backward-ltr.png
similarity index 100%
rename from gtk/stock-icons/24/gtk-media-rewind-ltr.png
rename to gtk/stock-icons/24/media-seek-backward-ltr.png

diff --git a/gtk/stock-icons/24/gtk-media-rewind-ltr.svg b/gtk/stock-icons/24/media-seek-backward-ltr.svg
similarity index 100%
rename from gtk/stock-icons/24/gtk-media-rewind-ltr.svg
rename to gtk/stock-icons/24/media-seek-backward-ltr.svg

diff --git a/gtk/stock-icons/24/gtk-media-forward-ltr.png b/gtk/stock-icons/24/media-seek-forward-ltr.png
similarity index 100%
rename from gtk/stock-icons/24/gtk-media-forward-ltr.png
rename to gtk/stock-icons/24/media-seek-forward-ltr.png

diff --git a/gtk/stock-icons/24/gtk-media-forward-ltr.svg b/gtk/stock-icons/24/media-seek-forward-ltr.svg
similarity index 100%
rename from gtk/stock-icons/24/gtk-media-forward-ltr.svg
rename to gtk/stock-icons/24/media-seek-forward-ltr.svg

diff --git a/gtk/stock-icons/24/gtk-media-previous-ltr.png b/gtk/stock-icons/24/media-skip-backward-ltr.png
similarity index 100%
rename from gtk/stock-icons/24/gtk-media-previous-ltr.png
rename to gtk/stock-icons/24/media-skip-backward-ltr.png

diff --git a/gtk/stock-icons/24/gtk-media-previous-ltr.svg b/gtk/stock-icons/24/media-skip-backward-ltr.svg
similarity index 100%
rename from gtk/stock-icons/24/gtk-media-previous-ltr.svg
rename to gtk/stock-icons/24/media-skip-backward-ltr.svg

diff --git a/gtk/stock-icons/24/gtk-media-next-ltr.png b/gtk/stock-icons/24/media-skip-forward-ltr.png
similarity index 100%
rename from gtk/stock-icons/24/gtk-media-next-ltr.png
rename to gtk/stock-icons/24/media-skip-forward-ltr.png

diff --git a/gtk/stock-icons/24/gtk-media-next-ltr.svg b/gtk/stock-icons/24/media-skip-forward-ltr.svg
similarity index 100%
rename from gtk/stock-icons/24/gtk-media-next-ltr.svg
rename to gtk/stock-icons/24/media-skip-forward-ltr.svg

diff --git a/gtk/stock-icons/24/gtk-network.png b/gtk/stock-icons/24/network-idle.png
similarity index 100%
rename from gtk/stock-icons/24/gtk-network.png
rename to gtk/stock-icons/24/network-idle.png

diff --git a/gtk/stock-icons/24/gtk-network.svg b/gtk/stock-icons/24/network-idle.svg
similarity index 100%
rename from gtk/stock-icons/24/gtk-network.svg
rename to gtk/stock-icons/24/network-idle.svg

diff --git a/gtk/stock-icons/24/gtk-print-error.png b/gtk/stock-icons/24/printer-error.png
similarity index 100%
rename from gtk/stock-icons/24/gtk-print-error.png
rename to gtk/stock-icons/24/printer-error.png

diff --git a/gtk/stock-icons/24/gtk-print-error.svg b/gtk/stock-icons/24/printer-error.svg
similarity index 100%
rename from gtk/stock-icons/24/gtk-print-error.svg
rename to gtk/stock-icons/24/printer-error.svg

diff --git a/gtk/stock-icons/24/gtk-print-report.png b/gtk/stock-icons/24/printer-info.png
similarity index 100%
rename from gtk/stock-icons/24/gtk-print-report.png
rename to gtk/stock-icons/24/printer-info.png

diff --git a/gtk/stock-icons/24/gtk-print-report.svg b/gtk/stock-icons/24/printer-info.svg
similarity index 100%
rename from gtk/stock-icons/24/gtk-print-report.svg
rename to gtk/stock-icons/24/printer-info.svg

diff --git a/gtk/stock-icons/24/gtk-print-paused.png b/gtk/stock-icons/24/printer-paused.png
similarity index 100%
rename from gtk/stock-icons/24/gtk-print-paused.png
rename to gtk/stock-icons/24/printer-paused.png

diff --git a/gtk/stock-icons/24/gtk-print-paused.svg b/gtk/stock-icons/24/printer-paused.svg
similarity index 100%
rename from gtk/stock-icons/24/gtk-print-paused.svg
rename to gtk/stock-icons/24/printer-paused.svg

diff --git a/gtk/stock-icons/24/gtk-print-warning.png b/gtk/stock-icons/24/printer-warning.png
similarity index 100%
rename from gtk/stock-icons/24/gtk-print-warning.png
rename to gtk/stock-icons/24/printer-warning.png

diff --git a/gtk/stock-icons/24/gtk-print-warning.svg b/gtk/stock-icons/24/printer-warning.svg
similarity index 100%
rename from gtk/stock-icons/24/gtk-print-warning.svg
rename to gtk/stock-icons/24/printer-warning.svg

diff --git a/gtk/stock-icons/24/gtk-stop.png b/gtk/stock-icons/24/process-stop.png
similarity index 100%
rename from gtk/stock-icons/24/gtk-stop.png
rename to gtk/stock-icons/24/process-stop.png

diff --git a/gtk/stock-icons/24/gtk-stop.svg b/gtk/stock-icons/24/process-stop.svg
similarity index 100%
rename from gtk/stock-icons/24/gtk-stop.svg
rename to gtk/stock-icons/24/process-stop.svg

diff --git a/gtk/stock-icons/24/gtk-execute.png b/gtk/stock-icons/24/system-run.png
similarity index 100%
rename from gtk/stock-icons/24/gtk-execute.png
rename to gtk/stock-icons/24/system-run.png

diff --git a/gtk/stock-icons/24/gtk-execute.svg b/gtk/stock-icons/24/system-run.svg
similarity index 100%
rename from gtk/stock-icons/24/gtk-execute.svg
rename to gtk/stock-icons/24/system-run.svg

diff --git a/gtk/stock-icons/24/gtk-spell-check.png b/gtk/stock-icons/24/tools-check-spelling.png
similarity index 100%
rename from gtk/stock-icons/24/gtk-spell-check.png
rename to gtk/stock-icons/24/tools-check-spelling.png

diff --git a/gtk/stock-icons/24/gtk-spell-check.svg b/gtk/stock-icons/24/tools-check-spelling.svg
similarity index 100%
rename from gtk/stock-icons/24/gtk-spell-check.svg
rename to gtk/stock-icons/24/tools-check-spelling.svg

diff --git a/gtk/stock-icons/24/gtk-fullscreen.png b/gtk/stock-icons/24/view-fullscreen.png
similarity index 100%
rename from gtk/stock-icons/24/gtk-fullscreen.png
rename to gtk/stock-icons/24/view-fullscreen.png

diff --git a/gtk/stock-icons/24/gtk-fullscreen.svg b/gtk/stock-icons/24/view-fullscreen.svg
similarity index 100%
rename from gtk/stock-icons/24/gtk-fullscreen.svg
rename to gtk/stock-icons/24/view-fullscreen.svg

diff --git a/gtk/stock-icons/24/gtk-refresh.png b/gtk/stock-icons/24/view-refresh.png
similarity index 100%
rename from gtk/stock-icons/24/gtk-refresh.png
rename to gtk/stock-icons/24/view-refresh.png

diff --git a/gtk/stock-icons/24/gtk-refresh.svg b/gtk/stock-icons/24/view-refresh.svg
similarity index 100%
rename from gtk/stock-icons/24/gtk-refresh.svg
rename to gtk/stock-icons/24/view-refresh.svg

diff --git a/gtk/stock-icons/24/gtk-leave-fullscreen.png b/gtk/stock-icons/24/view-restore.png
similarity index 100%
rename from gtk/stock-icons/24/gtk-leave-fullscreen.png
rename to gtk/stock-icons/24/view-restore.png

diff --git a/gtk/stock-icons/24/gtk-leave-fullscreen.svg b/gtk/stock-icons/24/view-restore.svg
similarity index 100%
rename from gtk/stock-icons/24/gtk-leave-fullscreen.svg
rename to gtk/stock-icons/24/view-restore.svg

diff --git a/gtk/stock-icons/24/gtk-sort-ascending.png b/gtk/stock-icons/24/view-sort-ascending.png
similarity index 100%
rename from gtk/stock-icons/24/gtk-sort-ascending.png
rename to gtk/stock-icons/24/view-sort-ascending.png

diff --git a/gtk/stock-icons/24/gtk-sort-descending.png b/gtk/stock-icons/24/view-sort-descending.png
similarity index 100%
rename from gtk/stock-icons/24/gtk-sort-descending.png
rename to gtk/stock-icons/24/view-sort-descending.png

diff --git a/gtk/stock-icons/24/gtk-close.png b/gtk/stock-icons/24/window-close.png
similarity index 100%
rename from gtk/stock-icons/24/gtk-close.png
rename to gtk/stock-icons/24/window-close.png

diff --git a/gtk/stock-icons/24/gtk-close.svg b/gtk/stock-icons/24/window-close.svg
similarity index 100%
rename from gtk/stock-icons/24/gtk-close.svg
rename to gtk/stock-icons/24/window-close.svg

diff --git a/gtk/stock-icons/24/gtk-zoom-fit.png b/gtk/stock-icons/24/zoom-fit-best.png
similarity index 100%
rename from gtk/stock-icons/24/gtk-zoom-fit.png
rename to gtk/stock-icons/24/zoom-fit-best.png

diff --git a/gtk/stock-icons/24/gtk-zoom-fit.svg b/gtk/stock-icons/24/zoom-fit-best.svg
similarity index 100%
rename from gtk/stock-icons/24/gtk-zoom-fit.svg
rename to gtk/stock-icons/24/zoom-fit-best.svg

diff --git a/gtk/stock-icons/24/gtk-zoom-in.png b/gtk/stock-icons/24/zoom-in.png
similarity index 100%
rename from gtk/stock-icons/24/gtk-zoom-in.png
rename to gtk/stock-icons/24/zoom-in.png

diff --git a/gtk/stock-icons/24/gtk-zoom-in.svg b/gtk/stock-icons/24/zoom-in.svg
similarity index 100%
rename from gtk/stock-icons/24/gtk-zoom-in.svg
rename to gtk/stock-icons/24/zoom-in.svg

diff --git a/gtk/stock-icons/24/gtk-zoom-100.png b/gtk/stock-icons/24/zoom-original.png
similarity index 100%
rename from gtk/stock-icons/24/gtk-zoom-100.png
rename to gtk/stock-icons/24/zoom-original.png

diff --git a/gtk/stock-icons/24/gtk-zoom-100.svg b/gtk/stock-icons/24/zoom-original.svg
similarity index 100%
rename from gtk/stock-icons/24/gtk-zoom-100.svg
rename to gtk/stock-icons/24/zoom-original.svg

diff --git a/gtk/stock-icons/24/gtk-zoom-out.png b/gtk/stock-icons/24/zoom-out.png
similarity index 100%
rename from gtk/stock-icons/24/gtk-zoom-out.png
rename to gtk/stock-icons/24/zoom-out.png

diff --git a/gtk/stock-icons/24/gtk-zoom-out.svg b/gtk/stock-icons/24/zoom-out.svg
similarity index 100%
rename from gtk/stock-icons/24/gtk-zoom-out.svg
rename to gtk/stock-icons/24/zoom-out.svg

diff --git a/gtk/stock-icons/48/gtk-dialog-error.png b/gtk/stock-icons/48/dialog-error.png
similarity index 100%
rename from gtk/stock-icons/48/gtk-dialog-error.png
rename to gtk/stock-icons/48/dialog-error.png

diff --git a/gtk/stock-icons/48/gtk-dialog-error.svg b/gtk/stock-icons/48/dialog-error.svg
similarity index 100%
rename from gtk/stock-icons/48/gtk-dialog-error.svg
rename to gtk/stock-icons/48/dialog-error.svg

diff --git a/gtk/stock-icons/48/gtk-dialog-info.png b/gtk/stock-icons/48/dialog-info.png
similarity index 100%
rename from gtk/stock-icons/48/gtk-dialog-info.png
rename to gtk/stock-icons/48/dialog-info.png

diff --git a/gtk/stock-icons/48/gtk-dialog-info.svg b/gtk/stock-icons/48/dialog-info.svg
similarity index 100%
rename from gtk/stock-icons/48/gtk-dialog-info.svg
rename to gtk/stock-icons/48/dialog-info.svg

diff --git a/gtk/stock-icons/48/gtk-dialog-authentication.png b/gtk/stock-icons/48/dialog-password.png
similarity index 100%
rename from gtk/stock-icons/48/gtk-dialog-authentication.png
rename to gtk/stock-icons/48/dialog-password.png

diff --git a/gtk/stock-icons/48/gtk-dialog-authentication.svg b/gtk/stock-icons/48/dialog-password.svg
similarity index 100%
rename from gtk/stock-icons/48/gtk-dialog-authentication.svg
rename to gtk/stock-icons/48/dialog-password.svg

diff --git a/gtk/stock-icons/48/gtk-dialog-question.png b/gtk/stock-icons/48/dialog-question.png
similarity index 100%
rename from gtk/stock-icons/48/gtk-dialog-question.png
rename to gtk/stock-icons/48/dialog-question.png

diff --git a/gtk/stock-icons/48/gtk-dialog-question.svg b/gtk/stock-icons/48/dialog-question.svg
similarity index 100%
rename from gtk/stock-icons/48/gtk-dialog-question.svg
rename to gtk/stock-icons/48/dialog-question.svg

diff --git a/gtk/stock-icons/48/gtk-dialog-warning.png b/gtk/stock-icons/48/dialog-warning.png
similarity index 100%
rename from gtk/stock-icons/48/gtk-dialog-warning.png
rename to gtk/stock-icons/48/dialog-warning.png

diff --git a/gtk/stock-icons/48/gtk-dialog-warning.svg b/gtk/stock-icons/48/dialog-warning.svg
similarity index 100%
rename from gtk/stock-icons/48/gtk-dialog-warning.svg
rename to gtk/stock-icons/48/dialog-warning.svg