From c0431df6f574766de25730819ee6a8bf8fa37174 Mon Sep 17 00:00:00 2001
From: Jehan <jehan@girinstud.io>
Date: Mon, 31 Jan 2022 16:09:28 +0100
Subject: [PATCH] icons, tools: new 'templates' icon list.

Some points to note:
- gimp-web and gimp-toilet-paper had some usage elsewhere so I also left
  them in 2 of the more generic size files.
- I remove gimp-floppy altogether as it's used nowhere in any of our
  code or data files.
---
 icons/Color/icon-list.mk         | 43 +++++++++++++++++---------------
 icons/Color/meson.build          |  6 ++---
 icons/Symbolic/icon-list.mk      | 43 +++++++++++++++++---------------
 icons/icon-lists/bitmap_16.list  | 11 +++-----
 icons/icon-lists/bitmap_24.list  |  8 +-----
 icons/icon-lists/scalable.list   | 10 ++------
 icons/icon-lists/templates.list  | 14 +++++++++++
 tools/generate-icon-makefiles.py | 14 ++++++-----
 8 files changed, 78 insertions(+), 71 deletions(-)
 create mode 100644 icons/icon-lists/templates.list

diff --git a/icons/Color/icon-list.mk b/icons/Color/icon-list.mk
index aa790a091c..67160bfd5c 100644
--- a/icons/Color/icon-list.mk
+++ b/icons/Color/icon-list.mk
@@ -46,8 +46,7 @@ scalable_images = \
 	scalable/help-about.svg					\
 	scalable/list-add.svg					\
 	scalable/list-remove.svg				\
-	scalable/media-floppy.svg				\
-	scalable/media-optical.svg				\
+	\
 	scalable/media-playback-pause.svg			\
 	scalable/media-playback-start.svg			\
 	scalable/media-record.svg				\
@@ -79,7 +78,6 @@ scalable_images = \
 	\
 	scalable/gimp-anchor.svg				\
 	scalable/gimp-attach.svg				\
-	scalable/gimp-business-card.svg				\
 	scalable/gimp-cap-butt.svg				\
 	scalable/gimp-cap-round.svg				\
 	scalable/gimp-cap-square.svg				\
@@ -124,7 +122,6 @@ scalable_images = \
 	scalable/gimp-default-colors.svg			\
 	scalable/gimp-detach.svg				\
 	scalable/gimp-device-status.svg				\
-	scalable/gimp-display.svg				\
 	scalable/gimp-display-filter.svg			\
 	scalable/gimp-display-filter-clip-warning.svg		\
 	scalable/gimp-display-filter-colorblind.svg		\
@@ -237,7 +234,6 @@ scalable_images = \
 	scalable/gimp-shape-diamond.svg				\
 	scalable/gimp-shape-square.svg				\
 	scalable/gimp-shred.svg					\
-	scalable/gimp-smartphone.svg				\
 	scalable/gimp-swap-colors.svg				\
 	scalable/gimp-symmetry.svg				\
 	scalable/gimp-template.svg				\
@@ -246,7 +242,6 @@ scalable_images = \
 	scalable/gimp-text-dir-ttb-rtl.svg			\
 	scalable/gimp-text-dir-ttb-rtl-upright.svg		\
 	scalable/gimp-text-layer.svg				\
-	scalable/gimp-toilet-paper.svg				\
 	scalable/gimp-tools.svg					\
 	scalable/gimp-transform-3d-camera.svg			\
 	scalable/gimp-transform-3d-move.svg			\
@@ -258,9 +253,7 @@ scalable_images = \
 	scalable/gimp-vchain.svg				\
 	scalable/gimp-vchain-broken.svg				\
 	scalable/gimp-vfill.svg					\
-	scalable/gimp-video.svg					\
 	scalable/gimp-visible.svg				\
-	scalable/gimp-web.svg					\
 	scalable/gimp-wilber.svg				\
 	scalable/gimp-wilber-eek.svg				\
 	scalable/gimp-wilber-outline.svg			\
@@ -305,6 +298,14 @@ scalable_images = \
 	scalable/gimp-prefs-folders-themes.svg			\
 	scalable/gimp-prefs-folders-tool-presets.svg		\
 	\
+	scalable/gimp-business-card.svg				\
+	scalable/gimp-display.svg				\
+	scalable/gimp-smartphone.svg				\
+	scalable/gimp-toilet-paper.svg				\
+	scalable/gimp-video.svg					\
+	scalable/gimp-web.svg					\
+	scalable/media-optical.svg				\
+	\
 	scalable/gimp-tool-airbrush.svg				\
 	scalable/gimp-tool-align.svg				\
 	scalable/gimp-tool-blur.svg				\
@@ -419,8 +420,6 @@ icons16_images = \
 	16/help-about.png					\
 	16/list-add.png						\
 	16/list-remove.png					\
-	16/media-floppy.png					\
-	16/media-optical.png					\
 	16/media-playback-pause.png				\
 	16/media-playback-start.png				\
 	16/media-record.png					\
@@ -451,7 +450,6 @@ icons16_images = \
 	16/gtk-yes.png						\
 	\
 	16/gimp-anchor.png					\
-	16/gimp-business-card.png				\
 	16/gimp-cap-butt.png					\
 	16/gimp-cap-round.png					\
 	16/gimp-cap-square.png					\
@@ -490,7 +488,6 @@ icons16_images = \
 	16/gimp-curve-smooth.png				\
 	16/gimp-dashboard.png					\
 	16/gimp-device-status.png				\
-	16/gimp-display.png					\
 	16/gimp-display-filter-clip-warning.png			\
 	16/gimp-display-filter-colorblind.png			\
 	16/gimp-display-filter-contrast.png			\
@@ -569,11 +566,9 @@ icons16_images = \
 	16/gimp-shape-diamond.png				\
 	16/gimp-shape-square.png				\
 	16/gimp-shred.png					\
-	16/gimp-smartphone.png					\
 	16/gimp-symmetry.png					\
 	16/gimp-template.png					\
 	16/gimp-text-layer.png					\
-	16/gimp-toilet-paper.png				\
 	16/gimp-tools.png					\
 	16/gimp-transform-3d-camera.png				\
 	16/gimp-transform-3d-move.png				\
@@ -581,7 +576,7 @@ icons16_images = \
 	16/gimp-transparency.png				\
 	16/gimp-undo-history.png				\
 	16/gimp-user-manual.png					\
-	16/gimp-video.png					\
+	\
 	16/gimp-web.png						\
 	16/gimp-wilber.png					\
 	\
@@ -626,6 +621,13 @@ icons16_images = \
 	\
 	16/gimp-wilber-eek.png					\
 	\
+	16/gimp-business-card.png				\
+	16/gimp-display.png					\
+	16/gimp-smartphone.png					\
+	16/gimp-toilet-paper.png				\
+	16/gimp-video.png					\
+	16/media-optical.png					\
+	\
 	16/gimp-tool-airbrush.png				\
 	16/gimp-tool-align.png					\
 	16/gimp-tool-blur.png					\
@@ -721,13 +723,10 @@ icons24_images = \
 	24/document-print.png					\
 	24/format-text-direction-ltr.png			\
 	24/format-text-direction-rtl.png			\
-	24/media-floppy.png					\
-	24/media-optical.png					\
 	\
 	24/gtk-select-color.png					\
 	\
 	24/gimp-attach.png					\
-	24/gimp-business-card.png				\
 	24/gimp-center.png					\
 	24/gimp-channel-alpha.png				\
 	24/gimp-channel-blue.png				\
@@ -750,7 +749,6 @@ icons24_images = \
 	24/gimp-dashboard.png					\
 	24/gimp-detach.png					\
 	24/gimp-device-status.png				\
-	24/gimp-display.png					\
 	24/gimp-display-filter.png				\
 	24/gimp-display-filter-clip-warning.png			\
 	24/gimp-display-filter-colorblind.png			\
@@ -784,7 +782,6 @@ icons24_images = \
 	24/gimp-sample-point.png				\
 	24/gimp-scale.png					\
 	24/gimp-selection.png					\
-	24/gimp-smartphone.png					\
 	24/gimp-symmetry.png					\
 	24/gimp-template.png					\
 	24/gimp-text-dir-ttb-rtl.png				\
@@ -792,6 +789,7 @@ icons24_images = \
 	24/gimp-text-dir-ttb-ltr.png				\
 	24/gimp-text-dir-ttb-ltr-upright.png			\
 	24/gimp-text-layer.png					\
+	\
 	24/gimp-toilet-paper.png				\
 	24/gimp-tools.png					\
 	24/gimp-transparency.png				\
@@ -801,8 +799,13 @@ icons24_images = \
 	24/gimp-vchain-broken.png				\
 	24/gimp-vchain.png					\
 	24/gimp-vfill.png					\
+	\
+	24/gimp-business-card.png				\
+	24/gimp-display.png					\
+	24/gimp-smartphone.png					\
 	24/gimp-video.png					\
 	24/gimp-web.png						\
+	24/media-optical.png					\
 	\
 	24/gimp-tool-airbrush.png				\
 	24/gimp-tool-align.png					\
diff --git a/icons/Color/meson.build b/icons/Color/meson.build
index 0d2b365bcd..a424cbd771 100644
--- a/icons/Color/meson.build
+++ b/icons/Color/meson.build
@@ -5,7 +5,7 @@ if have_vector_icons
       'outdir': 'scalable',
       'indir':  'scalable',
       'suffix': '.svg',
-      'files':  [ 'scalable', 'prefs', 'tools' ],
+      'files':  [ 'scalable', 'prefs', 'templates', 'tools' ],
     },
     {
       'outdir': '64x64',
@@ -17,11 +17,11 @@ if have_vector_icons
 else
   build_icons = {
     '12':  [ 'bitmap_12', ],
-    '16':  [ 'bitmap_16', 'prefs', 'tools' ],
+    '16':  [ 'bitmap_16', 'prefs', 'templates', 'tools' ],
     '18':  [ 'bitmap_18', ],
     '20':  [ 'bitmap_20', ],
     '22':  [ 'bitmap_22', ],
-    '24':  [ 'bitmap_24', 'tools' ],
+    '24':  [ 'bitmap_24', 'templates', 'tools' ],
     '32':  [ 'bitmap_32', ],
     '48':  [ 'bitmap_48', 'prefs' ],
     '64':  [ 'bitmap_64', 'bitmap_64-system', ],
diff --git a/icons/Symbolic/icon-list.mk b/icons/Symbolic/icon-list.mk
index b346ae0e52..cee130d4e5 100644
--- a/icons/Symbolic/icon-list.mk
+++ b/icons/Symbolic/icon-list.mk
@@ -46,8 +46,7 @@ scalable_images = \
 	scalable/help-about-symbolic.svg					\
 	scalable/list-add-symbolic.svg						\
 	scalable/list-remove-symbolic.svg					\
-	scalable/media-floppy-symbolic.svg					\
-	scalable/media-optical-symbolic.svg					\
+	\
 	scalable/media-playback-pause-symbolic.svg				\
 	scalable/media-playback-start-symbolic.svg				\
 	scalable/media-record-symbolic.svg					\
@@ -79,7 +78,6 @@ scalable_images = \
 	\
 	scalable/gimp-anchor-symbolic.svg					\
 	scalable/gimp-attach-symbolic.svg					\
-	scalable/gimp-business-card-symbolic.svg				\
 	scalable/gimp-cap-butt-symbolic.svg					\
 	scalable/gimp-cap-round-symbolic.svg					\
 	scalable/gimp-cap-square-symbolic.svg					\
@@ -124,7 +122,6 @@ scalable_images = \
 	scalable/gimp-default-colors-symbolic.svg				\
 	scalable/gimp-detach-symbolic.svg					\
 	scalable/gimp-device-status-symbolic.svg				\
-	scalable/gimp-display-symbolic.svg					\
 	scalable/gimp-display-filter-symbolic.svg				\
 	scalable/gimp-display-filter-clip-warning-symbolic.svg			\
 	scalable/gimp-display-filter-colorblind-symbolic.svg			\
@@ -237,7 +234,6 @@ scalable_images = \
 	scalable/gimp-shape-diamond-symbolic.svg				\
 	scalable/gimp-shape-square-symbolic.svg					\
 	scalable/gimp-shred-symbolic.svg					\
-	scalable/gimp-smartphone-symbolic.svg					\
 	scalable/gimp-swap-colors-symbolic.svg					\
 	scalable/gimp-symmetry-symbolic.svg					\
 	scalable/gimp-template-symbolic.svg					\
@@ -246,7 +242,6 @@ scalable_images = \
 	scalable/gimp-text-dir-ttb-rtl-symbolic.svg				\
 	scalable/gimp-text-dir-ttb-rtl-upright-symbolic.svg			\
 	scalable/gimp-text-layer-symbolic.svg					\
-	scalable/gimp-toilet-paper-symbolic.svg					\
 	scalable/gimp-tools-symbolic.svg					\
 	scalable/gimp-transform-3d-camera-symbolic.svg				\
 	scalable/gimp-transform-3d-move-symbolic.svg				\
@@ -258,9 +253,7 @@ scalable_images = \
 	scalable/gimp-vchain-symbolic.svg					\
 	scalable/gimp-vchain-broken-symbolic.svg				\
 	scalable/gimp-vfill-symbolic.svg					\
-	scalable/gimp-video-symbolic.svg					\
 	scalable/gimp-visible-symbolic.svg					\
-	scalable/gimp-web-symbolic.svg						\
 	scalable/gimp-wilber-symbolic.svg					\
 	scalable/gimp-wilber-eek-symbolic.svg					\
 	scalable/gimp-wilber-outline-symbolic.svg				\
@@ -305,6 +298,14 @@ scalable_images = \
 	scalable/gimp-prefs-folders-themes-symbolic.svg				\
 	scalable/gimp-prefs-folders-tool-presets-symbolic.svg			\
 	\
+	scalable/gimp-business-card-symbolic.svg				\
+	scalable/gimp-display-symbolic.svg					\
+	scalable/gimp-smartphone-symbolic.svg					\
+	scalable/gimp-toilet-paper-symbolic.svg					\
+	scalable/gimp-video-symbolic.svg					\
+	scalable/gimp-web-symbolic.svg						\
+	scalable/media-optical-symbolic.svg					\
+	\
 	scalable/gimp-tool-airbrush-symbolic.svg				\
 	scalable/gimp-tool-align-symbolic.svg					\
 	scalable/gimp-tool-blur-symbolic.svg					\
@@ -419,8 +420,6 @@ icons16_images = \
 	16/help-about-symbolic.symbolic.png					\
 	16/list-add-symbolic.symbolic.png					\
 	16/list-remove-symbolic.symbolic.png					\
-	16/media-floppy-symbolic.symbolic.png					\
-	16/media-optical-symbolic.symbolic.png					\
 	16/media-playback-pause-symbolic.symbolic.png				\
 	16/media-playback-start-symbolic.symbolic.png				\
 	16/media-record-symbolic.symbolic.png					\
@@ -451,7 +450,6 @@ icons16_images = \
 	16/gtk-yes-symbolic.symbolic.png					\
 	\
 	16/gimp-anchor-symbolic.symbolic.png					\
-	16/gimp-business-card-symbolic.symbolic.png				\
 	16/gimp-cap-butt-symbolic.symbolic.png					\
 	16/gimp-cap-round-symbolic.symbolic.png					\
 	16/gimp-cap-square-symbolic.symbolic.png				\
@@ -490,7 +488,6 @@ icons16_images = \
 	16/gimp-curve-smooth-symbolic.symbolic.png				\
 	16/gimp-dashboard-symbolic.symbolic.png					\
 	16/gimp-device-status-symbolic.symbolic.png				\
-	16/gimp-display-symbolic.symbolic.png					\
 	16/gimp-display-filter-clip-warning-symbolic.symbolic.png		\
 	16/gimp-display-filter-colorblind-symbolic.symbolic.png			\
 	16/gimp-display-filter-contrast-symbolic.symbolic.png			\
@@ -569,11 +566,9 @@ icons16_images = \
 	16/gimp-shape-diamond-symbolic.symbolic.png				\
 	16/gimp-shape-square-symbolic.symbolic.png				\
 	16/gimp-shred-symbolic.symbolic.png					\
-	16/gimp-smartphone-symbolic.symbolic.png				\
 	16/gimp-symmetry-symbolic.symbolic.png					\
 	16/gimp-template-symbolic.symbolic.png					\
 	16/gimp-text-layer-symbolic.symbolic.png				\
-	16/gimp-toilet-paper-symbolic.symbolic.png				\
 	16/gimp-tools-symbolic.symbolic.png					\
 	16/gimp-transform-3d-camera-symbolic.symbolic.png			\
 	16/gimp-transform-3d-move-symbolic.symbolic.png				\
@@ -581,7 +576,7 @@ icons16_images = \
 	16/gimp-transparency-symbolic.symbolic.png				\
 	16/gimp-undo-history-symbolic.symbolic.png				\
 	16/gimp-user-manual-symbolic.symbolic.png				\
-	16/gimp-video-symbolic.symbolic.png					\
+	\
 	16/gimp-web-symbolic.symbolic.png					\
 	16/gimp-wilber-symbolic.symbolic.png					\
 	\
@@ -626,6 +621,13 @@ icons16_images = \
 	\
 	16/gimp-wilber-eek-symbolic.symbolic.png				\
 	\
+	16/gimp-business-card-symbolic.symbolic.png				\
+	16/gimp-display-symbolic.symbolic.png					\
+	16/gimp-smartphone-symbolic.symbolic.png				\
+	16/gimp-toilet-paper-symbolic.symbolic.png				\
+	16/gimp-video-symbolic.symbolic.png					\
+	16/media-optical-symbolic.symbolic.png					\
+	\
 	16/gimp-tool-airbrush-symbolic.symbolic.png				\
 	16/gimp-tool-align-symbolic.symbolic.png				\
 	16/gimp-tool-blur-symbolic.symbolic.png					\
@@ -721,13 +723,10 @@ icons24_images = \
 	24/document-print-symbolic.symbolic.png					\
 	24/format-text-direction-ltr-symbolic.symbolic.png			\
 	24/format-text-direction-rtl-symbolic.symbolic.png			\
-	24/media-floppy-symbolic.symbolic.png					\
-	24/media-optical-symbolic.symbolic.png					\
 	\
 	24/gtk-select-color-symbolic.symbolic.png				\
 	\
 	24/gimp-attach-symbolic.symbolic.png					\
-	24/gimp-business-card-symbolic.symbolic.png				\
 	24/gimp-center-symbolic.symbolic.png					\
 	24/gimp-channel-alpha-symbolic.symbolic.png				\
 	24/gimp-channel-blue-symbolic.symbolic.png				\
@@ -750,7 +749,6 @@ icons24_images = \
 	24/gimp-dashboard-symbolic.symbolic.png					\
 	24/gimp-detach-symbolic.symbolic.png					\
 	24/gimp-device-status-symbolic.symbolic.png				\
-	24/gimp-display-symbolic.symbolic.png					\
 	24/gimp-display-filter-symbolic.symbolic.png				\
 	24/gimp-display-filter-clip-warning-symbolic.symbolic.png		\
 	24/gimp-display-filter-colorblind-symbolic.symbolic.png			\
@@ -784,7 +782,6 @@ icons24_images = \
 	24/gimp-sample-point-symbolic.symbolic.png				\
 	24/gimp-scale-symbolic.symbolic.png					\
 	24/gimp-selection-symbolic.symbolic.png					\
-	24/gimp-smartphone-symbolic.symbolic.png				\
 	24/gimp-symmetry-symbolic.symbolic.png					\
 	24/gimp-template-symbolic.symbolic.png					\
 	24/gimp-text-dir-ttb-rtl-symbolic.symbolic.png				\
@@ -792,6 +789,7 @@ icons24_images = \
 	24/gimp-text-dir-ttb-ltr-symbolic.symbolic.png				\
 	24/gimp-text-dir-ttb-ltr-upright-symbolic.symbolic.png			\
 	24/gimp-text-layer-symbolic.symbolic.png				\
+	\
 	24/gimp-toilet-paper-symbolic.symbolic.png				\
 	24/gimp-tools-symbolic.symbolic.png					\
 	24/gimp-transparency-symbolic.symbolic.png				\
@@ -801,8 +799,13 @@ icons24_images = \
 	24/gimp-vchain-broken-symbolic.symbolic.png				\
 	24/gimp-vchain-symbolic.symbolic.png					\
 	24/gimp-vfill-symbolic.symbolic.png					\
+	\
+	24/gimp-business-card-symbolic.symbolic.png				\
+	24/gimp-display-symbolic.symbolic.png					\
+	24/gimp-smartphone-symbolic.symbolic.png				\
 	24/gimp-video-symbolic.symbolic.png					\
 	24/gimp-web-symbolic.symbolic.png					\
+	24/media-optical-symbolic.symbolic.png					\
 	\
 	24/gimp-tool-airbrush-symbolic.symbolic.png				\
 	24/gimp-tool-align-symbolic.symbolic.png				\
diff --git a/icons/icon-lists/bitmap_16.list b/icons/icon-lists/bitmap_16.list
index 67e9ded4bc..65f7bb7d9f 100644
--- a/icons/icon-lists/bitmap_16.list
+++ b/icons/icon-lists/bitmap_16.list
@@ -30,8 +30,6 @@ go-up
 help-about
 list-add
 list-remove
-media-floppy
-media-optical
 media-playback-pause
 media-playback-start
 media-record
@@ -62,7 +60,6 @@ gtk-select-font
 gtk-yes
 
 gimp-anchor
-gimp-business-card
 gimp-cap-butt
 gimp-cap-round
 gimp-cap-square
@@ -101,7 +98,6 @@ gimp-curve-point-smooth
 gimp-curve-smooth
 gimp-dashboard
 gimp-device-status
-gimp-display
 gimp-display-filter-clip-warning
 gimp-display-filter-colorblind
 gimp-display-filter-contrast
@@ -180,11 +176,9 @@ gimp-shape-circle
 gimp-shape-diamond
 gimp-shape-square
 gimp-shred
-gimp-smartphone
 gimp-symmetry
 gimp-template
 gimp-text-layer
-gimp-toilet-paper
 gimp-tools
 gimp-transform-3d-camera
 gimp-transform-3d-move
@@ -192,6 +186,9 @@ gimp-transform-3d-rotate
 gimp-transparency
 gimp-undo-history
 gimp-user-manual
-gimp-video
+# - GTK_ICON_SIZE_BUTTON (16px) in file-open-location-dialog.c
+# - file-open-location action (menu, action search, etc. Usually 16px)
+# - GTK_ICON_SIZE_BUTTON in web-page plug-in.
+# - GTK_ICON_SIZE_MENU in imagemap plug-in.
 gimp-web
 gimp-wilber
diff --git a/icons/icon-lists/bitmap_24.list b/icons/icon-lists/bitmap_24.list
index 8b973ca681..3da2fc3488 100644
--- a/icons/icon-lists/bitmap_24.list
+++ b/icons/icon-lists/bitmap_24.list
@@ -5,13 +5,10 @@ dialog-warning
 document-print
 format-text-direction-ltr
 format-text-direction-rtl
-media-floppy
-media-optical
 
 gtk-select-color
 
 gimp-attach
-gimp-business-card
 gimp-center
 gimp-channel-alpha
 gimp-channel-blue
@@ -34,7 +31,6 @@ gimp-cursor
 gimp-dashboard
 gimp-detach
 gimp-device-status
-gimp-display
 gimp-display-filter
 gimp-display-filter-clip-warning
 gimp-display-filter-colorblind
@@ -68,7 +64,6 @@ gimp-resize
 gimp-sample-point
 gimp-scale
 gimp-selection
-gimp-smartphone
 gimp-symmetry
 gimp-template
 gimp-text-dir-ttb-rtl
@@ -76,6 +71,7 @@ gimp-text-dir-ttb-rtl-upright
 gimp-text-dir-ttb-ltr
 gimp-text-dir-ttb-ltr-upright
 gimp-text-layer
+# Default GimpIconPicker icon as GIMP_VIEW_SIZE_SMALL (24px) GimpView.
 gimp-toilet-paper
 gimp-tools
 gimp-transparency
@@ -85,5 +81,3 @@ gimp-vcenter
 gimp-vchain-broken
 gimp-vchain
 gimp-vfill
-gimp-video
-gimp-web
diff --git a/icons/icon-lists/scalable.list b/icons/icon-lists/scalable.list
index 1f27643903..303a5d024d 100644
--- a/icons/icon-lists/scalable.list
+++ b/icons/icon-lists/scalable.list
@@ -37,8 +37,8 @@ go-up
 help-about
 list-add
 list-remove
-media-floppy
-media-optical
+# Unused.
+# media-floppy
 media-playback-pause
 media-playback-start
 media-record
@@ -70,7 +70,6 @@ gtk-yes
 
 gimp-anchor
 gimp-attach
-gimp-business-card
 gimp-cap-butt
 gimp-cap-round
 gimp-cap-square
@@ -115,7 +114,6 @@ gimp-dashboard
 gimp-default-colors
 gimp-detach
 gimp-device-status
-gimp-display
 gimp-display-filter
 gimp-display-filter-clip-warning
 gimp-display-filter-colorblind
@@ -228,7 +226,6 @@ gimp-shape-circle
 gimp-shape-diamond
 gimp-shape-square
 gimp-shred
-gimp-smartphone
 gimp-swap-colors
 gimp-symmetry
 gimp-template
@@ -237,7 +234,6 @@ gimp-text-dir-ttb-ltr-upright
 gimp-text-dir-ttb-rtl
 gimp-text-dir-ttb-rtl-upright
 gimp-text-layer
-gimp-toilet-paper
 gimp-tools
 gimp-transform-3d-camera
 gimp-transform-3d-move
@@ -249,9 +245,7 @@ gimp-vcenter
 gimp-vchain
 gimp-vchain-broken
 gimp-vfill
-gimp-video
 gimp-visible
-gimp-web
 gimp-wilber
 gimp-wilber-eek
 gimp-wilber-outline
diff --git a/icons/icon-lists/templates.list b/icons/icon-lists/templates.list
new file mode 100644
index 0000000000..0f408860c6
--- /dev/null
+++ b/icons/icon-lists/templates.list
@@ -0,0 +1,14 @@
+# grep -rI icon-name etc/templaterc |sed 's/^.*"\([^"]*\)")/\1/' |sort|uniq
+# Used as:
+# - GimpTemplateView list or grid in GIMP_VIEW_SIZE_SMALL (24)
+# - Combo with size 16 in resize-dialog.c
+# - Combo with size 16 in preferences-dialog.c
+# - Combo with size 16 in image-new-dialog.c
+
+gimp-business-card
+gimp-display
+gimp-smartphone
+gimp-toilet-paper
+gimp-video
+gimp-web
+media-optical
diff --git a/tools/generate-icon-makefiles.py b/tools/generate-icon-makefiles.py
index 425058ee4d..74047a1abb 100755
--- a/tools/generate-icon-makefiles.py
+++ b/tools/generate-icon-makefiles.py
@@ -115,10 +115,10 @@ if __name__ == "__main__":
     # should contain nearly all images. So we compute max_len once and
     # reuse this value on all lists.
     col_max_len = print_icons(list_dir,
-                              ['scalable.list', 'prefs.list', 'tools.list'],
+                              ['scalable.list', 'prefs.list', 'templates.list', 'tools.list'],
                               None, "scalable/", ".svg", colorf)
     sym_max_len = print_icons(list_dir,
-                              ['scalable.list', 'prefs.list', 'tools.list'],
+                              ['scalable.list', 'prefs.list', 'templates.list', 'tools.list'],
                               None, "scalable/", "-symbolic.svg", symbolicf)
 
     # 12x12 bitmap
@@ -130,9 +130,11 @@ if __name__ == "__main__":
     # 16x16 bitmap
     print("\nicons16_images = \\", file=colorf)
     print("\nicons16_images = \\", file=symbolicf)
-    print_icons(list_dir, ['bitmap_16.list', 'prefs.list', 'tools.list'],
+    print_icons(list_dir,
+                ['bitmap_16.list', 'prefs.list', 'templates.list', 'tools.list'],
                 col_max_len, "16/", ".png", colorf)
-    print_icons(list_dir, ['bitmap_16.list', 'prefs.list', 'tools.list'],
+    print_icons(list_dir,
+                ['bitmap_16.list', 'prefs.list', 'templates.list', 'tools.list'],
                 sym_max_len, "16/", "-symbolic.symbolic.png", symbolicf)
 
     # 18x18 bitmap
@@ -156,9 +158,9 @@ if __name__ == "__main__":
     # 24x24 bitmap
     print("\nicons24_images = \\", file=colorf)
     print("\nicons24_images = \\", file=symbolicf)
-    print_icons(list_dir, ['bitmap_24.list', 'tools.list'],
+    print_icons(list_dir, ['bitmap_24.list', 'templates.list', 'tools.list'],
                 col_max_len, "24/", ".png", colorf)
-    print_icons(list_dir, ['bitmap_24.list', 'tools.list'],
+    print_icons(list_dir, ['bitmap_24.list', 'templates.list', 'tools.list'],
                 sym_max_len, "24/", "-symbolic.symbolic.png", symbolicf)
 
     # 32x32 bitmap