diff --git a/themes/Default/images/preferences/folders-brushes-16.svg b/icons/16/gimp-prefs-folders-brushes.svg
similarity index 100%
rename from themes/Default/images/preferences/folders-brushes-16.svg
rename to icons/16/gimp-prefs-folders-brushes.svg
diff --git a/themes/Default/images/preferences/folders-environ-16.svg b/icons/16/gimp-prefs-folders-environ.svg
similarity index 100%
rename from themes/Default/images/preferences/folders-environ-16.svg
rename to icons/16/gimp-prefs-folders-environ.svg
diff --git a/themes/Default/images/preferences/folders-fonts-16.svg b/icons/16/gimp-prefs-folders-fonts.svg
similarity index 100%
rename from themes/Default/images/preferences/folders-fonts-16.svg
rename to icons/16/gimp-prefs-folders-fonts.svg
diff --git a/themes/Default/images/preferences/folders-gradients-16.svg b/icons/16/gimp-prefs-folders-gradients.svg
similarity index 100%
rename from themes/Default/images/preferences/folders-gradients-16.svg
rename to icons/16/gimp-prefs-folders-gradients.svg
diff --git a/themes/Default/images/preferences/folders-interp-16.xcf b/icons/16/gimp-prefs-folders-interp.xcf
similarity index 100%
rename from themes/Default/images/preferences/folders-interp-16.xcf
rename to icons/16/gimp-prefs-folders-interp.xcf
diff --git a/themes/Default/images/preferences/folders-modules-16.svg b/icons/16/gimp-prefs-folders-modules.svg
similarity index 100%
rename from themes/Default/images/preferences/folders-modules-16.svg
rename to icons/16/gimp-prefs-folders-modules.svg
diff --git a/themes/Default/images/preferences/folders-palettes-16.svg b/icons/16/gimp-prefs-folders-palettes.svg
similarity index 100%
rename from themes/Default/images/preferences/folders-palettes-16.svg
rename to icons/16/gimp-prefs-folders-palettes.svg
diff --git a/themes/Default/images/preferences/folders-patterns-16.svg b/icons/16/gimp-prefs-folders-patterns.svg
similarity index 100%
rename from themes/Default/images/preferences/folders-patterns-16.svg
rename to icons/16/gimp-prefs-folders-patterns.svg
diff --git a/themes/Default/images/preferences/folders-plug-ins-16.svg b/icons/16/gimp-prefs-folders-plug-ins.svg
similarity index 100%
rename from themes/Default/images/preferences/folders-plug-ins-16.svg
rename to icons/16/gimp-prefs-folders-plug-ins.svg
diff --git a/themes/Default/images/preferences/folders-scripts-16.svg b/icons/16/gimp-prefs-folders-scripts.svg
similarity index 100%
rename from themes/Default/images/preferences/folders-scripts-16.svg
rename to icons/16/gimp-prefs-folders-scripts.svg
diff --git a/themes/Default/images/preferences/folders-themes-16.svg b/icons/16/gimp-prefs-folders-themes.svg
similarity index 100%
rename from themes/Default/images/preferences/folders-themes-16.svg
rename to icons/16/gimp-prefs-folders-themes.svg
diff --git a/themes/Default/images/preferences/folders-tool-plug-ins-16.xcf b/icons/16/gimp-prefs-folders-tool-plug-ins.xcf
similarity index 100%
rename from themes/Default/images/preferences/folders-tool-plug-ins-16.xcf
rename to icons/16/gimp-prefs-folders-tool-plug-ins.xcf
diff --git a/themes/Default/images/preferences/image-windows-16.svg b/icons/16/gimp-prefs-image-windows.svg
similarity index 100%
rename from themes/Default/images/preferences/image-windows-16.svg
rename to icons/16/gimp-prefs-image-windows.svg
diff --git a/themes/Default/images/preferences/interface-16.svg b/icons/16/gimp-prefs-interface.svg
similarity index 100%
rename from themes/Default/images/preferences/interface-16.svg
rename to icons/16/gimp-prefs-interface.svg
diff --git a/themes/Default/images/preferences/theme-16.svg b/icons/16/gimp-prefs-theme.svg
similarity index 100%
rename from themes/Default/images/preferences/theme-16.svg
rename to icons/16/gimp-prefs-theme.svg
diff --git a/themes/Default/images/preferences/toolbox-16.svg b/icons/16/gimp-prefs-toolbox.svg
similarity index 100%
rename from themes/Default/images/preferences/toolbox-16.svg
rename to icons/16/gimp-prefs-toolbox.svg
diff --git a/themes/Default/images/preferences/window-management-16.svg b/icons/16/gimp-prefs-window-management.svg
similarity index 100%
rename from themes/Default/images/preferences/window-management-16.svg
rename to icons/16/gimp-prefs-window-management.svg
diff --git a/themes/Default/images/preferences/color-management-22.xcf b/icons/22/gimp-prefs-color-management.xcf
similarity index 100%
rename from themes/Default/images/preferences/color-management-22.xcf
rename to icons/22/gimp-prefs-color-management.xcf
diff --git a/themes/Default/images/preferences/controllers-22.xcf b/icons/22/gimp-prefs-controllers.xcf
similarity index 100%
rename from themes/Default/images/preferences/controllers-22.xcf
rename to icons/22/gimp-prefs-controllers.xcf
diff --git a/themes/Default/images/preferences/default-grid-22.xcf b/icons/22/gimp-prefs-default-grid.xcf
similarity index 100%
rename from themes/Default/images/preferences/default-grid-22.xcf
rename to icons/22/gimp-prefs-default-grid.xcf
diff --git a/themes/Default/images/preferences/display-22.xcf b/icons/22/gimp-prefs-display.xcf
similarity index 100%
rename from themes/Default/images/preferences/display-22.xcf
rename to icons/22/gimp-prefs-display.xcf
diff --git a/themes/Default/images/preferences/environment-22.xcf b/icons/22/gimp-prefs-environment.xcf
similarity index 100%
rename from themes/Default/images/preferences/environment-22.xcf
rename to icons/22/gimp-prefs-environment.xcf
diff --git a/themes/Default/images/preferences/folders-brushes-22.svg b/icons/22/gimp-prefs-folders-brushes.svg
similarity index 100%
rename from themes/Default/images/preferences/folders-brushes-22.svg
rename to icons/22/gimp-prefs-folders-brushes.svg
diff --git a/themes/Default/images/preferences/folders-environ-22.svg b/icons/22/gimp-prefs-folders-environ.svg
similarity index 100%
rename from themes/Default/images/preferences/folders-environ-22.svg
rename to icons/22/gimp-prefs-folders-environ.svg
diff --git a/themes/Default/images/preferences/folders-fonts-22.svg b/icons/22/gimp-prefs-folders-fonts.svg
similarity index 100%
rename from themes/Default/images/preferences/folders-fonts-22.svg
rename to icons/22/gimp-prefs-folders-fonts.svg
diff --git a/themes/Default/images/preferences/folders-gradients-22.svg b/icons/22/gimp-prefs-folders-gradients.svg
similarity index 100%
rename from themes/Default/images/preferences/folders-gradients-22.svg
rename to icons/22/gimp-prefs-folders-gradients.svg
diff --git a/themes/Default/images/preferences/folders-interp-22.xcf b/icons/22/gimp-prefs-folders-interp.xcf
similarity index 100%
rename from themes/Default/images/preferences/folders-interp-22.xcf
rename to icons/22/gimp-prefs-folders-interp.xcf
diff --git a/themes/Default/images/preferences/folders-modules-22.svg b/icons/22/gimp-prefs-folders-modules.svg
similarity index 100%
rename from themes/Default/images/preferences/folders-modules-22.svg
rename to icons/22/gimp-prefs-folders-modules.svg
diff --git a/themes/Default/images/preferences/folders-palettes-22.svg b/icons/22/gimp-prefs-folders-palettes.svg
similarity index 100%
rename from themes/Default/images/preferences/folders-palettes-22.svg
rename to icons/22/gimp-prefs-folders-palettes.svg
diff --git a/themes/Default/images/preferences/folders-patterns-22.svg b/icons/22/gimp-prefs-folders-patterns.svg
similarity index 100%
rename from themes/Default/images/preferences/folders-patterns-22.svg
rename to icons/22/gimp-prefs-folders-patterns.svg
diff --git a/themes/Default/images/preferences/folders-plug-ins-22.svg b/icons/22/gimp-prefs-folders-plug-ins.svg
similarity index 100%
rename from themes/Default/images/preferences/folders-plug-ins-22.svg
rename to icons/22/gimp-prefs-folders-plug-ins.svg
diff --git a/themes/Default/images/preferences/folders-scripts-22.svg b/icons/22/gimp-prefs-folders-scripts.svg
similarity index 100%
rename from themes/Default/images/preferences/folders-scripts-22.svg
rename to icons/22/gimp-prefs-folders-scripts.svg
diff --git a/themes/Default/images/preferences/folders-themes-22.svg b/icons/22/gimp-prefs-folders-themes.svg
similarity index 100%
rename from themes/Default/images/preferences/folders-themes-22.svg
rename to icons/22/gimp-prefs-folders-themes.svg
diff --git a/themes/Default/images/preferences/folders-tool-plug-ins-22.xcf b/icons/22/gimp-prefs-folders-tool-plug-ins.xcf
similarity index 100%
rename from themes/Default/images/preferences/folders-tool-plug-ins-22.xcf
rename to icons/22/gimp-prefs-folders-tool-plug-ins.xcf
diff --git a/themes/Default/images/preferences/folders-22.xcf b/icons/22/gimp-prefs-folders.xcf
similarity index 100%
rename from themes/Default/images/preferences/folders-22.xcf
rename to icons/22/gimp-prefs-folders.xcf
diff --git a/themes/Default/images/preferences/image-title-22.xcf b/icons/22/gimp-prefs-image-title.xcf
similarity index 100%
rename from themes/Default/images/preferences/image-title-22.xcf
rename to icons/22/gimp-prefs-image-title.xcf
diff --git a/themes/Default/images/preferences/image-windows-22.svg b/icons/22/gimp-prefs-image-windows.svg
similarity index 100%
rename from themes/Default/images/preferences/image-windows-22.svg
rename to icons/22/gimp-prefs-image-windows.svg
diff --git a/themes/Default/images/preferences/input-devices-22.xcf b/icons/22/gimp-prefs-input-devices.xcf
similarity index 100%
rename from themes/Default/images/preferences/input-devices-22.xcf
rename to icons/22/gimp-prefs-input-devices.xcf
diff --git a/themes/Default/images/preferences/interface-22.svg b/icons/22/gimp-prefs-interface.svg
similarity index 100%
rename from themes/Default/images/preferences/interface-22.svg
rename to icons/22/gimp-prefs-interface.svg
diff --git a/themes/Default/images/preferences/new-image-22.xcf b/icons/22/gimp-prefs-new-image.xcf
similarity index 100%
rename from themes/Default/images/preferences/new-image-22.xcf
rename to icons/22/gimp-prefs-new-image.xcf
diff --git a/themes/Default/images/preferences/session-22.xcf b/icons/22/gimp-prefs-session.xcf
similarity index 100%
rename from themes/Default/images/preferences/session-22.xcf
rename to icons/22/gimp-prefs-session.xcf
diff --git a/themes/Default/images/preferences/theme-22.svg b/icons/22/gimp-prefs-theme.svg
similarity index 100%
rename from themes/Default/images/preferences/theme-22.svg
rename to icons/22/gimp-prefs-theme.svg
diff --git a/themes/Default/images/preferences/tool-options-22.xcf b/icons/22/gimp-prefs-tool-options.xcf
similarity index 100%
rename from themes/Default/images/preferences/tool-options-22.xcf
rename to icons/22/gimp-prefs-tool-options.xcf
diff --git a/themes/Default/images/preferences/toolbox-22.svg b/icons/22/gimp-prefs-toolbox.svg
similarity index 100%
rename from themes/Default/images/preferences/toolbox-22.svg
rename to icons/22/gimp-prefs-toolbox.svg
diff --git a/themes/Default/images/preferences/window-management-22.svg b/icons/22/gimp-prefs-window-management.svg
similarity index 100%
rename from themes/Default/images/preferences/window-management-22.svg
rename to icons/22/gimp-prefs-window-management.svg
diff --git a/themes/Default/images/preferences/color-management.xcf b/icons/48/gimp-prefs-color-management.xcf
similarity index 100%
rename from themes/Default/images/preferences/color-management.xcf
rename to icons/48/gimp-prefs-color-management.xcf
diff --git a/themes/Default/images/preferences/controllers.svg b/icons/48/gimp-prefs-controllers.svg
similarity index 100%
rename from themes/Default/images/preferences/controllers.svg
rename to icons/48/gimp-prefs-controllers.svg
diff --git a/themes/Default/images/preferences/default-comment.svg b/icons/48/gimp-prefs-default-comment.svg
similarity index 100%
rename from themes/Default/images/preferences/default-comment.svg
rename to icons/48/gimp-prefs-default-comment.svg
diff --git a/themes/Default/images/preferences/default-grid.svg b/icons/48/gimp-prefs-default-grid.svg
similarity index 100%
rename from themes/Default/images/preferences/default-grid.svg
rename to icons/48/gimp-prefs-default-grid.svg
diff --git a/themes/Default/images/preferences/display.svg b/icons/48/gimp-prefs-display.svg
similarity index 100%
rename from themes/Default/images/preferences/display.svg
rename to icons/48/gimp-prefs-display.svg
diff --git a/themes/Default/images/preferences/environment.svg b/icons/48/gimp-prefs-environment.svg
similarity index 100%
rename from themes/Default/images/preferences/environment.svg
rename to icons/48/gimp-prefs-environment.svg
diff --git a/themes/Default/images/preferences/folders-brushes.svg b/icons/48/gimp-prefs-folders-brushes.svg
similarity index 100%
rename from themes/Default/images/preferences/folders-brushes.svg
rename to icons/48/gimp-prefs-folders-brushes.svg
diff --git a/themes/Default/images/preferences/folders-dynamics.svg b/icons/48/gimp-prefs-folders-dynamics.svg
similarity index 100%
rename from themes/Default/images/preferences/folders-dynamics.svg
rename to icons/48/gimp-prefs-folders-dynamics.svg
diff --git a/themes/Default/images/preferences/folders-environ.svg b/icons/48/gimp-prefs-folders-environ.svg
similarity index 100%
rename from themes/Default/images/preferences/folders-environ.svg
rename to icons/48/gimp-prefs-folders-environ.svg
diff --git a/themes/Default/images/preferences/folders-fonts.svg b/icons/48/gimp-prefs-folders-fonts.svg
similarity index 100%
rename from themes/Default/images/preferences/folders-fonts.svg
rename to icons/48/gimp-prefs-folders-fonts.svg
diff --git a/themes/Default/images/preferences/folders-gradients.svg b/icons/48/gimp-prefs-folders-gradients.svg
similarity index 100%
rename from themes/Default/images/preferences/folders-gradients.svg
rename to icons/48/gimp-prefs-folders-gradients.svg
diff --git a/themes/Default/images/preferences/folders-interp.svg b/icons/48/gimp-prefs-folders-interp.svg
similarity index 100%
rename from themes/Default/images/preferences/folders-interp.svg
rename to icons/48/gimp-prefs-folders-interp.svg
diff --git a/themes/Default/images/preferences/folders-modules.svg b/icons/48/gimp-prefs-folders-modules.svg
similarity index 100%
rename from themes/Default/images/preferences/folders-modules.svg
rename to icons/48/gimp-prefs-folders-modules.svg
diff --git a/themes/Default/images/preferences/folders-palettes.svg b/icons/48/gimp-prefs-folders-palettes.svg
similarity index 100%
rename from themes/Default/images/preferences/folders-palettes.svg
rename to icons/48/gimp-prefs-folders-palettes.svg
diff --git a/themes/Default/images/preferences/folders-patterns.svg b/icons/48/gimp-prefs-folders-patterns.svg
similarity index 100%
rename from themes/Default/images/preferences/folders-patterns.svg
rename to icons/48/gimp-prefs-folders-patterns.svg
diff --git a/themes/Default/images/preferences/folders-plug-ins.svg b/icons/48/gimp-prefs-folders-plug-ins.svg
similarity index 100%
rename from themes/Default/images/preferences/folders-plug-ins.svg
rename to icons/48/gimp-prefs-folders-plug-ins.svg
diff --git a/themes/Default/images/preferences/folders-scripts.svg b/icons/48/gimp-prefs-folders-scripts.svg
similarity index 100%
rename from themes/Default/images/preferences/folders-scripts.svg
rename to icons/48/gimp-prefs-folders-scripts.svg
diff --git a/themes/Default/images/preferences/folders-themes.svg b/icons/48/gimp-prefs-folders-themes.svg
similarity index 100%
rename from themes/Default/images/preferences/folders-themes.svg
rename to icons/48/gimp-prefs-folders-themes.svg
diff --git a/themes/Default/images/preferences/folders-tool-presets.svg b/icons/48/gimp-prefs-folders-tool-presets.svg
similarity index 100%
rename from themes/Default/images/preferences/folders-tool-presets.svg
rename to icons/48/gimp-prefs-folders-tool-presets.svg
diff --git a/themes/Default/images/preferences/folders-tools.svg b/icons/48/gimp-prefs-folders-tools.svg
similarity index 100%
rename from themes/Default/images/preferences/folders-tools.svg
rename to icons/48/gimp-prefs-folders-tools.svg
diff --git a/themes/Default/images/preferences/folders.svg b/icons/48/gimp-prefs-folders.svg
similarity index 100%
rename from themes/Default/images/preferences/folders.svg
rename to icons/48/gimp-prefs-folders.svg
diff --git a/themes/Default/images/preferences/folders.xcf.gz b/icons/48/gimp-prefs-folders.xcf.gz
similarity index 100%
rename from themes/Default/images/preferences/folders.xcf.gz
rename to icons/48/gimp-prefs-folders.xcf.gz
diff --git a/themes/Default/images/preferences/image-title.svg b/icons/48/gimp-prefs-image-title.svg
similarity index 100%
rename from themes/Default/images/preferences/image-title.svg
rename to icons/48/gimp-prefs-image-title.svg
diff --git a/themes/Default/images/preferences/image-windows.svg b/icons/48/gimp-prefs-image-windows.svg
similarity index 100%
rename from themes/Default/images/preferences/image-windows.svg
rename to icons/48/gimp-prefs-image-windows.svg
diff --git a/themes/Default/images/preferences/input-devices.svg b/icons/48/gimp-prefs-input-devices.svg
similarity index 100%
rename from themes/Default/images/preferences/input-devices.svg
rename to icons/48/gimp-prefs-input-devices.svg
diff --git a/themes/Default/images/preferences/interface.svg b/icons/48/gimp-prefs-interface.svg
similarity index 100%
rename from themes/Default/images/preferences/interface.svg
rename to icons/48/gimp-prefs-interface.svg
diff --git a/themes/Default/images/preferences/new-image.svg b/icons/48/gimp-prefs-new-image.svg
similarity index 100%
rename from themes/Default/images/preferences/new-image.svg
rename to icons/48/gimp-prefs-new-image.svg
diff --git a/themes/Default/images/preferences/session.svg b/icons/48/gimp-prefs-session.svg
similarity index 100%
rename from themes/Default/images/preferences/session.svg
rename to icons/48/gimp-prefs-session.svg
diff --git a/themes/Default/images/preferences/theme.svg b/icons/48/gimp-prefs-theme.svg
similarity index 100%
rename from themes/Default/images/preferences/theme.svg
rename to icons/48/gimp-prefs-theme.svg
diff --git a/themes/Default/images/preferences/tool-options.xcf b/icons/48/gimp-prefs-tool-options.xcf
similarity index 100%
rename from themes/Default/images/preferences/tool-options.xcf
rename to icons/48/gimp-prefs-tool-options.xcf
diff --git a/themes/Default/images/preferences/window-management.svg b/icons/48/gimp-prefs-window-management.svg
similarity index 100%
rename from themes/Default/images/preferences/window-management.svg
rename to icons/48/gimp-prefs-window-management.svg