[gimp] themes, libgimpwidgets: prepare the icons to be named icons from an icon theme



commit cffc8234fa432057962540ea3d4fd432bdedcf38
Author: Michael Natterer <mitch gimp org>
Date:   Tue May 6 19:13:04 2014 +0200

    themes, libgimpwidgets: prepare the icons to be named icons from an icon theme
    
    Rename them and move them into folders, e.g.:
    
    stock-foo-16.png -> 16/gimp-foo.png
    
    This change only moves internal stuff around,
    it's not visible on any API.

 app/core/gimpviewable.c                            |    2 +-
 libgimpwidgets/gimpstock.c                         |  740 ++++++++++----------
 .../{stock-close-12.png => 12/gimp-close.png}      |  Bin 293 -> 293 bytes
 .../gimp-default-colors.png}                       |  Bin 167 -> 167 bytes
 .../images/{stock-eye-12.png => 12/gimp-eye.png}   |  Bin 413 -> 413 bytes
 .../{stock-linked-12.png => 12/gimp-linked.png}    |  Bin 328 -> 328 bytes
 .../gimp-menu-left.png}                            |  Bin 195 -> 195 bytes
 .../gimp-menu-right.png}                           |  Bin 191 -> 191 bytes
 .../gimp-quick-mask-off.png}                       |  Bin 136 -> 136 bytes
 .../gimp-quick-mask-on.png}                        |  Bin 98 -> 98 bytes
 .../gimp-swap-colors.png}                          |  Bin 283 -> 283 bytes
 .../gimp-zoom-follow-window.png}                   |  Bin 513 -> 513 bytes
 .../gimp-zoom-follow-window.xcf}                   |  Bin 2000 -> 2000 bytes
 .../{stock-anchor-16.png => 16/gimp-anchor.png}    |  Bin 566 -> 566 bytes
 .../gimp-cap-butt.png}                             |  Bin 388 -> 388 bytes
 .../gimp-cap-round.png}                            |  Bin 518 -> 518 bytes
 .../gimp-cap-square.png}                           |  Bin 413 -> 413 bytes
 .../{stock-center-16.png => 16/gimp-center.png}    |  Bin 449 -> 449 bytes
 .../gimp-channel-alpha.png}                        |  Bin 681 -> 681 bytes
 .../gimp-channel-alpha.svg}                        |    0
 .../gimp-channel-blue.png}                         |  Bin 775 -> 775 bytes
 .../gimp-channel-gray.png}                         |  Bin 750 -> 750 bytes
 .../gimp-channel-green.png}                        |  Bin 756 -> 756 bytes
 .../gimp-channel-indexed.png}                      |  Bin 723 -> 723 bytes
 .../gimp-channel-indexed.svg}                      |    0
 .../gimp-channel-red.png}                          |  Bin 752 -> 752 bytes
 .../{stock-channel-16.png => 16/gimp-channel.png}  |  Bin 907 -> 907 bytes
 .../gimp-channels.png}                             |  Bin 658 -> 658 bytes
 .../gimp-color-pick-from-screen.png}               |  Bin 566 -> 566 bytes
 .../gimp-color-triangle.png}                       |  Bin 811 -> 811 bytes
 .../gimp-colormap.png}                             |  Bin 569 -> 569 bytes
 .../gimp-colormap.svg}                             |    0
 .../gimp-controller-keyboard.png}                  |  Bin 549 -> 549 bytes
 .../gimp-controller-linux-input.png}               |  Bin 901 -> 901 bytes
 .../gimp-controller-midi.png}                      |  Bin 510 -> 510 bytes
 .../gimp-controller-midi.xcf}                      |  Bin 1845 -> 1845 bytes
 .../gimp-controller-wheel.png}                     |  Bin 705 -> 705 bytes
 .../gimp-controller-wheel.xcf}                     |  Bin 2843 -> 2843 bytes
 .../gimp-controller.png}                           |  Bin 460 -> 460 bytes
 .../gimp-convert-grayscale.png}                    |  Bin 287 -> 287 bytes
 .../gimp-convert-indexed.png}                      |  Bin 381 -> 381 bytes
 .../gimp-convert-rgb.png}                          |  Bin 625 -> 625 bytes
 .../{stock-cursor-16.png => 16/gimp-cursor.png}    |  Bin 322 -> 322 bytes
 .../gimp-curve-free.png}                           |  Bin 481 -> 481 bytes
 .../gimp-curve-smooth.png}                         |  Bin 414 -> 414 bytes
 .../gimp-device-status.png}                        |  Bin 786 -> 786 bytes
 .../gimp-display-filter-colorblind.png}            |  Bin 654 -> 654 bytes
 .../gimp-display-filter-colorblind.svg}            |    0
 .../gimp-display-filter-contrast.png}              |  Bin 508 -> 508 bytes
 .../gimp-display-filter-contrast.svg}              |    0
 .../gimp-display-filter-gamma.png}                 |  Bin 630 -> 630 bytes
 .../gimp-display-filter-gamma.svg}                 |    0
 .../gimp-display-filter-lcms.png}                  |  Bin 600 -> 600 bytes
 .../gimp-display-filter-lcms.svg}                  |    0
 .../gimp-display-filter-proof.png}                 |  Bin 721 -> 721 bytes
 .../gimp-display-filter-proof.xcf}                 |  Bin 2646 -> 2646 bytes
 .../gimp-display-filter.png}                       |  Bin 276 -> 276 bytes
 .../gimp-duplicate.png}                            |  Bin 482 -> 482 bytes
 .../gimp-dynamics.png}                             |  Bin 722 -> 722 bytes
 .../images/{stock-edit-16.png => 16/gimp-edit.png} |  Bin 526 -> 526 bytes
 .../gimp-flip-horizontal.png}                      |  Bin 418 -> 418 bytes
 .../gimp-flip-vertical.png}                        |  Bin 446 -> 446 bytes
 .../gimp-floating-selection.png}                   |  Bin 712 -> 712 bytes
 .../images/{stock-gegl-16.png => 16/gimp-gegl.png} |  Bin 961 -> 961 bytes
 .../images/{stock-gegl-16.svg => 16/gimp-gegl.svg} |    0
 .../gimp-gradient-bilinear.png}                    |  Bin 164 -> 164 bytes
 .../gimp-gradient-conical-asymmetric.png}          |  Bin 438 -> 438 bytes
 .../gimp-gradient-conical-symmetric.png}           |  Bin 515 -> 515 bytes
 .../gimp-gradient-linear.png}                      |  Bin 158 -> 158 bytes
 .../gimp-gradient-radial.png}                      |  Bin 616 -> 616 bytes
 .../gimp-gradient-shapeburst-angular.png}          |  Bin 370 -> 370 bytes
 .../gimp-gradient-shapeburst-dimpled.png}          |  Bin 364 -> 364 bytes
 .../gimp-gradient-shapeburst-spherical.png}        |  Bin 364 -> 364 bytes
 .../gimp-gradient-spiral-anticlockwise.png}        |  Bin 699 -> 699 bytes
 .../gimp-gradient-spiral-clockwise.png}            |  Bin 665 -> 665 bytes
 .../gimp-gradient-square.png}                      |  Bin 215 -> 215 bytes
 .../images/{stock-grid-16.png => 16/gimp-grid.png} |  Bin 244 -> 244 bytes
 .../gimp-histogram-linear.png}                     |  Bin 396 -> 396 bytes
 .../gimp-histogram-logarithmic.png}                |  Bin 364 -> 364 bytes
 .../gimp-histogram.png}                            |  Bin 349 -> 349 bytes
 .../{stock-image-16.png => 16/gimp-image.png}      |  Bin 533 -> 533 bytes
 .../{stock-images-16.png => 16/gimp-images.png}    |  Bin 456 -> 456 bytes
 .../images/{stock-info-16.png => 16/gimp-info.png} |  Bin 485 -> 485 bytes
 .../images/{stock-info-16.xcf => 16/gimp-info.xcf} |  Bin 1551 -> 1551 bytes
 .../gimp-input-device.png}                         |  Bin 843 -> 843 bytes
 .../{stock-invert-16.png => 16/gimp-invert.png}    |  Bin 259 -> 259 bytes
 .../gimp-join-bevel.png}                           |  Bin 297 -> 297 bytes
 .../gimp-join-miter.png}                           |  Bin 263 -> 263 bytes
 .../gimp-join-round.png}                           |  Bin 357 -> 357 bytes
 .../gimp-landscape.png}                            |  Bin 398 -> 398 bytes
 .../gimp-layer-mask.png}                           |  Bin 715 -> 715 bytes
 .../gimp-layer-mask.svg}                           |    0
 .../gimp-layer-to-imagesize.png}                   |  Bin 319 -> 319 bytes
 .../{stock-layer-16.png => 16/gimp-layer.png}      |  Bin 647 -> 647 bytes
 .../{stock-layer-16.svg => 16/gimp-layer.svg}      |    0
 .../{stock-layers-16.png => 16/gimp-layers.png}    |  Bin 585 -> 585 bytes
 .../{stock-layers-16.svg => 16/gimp-layers.svg}    |    0
 .../images/{stock-list-16.png => 16/gimp-list.png} |  Bin 254 -> 254 bytes
 .../gimp-merge-down.png}                           |  Bin 419 -> 419 bytes
 .../gimp-move-to-screen.png}                       |  Bin 592 -> 592 bytes
 .../gimp-move-to-screen.xcf}                       |  Bin 1953 -> 1953 bytes
 .../gimp-navigation.png}                           |  Bin 222 -> 222 bytes
 .../gimp-paste-as-new.png}                         |  Bin 713 -> 713 bytes
 .../gimp-paste-as-new.xcf}                         |  Bin 2119 -> 2119 bytes
 .../gimp-paste-into.png}                           |  Bin 557 -> 557 bytes
 .../gimp-paste-into.xcf}                           |  Bin 2542 -> 2542 bytes
 .../gimp-path-stroke.png}                          |  Bin 715 -> 715 bytes
 .../gimp-path-stroke.xcf}                          |  Bin 2319 -> 2319 bytes
 .../images/{stock-path-16.png => 16/gimp-path.png} |  Bin 412 -> 412 bytes
 .../{stock-paths-16.png => 16/gimp-paths.png}      |  Bin 470 -> 470 bytes
 .../{stock-plugin-16.png => 16/gimp-plugin.png}    |  Bin 378 -> 378 bytes
 .../gimp-portrait.png}                             |  Bin 536 -> 536 bytes
 .../gimp-print-resolution.png}                     |  Bin 514 -> 514 bytes
 .../gimp-print-resolution.xcf}                     |  Bin 2418 -> 2418 bytes
 .../{stock-reset-16.png => 16/gimp-reset.png}      |  Bin 438 -> 438 bytes
 .../{stock-reset-16.xcf => 16/gimp-reset.xcf}      |  Bin 1859 -> 1859 bytes
 .../gimp-reshow-filter.png}                        |  Bin 631 -> 631 bytes
 .../gimp-reshow-filter.xcf}                        |  Bin 2660 -> 2660 bytes
 .../{stock-resize-16.png => 16/gimp-resize.png}    |  Bin 299 -> 299 bytes
 .../gimp-rotate-180.png}                           |  Bin 572 -> 572 bytes
 .../gimp-rotate-180.xcf}                           |  Bin 1864 -> 1864 bytes
 .../gimp-rotate-270.png}                           |  Bin 435 -> 435 bytes
 .../gimp-rotate-270.xcf}                           |  Bin 1843 -> 1843 bytes
 .../gimp-rotate-90.png}                            |  Bin 465 -> 465 bytes
 .../gimp-rotate-90.xcf}                            |  Bin 1845 -> 1845 bytes
 .../gimp-sample-point.png}                         |  Bin 417 -> 417 bytes
 .../{stock-scale-16.png => 16/gimp-scale.png}      |  Bin 390 -> 390 bytes
 .../gimp-selection-add.png}                        |  Bin 519 -> 519 bytes
 .../gimp-selection-all.png}                        |  Bin 201 -> 201 bytes
 .../gimp-selection-border.png}                     |  Bin 388 -> 388 bytes
 .../gimp-selection-grow.png}                       |  Bin 275 -> 275 bytes
 .../gimp-selection-intersect.png}                  |  Bin 338 -> 338 bytes
 .../gimp-selection-none.png}                       |  Bin 417 -> 417 bytes
 .../gimp-selection-replace.png}                    |  Bin 433 -> 433 bytes
 .../gimp-selection-shrink.png}                     |  Bin 284 -> 284 bytes
 .../gimp-selection-stroke.png}                     |  Bin 798 -> 798 bytes
 .../gimp-selection-stroke.xcf}                     |  Bin 2773 -> 2773 bytes
 .../gimp-selection-subtract.png}                   |  Bin 399 -> 399 bytes
 .../gimp-selection-to-channel.png}                 |  Bin 323 -> 323 bytes
 .../gimp-selection-to-path.png}                    |  Bin 558 -> 558 bytes
 .../gimp-selection.png}                            |  Bin 433 -> 433 bytes
 .../gimp-shape-circle.png}                         |  Bin 155 -> 155 bytes
 .../gimp-shape-diamond.png}                        |  Bin 124 -> 124 bytes
 .../gimp-shape-square.png}                         |  Bin 86 -> 86 bytes
 .../gimp-template.png}                             |  Bin 497 -> 497 bytes
 .../gimp-template.xcf}                             |  Bin 1579 -> 1579 bytes
 .../gimp-text-layer.png}                           |  Bin 668 -> 668 bytes
 .../gimp-text-layer.svg}                           |    0
 .../gimp-toilet-paper.png}                         |  Bin 647 -> 647 bytes
 .../gimp-toilet-paper.xcf}                         |  Bin 1609 -> 1609 bytes
 .../gimp-tool-airbrush.png}                        |  Bin 639 -> 639 bytes
 .../gimp-tool-align.png}                           |  Bin 304 -> 304 bytes
 .../gimp-tool-blend.png}                           |  Bin 290 -> 290 bytes
 .../gimp-tool-blur.png}                            |  Bin 884 -> 884 bytes
 .../gimp-tool-blur.xcf}                            |  Bin 2496 -> 2496 bytes
 .../gimp-tool-brightness-contrast.png}             |  Bin 920 -> 920 bytes
 .../gimp-tool-bucket-fill.png}                     |  Bin 822 -> 822 bytes
 .../gimp-tool-by-color-select.png}                 |  Bin 599 -> 599 bytes
 .../gimp-tool-by-color-select.xcf}                 |  Bin 1966 -> 1966 bytes
 .../gimp-tool-cage.png}                            |  Bin 1081 -> 1081 bytes
 .../gimp-tool-cage.svg}                            |    0
 .../gimp-tool-clone.png}                           |  Bin 585 -> 585 bytes
 .../gimp-tool-color-balance.png}                   |  Bin 498 -> 498 bytes
 .../gimp-tool-color-picker.png}                    |  Bin 494 -> 494 bytes
 .../gimp-tool-colorize.png}                        |  Bin 739 -> 739 bytes
 .../gimp-tool-colorize.xcf}                        |  Bin 3038 -> 3038 bytes
 .../gimp-tool-crop.png}                            |  Bin 789 -> 789 bytes
 .../gimp-tool-curves.png}                          |  Bin 455 -> 455 bytes
 .../gimp-tool-desaturate.png}                      |  Bin 561 -> 561 bytes
 .../gimp-tool-dodge.png}                           |  Bin 622 -> 622 bytes
 .../gimp-tool-dodge.xcf}                           |  Bin 1795 -> 1795 bytes
 .../gimp-tool-ellipse-select.png}                  |  Bin 327 -> 327 bytes
 .../gimp-tool-eraser.png}                          |  Bin 408 -> 408 bytes
 .../gimp-tool-eraser.xcf}                          |  Bin 1559 -> 1559 bytes
 .../gimp-tool-flip.png}                            |  Bin 581 -> 581 bytes
 .../gimp-tool-foreground-select.png}               |  Bin 682 -> 682 bytes
 .../gimp-tool-foreground-select.xcf}               |  Bin 4463 -> 4463 bytes
 .../gimp-tool-free-select.png}                     |  Bin 686 -> 686 bytes
 .../gimp-tool-fuzzy-select.png}                    |  Bin 729 -> 729 bytes
 .../gimp-tool-heal.png}                            |  Bin 562 -> 562 bytes
 .../gimp-tool-heal.xcf}                            |  Bin 2439 -> 2439 bytes
 .../gimp-tool-hue-saturation.png}                  |  Bin 426 -> 426 bytes
 .../stock-tool-ink-16.png => 16/gimp-tool-ink.png} |  Bin 842 -> 842 bytes
 .../gimp-tool-iscissors.png}                       |  Bin 484 -> 484 bytes
 .../gimp-tool-iscissors.xcf}                       |  Bin 1766 -> 1766 bytes
 .../gimp-tool-levels.png}                          |  Bin 502 -> 502 bytes
 .../gimp-tool-levels.xcf}                          |  Bin 2143 -> 2143 bytes
 .../gimp-tool-measure.png}                         |  Bin 718 -> 718 bytes
 .../gimp-tool-measure.svg}                         |    0
 .../gimp-tool-move.png}                            |  Bin 323 -> 323 bytes
 .../gimp-tool-move.xcf}                            |  Bin 1381 -> 1381 bytes
 .../gimp-tool-options.png}                         |  Bin 518 -> 518 bytes
 .../gimp-tool-paintbrush.png}                      |  Bin 635 -> 635 bytes
 .../gimp-tool-path.png}                            |  Bin 678 -> 678 bytes
 .../gimp-tool-path.xcf}                            |  Bin 1800 -> 1800 bytes
 .../gimp-tool-pencil.png}                          |  Bin 607 -> 607 bytes
 .../gimp-tool-perspective-clone.png}               |  Bin 830 -> 830 bytes
 .../gimp-tool-perspective-clone.xcf}               |  Bin 3019 -> 3019 bytes
 .../gimp-tool-perspective.png}                     |  Bin 586 -> 586 bytes
 .../gimp-tool-posterize.png}                       |  Bin 568 -> 568 bytes
 .../gimp-tool-posterize.xcf}                       |  Bin 2387 -> 2387 bytes
 .../gimp-tool-preset.png}                          |  Bin 656 -> 656 bytes
 .../gimp-tool-preset.svg}                          |    0
 .../gimp-tool-rect-select.png}                     |  Bin 281 -> 281 bytes
 .../gimp-tool-rotate.png}                          |  Bin 703 -> 703 bytes
 .../gimp-tool-scale.png}                           |  Bin 576 -> 576 bytes
 .../gimp-tool-shear.png}                           |  Bin 526 -> 526 bytes
 .../gimp-tool-smudge.png}                          |  Bin 896 -> 896 bytes
 .../gimp-tool-text.png}                            |  Bin 704 -> 704 bytes
 .../gimp-tool-threshold.png}                       |  Bin 535 -> 535 bytes
 .../gimp-tool-threshold.xcf}                       |  Bin 1820 -> 1820 bytes
 .../gimp-tool-unified-transform.png}               |  Bin 586 -> 586 bytes
 .../gimp-tool-warp.png}                            |  Bin 709 -> 709 bytes
 .../gimp-tool-zoom.png}                            |  Bin 703 -> 703 bytes
 .../{stock-tools-16.png => 16/gimp-tools.png}      |  Bin 586 -> 586 bytes
 .../gimp-transparency.png}                         |  Bin 104 -> 104 bytes
 .../gimp-undo-history.png}                         |  Bin 606 -> 606 bytes
 .../gimp-undo-history.xcf}                         |  Bin 2399 -> 2399 bytes
 .../gimp-user-manual.png}                          |  Bin 928 -> 928 bytes
 .../{stock-video-16.png => 16/gimp-video.png}      |  Bin 513 -> 513 bytes
 .../{stock-warning-16.png => 16/gimp-warning.png}  |  Bin 603 -> 603 bytes
 .../images/{stock-web-16.png => 16/gimp-web.png}   |  Bin 874 -> 874 bytes
 .../images/{stock-web-16.svg => 16/gimp-web.svg}   |    0
 .../{stock-wilber-16.png => 16/gimp-wilber.png}    |  Bin 765 -> 765 bytes
 .../gimp-color-picker-black.png}                   |  Bin 527 -> 527 bytes
 .../gimp-color-picker-gray.png}                    |  Bin 546 -> 546 bytes
 .../gimp-color-picker-white.png}                   |  Bin 548 -> 548 bytes
 .../images/{stock-eye-20.png => 20/gimp-eye.png}   |  Bin 617 -> 617 bytes
 .../{stock-linked-20.png => 20/gimp-linked.png}    |  Bin 644 -> 644 bytes
 .../gimp-char-picker.png}                          |  Bin 714 -> 714 bytes
 .../gimp-dynamics.png}                             |  Bin 997 -> 997 bytes
 .../images/{stock-gegl-22.png => 22/gimp-gegl.png} |  Bin 1422 -> 1422 bytes
 .../images/{stock-gegl-22.svg => 22/gimp-gegl.svg} |    0
 .../gimp-histogram.png}                            |  Bin 515 -> 515 bytes
 .../gimp-input-device.png}                         |  Bin 1080 -> 1080 bytes
 .../gimp-landscape.png}                            |  Bin 813 -> 813 bytes
 .../gimp-letter-spacing.png}                       |  Bin 663 -> 663 bytes
 .../gimp-letter-spacing.xcf}                       |  Bin 3191 -> 3191 bytes
 .../gimp-line-spacing.png}                         |  Bin 565 -> 565 bytes
 .../gimp-line-spacing.xcf}                         |  Bin 4343 -> 4343 bytes
 .../images/{stock-path-22.png => 22/gimp-path.png} |  Bin 609 -> 609 bytes
 .../{stock-paths-22.png => 22/gimp-paths.png}      |  Bin 781 -> 781 bytes
 .../gimp-portrait.png}                             |  Bin 816 -> 816 bytes
 .../gimp-tool-airbrush.png}                        |  Bin 772 -> 772 bytes
 .../gimp-tool-align.png}                           |  Bin 380 -> 380 bytes
 .../gimp-tool-align.xcf}                           |  Bin 1901 -> 1901 bytes
 .../gimp-tool-blend.png}                           |  Bin 449 -> 449 bytes
 .../gimp-tool-blur.png}                            |  Bin 1074 -> 1074 bytes
 .../gimp-tool-blur.xcf}                            |  Bin 2810 -> 2810 bytes
 .../gimp-tool-brightness-contrast.png}             |  Bin 1394 -> 1394 bytes
 .../gimp-tool-bucket-fill.png}                     |  Bin 1253 -> 1253 bytes
 .../gimp-tool-bucket-fill.svg}                     |    0
 .../gimp-tool-by-color-select.png}                 |  Bin 689 -> 689 bytes
 .../gimp-tool-by-color-select.xcf}                 |  Bin 2470 -> 2470 bytes
 .../gimp-tool-cage.png}                            |  Bin 1771 -> 1771 bytes
 .../gimp-tool-cage.svg}                            |    0
 .../gimp-tool-clone.png}                           |  Bin 715 -> 715 bytes
 .../gimp-tool-color-balance.png}                   |  Bin 745 -> 745 bytes
 .../gimp-tool-color-picker.png}                    |  Bin 718 -> 718 bytes
 .../gimp-tool-colorize.png}                        |  Bin 1241 -> 1241 bytes
 .../gimp-tool-colorize.xcf}                        |  Bin 4507 -> 4507 bytes
 .../gimp-tool-crop.png}                            |  Bin 1132 -> 1132 bytes
 .../gimp-tool-curves.png}                          |  Bin 763 -> 763 bytes
 .../gimp-tool-curves.xcf}                          |  Bin 2867 -> 2867 bytes
 .../gimp-tool-desaturate.png}                      |  Bin 789 -> 789 bytes
 .../gimp-tool-dodge.png}                           |  Bin 875 -> 875 bytes
 .../gimp-tool-dodge.xcf}                           |  Bin 2462 -> 2462 bytes
 .../gimp-tool-ellipse-select.png}                  |  Bin 877 -> 877 bytes
 .../gimp-tool-ellipse-select.xcf}                  |  Bin 2914 -> 2914 bytes
 .../gimp-tool-eraser.png}                          |  Bin 830 -> 830 bytes
 .../gimp-tool-eraser.xcf}                          |  Bin 2314 -> 2314 bytes
 .../gimp-tool-flip.png}                            |  Bin 975 -> 975 bytes
 .../gimp-tool-flip.xcf}                            |  Bin 3475 -> 3475 bytes
 .../gimp-tool-foreground-select.png}               |  Bin 1072 -> 1072 bytes
 .../gimp-tool-foreground-select.xcf}               |  Bin 6621 -> 6621 bytes
 .../gimp-tool-free-select.png}                     |  Bin 959 -> 959 bytes
 .../gimp-tool-free-select.xcf}                     |  Bin 2281 -> 2281 bytes
 .../gimp-tool-fuzzy-select.png}                    |  Bin 852 -> 852 bytes
 .../gimp-tool-heal.png}                            |  Bin 918 -> 918 bytes
 .../gimp-tool-heal.xcf}                            |  Bin 2978 -> 2978 bytes
 .../gimp-tool-hue-saturation.png}                  |  Bin 551 -> 551 bytes
 .../stock-tool-ink-22.png => 22/gimp-tool-ink.png} |  Bin 1089 -> 1089 bytes
 .../gimp-tool-iscissors.png}                       |  Bin 996 -> 996 bytes
 .../gimp-tool-iscissors.xcf}                       |  Bin 2734 -> 2734 bytes
 .../gimp-tool-levels.png}                          |  Bin 685 -> 685 bytes
 .../gimp-tool-levels.xcf}                          |  Bin 4575 -> 4575 bytes
 .../gimp-tool-measure.png}                         |  Bin 1030 -> 1030 bytes
 .../gimp-tool-measure.svg}                         |    0
 .../gimp-tool-measure.xcf}                         |  Bin 2472 -> 2472 bytes
 .../gimp-tool-move.png}                            |  Bin 638 -> 638 bytes
 .../gimp-tool-move.xcf}                            |  Bin 2196 -> 2196 bytes
 .../gimp-tool-paintbrush.png}                      |  Bin 885 -> 885 bytes
 .../gimp-tool-path.png}                            |  Bin 920 -> 920 bytes
 .../gimp-tool-path.xcf}                            |  Bin 2781 -> 2781 bytes
 .../gimp-tool-pencil.png}                          |  Bin 820 -> 820 bytes
 .../gimp-tool-perspective-clone.png}               |  Bin 1158 -> 1158 bytes
 .../gimp-tool-perspective-clone.xcf}               |  Bin 3437 -> 3437 bytes
 .../gimp-tool-perspective.png}                     |  Bin 914 -> 914 bytes
 .../gimp-tool-perspective.xcf}                     |  Bin 3778 -> 3778 bytes
 .../gimp-tool-posterize.png}                       |  Bin 1072 -> 1072 bytes
 .../gimp-tool-posterize.xcf}                       |  Bin 3340 -> 3340 bytes
 .../gimp-tool-preset.png}                          |  Bin 933 -> 933 bytes
 .../gimp-tool-preset.svg}                          |    0
 .../gimp-tool-rect-select.png}                     |  Bin 499 -> 499 bytes
 .../gimp-tool-rect-select.xcf}                     |  Bin 2075 -> 2075 bytes
 .../gimp-tool-rotate.png}                          |  Bin 863 -> 863 bytes
 .../gimp-tool-rotate.xcf}                          |  Bin 3263 -> 3263 bytes
 .../gimp-tool-scale.png}                           |  Bin 902 -> 902 bytes
 .../gimp-tool-scale.xcf}                           |  Bin 4200 -> 4200 bytes
 .../gimp-tool-shear.png}                           |  Bin 797 -> 797 bytes
 .../gimp-tool-shear.xcf}                           |  Bin 3698 -> 3698 bytes
 .../gimp-tool-smudge.png}                          |  Bin 1009 -> 1009 bytes
 .../gimp-tool-smudge.xcf}                          |  Bin 2222 -> 2222 bytes
 .../gimp-tool-text.png}                            |  Bin 1032 -> 1032 bytes
 .../gimp-tool-threshold.png}                       |  Bin 714 -> 714 bytes
 .../gimp-tool-threshold.xcf}                       |  Bin 2327 -> 2327 bytes
 .../gimp-tool-unified-transform.png}               |  Bin 914 -> 914 bytes
 .../gimp-tool-unified-transform.xcf}               |  Bin 3778 -> 3778 bytes
 .../gimp-tool-warp.png}                            |  Bin 906 -> 906 bytes
 .../gimp-tool-zoom.png}                            |  Bin 1197 -> 1197 bytes
 .../{stock-wilber-22.png => 22/gimp-wilber.png}    |  Bin 1071 -> 1071 bytes
 .../{stock-center-24.png => 24/gimp-center.png}    |  Bin 756 -> 756 bytes
 .../gimp-channel-alpha.png}                        |  Bin 1008 -> 1008 bytes
 .../gimp-channel-alpha.svg}                        |    0
 .../gimp-channel-blue.png}                         |  Bin 1013 -> 1013 bytes
 .../gimp-channel-gray.png}                         |  Bin 999 -> 999 bytes
 .../gimp-channel-green.png}                        |  Bin 998 -> 998 bytes
 .../gimp-channel-indexed.png}                      |  Bin 1035 -> 1035 bytes
 .../gimp-channel-indexed.svg}                      |    0
 .../gimp-channel-red.png}                          |  Bin 1000 -> 1000 bytes
 .../{stock-channel-24.png => 24/gimp-channel.png}  |  Bin 1133 -> 1133 bytes
 .../gimp-channels.png}                             |  Bin 1040 -> 1040 bytes
 .../gimp-colormap.png}                             |  Bin 796 -> 796 bytes
 .../gimp-colormap.svg}                             |    0
 .../gimp-controller-keyboard.png}                  |  Bin 839 -> 839 bytes
 .../gimp-controller-linux-input.png}               |  Bin 1232 -> 1232 bytes
 .../gimp-controller-linux-input.xcf}               |  Bin 3311 -> 3311 bytes
 .../gimp-controller-midi.png}                      |  Bin 804 -> 804 bytes
 .../gimp-controller-midi.xcf}                      |  Bin 4197 -> 4197 bytes
 .../gimp-controller-wheel.png}                     |  Bin 1117 -> 1117 bytes
 .../gimp-controller-wheel.xcf}                     |  Bin 6839 -> 6839 bytes
 .../gimp-controller.png}                           |  Bin 554 -> 554 bytes
 .../{stock-cursor-24.png => 24/gimp-cursor.png}    |  Bin 442 -> 442 bytes
 .../gimp-device-status.png}                        |  Bin 1492 -> 1492 bytes
 .../gimp-display-filter-colorblind.png}            |  Bin 976 -> 976 bytes
 .../gimp-display-filter-colorblind.svg}            |    0
 .../gimp-display-filter-contrast.png}              |  Bin 712 -> 712 bytes
 .../gimp-display-filter-contrast.svg}              |    0
 .../gimp-display-filter-gamma.png}                 |  Bin 879 -> 879 bytes
 .../gimp-display-filter-gamma.svg}                 |    0
 .../gimp-display-filter-lcms.png}                  |  Bin 1165 -> 1165 bytes
 .../gimp-display-filter-lcms.svg}                  |    0
 .../gimp-display-filter-proof.png}                 |  Bin 1262 -> 1262 bytes
 .../gimp-display-filter-proof.xcf}                 |  Bin 4407 -> 4407 bytes
 .../gimp-display-filter.png}                       |  Bin 757 -> 757 bytes
 .../gimp-floating-selection.png}                   |  Bin 1056 -> 1056 bytes
 .../gimp-gravity-east.png}                         |  Bin 548 -> 548 bytes
 .../gimp-gravity-north-east.png}                   |  Bin 662 -> 662 bytes
 .../gimp-gravity-north-west.png}                   |  Bin 630 -> 630 bytes
 .../gimp-gravity-north.png}                        |  Bin 544 -> 544 bytes
 .../gimp-gravity-south-east.png}                   |  Bin 576 -> 576 bytes
 .../gimp-gravity-south-west.png}                   |  Bin 598 -> 598 bytes
 .../gimp-gravity-south.png}                        |  Bin 467 -> 467 bytes
 .../gimp-gravity-west.png}                         |  Bin 569 -> 569 bytes
 .../{stock-hcenter-24.png => 24/gimp-hcenter.png}  |  Bin 762 -> 762 bytes
 .../gimp-hchain-broken.png}                        |  Bin 373 -> 373 bytes
 .../{stock-hchain-24.png => 24/gimp-hchain.png}    |  Bin 374 -> 374 bytes
 .../{stock-hfill-24.png => 24/gimp-hfill.png}      |  Bin 7270 -> 7270 bytes
 .../{stock-image-24.png => 24/gimp-image.png}      |  Bin 774 -> 774 bytes
 .../{stock-images-24.png => 24/gimp-images.png}    |  Bin 740 -> 740 bytes
 .../images/{stock-info-24.png => 24/gimp-info.png} |  Bin 968 -> 968 bytes
 .../images/{stock-info-24.xcf => 24/gimp-info.xcf} |  Bin 4708 -> 4708 bytes
 .../gimp-layer-mask.png}                           |  Bin 1105 -> 1105 bytes
 .../gimp-layer-mask.svg}                           |    0
 .../{stock-layer-24.png => 24/gimp-layer.png}      |  Bin 1004 -> 1004 bytes
 .../{stock-layer-24.svg => 24/gimp-layer.svg}      |    0
 .../{stock-layers-24.png => 24/gimp-layers.png}    |  Bin 704 -> 704 bytes
 .../{stock-layers-24.svg => 24/gimp-layers.svg}    |    0
 .../gimp-move-to-screen.png}                       |  Bin 1032 -> 1032 bytes
 .../gimp-move-to-screen.xcf}                       |  Bin 3059 -> 3059 bytes
 .../gimp-print-resolution.png}                     |  Bin 839 -> 839 bytes
 .../gimp-print-resolution.xcf}                     |  Bin 3511 -> 3511 bytes
 .../gimp-sample-point.png}                         |  Bin 842 -> 842 bytes
 .../gimp-template.png}                             |  Bin 925 -> 925 bytes
 .../gimp-template.xcf}                             |  Bin 3752 -> 3752 bytes
 .../gimp-text-dir-ltr.png}                         |  Bin 478 -> 478 bytes
 .../gimp-text-dir-ltr.xcf}                         |  Bin 1560 -> 1560 bytes
 .../gimp-text-dir-rtl.png}                         |  Bin 529 -> 529 bytes
 .../gimp-text-dir-rtl.xcf}                         |  Bin 1814 -> 1814 bytes
 .../gimp-text-layer.png}                           |  Bin 878 -> 878 bytes
 .../gimp-text-layer.svg}                           |    0
 .../gimp-toilet-paper.png}                         |  Bin 1136 -> 1136 bytes
 .../gimp-toilet-paper.xcf}                         |  Bin 2693 -> 2693 bytes
 .../gimp-tool-options.png}                         |  Bin 769 -> 769 bytes
 .../gimp-tool-options.xcf}                         |  Bin 2684 -> 2684 bytes
 .../{stock-tools-24.png => 24/gimp-tools.png}      |  Bin 961 -> 961 bytes
 .../gimp-transparency.png}                         |  Bin 114 -> 114 bytes
 .../gimp-undo-history.png}                         |  Bin 1327 -> 1327 bytes
 .../gimp-undo-history.svg}                         |    0
 .../gimp-user-manual.png}                          |  Bin 1458 -> 1458 bytes
 .../{stock-vcenter-24.png => 24/gimp-vcenter.png}  |  Bin 678 -> 678 bytes
 .../gimp-vchain-broken.png}                        |  Bin 422 -> 422 bytes
 .../{stock-vchain-24.png => 24/gimp-vchain.png}    |  Bin 379 -> 379 bytes
 .../{stock-vfill-24.png => 24/gimp-vfill.png}      |  Bin 7037 -> 7037 bytes
 .../{stock-video-24.png => 24/gimp-video.png}      |  Bin 1241 -> 1241 bytes
 .../{stock-warning-24.png => 24/gimp-warning.png}  |  Bin 934 -> 934 bytes
 .../images/{stock-web-24.png => 24/gimp-web.png}   |  Bin 1385 -> 1385 bytes
 .../gimp-channel-alpha.png}                        |  Bin 1420 -> 1420 bytes
 .../gimp-channel-alpha.svg}                        |    0
 .../gimp-channel-blue.png}                         |  Bin 1147 -> 1147 bytes
 .../gimp-channel-gray.png}                         |  Bin 1135 -> 1135 bytes
 .../gimp-channel-green.png}                        |  Bin 1147 -> 1147 bytes
 .../gimp-channel-indexed.png}                      |  Bin 1249 -> 1249 bytes
 .../gimp-channel-indexed.svg}                      |    0
 .../gimp-channel-red.png}                          |  Bin 1145 -> 1145 bytes
 .../{stock-channel-32.png => 32/gimp-channel.png}  |  Bin 1289 -> 1289 bytes
 .../gimp-floating-selection.png}                   |  Bin 1331 -> 1331 bytes
 .../{stock-image-32.png => 32/gimp-image.png}      |  Bin 1272 -> 1272 bytes
 .../gimp-layer-mask.png}                           |  Bin 1666 -> 1666 bytes
 .../gimp-layer-mask.svg}                           |    0
 .../{stock-layer-32.png => 32/gimp-layer.png}      |  Bin 1335 -> 1335 bytes
 .../{stock-layer-32.svg => 32/gimp-layer.svg}      |    0
 .../gimp-text-layer.png}                           |  Bin 1158 -> 1158 bytes
 .../gimp-text-layer.svg}                           |    0
 .../gimp-user-manual.png}                          |  Bin 2146 -> 2146 bytes
 .../gimp-channel-alpha.png}                        |  Bin 2039 -> 2039 bytes
 .../gimp-channel-blue.png}                         |  Bin 1778 -> 1778 bytes
 .../gimp-channel-gray.png}                         |  Bin 1739 -> 1739 bytes
 .../gimp-channel-green.png}                        |  Bin 1788 -> 1788 bytes
 .../gimp-channel-indexed.png}                      |  Bin 1663 -> 1663 bytes
 .../gimp-channel-red.png}                          |  Bin 1743 -> 1743 bytes
 .../{stock-channel-48.png => 48/gimp-channel.png}  |  Bin 2055 -> 2055 bytes
 .../gimp-floating-selection.png}                   |  Bin 2032 -> 2032 bytes
 .../{stock-image-48.png => 48/gimp-image.png}      |  Bin 2055 -> 2055 bytes
 .../gimp-layer-mask.png}                           |  Bin 2130 -> 2130 bytes
 .../{stock-layer-48.png => 48/gimp-layer.png}      |  Bin 1651 -> 1651 bytes
 .../gimp-text-layer.png}                           |  Bin 1714 -> 1714 bytes
 .../{stock-error-64.png => 64/gimp-error.png}      |  Bin 4819 -> 4819 bytes
 .../{stock-frame-64.png => 64/gimp-frame.png}      |  Bin 398 -> 398 bytes
 .../images/{stock-info-64.png => 64/gimp-info.png} |  Bin 5727 -> 5727 bytes
 .../gimp-question.png}                             |  Bin 5178 -> 5178 bytes
 .../{stock-texture-64.png => 64/gimp-texture.png}  |  Bin 198 -> 198 bytes
 .../gimp-user-manual.png}                          |  Bin 5206 -> 5206 bytes
 .../{stock-warning-64.png => 64/gimp-warning.png}  |  Bin 4660 -> 4660 bytes
 .../gimp-wilber-eek.png}                           |  Bin 4203 -> 4203 bytes
 .../{stock-wilber-64.png => 64/gimp-wilber.png}    |  Bin 4473 -> 4473 bytes
 themes/Default/images/Makefile.am                  |  683 +++++++++---------
 447 files changed, 717 insertions(+), 708 deletions(-)
---
diff --git a/app/core/gimpviewable.c b/app/core/gimpviewable.c
index edf0f14..5c7d291 100644
--- a/app/core/gimpviewable.c
+++ b/app/core/gimpviewable.c
@@ -1081,7 +1081,7 @@ gimp_viewable_get_dummy_pixbuf (GimpViewable  *viewable,
   g_return_val_if_fail (width  > 0, NULL);
   g_return_val_if_fail (height > 0, NULL);
 
-  icon = gdk_pixbuf_new_from_inline (-1, stock_question_64, FALSE, NULL);
+  icon = gdk_pixbuf_new_from_inline (-1, gimp_question_64, FALSE, NULL);
 
   g_return_val_if_fail (icon != NULL, NULL);
 
diff --git a/libgimpwidgets/gimpstock.c b/libgimpwidgets/gimpstock.c
index cc4c4ca..5b9ae02 100644
--- a/libgimpwidgets/gimpstock.c
+++ b/libgimpwidgets/gimpstock.c
@@ -358,166 +358,166 @@ static const struct
 }
 gimp_stock_button_pixbufs[] =
 {
-  { GIMP_STOCK_ANCHOR,                   stock_anchor_16                   },
-  { GIMP_STOCK_CENTER,                   stock_center_24                   },
-  { GIMP_STOCK_DUPLICATE,                stock_duplicate_16                },
-  { GIMP_STOCK_EDIT,                     stock_edit_16                     },
-  { GIMP_STOCK_PASTE_AS_NEW,             stock_paste_as_new_16             },
-  { GIMP_STOCK_PASTE_INTO,               stock_paste_into_16               },
-  { GIMP_STOCK_RESET,                    stock_reset_16                    },
-
-  { GIMP_STOCK_GRAVITY_EAST,             stock_gravity_east_24             },
-  { GIMP_STOCK_GRAVITY_NORTH,            stock_gravity_north_24            },
-  { GIMP_STOCK_GRAVITY_NORTH_EAST,       stock_gravity_north_east_24       },
-  { GIMP_STOCK_GRAVITY_NORTH_WEST,       stock_gravity_north_west_24       },
-  { GIMP_STOCK_GRAVITY_SOUTH,            stock_gravity_south_24            },
-  { GIMP_STOCK_GRAVITY_SOUTH_EAST,       stock_gravity_south_east_24       },
-  { GIMP_STOCK_GRAVITY_SOUTH_WEST,       stock_gravity_south_west_24       },
-  { GIMP_STOCK_GRAVITY_WEST,             stock_gravity_west_24             },
-
-  { GIMP_STOCK_HCENTER,                  stock_hcenter_24                  },
-  { GIMP_STOCK_VCENTER,                  stock_vcenter_24                  },
-
-  { GIMP_STOCK_HFILL,                    stock_hfill_24                    },
-  { GIMP_STOCK_VFILL,                    stock_vfill_24                    },
-
-  { GIMP_STOCK_HCHAIN,                   stock_hchain_24                   },
-  { GIMP_STOCK_HCHAIN_BROKEN,            stock_hchain_broken_24            },
-  { GIMP_STOCK_VCHAIN,                   stock_vchain_24                   },
-  { GIMP_STOCK_VCHAIN_BROKEN,            stock_vchain_broken_24            },
-
-  { GIMP_STOCK_SELECTION,                stock_selection_16                },
-  { GIMP_STOCK_SELECTION_REPLACE,        stock_selection_replace_16        },
-  { GIMP_STOCK_SELECTION_ADD,            stock_selection_add_16            },
-  { GIMP_STOCK_SELECTION_SUBTRACT,       stock_selection_subtract_16       },
-  { GIMP_STOCK_SELECTION_INTERSECT,      stock_selection_intersect_16      },
-  { GIMP_STOCK_SELECTION_STROKE,         stock_selection_stroke_16         },
-  { GIMP_STOCK_SELECTION_TO_CHANNEL,     stock_selection_to_channel_16     },
-  { GIMP_STOCK_SELECTION_TO_PATH,        stock_selection_to_path_16        },
-
-  { GIMP_STOCK_PATH_STROKE,              stock_path_stroke_16              },
-
-  { GIMP_STOCK_CURVE_FREE,               stock_curve_free_16               },
-  { GIMP_STOCK_CURVE_SMOOTH,             stock_curve_smooth_16             },
-
-  { GIMP_STOCK_COLOR_PICKER_BLACK,       stock_color_picker_black_18       },
-  { GIMP_STOCK_COLOR_PICKER_GRAY,        stock_color_picker_gray_18        },
-  { GIMP_STOCK_COLOR_PICKER_WHITE,       stock_color_picker_white_18       },
-  { GIMP_STOCK_COLOR_TRIANGLE,           stock_color_triangle_16           },
-  { GIMP_STOCK_COLOR_PICK_FROM_SCREEN,   stock_color_pick_from_screen_16   },
-
-  { GIMP_STOCK_CHAR_PICKER,              stock_char_picker_22              },
-  { GIMP_STOCK_LETTER_SPACING,           stock_letter_spacing_22           },
-  { GIMP_STOCK_LINE_SPACING,             stock_line_spacing_22             },
-  { GIMP_STOCK_TEXT_DIR_LTR,             stock_text_dir_ltr_24             },
-  { GIMP_STOCK_TEXT_DIR_RTL,             stock_text_dir_rtl_24             },
-  { GIMP_STOCK_PRINT_RESOLUTION,         stock_print_resolution_24         },
-
-  { GIMP_STOCK_IMAGES,                   stock_images_24                   },
-  { GIMP_STOCK_LAYERS,                   stock_layers_24                   },
-  { GIMP_STOCK_CHANNELS,                 stock_channels_24                 },
-  { GIMP_STOCK_PATHS,                    stock_paths_22                    },
-  { GIMP_STOCK_TOOLS,                    stock_tools_24                    },
-  { GIMP_STOCK_TOOL_OPTIONS,             stock_tool_options_24             },
-  { GIMP_STOCK_DEVICE_STATUS,            stock_device_status_24            },
-  { GIMP_STOCK_INPUT_DEVICE,             stock_input_device_22             },
-  { GIMP_STOCK_CURSOR,                   stock_cursor_24                   },
-  { GIMP_STOCK_SAMPLE_POINT,             stock_sample_point_24             },
-  { GIMP_STOCK_DYNAMICS,                 stock_dynamics_22                 },
-  { GIMP_STOCK_TOOL_PRESET,              stock_tool_preset_22              },
-
-  { GIMP_STOCK_CONTROLLER,               stock_controller_24               },
-  { GIMP_STOCK_CONTROLLER_KEYBOARD,      stock_controller_keyboard_24      },
-  { GIMP_STOCK_CONTROLLER_LINUX_INPUT,   stock_controller_linux_input_24   },
-  { GIMP_STOCK_CONTROLLER_MIDI,          stock_controller_midi_24          },
-  { GIMP_STOCK_CONTROLLER_WHEEL,         stock_controller_wheel_24         },
-
-  { GIMP_STOCK_DISPLAY_FILTER,            stock_display_filter_24            },
-  { GIMP_STOCK_DISPLAY_FILTER_COLORBLIND, stock_display_filter_colorblind_24 },
-  { GIMP_STOCK_DISPLAY_FILTER_CONTRAST,   stock_display_filter_contrast_24   },
-  { GIMP_STOCK_DISPLAY_FILTER_GAMMA,      stock_display_filter_gamma_24      },
-  { GIMP_STOCK_DISPLAY_FILTER_LCMS,       stock_display_filter_lcms_24       },
-  { GIMP_STOCK_DISPLAY_FILTER_PROOF,      stock_display_filter_proof_24      },
-
-  { GIMP_STOCK_CHANNEL,                  stock_channel_24                  },
-  { GIMP_STOCK_CHANNEL_RED,              stock_channel_red_24              },
-  { GIMP_STOCK_CHANNEL_GREEN,            stock_channel_green_24            },
-  { GIMP_STOCK_CHANNEL_BLUE,             stock_channel_blue_24             },
-  { GIMP_STOCK_CHANNEL_GRAY,             stock_channel_gray_24             },
-  { GIMP_STOCK_CHANNEL_INDEXED,          stock_channel_indexed_24          },
-  { GIMP_STOCK_CHANNEL_ALPHA,            stock_channel_alpha_24            },
-  { GIMP_STOCK_LAYER_MASK,               stock_layer_mask_24               },
-  { GIMP_STOCK_IMAGE,                    stock_image_24                    },
-  { GIMP_STOCK_LAYER,                    stock_layer_24                    },
-  { GIMP_STOCK_TEXT_LAYER,               stock_text_layer_24               },
-  { GIMP_STOCK_FLOATING_SELECTION,       stock_floating_selection_24       },
-  { GIMP_STOCK_PATH,                     stock_path_22                     },
-  { GIMP_STOCK_TEMPLATE,                 stock_template_24                 },
-  { GIMP_STOCK_COLORMAP,                 stock_colormap_24                 },
-  { "gimp-indexed-palette", /* compat */ stock_colormap_24                 },
-  { GIMP_STOCK_HISTOGRAM,                stock_histogram_22                },
-  { GIMP_STOCK_UNDO_HISTORY,             stock_undo_history_24             },
-  { GIMP_STOCK_TRANSPARENCY,             stock_transparency_24             },
-
-  { GIMP_STOCK_LINKED,                   stock_linked_20                   },
-  { GIMP_STOCK_VISIBLE,                  stock_eye_20                      },
-
-  { GIMP_STOCK_MOVE_TO_SCREEN,           stock_move_to_screen_24           },
-
-  { GIMP_STOCK_TOOL_AIRBRUSH,            stock_tool_airbrush_22            },
-  { GIMP_STOCK_TOOL_ALIGN,               stock_tool_align_22               },
-  { GIMP_STOCK_TOOL_BLEND,               stock_tool_blend_22               },
-  { GIMP_STOCK_TOOL_BLUR,                stock_tool_blur_22                },
-  { GIMP_STOCK_TOOL_BRIGHTNESS_CONTRAST, stock_tool_brightness_contrast_22 },
-  { GIMP_STOCK_TOOL_BUCKET_FILL,         stock_tool_bucket_fill_22         },
-  { GIMP_STOCK_TOOL_BY_COLOR_SELECT,     stock_tool_by_color_select_22     },
-  { GIMP_STOCK_TOOL_CAGE,                stock_tool_cage_22                },
-  { GIMP_STOCK_TOOL_CLONE,               stock_tool_clone_22               },
-  { GIMP_STOCK_TOOL_COLOR_BALANCE,       stock_tool_color_balance_22       },
-  { GIMP_STOCK_TOOL_COLOR_PICKER,        stock_tool_color_picker_22        },
-  { GIMP_STOCK_TOOL_COLORIZE,            stock_tool_colorize_22            },
-  { GIMP_STOCK_TOOL_CROP,                stock_tool_crop_22                },
-  { GIMP_STOCK_TOOL_CURVES,              stock_tool_curves_22              },
-  { GIMP_STOCK_TOOL_DESATURATE,          stock_tool_desaturate_22          },
-  { GIMP_STOCK_TOOL_DODGE,               stock_tool_dodge_22               },
-  { GIMP_STOCK_TOOL_ELLIPSE_SELECT,      stock_tool_ellipse_select_22      },
-  { GIMP_STOCK_TOOL_ERASER,              stock_tool_eraser_22              },
-  { GIMP_STOCK_TOOL_FLIP,                stock_tool_flip_22                },
-  { GIMP_STOCK_TOOL_FREE_SELECT,         stock_tool_free_select_22         },
-  { GIMP_STOCK_TOOL_FOREGROUND_SELECT,   stock_tool_foreground_select_22   },
-  { GIMP_STOCK_TOOL_FUZZY_SELECT,        stock_tool_fuzzy_select_22        },
-  { GIMP_STOCK_TOOL_HEAL,                stock_tool_heal_22                },
-  { GIMP_STOCK_TOOL_HUE_SATURATION,      stock_tool_hue_saturation_22      },
-  { GIMP_STOCK_TOOL_INK,                 stock_tool_ink_22                 },
-  { GIMP_STOCK_TOOL_ISCISSORS,           stock_tool_iscissors_22           },
-  { GIMP_STOCK_TOOL_LEVELS,              stock_tool_levels_22              },
-  { GIMP_STOCK_TOOL_MEASURE,             stock_tool_measure_22             },
-  { GIMP_STOCK_TOOL_MOVE,                stock_tool_move_22                },
-  { GIMP_STOCK_TOOL_PAINTBRUSH,          stock_tool_paintbrush_22          },
-  { GIMP_STOCK_TOOL_PATH,                stock_tool_path_22                },
-  { GIMP_STOCK_TOOL_PENCIL,              stock_tool_pencil_22              },
-  { GIMP_STOCK_TOOL_PERSPECTIVE,         stock_tool_perspective_22         },
-  { GIMP_STOCK_TOOL_PERSPECTIVE_CLONE,   stock_tool_perspective_clone_22   },
-  { GIMP_STOCK_TOOL_POSTERIZE,           stock_tool_posterize_22           },
-  { GIMP_STOCK_TOOL_RECT_SELECT,         stock_tool_rect_select_22         },
-  { GIMP_STOCK_TOOL_ROTATE,              stock_tool_rotate_22              },
-  { GIMP_STOCK_TOOL_SCALE,               stock_tool_scale_22               },
-  { GIMP_STOCK_TOOL_SEAMLESS_CLONE,      stock_tool_clone_22               },
-  { GIMP_STOCK_TOOL_SHEAR,               stock_tool_shear_22               },
-  { GIMP_STOCK_TOOL_SMUDGE,              stock_tool_smudge_22              },
-  { GIMP_STOCK_TOOL_TEXT,                stock_tool_text_22                },
-  { GIMP_STOCK_TOOL_THRESHOLD,           stock_tool_threshold_22           },
-  { GIMP_STOCK_TOOL_UNIFIED_TRANSFORM,   stock_tool_unified_transform_22   },
-  { GIMP_STOCK_TOOL_WARP,                stock_tool_warp_22                },
-  { GIMP_STOCK_TOOL_ZOOM,                stock_tool_zoom_22                },
-
-  { GIMP_STOCK_INFO,                     stock_info_24                     },
-  { GIMP_STOCK_WARNING,                  stock_warning_24                  },
-  { GIMP_TOILET_PAPER,                   stock_toilet_paper_24             },
-  { GIMP_STOCK_WEB,                      stock_web_24                      },
-  { GIMP_STOCK_WILBER,                   stock_wilber_22                   },
-  { GIMP_STOCK_VIDEO,                    stock_video_24                    },
-  { GIMP_STOCK_GEGL,                     stock_gegl_22                     }
+  { GIMP_STOCK_ANCHOR,                   gimp_anchor_16                   },
+  { GIMP_STOCK_CENTER,                   gimp_center_24                   },
+  { GIMP_STOCK_DUPLICATE,                gimp_duplicate_16                },
+  { GIMP_STOCK_EDIT,                     gimp_edit_16                     },
+  { GIMP_STOCK_PASTE_AS_NEW,             gimp_paste_as_new_16             },
+  { GIMP_STOCK_PASTE_INTO,               gimp_paste_into_16               },
+  { GIMP_STOCK_RESET,                    gimp_reset_16                    },
+
+  { GIMP_STOCK_GRAVITY_EAST,             gimp_gravity_east_24             },
+  { GIMP_STOCK_GRAVITY_NORTH,            gimp_gravity_north_24            },
+  { GIMP_STOCK_GRAVITY_NORTH_EAST,       gimp_gravity_north_east_24       },
+  { GIMP_STOCK_GRAVITY_NORTH_WEST,       gimp_gravity_north_west_24       },
+  { GIMP_STOCK_GRAVITY_SOUTH,            gimp_gravity_south_24            },
+  { GIMP_STOCK_GRAVITY_SOUTH_EAST,       gimp_gravity_south_east_24       },
+  { GIMP_STOCK_GRAVITY_SOUTH_WEST,       gimp_gravity_south_west_24       },
+  { GIMP_STOCK_GRAVITY_WEST,             gimp_gravity_west_24             },
+
+  { GIMP_STOCK_HCENTER,                  gimp_hcenter_24                  },
+  { GIMP_STOCK_VCENTER,                  gimp_vcenter_24                  },
+
+  { GIMP_STOCK_HFILL,                    gimp_hfill_24                    },
+  { GIMP_STOCK_VFILL,                    gimp_vfill_24                    },
+
+  { GIMP_STOCK_HCHAIN,                   gimp_hchain_24                   },
+  { GIMP_STOCK_HCHAIN_BROKEN,            gimp_hchain_broken_24            },
+  { GIMP_STOCK_VCHAIN,                   gimp_vchain_24                   },
+  { GIMP_STOCK_VCHAIN_BROKEN,            gimp_vchain_broken_24            },
+
+  { GIMP_STOCK_SELECTION,                gimp_selection_16                },
+  { GIMP_STOCK_SELECTION_REPLACE,        gimp_selection_replace_16        },
+  { GIMP_STOCK_SELECTION_ADD,            gimp_selection_add_16            },
+  { GIMP_STOCK_SELECTION_SUBTRACT,       gimp_selection_subtract_16       },
+  { GIMP_STOCK_SELECTION_INTERSECT,      gimp_selection_intersect_16      },
+  { GIMP_STOCK_SELECTION_STROKE,         gimp_selection_stroke_16         },
+  { GIMP_STOCK_SELECTION_TO_CHANNEL,     gimp_selection_to_channel_16     },
+  { GIMP_STOCK_SELECTION_TO_PATH,        gimp_selection_to_path_16        },
+
+  { GIMP_STOCK_PATH_STROKE,              gimp_path_stroke_16              },
+
+  { GIMP_STOCK_CURVE_FREE,               gimp_curve_free_16               },
+  { GIMP_STOCK_CURVE_SMOOTH,             gimp_curve_smooth_16             },
+
+  { GIMP_STOCK_COLOR_PICKER_BLACK,       gimp_color_picker_black_18       },
+  { GIMP_STOCK_COLOR_PICKER_GRAY,        gimp_color_picker_gray_18        },
+  { GIMP_STOCK_COLOR_PICKER_WHITE,       gimp_color_picker_white_18       },
+  { GIMP_STOCK_COLOR_TRIANGLE,           gimp_color_triangle_16           },
+  { GIMP_STOCK_COLOR_PICK_FROM_SCREEN,   gimp_color_pick_from_screen_16   },
+
+  { GIMP_STOCK_CHAR_PICKER,              gimp_char_picker_22              },
+  { GIMP_STOCK_LETTER_SPACING,           gimp_letter_spacing_22           },
+  { GIMP_STOCK_LINE_SPACING,             gimp_line_spacing_22             },
+  { GIMP_STOCK_TEXT_DIR_LTR,             gimp_text_dir_ltr_24             },
+  { GIMP_STOCK_TEXT_DIR_RTL,             gimp_text_dir_rtl_24             },
+  { GIMP_STOCK_PRINT_RESOLUTION,         gimp_print_resolution_24         },
+
+  { GIMP_STOCK_IMAGES,                   gimp_images_24                   },
+  { GIMP_STOCK_LAYERS,                   gimp_layers_24                   },
+  { GIMP_STOCK_CHANNELS,                 gimp_channels_24                 },
+  { GIMP_STOCK_PATHS,                    gimp_paths_22                    },
+  { GIMP_STOCK_TOOLS,                    gimp_tools_24                    },
+  { GIMP_STOCK_TOOL_OPTIONS,             gimp_tool_options_24             },
+  { GIMP_STOCK_DEVICE_STATUS,            gimp_device_status_24            },
+  { GIMP_STOCK_INPUT_DEVICE,             gimp_input_device_22             },
+  { GIMP_STOCK_CURSOR,                   gimp_cursor_24                   },
+  { GIMP_STOCK_SAMPLE_POINT,             gimp_sample_point_24             },
+  { GIMP_STOCK_DYNAMICS,                 gimp_dynamics_22                 },
+  { GIMP_STOCK_TOOL_PRESET,              gimp_tool_preset_22              },
+
+  { GIMP_STOCK_CONTROLLER,               gimp_controller_24               },
+  { GIMP_STOCK_CONTROLLER_KEYBOARD,      gimp_controller_keyboard_24      },
+  { GIMP_STOCK_CONTROLLER_LINUX_INPUT,   gimp_controller_linux_input_24   },
+  { GIMP_STOCK_CONTROLLER_MIDI,          gimp_controller_midi_24          },
+  { GIMP_STOCK_CONTROLLER_WHEEL,         gimp_controller_wheel_24         },
+
+  { GIMP_STOCK_DISPLAY_FILTER,            gimp_display_filter_24            },
+  { GIMP_STOCK_DISPLAY_FILTER_COLORBLIND, gimp_display_filter_colorblind_24 },
+  { GIMP_STOCK_DISPLAY_FILTER_CONTRAST,   gimp_display_filter_contrast_24   },
+  { GIMP_STOCK_DISPLAY_FILTER_GAMMA,      gimp_display_filter_gamma_24      },
+  { GIMP_STOCK_DISPLAY_FILTER_LCMS,       gimp_display_filter_lcms_24       },
+  { GIMP_STOCK_DISPLAY_FILTER_PROOF,      gimp_display_filter_proof_24      },
+
+  { GIMP_STOCK_CHANNEL,                  gimp_channel_24                  },
+  { GIMP_STOCK_CHANNEL_RED,              gimp_channel_red_24              },
+  { GIMP_STOCK_CHANNEL_GREEN,            gimp_channel_green_24            },
+  { GIMP_STOCK_CHANNEL_BLUE,             gimp_channel_blue_24             },
+  { GIMP_STOCK_CHANNEL_GRAY,             gimp_channel_gray_24             },
+  { GIMP_STOCK_CHANNEL_INDEXED,          gimp_channel_indexed_24          },
+  { GIMP_STOCK_CHANNEL_ALPHA,            gimp_channel_alpha_24            },
+  { GIMP_STOCK_LAYER_MASK,               gimp_layer_mask_24               },
+  { GIMP_STOCK_IMAGE,                    gimp_image_24                    },
+  { GIMP_STOCK_LAYER,                    gimp_layer_24                    },
+  { GIMP_STOCK_TEXT_LAYER,               gimp_text_layer_24               },
+  { GIMP_STOCK_FLOATING_SELECTION,       gimp_floating_selection_24       },
+  { GIMP_STOCK_PATH,                     gimp_path_22                     },
+  { GIMP_STOCK_TEMPLATE,                 gimp_template_24                 },
+  { GIMP_STOCK_COLORMAP,                 gimp_colormap_24                 },
+  { "gimp-indexed-palette", /* compat */ gimp_colormap_24                 },
+  { GIMP_STOCK_HISTOGRAM,                gimp_histogram_22                },
+  { GIMP_STOCK_UNDO_HISTORY,             gimp_undo_history_24             },
+  { GIMP_STOCK_TRANSPARENCY,             gimp_transparency_24             },
+
+  { GIMP_STOCK_LINKED,                   gimp_linked_20                   },
+  { GIMP_STOCK_VISIBLE,                  gimp_eye_20                      },
+
+  { GIMP_STOCK_MOVE_TO_SCREEN,           gimp_move_to_screen_24           },
+
+  { GIMP_STOCK_TOOL_AIRBRUSH,            gimp_tool_airbrush_22            },
+  { GIMP_STOCK_TOOL_ALIGN,               gimp_tool_align_22               },
+  { GIMP_STOCK_TOOL_BLEND,               gimp_tool_blend_22               },
+  { GIMP_STOCK_TOOL_BLUR,                gimp_tool_blur_22                },
+  { GIMP_STOCK_TOOL_BRIGHTNESS_CONTRAST, gimp_tool_brightness_contrast_22 },
+  { GIMP_STOCK_TOOL_BUCKET_FILL,         gimp_tool_bucket_fill_22         },
+  { GIMP_STOCK_TOOL_BY_COLOR_SELECT,     gimp_tool_by_color_select_22     },
+  { GIMP_STOCK_TOOL_CAGE,                gimp_tool_cage_22                },
+  { GIMP_STOCK_TOOL_CLONE,               gimp_tool_clone_22               },
+  { GIMP_STOCK_TOOL_COLOR_BALANCE,       gimp_tool_color_balance_22       },
+  { GIMP_STOCK_TOOL_COLOR_PICKER,        gimp_tool_color_picker_22        },
+  { GIMP_STOCK_TOOL_COLORIZE,            gimp_tool_colorize_22            },
+  { GIMP_STOCK_TOOL_CROP,                gimp_tool_crop_22                },
+  { GIMP_STOCK_TOOL_CURVES,              gimp_tool_curves_22              },
+  { GIMP_STOCK_TOOL_DESATURATE,          gimp_tool_desaturate_22          },
+  { GIMP_STOCK_TOOL_DODGE,               gimp_tool_dodge_22               },
+  { GIMP_STOCK_TOOL_ELLIPSE_SELECT,      gimp_tool_ellipse_select_22      },
+  { GIMP_STOCK_TOOL_ERASER,              gimp_tool_eraser_22              },
+  { GIMP_STOCK_TOOL_FLIP,                gimp_tool_flip_22                },
+  { GIMP_STOCK_TOOL_FREE_SELECT,         gimp_tool_free_select_22         },
+  { GIMP_STOCK_TOOL_FOREGROUND_SELECT,   gimp_tool_foreground_select_22   },
+  { GIMP_STOCK_TOOL_FUZZY_SELECT,        gimp_tool_fuzzy_select_22        },
+  { GIMP_STOCK_TOOL_HEAL,                gimp_tool_heal_22                },
+  { GIMP_STOCK_TOOL_HUE_SATURATION,      gimp_tool_hue_saturation_22      },
+  { GIMP_STOCK_TOOL_INK,                 gimp_tool_ink_22                 },
+  { GIMP_STOCK_TOOL_ISCISSORS,           gimp_tool_iscissors_22           },
+  { GIMP_STOCK_TOOL_LEVELS,              gimp_tool_levels_22              },
+  { GIMP_STOCK_TOOL_MEASURE,             gimp_tool_measure_22             },
+  { GIMP_STOCK_TOOL_MOVE,                gimp_tool_move_22                },
+  { GIMP_STOCK_TOOL_PAINTBRUSH,          gimp_tool_paintbrush_22          },
+  { GIMP_STOCK_TOOL_PATH,                gimp_tool_path_22                },
+  { GIMP_STOCK_TOOL_PENCIL,              gimp_tool_pencil_22              },
+  { GIMP_STOCK_TOOL_PERSPECTIVE,         gimp_tool_perspective_22         },
+  { GIMP_STOCK_TOOL_PERSPECTIVE_CLONE,   gimp_tool_perspective_clone_22   },
+  { GIMP_STOCK_TOOL_POSTERIZE,           gimp_tool_posterize_22           },
+  { GIMP_STOCK_TOOL_RECT_SELECT,         gimp_tool_rect_select_22         },
+  { GIMP_STOCK_TOOL_ROTATE,              gimp_tool_rotate_22              },
+  { GIMP_STOCK_TOOL_SCALE,               gimp_tool_scale_22               },
+  { GIMP_STOCK_TOOL_SEAMLESS_CLONE,      gimp_tool_clone_22               },
+  { GIMP_STOCK_TOOL_SHEAR,               gimp_tool_shear_22               },
+  { GIMP_STOCK_TOOL_SMUDGE,              gimp_tool_smudge_22              },
+  { GIMP_STOCK_TOOL_TEXT,                gimp_tool_text_22                },
+  { GIMP_STOCK_TOOL_THRESHOLD,           gimp_tool_threshold_22           },
+  { GIMP_STOCK_TOOL_UNIFIED_TRANSFORM,   gimp_tool_unified_transform_22   },
+  { GIMP_STOCK_TOOL_WARP,                gimp_tool_warp_22                },
+  { GIMP_STOCK_TOOL_ZOOM,                gimp_tool_zoom_22                },
+
+  { GIMP_STOCK_INFO,                     gimp_info_24                     },
+  { GIMP_STOCK_WARNING,                  gimp_warning_24                  },
+  { GIMP_TOILET_PAPER,                   gimp_toilet_paper_24             },
+  { GIMP_STOCK_WEB,                      gimp_web_24                      },
+  { GIMP_STOCK_WILBER,                   gimp_wilber_22                   },
+  { GIMP_STOCK_VIDEO,                    gimp_video_24                    },
+  { GIMP_STOCK_GEGL,                     gimp_gegl_22                     }
 };
 
 static const struct
@@ -527,178 +527,178 @@ static const struct
 }
 gimp_stock_menu_pixbufs[] =
 {
-  { GIMP_STOCK_CENTER,                   stock_center_16                   },
-
-  { GIMP_STOCK_CONVERT_RGB,              stock_convert_rgb_16              },
-  { GIMP_STOCK_CONVERT_GRAYSCALE,        stock_convert_grayscale_16        },
-  { GIMP_STOCK_CONVERT_INDEXED,          stock_convert_indexed_16          },
-  { GIMP_STOCK_INVERT,                   stock_invert_16                   },
-  { GIMP_STOCK_MERGE_DOWN,               stock_merge_down_16               },
-  { GIMP_STOCK_LAYER_TO_IMAGESIZE,       stock_layer_to_imagesize_16       },
-  { GIMP_STOCK_PLUGIN,                   stock_plugin_16                   },
-  { GIMP_STOCK_RESHOW_FILTER,            stock_reshow_filter_16            },
-  { GIMP_STOCK_ROTATE_90,                stock_rotate_90_16                },
-  { GIMP_STOCK_ROTATE_180,               stock_rotate_180_16               },
-  { GIMP_STOCK_ROTATE_270,               stock_rotate_270_16               },
-  { GIMP_STOCK_RESIZE,                   stock_resize_16                   },
-  { GIMP_STOCK_SCALE,                    stock_scale_16                    },
-  { GIMP_STOCK_FLIP_HORIZONTAL,          stock_flip_horizontal_16          },
-  { GIMP_STOCK_FLIP_VERTICAL,            stock_flip_vertical_16            },
-
-  { GIMP_STOCK_PRINT_RESOLUTION,         stock_print_resolution_16         },
-
-  { GIMP_STOCK_IMAGES,                   stock_images_16                   },
-  { GIMP_STOCK_LAYERS,                   stock_layers_16                   },
-  { GIMP_STOCK_CHANNELS,                 stock_channels_16                 },
-  { GIMP_STOCK_PATHS,                    stock_paths_16                    },
-  { GIMP_STOCK_TOOLS,                    stock_tools_16                    },
-  { GIMP_STOCK_TOOL_OPTIONS,             stock_tool_options_16             },
-  { GIMP_STOCK_DEVICE_STATUS,            stock_device_status_16            },
-  { GIMP_STOCK_INPUT_DEVICE,             stock_input_device_16             },
-  { GIMP_STOCK_CURSOR,                   stock_cursor_16                   },
-  { GIMP_STOCK_SAMPLE_POINT,             stock_sample_point_16             },
-  { GIMP_STOCK_DYNAMICS,                 stock_dynamics_16                 },
-  { GIMP_STOCK_TOOL_PRESET,              stock_tool_preset_16              },
-
-  { GIMP_STOCK_CONTROLLER,               stock_controller_16               },
-  { GIMP_STOCK_CONTROLLER_KEYBOARD,      stock_controller_keyboard_16      },
-  { GIMP_STOCK_CONTROLLER_LINUX_INPUT,   stock_controller_linux_input_16   },
-  { GIMP_STOCK_CONTROLLER_MIDI,          stock_controller_midi_16          },
-  { GIMP_STOCK_CONTROLLER_WHEEL,         stock_controller_wheel_16         },
-
-  { GIMP_STOCK_DISPLAY_FILTER,            stock_display_filter_16            },
-  { GIMP_STOCK_DISPLAY_FILTER_COLORBLIND, stock_display_filter_colorblind_16 },
-  { GIMP_STOCK_DISPLAY_FILTER_CONTRAST,   stock_display_filter_contrast_16   },
-  { GIMP_STOCK_DISPLAY_FILTER_GAMMA,      stock_display_filter_gamma_16      },
-  { GIMP_STOCK_DISPLAY_FILTER_LCMS,       stock_display_filter_lcms_16       },
-  { GIMP_STOCK_DISPLAY_FILTER_PROOF,      stock_display_filter_proof_16      },
-
-  { GIMP_STOCK_CHANNEL,                  stock_channel_16                  },
-  { GIMP_STOCK_CHANNEL_RED,              stock_channel_red_16              },
-  { GIMP_STOCK_CHANNEL_GREEN,            stock_channel_green_16            },
-  { GIMP_STOCK_CHANNEL_BLUE,             stock_channel_blue_16             },
-  { GIMP_STOCK_CHANNEL_GRAY,             stock_channel_gray_16             },
-  { GIMP_STOCK_CHANNEL_INDEXED,          stock_channel_indexed_16          },
-  { GIMP_STOCK_CHANNEL_ALPHA,            stock_channel_alpha_16            },
-  { GIMP_STOCK_LAYER_MASK,               stock_layer_mask_16               },
-  { GIMP_STOCK_IMAGE,                    stock_image_16                    },
-  { GIMP_STOCK_LAYER,                    stock_layer_16                    },
-  { GIMP_STOCK_TEXT_LAYER,               stock_text_layer_16               },
-  { GIMP_STOCK_FLOATING_SELECTION,       stock_floating_selection_16       },
-  { GIMP_STOCK_PATH,                     stock_path_16                     },
-  { GIMP_STOCK_TEMPLATE,                 stock_template_16                 },
-  { GIMP_STOCK_COLORMAP,                 stock_colormap_16                 },
-  { "gimp-indexed-palette", /* compat */ stock_colormap_16                 },
-  { GIMP_STOCK_HISTOGRAM,                stock_histogram_16                },
-  { GIMP_STOCK_HISTOGRAM_LINEAR,         stock_histogram_linear_16         },
-  { GIMP_STOCK_HISTOGRAM_LOGARITHMIC,    stock_histogram_logarithmic_16    },
-  { GIMP_STOCK_UNDO_HISTORY,             stock_undo_history_16             },
-  { GIMP_STOCK_TRANSPARENCY,             stock_transparency_16             },
-
-  { GIMP_STOCK_LINKED,                   stock_linked_12                   },
-  { GIMP_STOCK_VISIBLE,                  stock_eye_12                      },
-
-  { GIMP_STOCK_SELECTION_ALL,            stock_selection_all_16            },
-  { GIMP_STOCK_SELECTION_NONE,           stock_selection_none_16           },
-  { GIMP_STOCK_SELECTION_GROW,           stock_selection_grow_16           },
-  { GIMP_STOCK_SELECTION_SHRINK,         stock_selection_shrink_16         },
-  { GIMP_STOCK_SELECTION_BORDER,         stock_selection_border_16         },
-
-  { GIMP_STOCK_NAVIGATION,               stock_navigation_16               },
-  { GIMP_STOCK_QUICK_MASK_OFF,           stock_quick_mask_off_12           },
-  { GIMP_STOCK_QUICK_MASK_ON,            stock_quick_mask_on_12            },
-  { "gimp-qmask-off", /* compat */       stock_quick_mask_off_12           },
-  { "gimp-qmask-on",  /* compat */       stock_quick_mask_on_12            },
-
-  { GIMP_STOCK_LIST,                     stock_list_16                     },
-  { GIMP_STOCK_GRID,                     stock_grid_16                     },
-
-  { GIMP_STOCK_PORTRAIT,                 stock_portrait_16                 },
-  { GIMP_STOCK_LANDSCAPE,                stock_landscape_16                },
-
-  { GIMP_STOCK_CLOSE,                    stock_close_12                    },
-  { GIMP_STOCK_MOVE_TO_SCREEN,           stock_move_to_screen_16           },
-  { GIMP_STOCK_DEFAULT_COLORS,           stock_default_colors_12           },
-  { GIMP_STOCK_SWAP_COLORS,              stock_swap_colors_12              },
-  { GIMP_STOCK_ZOOM_FOLLOW_WINDOW,       stock_zoom_follow_window_12       },
-
-  { GIMP_STOCK_GRADIENT_LINEAR,               stock_gradient_linear_16               },
-  { GIMP_STOCK_GRADIENT_BILINEAR,             stock_gradient_bilinear_16             },
-  { GIMP_STOCK_GRADIENT_RADIAL,               stock_gradient_radial_16               },
-  { GIMP_STOCK_GRADIENT_SQUARE,               stock_gradient_square_16               },
-  { GIMP_STOCK_GRADIENT_CONICAL_SYMMETRIC,    stock_gradient_conical_symmetric_16    },
-  { GIMP_STOCK_GRADIENT_CONICAL_ASYMMETRIC,   stock_gradient_conical_asymmetric_16   },
-  { GIMP_STOCK_GRADIENT_SHAPEBURST_ANGULAR,   stock_gradient_shapeburst_angular_16   },
-  { GIMP_STOCK_GRADIENT_SHAPEBURST_SPHERICAL, stock_gradient_shapeburst_spherical_16 },
-  { GIMP_STOCK_GRADIENT_SHAPEBURST_DIMPLED,   stock_gradient_shapeburst_dimpled_16   },
-  { GIMP_STOCK_GRADIENT_SPIRAL_CLOCKWISE,     stock_gradient_spiral_clockwise_16     },
-  { GIMP_STOCK_GRADIENT_SPIRAL_ANTICLOCKWISE, stock_gradient_spiral_anticlockwise_16 },
-
-  { GIMP_STOCK_TOOL_AIRBRUSH,            stock_tool_airbrush_16            },
-  { GIMP_STOCK_TOOL_ALIGN,               stock_tool_align_16               },
-  { GIMP_STOCK_TOOL_BLEND,               stock_tool_blend_16               },
-  { GIMP_STOCK_TOOL_BLUR,                stock_tool_blur_16                },
-  { GIMP_STOCK_TOOL_BRIGHTNESS_CONTRAST, stock_tool_brightness_contrast_16 },
-  { GIMP_STOCK_TOOL_BUCKET_FILL,         stock_tool_bucket_fill_16         },
-  { GIMP_STOCK_TOOL_BY_COLOR_SELECT,     stock_tool_by_color_select_16     },
-  { GIMP_STOCK_TOOL_CAGE,                stock_tool_cage_16                },
-  { GIMP_STOCK_TOOL_CLONE,               stock_tool_clone_16               },
-  { GIMP_STOCK_TOOL_COLOR_BALANCE,       stock_tool_color_balance_16       },
-  { GIMP_STOCK_TOOL_COLOR_PICKER,        stock_tool_color_picker_16        },
-  { GIMP_STOCK_TOOL_COLORIZE,            stock_tool_colorize_16            },
-  { GIMP_STOCK_TOOL_CROP,                stock_tool_crop_16                },
-  { GIMP_STOCK_TOOL_CURVES,              stock_tool_curves_16              },
-  { GIMP_STOCK_TOOL_DESATURATE,          stock_tool_desaturate_16          },
-  { GIMP_STOCK_TOOL_DODGE,               stock_tool_dodge_16               },
-  { GIMP_STOCK_TOOL_ELLIPSE_SELECT,      stock_tool_ellipse_select_16      },
-  { GIMP_STOCK_TOOL_ERASER,              stock_tool_eraser_16              },
-  { GIMP_STOCK_TOOL_FLIP,                stock_tool_flip_16                },
-  { GIMP_STOCK_TOOL_FREE_SELECT,         stock_tool_free_select_16         },
-  { GIMP_STOCK_TOOL_FOREGROUND_SELECT,   stock_tool_foreground_select_16   },
-  { GIMP_STOCK_TOOL_FUZZY_SELECT,        stock_tool_fuzzy_select_16        },
-  { GIMP_STOCK_TOOL_HEAL,                stock_tool_heal_16                },
-  { GIMP_STOCK_TOOL_HUE_SATURATION,      stock_tool_hue_saturation_16      },
-  { GIMP_STOCK_TOOL_INK,                 stock_tool_ink_16                 },
-  { GIMP_STOCK_TOOL_ISCISSORS,           stock_tool_iscissors_16           },
-  { GIMP_STOCK_TOOL_LEVELS,              stock_tool_levels_16              },
-  { GIMP_STOCK_TOOL_MEASURE,             stock_tool_measure_16             },
-  { GIMP_STOCK_TOOL_MOVE,                stock_tool_move_16                },
-  { GIMP_STOCK_TOOL_PAINTBRUSH,          stock_tool_paintbrush_16          },
-  { GIMP_STOCK_TOOL_PATH,                stock_tool_path_16                },
-  { GIMP_STOCK_TOOL_PENCIL,              stock_tool_pencil_16              },
-  { GIMP_STOCK_TOOL_PERSPECTIVE,         stock_tool_perspective_16         },
-  { GIMP_STOCK_TOOL_PERSPECTIVE_CLONE,   stock_tool_perspective_clone_16   },
-  { GIMP_STOCK_TOOL_POSTERIZE,           stock_tool_posterize_16           },
-  { GIMP_STOCK_TOOL_RECT_SELECT,         stock_tool_rect_select_16         },
-  { GIMP_STOCK_TOOL_ROTATE,              stock_tool_rotate_16              },
-  { GIMP_STOCK_TOOL_SCALE,               stock_tool_scale_16               },
-  { GIMP_STOCK_TOOL_SEAMLESS_CLONE,      stock_tool_clone_16               },
-  { GIMP_STOCK_TOOL_SHEAR,               stock_tool_shear_16               },
-  { GIMP_STOCK_TOOL_SMUDGE,              stock_tool_smudge_16              },
-  { GIMP_STOCK_TOOL_TEXT,                stock_tool_text_16                },
-  { GIMP_STOCK_TOOL_THRESHOLD,           stock_tool_threshold_16           },
-  { GIMP_STOCK_TOOL_UNIFIED_TRANSFORM,   stock_tool_unified_transform_16   },
-  { GIMP_STOCK_TOOL_WARP,                stock_tool_warp_16                },
-  { GIMP_STOCK_TOOL_ZOOM,                stock_tool_zoom_16                },
-
-  { GIMP_STOCK_INFO,                     stock_info_16                     },
-  { GIMP_STOCK_WARNING,                  stock_warning_16                  },
-  { GIMP_STOCK_WILBER,                   stock_wilber_16                   },
-  { GIMP_TOILET_PAPER,                   stock_toilet_paper_16             },
-  { GIMP_STOCK_USER_MANUAL,              stock_user_manual_16              },
-  { GIMP_STOCK_WEB,                      stock_web_16                      },
-  { GIMP_STOCK_VIDEO,                    stock_video_16                    },
-  { GIMP_STOCK_GEGL,                     stock_gegl_16                     },
-
-  { GIMP_STOCK_SHAPE_CIRCLE,             stock_shape_circle_16             },
-  { GIMP_STOCK_SHAPE_SQUARE,             stock_shape_square_16             },
-  { GIMP_STOCK_SHAPE_DIAMOND,            stock_shape_diamond_16            },
-  { GIMP_STOCK_CAP_BUTT,                 stock_cap_butt_16                 },
-  { GIMP_STOCK_CAP_ROUND,                stock_cap_round_16                },
-  { GIMP_STOCK_CAP_SQUARE,               stock_cap_square_16               },
-  { GIMP_STOCK_JOIN_MITER,               stock_join_miter_16               },
-  { GIMP_STOCK_JOIN_ROUND,               stock_join_round_16               },
-  { GIMP_STOCK_JOIN_BEVEL,               stock_join_bevel_16               }
+  { GIMP_STOCK_CENTER,                   gimp_center_16                   },
+
+  { GIMP_STOCK_CONVERT_RGB,              gimp_convert_rgb_16              },
+  { GIMP_STOCK_CONVERT_GRAYSCALE,        gimp_convert_grayscale_16        },
+  { GIMP_STOCK_CONVERT_INDEXED,          gimp_convert_indexed_16          },
+  { GIMP_STOCK_INVERT,                   gimp_invert_16                   },
+  { GIMP_STOCK_MERGE_DOWN,               gimp_merge_down_16               },
+  { GIMP_STOCK_LAYER_TO_IMAGESIZE,       gimp_layer_to_imagesize_16       },
+  { GIMP_STOCK_PLUGIN,                   gimp_plugin_16                   },
+  { GIMP_STOCK_RESHOW_FILTER,            gimp_reshow_filter_16            },
+  { GIMP_STOCK_ROTATE_90,                gimp_rotate_90_16                },
+  { GIMP_STOCK_ROTATE_180,               gimp_rotate_180_16               },
+  { GIMP_STOCK_ROTATE_270,               gimp_rotate_270_16               },
+  { GIMP_STOCK_RESIZE,                   gimp_resize_16                   },
+  { GIMP_STOCK_SCALE,                    gimp_scale_16                    },
+  { GIMP_STOCK_FLIP_HORIZONTAL,          gimp_flip_horizontal_16          },
+  { GIMP_STOCK_FLIP_VERTICAL,            gimp_flip_vertical_16            },
+
+  { GIMP_STOCK_PRINT_RESOLUTION,         gimp_print_resolution_16         },
+
+  { GIMP_STOCK_IMAGES,                   gimp_images_16                   },
+  { GIMP_STOCK_LAYERS,                   gimp_layers_16                   },
+  { GIMP_STOCK_CHANNELS,                 gimp_channels_16                 },
+  { GIMP_STOCK_PATHS,                    gimp_paths_16                    },
+  { GIMP_STOCK_TOOLS,                    gimp_tools_16                    },
+  { GIMP_STOCK_TOOL_OPTIONS,             gimp_tool_options_16             },
+  { GIMP_STOCK_DEVICE_STATUS,            gimp_device_status_16            },
+  { GIMP_STOCK_INPUT_DEVICE,             gimp_input_device_16             },
+  { GIMP_STOCK_CURSOR,                   gimp_cursor_16                   },
+  { GIMP_STOCK_SAMPLE_POINT,             gimp_sample_point_16             },
+  { GIMP_STOCK_DYNAMICS,                 gimp_dynamics_16                 },
+  { GIMP_STOCK_TOOL_PRESET,              gimp_tool_preset_16              },
+
+  { GIMP_STOCK_CONTROLLER,               gimp_controller_16               },
+  { GIMP_STOCK_CONTROLLER_KEYBOARD,      gimp_controller_keyboard_16      },
+  { GIMP_STOCK_CONTROLLER_LINUX_INPUT,   gimp_controller_linux_input_16   },
+  { GIMP_STOCK_CONTROLLER_MIDI,          gimp_controller_midi_16          },
+  { GIMP_STOCK_CONTROLLER_WHEEL,         gimp_controller_wheel_16         },
+
+  { GIMP_STOCK_DISPLAY_FILTER,            gimp_display_filter_16            },
+  { GIMP_STOCK_DISPLAY_FILTER_COLORBLIND, gimp_display_filter_colorblind_16 },
+  { GIMP_STOCK_DISPLAY_FILTER_CONTRAST,   gimp_display_filter_contrast_16   },
+  { GIMP_STOCK_DISPLAY_FILTER_GAMMA,      gimp_display_filter_gamma_16      },
+  { GIMP_STOCK_DISPLAY_FILTER_LCMS,       gimp_display_filter_lcms_16       },
+  { GIMP_STOCK_DISPLAY_FILTER_PROOF,      gimp_display_filter_proof_16      },
+
+  { GIMP_STOCK_CHANNEL,                  gimp_channel_16                  },
+  { GIMP_STOCK_CHANNEL_RED,              gimp_channel_red_16              },
+  { GIMP_STOCK_CHANNEL_GREEN,            gimp_channel_green_16            },
+  { GIMP_STOCK_CHANNEL_BLUE,             gimp_channel_blue_16             },
+  { GIMP_STOCK_CHANNEL_GRAY,             gimp_channel_gray_16             },
+  { GIMP_STOCK_CHANNEL_INDEXED,          gimp_channel_indexed_16          },
+  { GIMP_STOCK_CHANNEL_ALPHA,            gimp_channel_alpha_16            },
+  { GIMP_STOCK_LAYER_MASK,               gimp_layer_mask_16               },
+  { GIMP_STOCK_IMAGE,                    gimp_image_16                    },
+  { GIMP_STOCK_LAYER,                    gimp_layer_16                    },
+  { GIMP_STOCK_TEXT_LAYER,               gimp_text_layer_16               },
+  { GIMP_STOCK_FLOATING_SELECTION,       gimp_floating_selection_16       },
+  { GIMP_STOCK_PATH,                     gimp_path_16                     },
+  { GIMP_STOCK_TEMPLATE,                 gimp_template_16                 },
+  { GIMP_STOCK_COLORMAP,                 gimp_colormap_16                 },
+  { "gimp-indexed-palette", /* compat */ gimp_colormap_16                 },
+  { GIMP_STOCK_HISTOGRAM,                gimp_histogram_16                },
+  { GIMP_STOCK_HISTOGRAM_LINEAR,         gimp_histogram_linear_16         },
+  { GIMP_STOCK_HISTOGRAM_LOGARITHMIC,    gimp_histogram_logarithmic_16    },
+  { GIMP_STOCK_UNDO_HISTORY,             gimp_undo_history_16             },
+  { GIMP_STOCK_TRANSPARENCY,             gimp_transparency_16             },
+
+  { GIMP_STOCK_LINKED,                   gimp_linked_12                   },
+  { GIMP_STOCK_VISIBLE,                  gimp_eye_12                      },
+
+  { GIMP_STOCK_SELECTION_ALL,            gimp_selection_all_16            },
+  { GIMP_STOCK_SELECTION_NONE,           gimp_selection_none_16           },
+  { GIMP_STOCK_SELECTION_GROW,           gimp_selection_grow_16           },
+  { GIMP_STOCK_SELECTION_SHRINK,         gimp_selection_shrink_16         },
+  { GIMP_STOCK_SELECTION_BORDER,         gimp_selection_border_16         },
+
+  { GIMP_STOCK_NAVIGATION,               gimp_navigation_16               },
+  { GIMP_STOCK_QUICK_MASK_OFF,           gimp_quick_mask_off_12           },
+  { GIMP_STOCK_QUICK_MASK_ON,            gimp_quick_mask_on_12            },
+  { "gimp-qmask-off", /* compat */       gimp_quick_mask_off_12           },
+  { "gimp-qmask-on",  /* compat */       gimp_quick_mask_on_12            },
+
+  { GIMP_STOCK_LIST,                     gimp_list_16                     },
+  { GIMP_STOCK_GRID,                     gimp_grid_16                     },
+
+  { GIMP_STOCK_PORTRAIT,                 gimp_portrait_16                 },
+  { GIMP_STOCK_LANDSCAPE,                gimp_landscape_16                },
+
+  { GIMP_STOCK_CLOSE,                    gimp_close_12                    },
+  { GIMP_STOCK_MOVE_TO_SCREEN,           gimp_move_to_screen_16           },
+  { GIMP_STOCK_DEFAULT_COLORS,           gimp_default_colors_12           },
+  { GIMP_STOCK_SWAP_COLORS,              gimp_swap_colors_12              },
+  { GIMP_STOCK_ZOOM_FOLLOW_WINDOW,       gimp_zoom_follow_window_12       },
+
+  { GIMP_STOCK_GRADIENT_LINEAR,               gimp_gradient_linear_16               },
+  { GIMP_STOCK_GRADIENT_BILINEAR,             gimp_gradient_bilinear_16             },
+  { GIMP_STOCK_GRADIENT_RADIAL,               gimp_gradient_radial_16               },
+  { GIMP_STOCK_GRADIENT_SQUARE,               gimp_gradient_square_16               },
+  { GIMP_STOCK_GRADIENT_CONICAL_SYMMETRIC,    gimp_gradient_conical_symmetric_16    },
+  { GIMP_STOCK_GRADIENT_CONICAL_ASYMMETRIC,   gimp_gradient_conical_asymmetric_16   },
+  { GIMP_STOCK_GRADIENT_SHAPEBURST_ANGULAR,   gimp_gradient_shapeburst_angular_16   },
+  { GIMP_STOCK_GRADIENT_SHAPEBURST_SPHERICAL, gimp_gradient_shapeburst_spherical_16 },
+  { GIMP_STOCK_GRADIENT_SHAPEBURST_DIMPLED,   gimp_gradient_shapeburst_dimpled_16   },
+  { GIMP_STOCK_GRADIENT_SPIRAL_CLOCKWISE,     gimp_gradient_spiral_clockwise_16     },
+  { GIMP_STOCK_GRADIENT_SPIRAL_ANTICLOCKWISE, gimp_gradient_spiral_anticlockwise_16 },
+
+  { GIMP_STOCK_TOOL_AIRBRUSH,            gimp_tool_airbrush_16            },
+  { GIMP_STOCK_TOOL_ALIGN,               gimp_tool_align_16               },
+  { GIMP_STOCK_TOOL_BLEND,               gimp_tool_blend_16               },
+  { GIMP_STOCK_TOOL_BLUR,                gimp_tool_blur_16                },
+  { GIMP_STOCK_TOOL_BRIGHTNESS_CONTRAST, gimp_tool_brightness_contrast_16 },
+  { GIMP_STOCK_TOOL_BUCKET_FILL,         gimp_tool_bucket_fill_16         },
+  { GIMP_STOCK_TOOL_BY_COLOR_SELECT,     gimp_tool_by_color_select_16     },
+  { GIMP_STOCK_TOOL_CAGE,                gimp_tool_cage_16                },
+  { GIMP_STOCK_TOOL_CLONE,               gimp_tool_clone_16               },
+  { GIMP_STOCK_TOOL_COLOR_BALANCE,       gimp_tool_color_balance_16       },
+  { GIMP_STOCK_TOOL_COLOR_PICKER,        gimp_tool_color_picker_16        },
+  { GIMP_STOCK_TOOL_COLORIZE,            gimp_tool_colorize_16            },
+  { GIMP_STOCK_TOOL_CROP,                gimp_tool_crop_16                },
+  { GIMP_STOCK_TOOL_CURVES,              gimp_tool_curves_16              },
+  { GIMP_STOCK_TOOL_DESATURATE,          gimp_tool_desaturate_16          },
+  { GIMP_STOCK_TOOL_DODGE,               gimp_tool_dodge_16               },
+  { GIMP_STOCK_TOOL_ELLIPSE_SELECT,      gimp_tool_ellipse_select_16      },
+  { GIMP_STOCK_TOOL_ERASER,              gimp_tool_eraser_16              },
+  { GIMP_STOCK_TOOL_FLIP,                gimp_tool_flip_16                },
+  { GIMP_STOCK_TOOL_FREE_SELECT,         gimp_tool_free_select_16         },
+  { GIMP_STOCK_TOOL_FOREGROUND_SELECT,   gimp_tool_foreground_select_16   },
+  { GIMP_STOCK_TOOL_FUZZY_SELECT,        gimp_tool_fuzzy_select_16        },
+  { GIMP_STOCK_TOOL_HEAL,                gimp_tool_heal_16                },
+  { GIMP_STOCK_TOOL_HUE_SATURATION,      gimp_tool_hue_saturation_16      },
+  { GIMP_STOCK_TOOL_INK,                 gimp_tool_ink_16                 },
+  { GIMP_STOCK_TOOL_ISCISSORS,           gimp_tool_iscissors_16           },
+  { GIMP_STOCK_TOOL_LEVELS,              gimp_tool_levels_16              },
+  { GIMP_STOCK_TOOL_MEASURE,             gimp_tool_measure_16             },
+  { GIMP_STOCK_TOOL_MOVE,                gimp_tool_move_16                },
+  { GIMP_STOCK_TOOL_PAINTBRUSH,          gimp_tool_paintbrush_16          },
+  { GIMP_STOCK_TOOL_PATH,                gimp_tool_path_16                },
+  { GIMP_STOCK_TOOL_PENCIL,              gimp_tool_pencil_16              },
+  { GIMP_STOCK_TOOL_PERSPECTIVE,         gimp_tool_perspective_16         },
+  { GIMP_STOCK_TOOL_PERSPECTIVE_CLONE,   gimp_tool_perspective_clone_16   },
+  { GIMP_STOCK_TOOL_POSTERIZE,           gimp_tool_posterize_16           },
+  { GIMP_STOCK_TOOL_RECT_SELECT,         gimp_tool_rect_select_16         },
+  { GIMP_STOCK_TOOL_ROTATE,              gimp_tool_rotate_16              },
+  { GIMP_STOCK_TOOL_SCALE,               gimp_tool_scale_16               },
+  { GIMP_STOCK_TOOL_SEAMLESS_CLONE,      gimp_tool_clone_16               },
+  { GIMP_STOCK_TOOL_SHEAR,               gimp_tool_shear_16               },
+  { GIMP_STOCK_TOOL_SMUDGE,              gimp_tool_smudge_16              },
+  { GIMP_STOCK_TOOL_TEXT,                gimp_tool_text_16                },
+  { GIMP_STOCK_TOOL_THRESHOLD,           gimp_tool_threshold_16           },
+  { GIMP_STOCK_TOOL_UNIFIED_TRANSFORM,   gimp_tool_unified_transform_16   },
+  { GIMP_STOCK_TOOL_WARP,                gimp_tool_warp_16                },
+  { GIMP_STOCK_TOOL_ZOOM,                gimp_tool_zoom_16                },
+
+  { GIMP_STOCK_INFO,                     gimp_info_16                     },
+  { GIMP_STOCK_WARNING,                  gimp_warning_16                  },
+  { GIMP_STOCK_WILBER,                   gimp_wilber_16                   },
+  { GIMP_TOILET_PAPER,                   gimp_toilet_paper_16             },
+  { GIMP_STOCK_USER_MANUAL,              gimp_user_manual_16              },
+  { GIMP_STOCK_WEB,                      gimp_web_16                      },
+  { GIMP_STOCK_VIDEO,                    gimp_video_16                    },
+  { GIMP_STOCK_GEGL,                     gimp_gegl_16                     },
+
+  { GIMP_STOCK_SHAPE_CIRCLE,             gimp_shape_circle_16             },
+  { GIMP_STOCK_SHAPE_SQUARE,             gimp_shape_square_16             },
+  { GIMP_STOCK_SHAPE_DIAMOND,            gimp_shape_diamond_16            },
+  { GIMP_STOCK_CAP_BUTT,                 gimp_cap_butt_16                 },
+  { GIMP_STOCK_CAP_ROUND,                gimp_cap_round_16                },
+  { GIMP_STOCK_CAP_SQUARE,               gimp_cap_square_16               },
+  { GIMP_STOCK_JOIN_MITER,               gimp_join_miter_16               },
+  { GIMP_STOCK_JOIN_ROUND,               gimp_join_round_16               },
+  { GIMP_STOCK_JOIN_BEVEL,               gimp_join_bevel_16               }
 };
 
 static const struct
@@ -708,19 +708,19 @@ static const struct
 }
 gimp_stock_dnd_pixbufs[] =
 {
-  { GIMP_STOCK_CHANNEL,              stock_channel_32              },
-  { GIMP_STOCK_CHANNEL_RED,          stock_channel_red_32          },
-  { GIMP_STOCK_CHANNEL_GREEN,        stock_channel_green_32        },
-  { GIMP_STOCK_CHANNEL_BLUE,         stock_channel_blue_32         },
-  { GIMP_STOCK_CHANNEL_GRAY,         stock_channel_gray_32         },
-  { GIMP_STOCK_CHANNEL_INDEXED,      stock_channel_indexed_32      },
-  { GIMP_STOCK_CHANNEL_ALPHA,        stock_channel_alpha_32        },
-  { GIMP_STOCK_FLOATING_SELECTION,   stock_floating_selection_32   },
-  { GIMP_STOCK_LAYER_MASK,           stock_layer_mask_32           },
-  { GIMP_STOCK_IMAGE,                stock_image_32                },
-  { GIMP_STOCK_LAYER,                stock_layer_32                },
-  { GIMP_STOCK_TEXT_LAYER,           stock_text_layer_32           },
-  { GIMP_STOCK_USER_MANUAL,          stock_user_manual_32          }
+  { GIMP_STOCK_CHANNEL,              gimp_channel_32              },
+  { GIMP_STOCK_CHANNEL_RED,          gimp_channel_red_32          },
+  { GIMP_STOCK_CHANNEL_GREEN,        gimp_channel_green_32        },
+  { GIMP_STOCK_CHANNEL_BLUE,         gimp_channel_blue_32         },
+  { GIMP_STOCK_CHANNEL_GRAY,         gimp_channel_gray_32         },
+  { GIMP_STOCK_CHANNEL_INDEXED,      gimp_channel_indexed_32      },
+  { GIMP_STOCK_CHANNEL_ALPHA,        gimp_channel_alpha_32        },
+  { GIMP_STOCK_FLOATING_SELECTION,   gimp_floating_selection_32   },
+  { GIMP_STOCK_LAYER_MASK,           gimp_layer_mask_32           },
+  { GIMP_STOCK_IMAGE,                gimp_image_32                },
+  { GIMP_STOCK_LAYER,                gimp_layer_32                },
+  { GIMP_STOCK_TEXT_LAYER,           gimp_text_layer_32           },
+  { GIMP_STOCK_USER_MANUAL,          gimp_user_manual_32          }
 };
 
 static const struct
@@ -730,29 +730,29 @@ static const struct
 }
 gimp_stock_dialog_pixbufs[] =
 {
-  { GIMP_STOCK_CHANNEL,              stock_channel_48              },
-  { GIMP_STOCK_CHANNEL_RED,          stock_channel_red_48          },
-  { GIMP_STOCK_CHANNEL_GREEN,        stock_channel_green_48        },
-  { GIMP_STOCK_CHANNEL_BLUE,         stock_channel_blue_48         },
-  { GIMP_STOCK_CHANNEL_GRAY,         stock_channel_gray_48         },
-  { GIMP_STOCK_CHANNEL_INDEXED,      stock_channel_indexed_48      },
-  { GIMP_STOCK_CHANNEL_ALPHA,        stock_channel_alpha_48        },
-  { GIMP_STOCK_FLOATING_SELECTION,   stock_floating_selection_48   },
-  { GIMP_STOCK_LAYER_MASK,           stock_layer_mask_48           },
-  { GIMP_STOCK_IMAGE,                stock_image_48                },
-  { GIMP_STOCK_LAYER,                stock_layer_48                },
-  { GIMP_STOCK_TEXT_LAYER,           stock_text_layer_48           },
-
-  { GIMP_STOCK_ERROR,                stock_error_64                },
-  { GIMP_STOCK_INFO,                 stock_info_64                 },
-  { GIMP_STOCK_QUESTION,             stock_question_64             },
-  { GIMP_STOCK_USER_MANUAL,          stock_user_manual_64          },
-  { GIMP_STOCK_WARNING,              stock_warning_64              },
-  { GIMP_STOCK_WILBER,               stock_wilber_64               },
-  { GIMP_STOCK_WILBER_EEK,           stock_wilber_eek_64           },
-
-  { GIMP_STOCK_FRAME,                stock_frame_64                },
-  { GIMP_STOCK_TEXTURE,              stock_texture_64              }
+  { GIMP_STOCK_CHANNEL,              gimp_channel_48              },
+  { GIMP_STOCK_CHANNEL_RED,          gimp_channel_red_48          },
+  { GIMP_STOCK_CHANNEL_GREEN,        gimp_channel_green_48        },
+  { GIMP_STOCK_CHANNEL_BLUE,         gimp_channel_blue_48         },
+  { GIMP_STOCK_CHANNEL_GRAY,         gimp_channel_gray_48         },
+  { GIMP_STOCK_CHANNEL_INDEXED,      gimp_channel_indexed_48      },
+  { GIMP_STOCK_CHANNEL_ALPHA,        gimp_channel_alpha_48        },
+  { GIMP_STOCK_FLOATING_SELECTION,   gimp_floating_selection_48   },
+  { GIMP_STOCK_LAYER_MASK,           gimp_layer_mask_48           },
+  { GIMP_STOCK_IMAGE,                gimp_image_48                },
+  { GIMP_STOCK_LAYER,                gimp_layer_48                },
+  { GIMP_STOCK_TEXT_LAYER,           gimp_text_layer_48           },
+
+  { GIMP_STOCK_ERROR,                gimp_error_64                },
+  { GIMP_STOCK_INFO,                 gimp_info_64                 },
+  { GIMP_STOCK_QUESTION,             gimp_question_64             },
+  { GIMP_STOCK_USER_MANUAL,          gimp_user_manual_64          },
+  { GIMP_STOCK_WARNING,              gimp_warning_64              },
+  { GIMP_STOCK_WILBER,               gimp_wilber_64               },
+  { GIMP_STOCK_WILBER_EEK,           gimp_wilber_eek_64           },
+
+  { GIMP_STOCK_FRAME,                gimp_frame_64                },
+  { GIMP_STOCK_TEXTURE,              gimp_texture_64              }
 };
 
 static const struct
@@ -763,8 +763,8 @@ static const struct
 }
 gimp_stock_direction_pixbufs[] =
 {
-  { GIMP_STOCK_MENU_LEFT,  stock_menu_left_12,  stock_menu_right_12 },
-  { GIMP_STOCK_MENU_RIGHT, stock_menu_right_12, stock_menu_left_12  }
+  { GIMP_STOCK_MENU_LEFT,  gimp_menu_left_12,  gimp_menu_right_12 },
+  { GIMP_STOCK_MENU_RIGHT, gimp_menu_right_12, gimp_menu_left_12  }
 };
 
 
diff --git a/themes/Default/images/stock-channel-alpha-16.svg 
b/themes/Default/images/16/gimp-channel-alpha.svg
similarity index 100%
rename from themes/Default/images/stock-channel-alpha-16.svg
rename to themes/Default/images/16/gimp-channel-alpha.svg
diff --git a/themes/Default/images/stock-channel-indexed-16.svg 
b/themes/Default/images/16/gimp-channel-indexed.svg
similarity index 100%
rename from themes/Default/images/stock-channel-indexed-16.svg
rename to themes/Default/images/16/gimp-channel-indexed.svg
diff --git a/themes/Default/images/stock-colormap-16.svg b/themes/Default/images/16/gimp-colormap.svg
similarity index 100%
rename from themes/Default/images/stock-colormap-16.svg
rename to themes/Default/images/16/gimp-colormap.svg
diff --git a/themes/Default/images/stock-display-filter-colorblind-16.svg 
b/themes/Default/images/16/gimp-display-filter-colorblind.svg
similarity index 100%
rename from themes/Default/images/stock-display-filter-colorblind-16.svg
rename to themes/Default/images/16/gimp-display-filter-colorblind.svg
diff --git a/themes/Default/images/stock-display-filter-contrast-16.svg 
b/themes/Default/images/16/gimp-display-filter-contrast.svg
similarity index 100%
rename from themes/Default/images/stock-display-filter-contrast-16.svg
rename to themes/Default/images/16/gimp-display-filter-contrast.svg
diff --git a/themes/Default/images/stock-display-filter-gamma-16.svg 
b/themes/Default/images/16/gimp-display-filter-gamma.svg
similarity index 100%
rename from themes/Default/images/stock-display-filter-gamma-16.svg
rename to themes/Default/images/16/gimp-display-filter-gamma.svg
diff --git a/themes/Default/images/stock-display-filter-lcms-16.svg 
b/themes/Default/images/16/gimp-display-filter-lcms.svg
similarity index 100%
rename from themes/Default/images/stock-display-filter-lcms-16.svg
rename to themes/Default/images/16/gimp-display-filter-lcms.svg
diff --git a/themes/Default/images/stock-gegl-16.svg b/themes/Default/images/16/gimp-gegl.svg
similarity index 100%
rename from themes/Default/images/stock-gegl-16.svg
rename to themes/Default/images/16/gimp-gegl.svg
diff --git a/themes/Default/images/stock-layer-mask-16.svg b/themes/Default/images/16/gimp-layer-mask.svg
similarity index 100%
rename from themes/Default/images/stock-layer-mask-16.svg
rename to themes/Default/images/16/gimp-layer-mask.svg
diff --git a/themes/Default/images/stock-layer-16.svg b/themes/Default/images/16/gimp-layer.svg
similarity index 100%
rename from themes/Default/images/stock-layer-16.svg
rename to themes/Default/images/16/gimp-layer.svg
diff --git a/themes/Default/images/stock-layers-16.svg b/themes/Default/images/16/gimp-layers.svg
similarity index 100%
rename from themes/Default/images/stock-layers-16.svg
rename to themes/Default/images/16/gimp-layers.svg
diff --git a/themes/Default/images/stock-text-layer-16.svg b/themes/Default/images/16/gimp-text-layer.svg
similarity index 100%
rename from themes/Default/images/stock-text-layer-16.svg
rename to themes/Default/images/16/gimp-text-layer.svg
diff --git a/themes/Default/images/tools/stock-tool-cage-16.svg b/themes/Default/images/16/gimp-tool-cage.svg
similarity index 100%
rename from themes/Default/images/tools/stock-tool-cage-16.svg
rename to themes/Default/images/16/gimp-tool-cage.svg
diff --git a/themes/Default/images/tools/stock-tool-measure-16.svg 
b/themes/Default/images/16/gimp-tool-measure.svg
similarity index 100%
rename from themes/Default/images/tools/stock-tool-measure-16.svg
rename to themes/Default/images/16/gimp-tool-measure.svg
diff --git a/themes/Default/images/stock-tool-preset-16.svg b/themes/Default/images/16/gimp-tool-preset.svg
similarity index 100%
rename from themes/Default/images/stock-tool-preset-16.svg
rename to themes/Default/images/16/gimp-tool-preset.svg
diff --git a/themes/Default/images/stock-web-16.svg b/themes/Default/images/16/gimp-web.svg
similarity index 100%
rename from themes/Default/images/stock-web-16.svg
rename to themes/Default/images/16/gimp-web.svg
diff --git a/themes/Default/images/stock-gegl-22.svg b/themes/Default/images/22/gimp-gegl.svg
similarity index 100%
rename from themes/Default/images/stock-gegl-22.svg
rename to themes/Default/images/22/gimp-gegl.svg
diff --git a/themes/Default/images/tools/stock-tool-bucket-fill-22.svg 
b/themes/Default/images/22/gimp-tool-bucket-fill.svg
similarity index 100%
rename from themes/Default/images/tools/stock-tool-bucket-fill-22.svg
rename to themes/Default/images/22/gimp-tool-bucket-fill.svg
diff --git a/themes/Default/images/tools/stock-tool-cage-22.svg b/themes/Default/images/22/gimp-tool-cage.svg
similarity index 100%
rename from themes/Default/images/tools/stock-tool-cage-22.svg
rename to themes/Default/images/22/gimp-tool-cage.svg
diff --git a/themes/Default/images/tools/stock-tool-measure-22.svg 
b/themes/Default/images/22/gimp-tool-measure.svg
similarity index 100%
rename from themes/Default/images/tools/stock-tool-measure-22.svg
rename to themes/Default/images/22/gimp-tool-measure.svg
diff --git a/themes/Default/images/stock-tool-preset-22.svg b/themes/Default/images/22/gimp-tool-preset.svg
similarity index 100%
rename from themes/Default/images/stock-tool-preset-22.svg
rename to themes/Default/images/22/gimp-tool-preset.svg
diff --git a/themes/Default/images/stock-channel-alpha-24.svg 
b/themes/Default/images/24/gimp-channel-alpha.svg
similarity index 100%
rename from themes/Default/images/stock-channel-alpha-24.svg
rename to themes/Default/images/24/gimp-channel-alpha.svg
diff --git a/themes/Default/images/stock-channel-indexed-24.svg 
b/themes/Default/images/24/gimp-channel-indexed.svg
similarity index 100%
rename from themes/Default/images/stock-channel-indexed-24.svg
rename to themes/Default/images/24/gimp-channel-indexed.svg
diff --git a/themes/Default/images/stock-colormap-24.svg b/themes/Default/images/24/gimp-colormap.svg
similarity index 100%
rename from themes/Default/images/stock-colormap-24.svg
rename to themes/Default/images/24/gimp-colormap.svg
diff --git a/themes/Default/images/stock-display-filter-colorblind-24.svg 
b/themes/Default/images/24/gimp-display-filter-colorblind.svg
similarity index 100%
rename from themes/Default/images/stock-display-filter-colorblind-24.svg
rename to themes/Default/images/24/gimp-display-filter-colorblind.svg
diff --git a/themes/Default/images/stock-display-filter-contrast-24.svg 
b/themes/Default/images/24/gimp-display-filter-contrast.svg
similarity index 100%
rename from themes/Default/images/stock-display-filter-contrast-24.svg
rename to themes/Default/images/24/gimp-display-filter-contrast.svg
diff --git a/themes/Default/images/stock-display-filter-gamma-24.svg 
b/themes/Default/images/24/gimp-display-filter-gamma.svg
similarity index 100%
rename from themes/Default/images/stock-display-filter-gamma-24.svg
rename to themes/Default/images/24/gimp-display-filter-gamma.svg
diff --git a/themes/Default/images/stock-display-filter-lcms-24.svg 
b/themes/Default/images/24/gimp-display-filter-lcms.svg
similarity index 100%
rename from themes/Default/images/stock-display-filter-lcms-24.svg
rename to themes/Default/images/24/gimp-display-filter-lcms.svg
diff --git a/themes/Default/images/stock-layer-mask-24.svg b/themes/Default/images/24/gimp-layer-mask.svg
similarity index 100%
rename from themes/Default/images/stock-layer-mask-24.svg
rename to themes/Default/images/24/gimp-layer-mask.svg
diff --git a/themes/Default/images/stock-layer-24.svg b/themes/Default/images/24/gimp-layer.svg
similarity index 100%
rename from themes/Default/images/stock-layer-24.svg
rename to themes/Default/images/24/gimp-layer.svg
diff --git a/themes/Default/images/stock-layers-24.svg b/themes/Default/images/24/gimp-layers.svg
similarity index 100%
rename from themes/Default/images/stock-layers-24.svg
rename to themes/Default/images/24/gimp-layers.svg
diff --git a/themes/Default/images/stock-text-layer-24.svg b/themes/Default/images/24/gimp-text-layer.svg
similarity index 100%
rename from themes/Default/images/stock-text-layer-24.svg
rename to themes/Default/images/24/gimp-text-layer.svg
diff --git a/themes/Default/images/stock-undo-history-24.svg b/themes/Default/images/24/gimp-undo-history.svg
similarity index 100%
rename from themes/Default/images/stock-undo-history-24.svg
rename to themes/Default/images/24/gimp-undo-history.svg
diff --git a/themes/Default/images/stock-channel-alpha-32.svg 
b/themes/Default/images/32/gimp-channel-alpha.svg
similarity index 100%
rename from themes/Default/images/stock-channel-alpha-32.svg
rename to themes/Default/images/32/gimp-channel-alpha.svg
diff --git a/themes/Default/images/stock-channel-indexed-32.svg 
b/themes/Default/images/32/gimp-channel-indexed.svg
similarity index 100%
rename from themes/Default/images/stock-channel-indexed-32.svg
rename to themes/Default/images/32/gimp-channel-indexed.svg
diff --git a/themes/Default/images/stock-layer-mask-32.svg b/themes/Default/images/32/gimp-layer-mask.svg
similarity index 100%
rename from themes/Default/images/stock-layer-mask-32.svg
rename to themes/Default/images/32/gimp-layer-mask.svg
diff --git a/themes/Default/images/stock-layer-32.svg b/themes/Default/images/32/gimp-layer.svg
similarity index 100%
rename from themes/Default/images/stock-layer-32.svg
rename to themes/Default/images/32/gimp-layer.svg
diff --git a/themes/Default/images/stock-text-layer-32.svg b/themes/Default/images/32/gimp-text-layer.svg
similarity index 100%
rename from themes/Default/images/stock-text-layer-32.svg
rename to themes/Default/images/32/gimp-text-layer.svg
diff --git a/themes/Default/images/Makefile.am b/themes/Default/images/Makefile.am
index 75d41e6..4a0448e 100644
--- a/themes/Default/images/Makefile.am
+++ b/themes/Default/images/Makefile.am
@@ -8,353 +8,362 @@ themedatadir = $(gimpdatadir)/themes/Default/images
 ## A warning Wilber that is used from the core
 
 CORE_IMAGES = \
-       stock-question-64.png
+       64/gimp-question.png
 
 CORE_VARIABLES = \
-       stock_question_64 $(srcdir)/stock-question-64.png
+       gimp_question_64 $(srcdir)/64/gimp-question.png
 
 
 ## Compiled in stock icons
 
 STOCK_MENU_IMAGES = \
-       stock-cap-butt-16.png                           \
-       stock-cap-round-16.png                          \
-       stock-cap-square-16.png                         \
-       stock-center-16.png                             \
-       stock-channel-16.png                            \
-       stock-channel-alpha-16.png                      \
-       stock-channel-blue-16.png                       \
-       stock-channel-gray-16.png                       \
-       stock-channel-green-16.png                      \
-       stock-channel-indexed-16.png                    \
-       stock-channel-red-16.png                        \
-       stock-channels-16.png                           \
-       stock-close-12.png                              \
-       stock-colormap-16.png                           \
-       stock-controller-16.png                         \
-       stock-controller-keyboard-16.png                \
-       stock-controller-linux-input-16.png             \
-       stock-controller-midi-16.png                    \
-       stock-controller-wheel-16.png                   \
-       stock-convert-grayscale-16.png                  \
-       stock-convert-indexed-16.png                    \
-       stock-convert-rgb-16.png                        \
-       stock-cursor-16.png                             \
-       stock-default-colors-12.png                     \
-       stock-device-status-16.png                      \
-       stock-display-filter-16.png                     \
-       stock-display-filter-colorblind-16.png          \
-       stock-display-filter-contrast-16.png            \
-       stock-display-filter-gamma-16.png               \
-       stock-display-filter-lcms-16.png                \
-       stock-display-filter-proof-16.png               \
-       stock-dynamics-16.png                           \
-       stock-eye-12.png                                \
-       stock-flip-horizontal-16.png                    \
-       stock-flip-vertical-16.png                      \
-       stock-floating-selection-16.png                 \
-       stock-gegl-16.png                               \
-       stock-gradient-bilinear-16.png                  \
-       stock-gradient-conical-asymmetric-16.png        \
-       stock-gradient-conical-symmetric-16.png         \
-       stock-gradient-linear-16.png                    \
-       stock-gradient-radial-16.png                    \
-       stock-gradient-shapeburst-angular-16.png        \
-       stock-gradient-shapeburst-dimpled-16.png        \
-       stock-gradient-shapeburst-spherical-16.png      \
-       stock-gradient-spiral-anticlockwise-16.png      \
-       stock-gradient-spiral-clockwise-16.png          \
-       stock-gradient-square-16.png                    \
-       stock-grid-16.png                               \
-       stock-histogram-16.png                          \
-       stock-histogram-linear-16.png                   \
-       stock-histogram-logarithmic-16.png              \
-       stock-image-16.png                              \
-       stock-images-16.png                             \
-       stock-info-16.png                               \
-       stock-input-device-16.png                       \
-       stock-invert-16.png                             \
-       stock-join-bevel-16.png                         \
-       stock-join-miter-16.png                         \
-       stock-join-round-16.png                         \
-       stock-landscape-16.png                          \
-       stock-layer-16.png                              \
-       stock-layer-mask-16.png                         \
-       stock-layer-to-imagesize-16.png                 \
-       stock-layers-16.png                             \
-       stock-list-16.png                               \
-       stock-menu-left-12.png                          \
-       stock-menu-right-12.png                         \
-       stock-merge-down-16.png                         \
-       stock-move-to-screen-16.png                     \
-       stock-navigation-16.png                         \
-       stock-path-16.png                               \
-       stock-paths-16.png                              \
-       stock-plugin-16.png                             \
-       stock-portrait-16.png                           \
-       stock-print-resolution-16.png                   \
-       stock-quick-mask-off-12.png                     \
-       stock-quick-mask-on-12.png                      \
-       stock-reshow-filter-16.png                      \
-       stock-resize-16.png                             \
-       stock-rotate-180-16.png                         \
-       stock-rotate-270-16.png                         \
-       stock-rotate-90-16.png                          \
-       stock-sample-point-16.png                       \
-       stock-scale-16.png                              \
-       stock-selection-16.png                          \
-       stock-selection-all-16.png                      \
-       stock-selection-grow-16.png                     \
-       stock-selection-none-16.png                     \
-       stock-selection-shrink-16.png                   \
-       stock-selection-border-16.png                   \
-       stock-shape-circle-16.png                       \
-       stock-shape-diamond-16.png                      \
-       stock-shape-square-16.png                       \
-       stock-swap-colors-12.png                        \
-       stock-template-16.png                           \
-       stock-text-layer-16.png                         \
-       stock-toilet-paper-16.png                       \
-       stock-tool-options-16.png                       \
-       stock-tool-preset-16.png                        \
-       stock-tool-preset-22.png                        \
-       stock-tools-16.png                              \
-       stock-transparency-16.png                       \
-       stock-undo-history-16.png                       \
-       stock-user-manual-16.png                        \
-       stock-video-16.png                              \
-       stock-warning-16.png                            \
-       stock-wilber-16.png                             \
-       stock-web-16.png                                \
-       stock-zoom-follow-window-12.png
+       12/gimp-close.png                               \
+       12/gimp-default-colors.png                      \
+       12/gimp-eye.png                                 \
+       12/gimp-menu-left.png                           \
+       12/gimp-menu-right.png                          \
+       12/gimp-quick-mask-off.png                      \
+       12/gimp-quick-mask-on.png                       \
+       12/gimp-swap-colors.png                         \
+       12/gimp-zoom-follow-window.png                  \
+       \
+       16/gimp-cap-butt.png                            \
+       16/gimp-cap-round.png                           \
+       16/gimp-cap-square.png                          \
+       16/gimp-center.png                              \
+       16/gimp-channel-alpha.png                       \
+       16/gimp-channel-blue.png                        \
+       16/gimp-channel-gray.png                        \
+       16/gimp-channel-green.png                       \
+       16/gimp-channel-indexed.png                     \
+       16/gimp-channel-red.png                         \
+       16/gimp-channel.png                             \
+       16/gimp-channels.png                            \
+       16/gimp-colormap.png                            \
+       16/gimp-controller-keyboard.png                 \
+       16/gimp-controller-linux-input.png              \
+       16/gimp-controller-midi.png                     \
+       16/gimp-controller-wheel.png                    \
+       16/gimp-controller.png                          \
+       16/gimp-convert-grayscale.png                   \
+       16/gimp-convert-indexed.png                     \
+       16/gimp-convert-rgb.png                         \
+       16/gimp-cursor.png                              \
+       16/gimp-device-status.png                       \
+       16/gimp-display-filter-colorblind.png           \
+       16/gimp-display-filter-contrast.png             \
+       16/gimp-display-filter-gamma.png                \
+       16/gimp-display-filter-lcms.png                 \
+       16/gimp-display-filter-proof.png                \
+       16/gimp-display-filter.png                      \
+       16/gimp-dynamics.png                            \
+       16/gimp-flip-horizontal.png                     \
+       16/gimp-flip-vertical.png                       \
+       16/gimp-floating-selection.png                  \
+       16/gimp-gegl.png                                \
+       16/gimp-gradient-bilinear.png                   \
+       16/gimp-gradient-conical-asymmetric.png         \
+       16/gimp-gradient-conical-symmetric.png          \
+       16/gimp-gradient-linear.png                     \
+       16/gimp-gradient-radial.png                     \
+       16/gimp-gradient-shapeburst-angular.png         \
+       16/gimp-gradient-shapeburst-dimpled.png         \
+       16/gimp-gradient-shapeburst-spherical.png       \
+       16/gimp-gradient-spiral-anticlockwise.png       \
+       16/gimp-gradient-spiral-clockwise.png           \
+       16/gimp-gradient-square.png                     \
+       16/gimp-grid.png                                \
+       16/gimp-histogram-linear.png                    \
+       16/gimp-histogram-logarithmic.png               \
+       16/gimp-histogram.png                           \
+       16/gimp-image.png                               \
+       16/gimp-images.png                              \
+       16/gimp-info.png                                \
+       16/gimp-input-device.png                        \
+       16/gimp-invert.png                              \
+       16/gimp-join-bevel.png                          \
+       16/gimp-join-miter.png                          \
+       16/gimp-join-round.png                          \
+       16/gimp-landscape.png                           \
+       16/gimp-layer-mask.png                          \
+       16/gimp-layer-to-imagesize.png                  \
+       16/gimp-layer.png                               \
+       16/gimp-layers.png                              \
+       16/gimp-list.png                                \
+       16/gimp-merge-down.png                          \
+       16/gimp-move-to-screen.png                      \
+       16/gimp-navigation.png                          \
+       16/gimp-path.png                                \
+       16/gimp-paths.png                               \
+       16/gimp-plugin.png                              \
+       16/gimp-portrait.png                            \
+       16/gimp-print-resolution.png                    \
+       16/gimp-reshow-filter.png                       \
+       16/gimp-resize.png                              \
+       16/gimp-rotate-180.png                          \
+       16/gimp-rotate-270.png                          \
+       16/gimp-rotate-90.png                           \
+       16/gimp-sample-point.png                        \
+       16/gimp-scale.png                               \
+       16/gimp-selection-all.png                       \
+       16/gimp-selection-border.png                    \
+       16/gimp-selection-grow.png                      \
+       16/gimp-selection-none.png                      \
+       16/gimp-selection-shrink.png                    \
+       16/gimp-selection.png                           \
+       16/gimp-shape-circle.png                        \
+       16/gimp-shape-diamond.png                       \
+       16/gimp-shape-square.png                        \
+       16/gimp-template.png                            \
+       16/gimp-text-layer.png                          \
+       16/gimp-toilet-paper.png                        \
+       16/gimp-tool-options.png                        \
+       16/gimp-tool-preset.png                         \
+       16/gimp-tools.png                               \
+       16/gimp-transparency.png                        \
+       16/gimp-undo-history.png                        \
+       16/gimp-user-manual.png                         \
+       16/gimp-video.png                               \
+       16/gimp-warning.png                             \
+       16/gimp-web.png                                 \
+       16/gimp-wilber.png                              \
+       \
+       22/gimp-tool-preset.png
 
 STOCK_BUTTON_IMAGES = \
-       stock-anchor-16.png                     \
-       stock-center-24.png                     \
-       stock-channel-24.png                    \
-       stock-channel-alpha-24.png              \
-       stock-channel-blue-24.png               \
-       stock-channel-gray-24.png               \
-       stock-channel-green-24.png              \
-       stock-channel-indexed-24.png            \
-       stock-channel-red-24.png                \
-       stock-channels-24.png                   \
-       stock-char-picker-22.png                \
-       stock-color-picker-black-18.png         \
-       stock-color-picker-gray-18.png          \
-       stock-color-picker-white-18.png         \
-       stock-color-pick-from-screen-16.png     \
-       stock-color-triangle-16.png             \
-       stock-colormap-24.png                   \
-       stock-controller-24.png                 \
-       stock-controller-keyboard-24.png        \
-       stock-controller-linux-input-24.png     \
-       stock-controller-midi-24.png            \
-       stock-controller-wheel-24.png           \
-       stock-cursor-24.png                     \
-       stock-curve-free-16.png                 \
-       stock-curve-smooth-16.png               \
-       stock-device-status-24.png              \
-       stock-display-filter-24.png             \
-       stock-display-filter-colorblind-24.png  \
-       stock-display-filter-contrast-24.png    \
-       stock-display-filter-gamma-24.png       \
-       stock-display-filter-lcms-24.png        \
-       stock-display-filter-proof-24.png       \
-       stock-duplicate-16.png                  \
-       stock-dynamics-22.png                   \
-       stock-edit-16.png                       \
-       stock-eye-20.png                        \
-       stock-floating-selection-24.png         \
-       stock-gegl-22.png                       \
-       stock-gravity-east-24.png               \
-       stock-gravity-north-24.png              \
-       stock-gravity-north-east-24.png         \
-       stock-gravity-north-west-24.png         \
-       stock-gravity-south-24.png              \
-       stock-gravity-south-east-24.png         \
-       stock-gravity-south-west-24.png         \
-       stock-gravity-west-24.png               \
-       stock-hcenter-24.png                    \
-       stock-hchain-24.png                     \
-       stock-hchain-broken-24.png              \
-       stock-hfill-24.png                      \
-       stock-histogram-22.png                  \
-       stock-image-24.png                      \
-       stock-images-24.png                     \
-       stock-info-24.png                       \
-       stock-input-device-22.png               \
-       stock-layer-24.png                      \
-       stock-layer-mask-24.png                 \
-       stock-layers-24.png                     \
-       stock-letter-spacing-22.png             \
-       stock-line-spacing-22.png               \
-       stock-linked-12.png                     \
-       stock-linked-20.png                     \
-       stock-move-to-screen-24.png             \
-       stock-paste-as-new-16.png               \
-       stock-paste-into-16.png                 \
-       stock-path-stroke-16.png                \
-       stock-path-22.png                       \
-       stock-paths-22.png                      \
-       stock-print-resolution-24.png           \
-       stock-reset-16.png                      \
-       stock-sample-point-24.png               \
-       stock-selection-add-16.png              \
-       stock-selection-intersect-16.png        \
-       stock-selection-replace-16.png          \
-       stock-selection-stroke-16.png           \
-       stock-selection-subtract-16.png         \
-       stock-selection-to-channel-16.png       \
-       stock-selection-to-path-16.png          \
-       stock-text-dir-ltr-24.png               \
-       stock-text-dir-rtl-24.png               \
-       stock-template-24.png                   \
-       stock-text-layer-24.png                 \
-       stock-toilet-paper-24.png               \
-       stock-tool-options-24.png               \
-       stock-tools-24.png                      \
-       stock-transparency-24.png               \
-       stock-undo-history-24.png               \
-       stock-user-manual-24.png                \
-       stock-vcenter-24.png                    \
-       stock-vchain-24.png                     \
-       stock-vchain-broken-24.png              \
-       stock-vfill-24.png                      \
-       stock-video-24.png                      \
-       stock-warning-24.png                    \
-       stock-web-24.png                        \
-       stock-wilber-22.png
+       12/gimp-linked.png                      \
+       \
+       16/gimp-anchor.png                      \
+       16/gimp-color-pick-from-screen.png      \
+       16/gimp-color-triangle.png              \
+       16/gimp-curve-free.png                  \
+       16/gimp-curve-smooth.png                \
+       16/gimp-duplicate.png                   \
+       16/gimp-edit.png                        \
+       16/gimp-paste-as-new.png                \
+       16/gimp-paste-into.png                  \
+       16/gimp-path-stroke.png                 \
+       16/gimp-reset.png                       \
+       16/gimp-selection-add.png               \
+       16/gimp-selection-intersect.png         \
+       16/gimp-selection-replace.png           \
+       16/gimp-selection-stroke.png            \
+       16/gimp-selection-subtract.png          \
+       16/gimp-selection-to-channel.png        \
+       16/gimp-selection-to-path.png           \
+       \
+       18/gimp-color-picker-black.png          \
+       18/gimp-color-picker-gray.png           \
+       18/gimp-color-picker-white.png          \
+       \
+       20/gimp-eye.png                         \
+       20/gimp-linked.png                      \
+       \
+       22/gimp-char-picker.png                 \
+       22/gimp-dynamics.png                    \
+       22/gimp-gegl.png                        \
+       22/gimp-histogram.png                   \
+       22/gimp-input-device.png                \
+       22/gimp-letter-spacing.png              \
+       22/gimp-line-spacing.png                \
+       22/gimp-path.png                        \
+       22/gimp-paths.png                       \
+       22/gimp-wilber.png                      \
+       \
+       24/gimp-center.png                      \
+       24/gimp-channel-alpha.png               \
+       24/gimp-channel-blue.png                \
+       24/gimp-channel-gray.png                \
+       24/gimp-channel-green.png               \
+       24/gimp-channel-indexed.png             \
+       24/gimp-channel-red.png                 \
+       24/gimp-channel.png                     \
+       24/gimp-channels.png                    \
+       24/gimp-colormap.png                    \
+       24/gimp-controller-keyboard.png         \
+       24/gimp-controller-linux-input.png      \
+       24/gimp-controller-midi.png             \
+       24/gimp-controller-wheel.png            \
+       24/gimp-controller.png                  \
+       24/gimp-cursor.png                      \
+       24/gimp-device-status.png               \
+       24/gimp-display-filter-colorblind.png   \
+       24/gimp-display-filter-contrast.png     \
+       24/gimp-display-filter-gamma.png        \
+       24/gimp-display-filter-lcms.png         \
+       24/gimp-display-filter-proof.png        \
+       24/gimp-display-filter.png              \
+       24/gimp-floating-selection.png          \
+       24/gimp-gravity-east.png                \
+       24/gimp-gravity-north-east.png          \
+       24/gimp-gravity-north-west.png          \
+       24/gimp-gravity-north.png               \
+       24/gimp-gravity-south-east.png          \
+       24/gimp-gravity-south-west.png          \
+       24/gimp-gravity-south.png               \
+       24/gimp-gravity-west.png                \
+       24/gimp-hcenter.png                     \
+       24/gimp-hchain-broken.png               \
+       24/gimp-hchain.png                      \
+       24/gimp-hfill.png                       \
+       24/gimp-image.png                       \
+       24/gimp-images.png                      \
+       24/gimp-info.png                        \
+       24/gimp-layer-mask.png                  \
+       24/gimp-layer.png                       \
+       24/gimp-layers.png                      \
+       24/gimp-move-to-screen.png              \
+       24/gimp-print-resolution.png            \
+       24/gimp-sample-point.png                \
+       24/gimp-template.png                    \
+       24/gimp-text-dir-ltr.png                \
+       24/gimp-text-dir-rtl.png                \
+       24/gimp-text-layer.png                  \
+       24/gimp-toilet-paper.png                \
+       24/gimp-tool-options.png                \
+       24/gimp-tools.png                       \
+       24/gimp-transparency.png                \
+       24/gimp-undo-history.png                \
+       24/gimp-user-manual.png                 \
+       24/gimp-vcenter.png                     \
+       24/gimp-vchain-broken.png               \
+       24/gimp-vchain.png                      \
+       24/gimp-vfill.png                       \
+       24/gimp-video.png                       \
+       24/gimp-warning.png                     \
+       24/gimp-web.png
 
 STOCK_DND_IMAGES = \
-       stock-channel-32.png                    \
-       stock-channel-alpha-32.png              \
-       stock-channel-blue-32.png               \
-       stock-channel-gray-32.png               \
-       stock-channel-green-32.png              \
-       stock-channel-indexed-32.png            \
-       stock-channel-red-32.png                \
-       stock-floating-selection-32.png         \
-       stock-image-32.png                      \
-       stock-layer-32.png                      \
-       stock-layer-mask-32.png                 \
-       stock-text-layer-32.png                 \
-       stock-user-manual-32.png
+       32/gimp-channel-alpha.png       \
+       32/gimp-channel-blue.png        \
+       32/gimp-channel-gray.png        \
+       32/gimp-channel-green.png       \
+       32/gimp-channel-indexed.png     \
+       32/gimp-channel-red.png         \
+       32/gimp-channel.png             \
+       32/gimp-floating-selection.png  \
+       32/gimp-image.png               \
+       32/gimp-layer-mask.png          \
+       32/gimp-layer.png               \
+       32/gimp-text-layer.png          \
+       32/gimp-user-manual.png
 
 STOCK_DIALOG_IMAGES = \
-       stock-channel-48.png                    \
-       stock-channel-alpha-48.png              \
-       stock-channel-blue-48.png               \
-       stock-channel-gray-48.png               \
-       stock-channel-green-48.png              \
-       stock-channel-indexed-48.png            \
-       stock-channel-red-48.png                \
-       stock-error-64.png                      \
-       stock-floating-selection-48.png         \
-       stock-frame-64.png                      \
-       stock-image-48.png                      \
-       stock-info-64.png                       \
-       stock-layer-48.png                      \
-       stock-layer-mask-48.png                 \
-       stock-question-64.png                   \
-       stock-text-layer-48.png                 \
-       stock-texture-64.png                    \
-       stock-user-manual-64.png                \
-       stock-warning-64.png                    \
-       stock-wilber-64.png                     \
-       stock-wilber-eek-64.png
+       48/gimp-channel-alpha.png       \
+       48/gimp-channel-blue.png        \
+       48/gimp-channel-gray.png        \
+       48/gimp-channel-green.png       \
+       48/gimp-channel-indexed.png     \
+       48/gimp-channel-red.png         \
+       48/gimp-channel.png             \
+       48/gimp-floating-selection.png  \
+       48/gimp-image.png               \
+       48/gimp-layer-mask.png          \
+       48/gimp-layer.png               \
+       48/gimp-text-layer.png          \
+       \
+       64/gimp-error.png               \
+       64/gimp-frame.png               \
+       64/gimp-info.png                \
+       64/gimp-question.png            \
+       64/gimp-texture.png             \
+       64/gimp-user-manual.png         \
+       64/gimp-warning.png             \
+       64/gimp-wilber-eek.png          \
+       64/gimp-wilber.png
 
 STOCK_TOOL_IMAGES = \
-       tools/stock-tool-airbrush-16.png                \
-       tools/stock-tool-airbrush-22.png                \
-       tools/stock-tool-align-16.png                   \
-       tools/stock-tool-align-22.png                   \
-       tools/stock-tool-blend-16.png                   \
-       tools/stock-tool-blend-22.png                   \
-       tools/stock-tool-blur-16.png                    \
-       tools/stock-tool-blur-22.png                    \
-       tools/stock-tool-brightness-contrast-16.png     \
-       tools/stock-tool-brightness-contrast-22.png     \
-       tools/stock-tool-bucket-fill-16.png             \
-       tools/stock-tool-bucket-fill-22.png             \
-       tools/stock-tool-by-color-select-16.png         \
-       tools/stock-tool-by-color-select-22.png         \
-       tools/stock-tool-cage-16.png                    \
-       tools/stock-tool-cage-22.png                    \
-       tools/stock-tool-clone-16.png                   \
-       tools/stock-tool-clone-22.png                   \
-       tools/stock-tool-color-balance-16.png           \
-       tools/stock-tool-color-balance-22.png           \
-       tools/stock-tool-color-picker-16.png            \
-       tools/stock-tool-color-picker-22.png            \
-       tools/stock-tool-colorize-16.png                \
-       tools/stock-tool-colorize-22.png                \
-       tools/stock-tool-crop-16.png                    \
-       tools/stock-tool-crop-22.png                    \
-       tools/stock-tool-curves-16.png                  \
-       tools/stock-tool-curves-22.png                  \
-       tools/stock-tool-desaturate-16.png              \
-       tools/stock-tool-desaturate-22.png              \
-       tools/stock-tool-dodge-16.png                   \
-       tools/stock-tool-dodge-22.png                   \
-       tools/stock-tool-ellipse-select-16.png          \
-       tools/stock-tool-ellipse-select-22.png          \
-       tools/stock-tool-eraser-16.png                  \
-       tools/stock-tool-eraser-22.png                  \
-       tools/stock-tool-flip-16.png                    \
-       tools/stock-tool-flip-22.png                    \
-       tools/stock-tool-free-select-16.png             \
-       tools/stock-tool-free-select-22.png             \
-       tools/stock-tool-foreground-select-16.png       \
-       tools/stock-tool-foreground-select-22.png       \
-       tools/stock-tool-fuzzy-select-16.png            \
-       tools/stock-tool-fuzzy-select-22.png            \
-       tools/stock-tool-hue-saturation-16.png          \
-       tools/stock-tool-hue-saturation-22.png          \
-       tools/stock-tool-heal-16.png                    \
-       tools/stock-tool-heal-22.png                    \
-       tools/stock-tool-ink-16.png                     \
-       tools/stock-tool-ink-22.png                     \
-       tools/stock-tool-iscissors-16.png               \
-       tools/stock-tool-iscissors-22.png               \
-       tools/stock-tool-levels-16.png                  \
-       tools/stock-tool-levels-22.png                  \
-       tools/stock-tool-measure-16.png                 \
-       tools/stock-tool-measure-22.png                 \
-       tools/stock-tool-move-16.png                    \
-       tools/stock-tool-move-22.png                    \
-       tools/stock-tool-paintbrush-16.png              \
-       tools/stock-tool-paintbrush-22.png              \
-       tools/stock-tool-path-16.png                    \
-       tools/stock-tool-path-22.png                    \
-       tools/stock-tool-pencil-16.png                  \
-       tools/stock-tool-pencil-22.png                  \
-       tools/stock-tool-perspective-16.png             \
-       tools/stock-tool-perspective-22.png             \
-       tools/stock-tool-perspective-clone-16.png       \
-       tools/stock-tool-perspective-clone-22.png       \
-       tools/stock-tool-posterize-16.png               \
-       tools/stock-tool-posterize-22.png               \
-       tools/stock-tool-rect-select-16.png             \
-       tools/stock-tool-rect-select-22.png             \
-       tools/stock-tool-rotate-16.png                  \
-       tools/stock-tool-rotate-22.png                  \
-       tools/stock-tool-scale-16.png                   \
-       tools/stock-tool-scale-22.png                   \
-       tools/stock-tool-shear-16.png                   \
-       tools/stock-tool-shear-22.png                   \
-       tools/stock-tool-smudge-16.png                  \
-       tools/stock-tool-smudge-22.png                  \
-       tools/stock-tool-text-16.png                    \
-       tools/stock-tool-text-22.png                    \
-       tools/stock-tool-threshold-16.png               \
-       tools/stock-tool-threshold-22.png               \
-       tools/stock-tool-unified-transform-16.png       \
-       tools/stock-tool-unified-transform-22.png       \
-       tools/stock-tool-warp-16.png                    \
-       tools/stock-tool-warp-22.png                    \
-       tools/stock-tool-zoom-16.png                    \
-       tools/stock-tool-zoom-22.png
+       16/gimp-tool-airbrush.png               \
+       16/gimp-tool-align.png                  \
+       16/gimp-tool-blend.png                  \
+       16/gimp-tool-blur.png                   \
+       16/gimp-tool-brightness-contrast.png    \
+       16/gimp-tool-bucket-fill.png            \
+       16/gimp-tool-by-color-select.png        \
+       16/gimp-tool-cage.png                   \
+       16/gimp-tool-clone.png                  \
+       16/gimp-tool-color-balance.png          \
+       16/gimp-tool-color-picker.png           \
+       16/gimp-tool-colorize.png               \
+       16/gimp-tool-crop.png                   \
+       16/gimp-tool-curves.png                 \
+       16/gimp-tool-desaturate.png             \
+       16/gimp-tool-dodge.png                  \
+       16/gimp-tool-ellipse-select.png         \
+       16/gimp-tool-eraser.png                 \
+       16/gimp-tool-flip.png                   \
+       16/gimp-tool-foreground-select.png      \
+       16/gimp-tool-free-select.png            \
+       16/gimp-tool-fuzzy-select.png           \
+       16/gimp-tool-heal.png                   \
+       16/gimp-tool-hue-saturation.png         \
+       16/gimp-tool-ink.png                    \
+       16/gimp-tool-iscissors.png              \
+       16/gimp-tool-levels.png                 \
+       16/gimp-tool-measure.png                \
+       16/gimp-tool-move.png                   \
+       16/gimp-tool-paintbrush.png             \
+       16/gimp-tool-path.png                   \
+       16/gimp-tool-pencil.png                 \
+       16/gimp-tool-perspective-clone.png      \
+       16/gimp-tool-perspective.png            \
+       16/gimp-tool-posterize.png              \
+       16/gimp-tool-rect-select.png            \
+       16/gimp-tool-rotate.png                 \
+       16/gimp-tool-scale.png                  \
+       16/gimp-tool-shear.png                  \
+       16/gimp-tool-smudge.png                 \
+       16/gimp-tool-text.png                   \
+       16/gimp-tool-threshold.png              \
+       16/gimp-tool-unified-transform.png      \
+       16/gimp-tool-warp.png                   \
+       16/gimp-tool-zoom.png                   \
+       \
+       22/gimp-tool-airbrush.png               \
+       22/gimp-tool-align.png                  \
+       22/gimp-tool-blend.png                  \
+       22/gimp-tool-blur.png                   \
+       22/gimp-tool-brightness-contrast.png    \
+       22/gimp-tool-bucket-fill.png            \
+       22/gimp-tool-by-color-select.png        \
+       22/gimp-tool-cage.png                   \
+       22/gimp-tool-clone.png                  \
+       22/gimp-tool-color-balance.png          \
+       22/gimp-tool-color-picker.png           \
+       22/gimp-tool-colorize.png               \
+       22/gimp-tool-crop.png                   \
+       22/gimp-tool-curves.png                 \
+       22/gimp-tool-desaturate.png             \
+       22/gimp-tool-dodge.png                  \
+       22/gimp-tool-ellipse-select.png         \
+       22/gimp-tool-eraser.png                 \
+       22/gimp-tool-flip.png                   \
+       22/gimp-tool-foreground-select.png      \
+       22/gimp-tool-free-select.png            \
+       22/gimp-tool-fuzzy-select.png           \
+       22/gimp-tool-heal.png                   \
+       22/gimp-tool-hue-saturation.png         \
+       22/gimp-tool-ink.png                    \
+       22/gimp-tool-iscissors.png              \
+       22/gimp-tool-levels.png                 \
+       22/gimp-tool-measure.png                \
+       22/gimp-tool-move.png                   \
+       22/gimp-tool-paintbrush.png             \
+       22/gimp-tool-path.png                   \
+       22/gimp-tool-pencil.png                 \
+       22/gimp-tool-perspective-clone.png      \
+       22/gimp-tool-perspective.png            \
+       22/gimp-tool-posterize.png              \
+       22/gimp-tool-rect-select.png            \
+       22/gimp-tool-rotate.png                 \
+       22/gimp-tool-scale.png                  \
+       22/gimp-tool-shear.png                  \
+       22/gimp-tool-smudge.png                 \
+       22/gimp-tool-text.png                   \
+       22/gimp-tool-threshold.png              \
+       22/gimp-tool-unified-transform.png      \
+       22/gimp-tool-warp.png                   \
+       22/gimp-tool-zoom.png
 
 STOCK_IMAGES = \
        $(STOCK_MENU_IMAGES)    \
@@ -365,10 +374,10 @@ STOCK_IMAGES = \
 
 
 themedata_DATA = \
-       stock-error-64.png      \
-       stock-info-64.png       \
-       stock-question-64.png   \
-       stock-warning-64.png
+       64/gimp-error.png       \
+       64/gimp-info.png        \
+       64/gimp-question.png    \
+       64/gimp-warning.png
 
 
 EXTRA_DIST = \
@@ -389,7 +398,7 @@ stock-icons.list: $(STOCK_IMAGES) Makefile.am
        $(AM_V_GEN) ( rm -f $@; \
           for image in $(STOCK_IMAGES); do \
             echo $$image | \
-              sed -e 's|.*/||' -e 's|-|_|g' -e 's|\.png$$||' >> $@; \
+              sed -e 's|\(.*\)/\(.*\).png|\2-\1.png|' -e 's|-|_|g' -e 's|\.png$$||' >> $@; \
            echo "  $(srcdir)/$$image" >> $@; \
          done )
 


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