[glade/wip/inigomartinez/improve-install: 1/2] build: Improve installation of directories

[Alberto Fanjul <albfan src gnome org>]

commit 6cdcd6cb1d2d8c655cdf36cc23a0e0b767ad6c97
Author: Iñigo Martínez <inigomartinez gmail com>
Date:   Fri Mar 22 09:45:34 2019 +0100

    build: Improve installation of directories
    
    Some directories on the source code are almost fully copied in the
    installation process. However, they are not always installed using
    the same tree.
    
    Some of these directories have been relocated following the
    installation tree.

 configure.ac                                       |  11 +-
 data/Makefile.am                                   |   8 +-
 data/gettext/Makefile.am                           |   1 -
 data/gettext/its/Makefile.am                       |   9 -
 data/icons/Makefile.am                             |  17 +-
 data/icons/hicolor/Makefile.am                     |   1 -
 data/icons/hicolor/scalable/Makefile.am            |   1 -
 data/icons/hicolor/scalable/apps/Makefile.am       |   8 -
 data/icons/hicolor/symbolic/Makefile.am            |   1 -
 data/icons/hicolor/symbolic/apps/Makefile.am       |   9 -
 data/icons/meson.build                             |  18 ++
 data/meson.build                                   |  43 +--
 plugins/gtk+/icons/16x16/Makefile.am               | 161 -----------
 plugins/gtk+/icons/22x22/Makefile.am               | 161 -----------
 plugins/gtk+/icons/Makefile.am                     | 318 ++++++++++++++++++++-
 .../16x16/actions}/widget-gtk-aboutdialog.png      | Bin
 .../16x16/actions}/widget-gtk-accelgroup.png       | Bin
 .../16x16/actions}/widget-gtk-accellabel.png       | Bin
 .../16x16/actions}/widget-gtk-action.png           | Bin
 .../16x16/actions}/widget-gtk-actionbar.png        | Bin
 .../16x16/actions}/widget-gtk-actiongroup.png      | Bin
 .../16x16/actions}/widget-gtk-adjustment.png       | Bin
 .../16x16/actions}/widget-gtk-alignment.png        | Bin
 .../16x16/actions}/widget-gtk-appchooserbutton.png | Bin
 .../16x16/actions}/widget-gtk-appchooserdialog.png | Bin
 .../16x16/actions}/widget-gtk-appchooserwidget.png | Bin
 .../16x16/actions}/widget-gtk-arrow.png            | Bin
 .../16x16/actions}/widget-gtk-aspectframe.png      | Bin
 .../16x16/actions}/widget-gtk-assistant.png        | Bin
 .../16x16/actions}/widget-gtk-box.png              | Bin
 .../16x16/actions}/widget-gtk-button.png           | Bin
 .../16x16/actions}/widget-gtk-buttonbox.png        | Bin
 .../16x16/actions}/widget-gtk-calendar.png         | Bin
 .../16x16/actions}/widget-gtk-cellareabox.png      | Bin
 .../actions}/widget-gtk-cellrendereraccel.png      | Bin
 .../actions}/widget-gtk-cellrenderercombo.png      | Bin
 .../actions}/widget-gtk-cellrendererpixbuf.png     | Bin
 .../actions}/widget-gtk-cellrendererprogress.png   | Bin
 .../16x16/actions}/widget-gtk-cellrendererspin.png | Bin
 .../actions}/widget-gtk-cellrendererspinner.png    | Bin
 .../16x16/actions}/widget-gtk-cellrenderertext.png | Bin
 .../actions}/widget-gtk-cellrenderertoggle.png     | Bin
 .../16x16/actions}/widget-gtk-checkbutton.png      | Bin
 .../16x16/actions}/widget-gtk-checkmenuitem.png    | Bin
 .../16x16/actions}/widget-gtk-colorbutton.png      | Bin
 .../16x16/actions}/widget-gtk-colorselection.png   | Bin
 .../actions}/widget-gtk-colorselectiondialog.png   | Bin
 .../16x16/actions}/widget-gtk-combobox.png         | Bin
 .../16x16/actions}/widget-gtk-comboboxtext.png     | Bin
 .../16x16/actions}/widget-gtk-custom.png           | Bin
 .../16x16/actions}/widget-gtk-default.png          | Bin
 .../16x16/actions}/widget-gtk-dialog.png           | Bin
 .../16x16/actions}/widget-gtk-drawingarea.png      | Bin
 .../16x16/actions}/widget-gtk-entry.png            | Bin
 .../16x16/actions}/widget-gtk-entrybuffer.png      | Bin
 .../16x16/actions}/widget-gtk-entrycompletion.png  | Bin
 .../16x16/actions}/widget-gtk-eventbox.png         | Bin
 .../16x16/actions}/widget-gtk-expander.png         | Bin
 .../actions}/widget-gtk-filechooserbutton.png      | Bin
 .../actions}/widget-gtk-filechooserdialog.png      | Bin
 .../actions}/widget-gtk-filechooserwidget.png      | Bin
 .../16x16/actions}/widget-gtk-filefilter.png       | Bin
 .../16x16/actions}/widget-gtk-fixed.png            | Bin
 .../16x16/actions}/widget-gtk-flowbox.png          | Bin
 .../16x16/actions}/widget-gtk-flowboxchild.png     | Bin
 .../16x16/actions}/widget-gtk-fontbutton.png       | Bin
 .../16x16/actions}/widget-gtk-fontselection.png    | Bin
 .../actions}/widget-gtk-fontselectiondialog.png    | Bin
 .../16x16/actions}/widget-gtk-frame.png            | Bin
 .../16x16/actions}/widget-gtk-glarea.png           | Bin
 .../16x16/actions}/widget-gtk-grid.png             | Bin
 .../16x16/actions}/widget-gtk-gtktextview.png      | Bin
 .../16x16/actions}/widget-gtk-handlebox.png        | Bin
 .../16x16/actions}/widget-gtk-hbox.png             | Bin
 .../16x16/actions}/widget-gtk-hbuttonbox.png       | Bin
 .../16x16/actions}/widget-gtk-headerbar.png        | Bin
 .../16x16/actions}/widget-gtk-hpaned.png           | Bin
 .../16x16/actions}/widget-gtk-hscale.png           | Bin
 .../16x16/actions}/widget-gtk-hscrollbar.png       | Bin
 .../16x16/actions}/widget-gtk-hseparator.png       | Bin
 .../16x16/actions}/widget-gtk-iconfactory.png      | Bin
 .../16x16/actions}/widget-gtk-iconview.png         | Bin
 .../16x16/actions}/widget-gtk-image.png            | Bin
 .../16x16/actions}/widget-gtk-imagemenuitem.png    | Bin
 .../16x16/actions}/widget-gtk-infobar.png          | Bin
 .../16x16/actions}/widget-gtk-inputdialog.png      | Bin
 .../16x16/actions}/widget-gtk-label.png            | Bin
 .../16x16/actions}/widget-gtk-layout.png           | Bin
 .../16x16/actions}/widget-gtk-levelbar.png         | Bin
 .../16x16/actions}/widget-gtk-linkbutton.png       | Bin
 .../16x16/actions}/widget-gtk-listbox.png          | Bin
 .../16x16/actions}/widget-gtk-listboxrow.png       | Bin
 .../16x16/actions}/widget-gtk-liststore.png        | Bin
 .../16x16/actions}/widget-gtk-lockbutton.png       | Bin
 .../16x16/actions}/widget-gtk-menu.png             | Bin
 .../16x16/actions}/widget-gtk-menubar.png          | Bin
 .../16x16/actions}/widget-gtk-menubutton.png       | Bin
 .../16x16/actions}/widget-gtk-menuitem.png         | Bin
 .../16x16/actions}/widget-gtk-menutoolbutton.png   | Bin
 .../16x16/actions}/widget-gtk-messagedialog.png    | Bin
 .../16x16/actions}/widget-gtk-modelbutton.png      | Bin
 .../16x16/actions}/widget-gtk-notebook.png         | Bin
 .../16x16/actions}/widget-gtk-offscreenwindow.png  | Bin
 .../16x16/actions}/widget-gtk-overlay.png          | Bin
 .../16x16/actions}/widget-gtk-pagesetupdialog.png  | Bin
 .../16x16/actions}/widget-gtk-paned.png            | Bin
 .../16x16/actions}/widget-gtk-placessidebar.png    | Bin
 .../16x16/actions}/widget-gtk-popover.png          | Bin
 .../16x16/actions}/widget-gtk-popovermenu.png      | Bin
 .../16x16/actions}/widget-gtk-printdialog.png      | Bin
 .../16x16/actions}/widget-gtk-progressbar.png      | Bin
 .../16x16/actions}/widget-gtk-radioaction.png      | Bin
 .../16x16/actions}/widget-gtk-radiobutton.png      | Bin
 .../16x16/actions}/widget-gtk-radiomenuitem.png    | Bin
 .../16x16/actions}/widget-gtk-radiotoolbutton.png  | Bin
 .../16x16/actions}/widget-gtk-recentaction.png     | Bin
 .../16x16/actions}/widget-gtk-recentchooser.png    | Bin
 .../actions}/widget-gtk-recentchooserdialog.png    | Bin
 .../actions}/widget-gtk-recentchoosermenu.png      | Bin
 .../16x16/actions}/widget-gtk-recentfilter.png     | Bin
 .../16x16/actions}/widget-gtk-recentmanager.png    | Bin
 .../16x16/actions}/widget-gtk-revealer.png         | Bin
 .../16x16/actions}/widget-gtk-scale.png            | Bin
 .../16x16/actions}/widget-gtk-scalebutton.png      | Bin
 .../16x16/actions}/widget-gtk-scrollbar.png        | Bin
 .../16x16/actions}/widget-gtk-scrolledwindow.png   | Bin
 .../16x16/actions}/widget-gtk-searchbar.png        | Bin
 .../16x16/actions}/widget-gtk-searchentry.png      | Bin
 .../16x16/actions}/widget-gtk-separator.png        | Bin
 .../actions}/widget-gtk-separatormenuitem.png      | Bin
 .../actions}/widget-gtk-separatortoolitem.png      | Bin
 .../16x16/actions}/widget-gtk-sizegroup.png        | Bin
 .../16x16/actions}/widget-gtk-spinbutton.png       | Bin
 .../16x16/actions}/widget-gtk-spinner.png          | Bin
 .../16x16/actions}/widget-gtk-stack.png            | Bin
 .../16x16/actions}/widget-gtk-stacksidebar.png     | Bin
 .../16x16/actions}/widget-gtk-stackswitcher.png    | Bin
 .../16x16/actions}/widget-gtk-statusbar.png        | Bin
 .../16x16/actions}/widget-gtk-statusicon.png       | Bin
 .../16x16/actions}/widget-gtk-switch.png           | Bin
 .../16x16/actions}/widget-gtk-table.png            | Bin
 .../16x16/actions}/widget-gtk-tearoffmenuitem.png  | Bin
 .../16x16/actions}/widget-gtk-textbuffer.png       | Bin
 .../16x16/actions}/widget-gtk-texttag.png          | Bin
 .../16x16/actions}/widget-gtk-texttagtable.png     | Bin
 .../16x16/actions}/widget-gtk-textview.png         | Bin
 .../16x16/actions}/widget-gtk-toggleaction.png     | Bin
 .../16x16/actions}/widget-gtk-togglebutton.png     | Bin
 .../16x16/actions}/widget-gtk-toggletoolbutton.png | Bin
 .../16x16/actions}/widget-gtk-toolbar.png          | Bin
 .../16x16/actions}/widget-gtk-toolbutton.png       | Bin
 .../16x16/actions}/widget-gtk-toolitem.png         | Bin
 .../16x16/actions}/widget-gtk-toolitemgroup.png    | Bin
 .../16x16/actions}/widget-gtk-toolpalette.png      | Bin
 .../16x16/actions}/widget-gtk-treemodelfilter.png  | Bin
 .../16x16/actions}/widget-gtk-treemodelsort.png    | Bin
 .../16x16/actions}/widget-gtk-treeselection.png    | Bin
 .../16x16/actions}/widget-gtk-treestore.png        | Bin
 .../16x16/actions}/widget-gtk-treeview.png         | Bin
 .../16x16/actions}/widget-gtk-treeviewcolumn.png   | Bin
 .../16x16/actions}/widget-gtk-uimanager.png        | Bin
 .../16x16/actions}/widget-gtk-vbox.png             | Bin
 .../16x16/actions}/widget-gtk-vbuttonbox.png       | Bin
 .../16x16/actions}/widget-gtk-viewport.png         | Bin
 .../16x16/actions}/widget-gtk-volumebutton.png     | Bin
 .../16x16/actions}/widget-gtk-vpaned.png           | Bin
 .../16x16/actions}/widget-gtk-vscale.png           | Bin
 .../16x16/actions}/widget-gtk-vscrollbar.png       | Bin
 .../16x16/actions}/widget-gtk-vseparator.png       | Bin
 .../16x16/actions}/widget-gtk-window.png           | Bin
 .../16x16/actions}/widget-gtk-windowgroup.png      | Bin
 .../22x22/actions}/widget-gtk-aboutdialog.png      | Bin
 .../22x22/actions}/widget-gtk-accelgroup.png       | Bin
 .../22x22/actions}/widget-gtk-accellabel.png       | Bin
 .../22x22/actions}/widget-gtk-action.png           | Bin
 .../22x22/actions}/widget-gtk-actionbar.png        | Bin
 .../22x22/actions}/widget-gtk-actiongroup.png      | Bin
 .../22x22/actions}/widget-gtk-adjustment.png       | Bin
 .../22x22/actions}/widget-gtk-alignment.png        | Bin
 .../22x22/actions}/widget-gtk-appchooserbutton.png | Bin
 .../22x22/actions}/widget-gtk-appchooserdialog.png | Bin
 .../22x22/actions}/widget-gtk-appchooserwidget.png | Bin
 .../22x22/actions}/widget-gtk-arrow.png            | Bin
 .../22x22/actions}/widget-gtk-aspectframe.png      | Bin
 .../22x22/actions}/widget-gtk-assistant.png        | Bin
 .../22x22/actions}/widget-gtk-box.png              | Bin
 .../22x22/actions}/widget-gtk-button.png           | Bin
 .../22x22/actions}/widget-gtk-buttonbox.png        | Bin
 .../22x22/actions}/widget-gtk-calendar.png         | Bin
 .../22x22/actions}/widget-gtk-cellareabox.png      | Bin
 .../actions}/widget-gtk-cellrendereraccel.png      | Bin
 .../actions}/widget-gtk-cellrenderercombo.png      | Bin
 .../actions}/widget-gtk-cellrendererpixbuf.png     | Bin
 .../actions}/widget-gtk-cellrendererprogress.png   | Bin
 .../22x22/actions}/widget-gtk-cellrendererspin.png | Bin
 .../actions}/widget-gtk-cellrendererspinner.png    | Bin
 .../22x22/actions}/widget-gtk-cellrenderertext.png | Bin
 .../actions}/widget-gtk-cellrenderertoggle.png     | Bin
 .../22x22/actions}/widget-gtk-checkbutton.png      | Bin
 .../22x22/actions}/widget-gtk-checkmenuitem.png    | Bin
 .../22x22/actions}/widget-gtk-colorbutton.png      | Bin
 .../22x22/actions}/widget-gtk-colorselection.png   | Bin
 .../actions}/widget-gtk-colorselectiondialog.png   | Bin
 .../22x22/actions}/widget-gtk-combobox.png         | Bin
 .../22x22/actions}/widget-gtk-comboboxtext.png     | Bin
 .../22x22/actions}/widget-gtk-custom.png           | Bin
 .../22x22/actions}/widget-gtk-default.png          | Bin
 .../22x22/actions}/widget-gtk-dialog.png           | Bin
 .../22x22/actions}/widget-gtk-drawingarea.png      | Bin
 .../22x22/actions}/widget-gtk-entry.png            | Bin
 .../22x22/actions}/widget-gtk-entrybuffer.png      | Bin
 .../22x22/actions}/widget-gtk-entrycompletion.png  | Bin
 .../22x22/actions}/widget-gtk-eventbox.png         | Bin
 .../22x22/actions}/widget-gtk-expander.png         | Bin
 .../actions}/widget-gtk-filechooserbutton.png      | Bin
 .../actions}/widget-gtk-filechooserdialog.png      | Bin
 .../actions}/widget-gtk-filechooserwidget.png      | Bin
 .../22x22/actions}/widget-gtk-filefilter.png       | Bin
 .../22x22/actions}/widget-gtk-fixed.png            | Bin
 .../22x22/actions}/widget-gtk-flowbox.png          | Bin
 .../22x22/actions}/widget-gtk-flowboxchild.png     | Bin
 .../22x22/actions}/widget-gtk-fontbutton.png       | Bin
 .../22x22/actions}/widget-gtk-fontselection.png    | Bin
 .../actions}/widget-gtk-fontselectiondialog.png    | Bin
 .../22x22/actions}/widget-gtk-frame.png            | Bin
 .../22x22/actions}/widget-gtk-glarea.png           | Bin
 .../22x22/actions}/widget-gtk-grid.png             | Bin
 .../22x22/actions}/widget-gtk-handlebox.png        | Bin
 .../22x22/actions}/widget-gtk-hbox.png             | Bin
 .../22x22/actions}/widget-gtk-hbuttonbox.png       | Bin
 .../22x22/actions}/widget-gtk-headerbar.png        | Bin
 .../22x22/actions}/widget-gtk-hpaned.png           | Bin
 .../22x22/actions}/widget-gtk-hscale.png           | Bin
 .../22x22/actions}/widget-gtk-hscrollbar.png       | Bin
 .../22x22/actions}/widget-gtk-hseparator.png       | Bin
 .../22x22/actions}/widget-gtk-iconfactory.png      | Bin
 .../22x22/actions}/widget-gtk-iconview.png         | Bin
 .../22x22/actions}/widget-gtk-image.png            | Bin
 .../22x22/actions}/widget-gtk-imagemenuitem.png    | Bin
 .../22x22/actions}/widget-gtk-infobar.png          | Bin
 .../22x22/actions}/widget-gtk-inputdialog.png      | Bin
 .../22x22/actions}/widget-gtk-label.png            | Bin
 .../22x22/actions}/widget-gtk-layout.png           | Bin
 .../22x22/actions}/widget-gtk-levelbar.png         | Bin
 .../22x22/actions}/widget-gtk-linkbutton.png       | Bin
 .../22x22/actions}/widget-gtk-listbox.png          | Bin
 .../22x22/actions}/widget-gtk-listboxrow.png       | Bin
 .../22x22/actions}/widget-gtk-liststore.png        | Bin
 .../22x22/actions}/widget-gtk-lockbutton.png       | Bin
 .../22x22/actions}/widget-gtk-menu.png             | Bin
 .../22x22/actions}/widget-gtk-menubar.png          | Bin
 .../22x22/actions}/widget-gtk-menubutton.png       | Bin
 .../22x22/actions}/widget-gtk-menuitem.png         | Bin
 .../22x22/actions}/widget-gtk-menutoolbutton.png   | Bin
 .../22x22/actions}/widget-gtk-messagedialog.png    | Bin
 .../22x22/actions}/widget-gtk-modelbutton.png      | Bin
 .../22x22/actions}/widget-gtk-notebook.png         | Bin
 .../22x22/actions}/widget-gtk-offscreenwindow.png  | Bin
 .../22x22/actions}/widget-gtk-overlay.png          | Bin
 .../22x22/actions}/widget-gtk-pagesetupdialog.png  | Bin
 .../22x22/actions}/widget-gtk-paned.png            | Bin
 .../22x22/actions}/widget-gtk-placessidebar.png    | Bin
 .../22x22/actions}/widget-gtk-popover.png          | Bin
 .../22x22/actions}/widget-gtk-popovermenu.png      | Bin
 .../22x22/actions}/widget-gtk-printdialog.png      | Bin
 .../22x22/actions}/widget-gtk-progressbar.png      | Bin
 .../22x22/actions}/widget-gtk-radioaction.png      | Bin
 .../22x22/actions}/widget-gtk-radiobutton.png      | Bin
 .../22x22/actions}/widget-gtk-radiomenuitem.png    | Bin
 .../22x22/actions}/widget-gtk-radiotoolbutton.png  | Bin
 .../22x22/actions}/widget-gtk-recentaction.png     | Bin
 .../22x22/actions}/widget-gtk-recentchooser.png    | Bin
 .../actions}/widget-gtk-recentchooserdialog.png    | Bin
 .../actions}/widget-gtk-recentchoosermenu.png      | Bin
 .../22x22/actions}/widget-gtk-recentfilter.png     | Bin
 .../22x22/actions}/widget-gtk-recentmanager.png    | Bin
 .../22x22/actions}/widget-gtk-revealer.png         | Bin
 .../22x22/actions}/widget-gtk-scale.png            | Bin
 .../22x22/actions}/widget-gtk-scalebutton.png      | Bin
 .../22x22/actions}/widget-gtk-scrollbar.png        | Bin
 .../22x22/actions}/widget-gtk-scrolledwindow.png   | Bin
 .../22x22/actions}/widget-gtk-searchbar.png        | Bin
 .../22x22/actions}/widget-gtk-searchentry.png      | Bin
 .../22x22/actions}/widget-gtk-separator.png        | Bin
 .../actions}/widget-gtk-separatormenuitem.png      | Bin
 .../actions}/widget-gtk-separatortoolitem.png      | Bin
 .../22x22/actions}/widget-gtk-sizegroup.png        | Bin
 .../22x22/actions}/widget-gtk-spinbutton.png       | Bin
 .../22x22/actions}/widget-gtk-spinner.png          | Bin
 .../22x22/actions}/widget-gtk-stack.png            | Bin
 .../22x22/actions}/widget-gtk-stacksidebar.png     | Bin
 .../22x22/actions}/widget-gtk-stackswitcher.png    | Bin
 .../22x22/actions}/widget-gtk-statusbar.png        | Bin
 .../22x22/actions}/widget-gtk-statusicon.png       | Bin
 .../22x22/actions}/widget-gtk-switch.png           | Bin
 .../22x22/actions}/widget-gtk-table.png            | Bin
 .../22x22/actions}/widget-gtk-tearoffmenuitem.png  | Bin
 .../22x22/actions}/widget-gtk-textbuffer.png       | Bin
 .../22x22/actions}/widget-gtk-texttag.png          | Bin
 .../22x22/actions}/widget-gtk-texttagtable.png     | Bin
 .../22x22/actions}/widget-gtk-textview.png         | Bin
 .../22x22/actions}/widget-gtk-toggleaction.png     | Bin
 .../22x22/actions}/widget-gtk-togglebutton.png     | Bin
 .../22x22/actions}/widget-gtk-toggletoolbutton.png | Bin
 .../22x22/actions}/widget-gtk-toolbar.png          | Bin
 .../22x22/actions}/widget-gtk-toolbutton.png       | Bin
 .../22x22/actions}/widget-gtk-toolitem.png         | Bin
 .../22x22/actions}/widget-gtk-toolitemgroup.png    | Bin
 .../22x22/actions}/widget-gtk-toolpalette.png      | Bin
 .../22x22/actions}/widget-gtk-treemodelfilter.png  | Bin
 .../22x22/actions}/widget-gtk-treemodelsort.png    | Bin
 .../22x22/actions}/widget-gtk-treeselection.png    | Bin
 .../22x22/actions}/widget-gtk-treestore.png        | Bin
 .../22x22/actions}/widget-gtk-treeview.png         | Bin
 .../22x22/actions}/widget-gtk-treeviewcolumn.png   | Bin
 .../22x22/actions}/widget-gtk-uimanager.png        | Bin
 .../22x22/actions}/widget-gtk-vbox.png             | Bin
 .../22x22/actions}/widget-gtk-vbuttonbox.png       | Bin
 .../22x22/actions}/widget-gtk-viewport.png         | Bin
 .../22x22/actions}/widget-gtk-volumebutton.png     | Bin
 .../22x22/actions}/widget-gtk-vpaned.png           | Bin
 .../22x22/actions}/widget-gtk-vscale.png           | Bin
 .../22x22/actions}/widget-gtk-vscrollbar.png       | Bin
 .../22x22/actions}/widget-gtk-vseparator.png       | Bin
 .../22x22/actions}/widget-gtk-window.png           | Bin
 .../22x22/actions}/widget-gtk-windowgroup.png      | Bin
 plugins/gtk+/icons/meson.build                     | 165 -----------
 plugins/gtk+/meson.build                           |  16 +-
 tests/meson.build                                  |   2 +-
 329 files changed, 378 insertions(+), 572 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 79e4d58d..72880ef6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -337,7 +337,7 @@ AM_CONDITIONAL(BUILD_GLADEUI, test x"$enable_gladeui" = "xyes")
 dnl ================================================================
 dnl Testing environment
 dnl ================================================================
-GLADE_TEST_ENVIRONMENT='GLADE_TESTING=1 GLADE_CATALOG_SEARCH_PATH=$(top_srcdir)/plugins/gtk+ 
GLADE_MODULE_SEARCH_PATH=$(top_builddir)/plugins/gtk+/.libs GLADE_PIXMAP_DIR=$(top_srcdir)/data/icons 
GLADE_ICON_THEME_PATH=$(top_srcdir)/plugins/gtk+/icons/22x22'
+GLADE_TEST_ENVIRONMENT='GLADE_TESTING=1 GLADE_CATALOG_SEARCH_PATH=$(top_srcdir)/plugins/gtk+ 
GLADE_MODULE_SEARCH_PATH=$(top_builddir)/plugins/gtk+/.libs GLADE_PIXMAP_DIR=$(top_srcdir)/data/icons 
GLADE_ICON_THEME_PATH=$(top_srcdir)/plugins/gtk+/icons/hicolor/22x22/actions'
 AC_SUBST(GLADE_TEST_ENVIRONMENT)
 
 AC_SUBST([AM_CPPFLAGS])
@@ -351,13 +351,6 @@ data/gladeui-2.0.pc
 data/glade.desktop.in
 data/Makefile
 data/icons/Makefile
-data/icons/hicolor/Makefile
-data/icons/hicolor/scalable/Makefile
-data/icons/hicolor/scalable/apps/Makefile
-data/icons/hicolor/symbolic/Makefile
-data/icons/hicolor/symbolic/apps/Makefile
-data/gettext/Makefile
-data/gettext/its/Makefile
 gladeui/Makefile
 gladeui/gladeui.rc
 gladeui/glade-previewer.rc
@@ -366,8 +359,6 @@ src/glade.rc
 plugins/Makefile
 plugins/gtk+/Makefile
 plugins/gtk+/icons/Makefile
-plugins/gtk+/icons/16x16/Makefile
-plugins/gtk+/icons/22x22/Makefile
 plugins/python/Makefile
 plugins/gladeui/Makefile
 plugins/webkit2gtk/Makefile
diff --git a/data/Makefile.am b/data/Makefile.am
index e685d0c8..b906c9ac 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-SUBDIRS = icons gettext
+SUBDIRS = icons
 
 desktopdir = $(datadir)/applications
 desktop_in_files = glade.desktop.in.in
@@ -17,7 +17,13 @@ appdata_in_files = glade.appdata.xml.in
 $(appdata_DATA): $(appdata_in_files)
        $(AM_V_GEN) $(MSGFMT) --xml --template $< -d $(top_srcdir)/po -o $@
 
+its_filesdir = $(datadir)/gettext/its
+its_files = \
+       gettext/its/glade-catalog.its \
+       gettext/its/glade-catalog.loc
+
 EXTRA_DIST =                           \
+       $(its_files)                    \
        $(appdata_in_files)             \
        $(desktop_in_files)             \
        gladeui-2.0.pc.in
diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am
index 02f7d9a9..5ddb1265 100644
--- a/data/icons/Makefile.am
+++ b/data/icons/Makefile.am
@@ -1,6 +1,15 @@
 ## Process this file with automake to produce Makefile.in
 
-SUBDIRS = hicolor
+scalableappicondir = $(datadir)/icons/hicolor/scalable/apps
+scalableappicon_DATA = \
+       hicolor/scalable/apps/org.gnome.Glade.svg \
+       $(NULL)
+
+symbolicappicondir = $(datadir)/icons/hicolor/symbolic/apps
+symbolicappicon_DATA = \
+       hicolor/symbolic/apps/org.gnome.Glade-symbolic.svg \
+       hicolor/symbolic/apps/glade-brand-symbolic.svg \
+       $(NULL)
 
 gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
 
@@ -24,4 +33,8 @@ pixmaps_DATA = devhelp.png \
        deprecated-22x22.png
 
 
-EXTRA_DIST = $(pixmaps_DATA) glade.ico
+EXTRA_DIST = \
+       $(scalableappicon_DATA) \
+       $(symbolicappicon_DATA) \
+       $(pixmaps_DATA) \
+       glade.ico
diff --git a/data/icons/meson.build b/data/icons/meson.build
new file mode 100644
index 00000000..23132e7d
--- /dev/null
+++ b/data/icons/meson.build
@@ -0,0 +1,18 @@
+install_subdir(
+  'hicolor',
+  install_dir: glade_datadir / 'icons',
+)
+
+pixmaps_data = files(
+  'deprecated-16x16.png',
+  'deprecated-22x22.png',
+  'devhelp.png',
+  'fixed-bg.png',
+  'placeholder.png',
+  'plus.png',
+)
+
+install_data(
+  pixmaps_data,
+  install_dir: glade_datadir / glade_pixmapdir,
+)
diff --git a/data/meson.build b/data/meson.build
index 9ce56c4a..98ba4799 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -1,3 +1,5 @@
+subdir('icons')
+
 desktop_conf = configuration_data()
 desktop_conf.set('VERSION', glade_version)
 
@@ -30,42 +32,7 @@ i18n.merge_file(
   install_dir: glade_datadir / 'metainfo',
 )
 
-# FIXME: replace these by install_subdir once autotools is removed
-install_data(
-  'icons/hicolor/scalable/apps/org.gnome.Glade.svg',
-  install_dir: glade_datadir / 'icons/hicolor/scalable/apps',
-)
-
-icon_symbolic_data = files(
-    'icons/hicolor/symbolic/apps/glade-brand-symbolic.svg',
-    'icons/hicolor/symbolic/apps/org.gnome.Glade-symbolic.svg',
-)
-
-install_data(
-  icon_symbolic_data,
-  install_dir: glade_datadir / 'icons/hicolor/symbolic/apps',
-)
-
-pixmaps_data = files(
-  'icons/deprecated-16x16.png',
-  'icons/deprecated-22x22.png',
-  'icons/devhelp.png',
-  'icons/fixed-bg.png',
-  'icons/placeholder.png',
-  'icons/plus.png',
-)
-
-install_data(
-  pixmaps_data,
-  install_dir: glade_datadir / glade_pixmapdir,
-)
-
-its_data = files(
-  'gettext/its/glade-catalog.its',
-  'gettext/its/glade-catalog.loc',
-)
-
-install_data(
-  its_data,
-  install_dir: glade_datadir / 'gettext/its',
+install_subdir(
+  'gettext',
+  install_dir: glade_datadir,
 )
diff --git a/plugins/gtk+/icons/Makefile.am b/plugins/gtk+/icons/Makefile.am
index bd39c36e..ff3f2a89 100644
--- a/plugins/gtk+/icons/Makefile.am
+++ b/plugins/gtk+/icons/Makefile.am
@@ -1,3 +1,319 @@
 ## Process this file with automake to produce Makefile.in
 
-SUBDIRS = 16x16 22x22
+icons16dir = $(pkgdatadir)/pixmaps/hicolor/16x16/actions
+
+icons16_DATA = \
+       hicolor/16x16/actions/widget-gtk-aboutdialog.png \
+       hicolor/16x16/actions/widget-gtk-accelgroup.png \
+       hicolor/16x16/actions/widget-gtk-accellabel.png \
+       hicolor/16x16/actions/widget-gtk-actionbar.png \
+       hicolor/16x16/actions/widget-gtk-adjustment.png \
+       hicolor/16x16/actions/widget-gtk-alignment.png \
+       hicolor/16x16/actions/widget-gtk-appchooserbutton.png \
+       hicolor/16x16/actions/widget-gtk-appchooserdialog.png \
+       hicolor/16x16/actions/widget-gtk-appchooserwidget.png \
+       hicolor/16x16/actions/widget-gtk-arrow.png \
+       hicolor/16x16/actions/widget-gtk-aspectframe.png \
+       hicolor/16x16/actions/widget-gtk-assistant.png \
+       hicolor/16x16/actions/widget-gtk-button.png \
+       hicolor/16x16/actions/widget-gtk-buttonbox.png \
+       hicolor/16x16/actions/widget-gtk-box.png \
+       hicolor/16x16/actions/widget-gtk-calendar.png \
+       hicolor/16x16/actions/widget-gtk-cellareabox.png \
+       hicolor/16x16/actions/widget-gtk-cellrenderertext.png \
+       hicolor/16x16/actions/widget-gtk-cellrendereraccel.png \
+       hicolor/16x16/actions/widget-gtk-cellrenderercombo.png \
+       hicolor/16x16/actions/widget-gtk-cellrendererspin.png \
+       hicolor/16x16/actions/widget-gtk-cellrendererspinner.png \
+       hicolor/16x16/actions/widget-gtk-cellrendererpixbuf.png \
+       hicolor/16x16/actions/widget-gtk-cellrendererprogress.png \
+       hicolor/16x16/actions/widget-gtk-cellrenderertoggle.png \
+       hicolor/16x16/actions/widget-gtk-checkbutton.png \
+       hicolor/16x16/actions/widget-gtk-checkmenuitem.png \
+       hicolor/16x16/actions/widget-gtk-colorbutton.png \
+       hicolor/16x16/actions/widget-gtk-colorselection.png \
+       hicolor/16x16/actions/widget-gtk-colorselectiondialog.png \
+       hicolor/16x16/actions/widget-gtk-combobox.png \
+       hicolor/16x16/actions/widget-gtk-comboboxtext.png \
+       hicolor/16x16/actions/widget-gtk-default.png \
+       hicolor/16x16/actions/widget-gtk-dialog.png \
+       hicolor/16x16/actions/widget-gtk-drawingarea.png \
+       hicolor/16x16/actions/widget-gtk-entry.png \
+       hicolor/16x16/actions/widget-gtk-entrybuffer.png \
+       hicolor/16x16/actions/widget-gtk-eventbox.png \
+       hicolor/16x16/actions/widget-gtk-expander.png \
+       hicolor/16x16/actions/widget-gtk-filechooserbutton.png \
+       hicolor/16x16/actions/widget-gtk-filechooserdialog.png \
+       hicolor/16x16/actions/widget-gtk-filechooserwidget.png \
+       hicolor/16x16/actions/widget-gtk-filefilter.png \
+       hicolor/16x16/actions/widget-gtk-fixed.png \
+       hicolor/16x16/actions/widget-gtk-flowbox.png \
+       hicolor/16x16/actions/widget-gtk-flowboxchild.png \
+       hicolor/16x16/actions/widget-gtk-fontbutton.png \
+       hicolor/16x16/actions/widget-gtk-fontselection.png \
+       hicolor/16x16/actions/widget-gtk-fontselectiondialog.png \
+       hicolor/16x16/actions/widget-gtk-frame.png \
+       hicolor/16x16/actions/widget-gtk-grid.png \
+       hicolor/16x16/actions/widget-gtk-glarea.png \
+       hicolor/16x16/actions/widget-gtk-handlebox.png \
+       hicolor/16x16/actions/widget-gtk-hbox.png \
+       hicolor/16x16/actions/widget-gtk-hbuttonbox.png \
+       hicolor/16x16/actions/widget-gtk-headerbar.png \
+       hicolor/16x16/actions/widget-gtk-hpaned.png \
+       hicolor/16x16/actions/widget-gtk-hscale.png \
+       hicolor/16x16/actions/widget-gtk-hscrollbar.png \
+       hicolor/16x16/actions/widget-gtk-hseparator.png \
+       hicolor/16x16/actions/widget-gtk-iconview.png \
+       hicolor/16x16/actions/widget-gtk-image.png \
+       hicolor/16x16/actions/widget-gtk-imagemenuitem.png \
+       hicolor/16x16/actions/widget-gtk-infobar.png \
+       hicolor/16x16/actions/widget-gtk-inputdialog.png \
+       hicolor/16x16/actions/widget-gtk-label.png \
+       hicolor/16x16/actions/widget-gtk-layout.png \
+       hicolor/16x16/actions/widget-gtk-linkbutton.png \
+       hicolor/16x16/actions/widget-gtk-lockbutton.png \
+       hicolor/16x16/actions/widget-gtk-menu.png \
+       hicolor/16x16/actions/widget-gtk-menubar.png \
+       hicolor/16x16/actions/widget-gtk-menubutton.png \
+       hicolor/16x16/actions/widget-gtk-menuitem.png \
+       hicolor/16x16/actions/widget-gtk-menutoolbutton.png \
+       hicolor/16x16/actions/widget-gtk-messagedialog.png \
+       hicolor/16x16/actions/widget-gtk-modelbutton.png \
+       hicolor/16x16/actions/widget-gtk-notebook.png \
+       hicolor/16x16/actions/widget-gtk-offscreenwindow.png \
+       hicolor/16x16/actions/widget-gtk-paned.png \
+       hicolor/16x16/actions/widget-gtk-pagesetupdialog.png \
+       hicolor/16x16/actions/widget-gtk-placessidebar.png \
+       hicolor/16x16/actions/widget-gtk-popover.png \
+       hicolor/16x16/actions/widget-gtk-popovermenu.png \
+       hicolor/16x16/actions/widget-gtk-printdialog.png \
+       hicolor/16x16/actions/widget-gtk-progressbar.png \
+       hicolor/16x16/actions/widget-gtk-searchbar.png \
+       hicolor/16x16/actions/widget-gtk-levelbar.png \
+       hicolor/16x16/actions/widget-gtk-radiobutton.png \
+       hicolor/16x16/actions/widget-gtk-radiomenuitem.png \
+       hicolor/16x16/actions/widget-gtk-radiotoolbutton.png \
+       hicolor/16x16/actions/widget-gtk-recentaction.png \
+       hicolor/16x16/actions/widget-gtk-recentchooser.png \
+       hicolor/16x16/actions/widget-gtk-recentchooserdialog.png \
+       hicolor/16x16/actions/widget-gtk-recentchoosermenu.png \
+       hicolor/16x16/actions/widget-gtk-recentfilter.png \
+       hicolor/16x16/actions/widget-gtk-recentmanager.png \
+       hicolor/16x16/actions/widget-gtk-scale.png \
+       hicolor/16x16/actions/widget-gtk-scrollbar.png \
+       hicolor/16x16/actions/widget-gtk-scrolledwindow.png \
+       hicolor/16x16/actions/widget-gtk-separator.png \
+       hicolor/16x16/actions/widget-gtk-separatormenuitem.png \
+       hicolor/16x16/actions/widget-gtk-separatortoolitem.png \
+       hicolor/16x16/actions/widget-gtk-stacksidebar.png \
+       hicolor/16x16/actions/widget-gtk-sizegroup.png \
+       hicolor/16x16/actions/widget-gtk-spinbutton.png \
+       hicolor/16x16/actions/widget-gtk-spinner.png \
+       hicolor/16x16/actions/widget-gtk-stack.png \
+       hicolor/16x16/actions/widget-gtk-stackswitcher.png \
+       hicolor/16x16/actions/widget-gtk-statusbar.png \
+       hicolor/16x16/actions/widget-gtk-statusicon.png \
+       hicolor/16x16/actions/widget-gtk-table.png \
+       hicolor/16x16/actions/widget-gtk-tearoffmenuitem.png \
+       hicolor/16x16/actions/widget-gtk-textbuffer.png \
+       hicolor/16x16/actions/widget-gtk-texttag.png \
+       hicolor/16x16/actions/widget-gtk-texttagtable.png \
+       hicolor/16x16/actions/widget-gtk-textview.png \
+       hicolor/16x16/actions/widget-gtk-togglebutton.png \
+       hicolor/16x16/actions/widget-gtk-switch.png \
+       hicolor/16x16/actions/widget-gtk-toggletoolbutton.png \
+       hicolor/16x16/actions/widget-gtk-toolbar.png \
+       hicolor/16x16/actions/widget-gtk-toolbutton.png \
+       hicolor/16x16/actions/widget-gtk-toolitem.png \
+       hicolor/16x16/actions/widget-gtk-toolitemgroup.png \
+       hicolor/16x16/actions/widget-gtk-toolpalette.png \
+       hicolor/16x16/actions/widget-gtk-treemodelfilter.png \
+       hicolor/16x16/actions/widget-gtk-treemodelsort.png \
+       hicolor/16x16/actions/widget-gtk-treeselection.png \
+       hicolor/16x16/actions/widget-gtk-treeview.png \
+       hicolor/16x16/actions/widget-gtk-treeviewcolumn.png \
+       hicolor/16x16/actions/widget-gtk-vbox.png \
+       hicolor/16x16/actions/widget-gtk-vbuttonbox.png \
+       hicolor/16x16/actions/widget-gtk-viewport.png \
+       hicolor/16x16/actions/widget-gtk-vpaned.png \
+       hicolor/16x16/actions/widget-gtk-vscale.png \
+       hicolor/16x16/actions/widget-gtk-vscrollbar.png \
+       hicolor/16x16/actions/widget-gtk-vseparator.png \
+       hicolor/16x16/actions/widget-gtk-window.png \
+       hicolor/16x16/actions/widget-gtk-entrycompletion.png \
+       hicolor/16x16/actions/widget-gtk-action.png \
+       hicolor/16x16/actions/widget-gtk-actiongroup.png \
+       hicolor/16x16/actions/widget-gtk-radioaction.png \
+       hicolor/16x16/actions/widget-gtk-toggleaction.png \
+       hicolor/16x16/actions/widget-gtk-volumebutton.png \
+       hicolor/16x16/actions/widget-gtk-windowgroup.png \
+       hicolor/16x16/actions/widget-gtk-treestore.png \
+       hicolor/16x16/actions/widget-gtk-liststore.png \
+       hicolor/16x16/actions/widget-gtk-scalebutton.png \
+       hicolor/16x16/actions/widget-gtk-revealer.png \
+       hicolor/16x16/actions/widget-gtk-overlay.png \
+       hicolor/16x16/actions/widget-gtk-listbox.png \
+       hicolor/16x16/actions/widget-gtk-listboxrow.png \
+       hicolor/16x16/actions/widget-gtk-searchentry.png \
+       hicolor/16x16/actions/widget-gtk-iconfactory.png
+
+icons22dir = $(pkgdatadir)/pixmaps/hicolor/22x22/actions
+
+icons22_DATA = \
+       hicolor/22x22/actions/widget-gtk-aboutdialog.png \
+       hicolor/22x22/actions/widget-gtk-accelgroup.png \
+       hicolor/22x22/actions/widget-gtk-accellabel.png \
+       hicolor/22x22/actions/widget-gtk-actionbar.png \
+       hicolor/22x22/actions/widget-gtk-adjustment.png \
+       hicolor/22x22/actions/widget-gtk-alignment.png \
+       hicolor/22x22/actions/widget-gtk-appchooserbutton.png \
+       hicolor/22x22/actions/widget-gtk-appchooserdialog.png \
+       hicolor/22x22/actions/widget-gtk-appchooserwidget.png \
+       hicolor/22x22/actions/widget-gtk-arrow.png \
+       hicolor/22x22/actions/widget-gtk-aspectframe.png \
+       hicolor/22x22/actions/widget-gtk-assistant.png \
+       hicolor/22x22/actions/widget-gtk-button.png \
+       hicolor/22x22/actions/widget-gtk-buttonbox.png \
+       hicolor/22x22/actions/widget-gtk-box.png \
+       hicolor/22x22/actions/widget-gtk-calendar.png \
+       hicolor/22x22/actions/widget-gtk-cellareabox.png \
+       hicolor/22x22/actions/widget-gtk-cellrenderertext.png \
+       hicolor/22x22/actions/widget-gtk-cellrendereraccel.png \
+       hicolor/22x22/actions/widget-gtk-cellrenderercombo.png \
+       hicolor/22x22/actions/widget-gtk-cellrendererspin.png \
+       hicolor/22x22/actions/widget-gtk-cellrendererspinner.png \
+       hicolor/22x22/actions/widget-gtk-cellrendererpixbuf.png \
+       hicolor/22x22/actions/widget-gtk-cellrendererprogress.png \
+       hicolor/22x22/actions/widget-gtk-cellrenderertoggle.png \
+       hicolor/22x22/actions/widget-gtk-checkbutton.png \
+       hicolor/22x22/actions/widget-gtk-checkmenuitem.png \
+       hicolor/22x22/actions/widget-gtk-colorbutton.png \
+       hicolor/22x22/actions/widget-gtk-colorselection.png \
+       hicolor/22x22/actions/widget-gtk-colorselectiondialog.png \
+       hicolor/22x22/actions/widget-gtk-combobox.png \
+       hicolor/22x22/actions/widget-gtk-comboboxtext.png \
+       hicolor/22x22/actions/widget-gtk-default.png \
+       hicolor/22x22/actions/widget-gtk-dialog.png \
+       hicolor/22x22/actions/widget-gtk-drawingarea.png \
+       hicolor/22x22/actions/widget-gtk-entry.png \
+       hicolor/22x22/actions/widget-gtk-entrybuffer.png \
+       hicolor/22x22/actions/widget-gtk-eventbox.png \
+       hicolor/22x22/actions/widget-gtk-expander.png \
+       hicolor/22x22/actions/widget-gtk-filechooserbutton.png \
+       hicolor/22x22/actions/widget-gtk-filechooserdialog.png \
+       hicolor/22x22/actions/widget-gtk-filechooserwidget.png \
+       hicolor/22x22/actions/widget-gtk-filefilter.png \
+       hicolor/22x22/actions/widget-gtk-fixed.png \
+       hicolor/22x22/actions/widget-gtk-flowbox.png \
+       hicolor/22x22/actions/widget-gtk-flowboxchild.png \
+       hicolor/22x22/actions/widget-gtk-fontbutton.png \
+       hicolor/22x22/actions/widget-gtk-fontselection.png \
+       hicolor/22x22/actions/widget-gtk-fontselectiondialog.png \
+       hicolor/22x22/actions/widget-gtk-frame.png \
+       hicolor/22x22/actions/widget-gtk-grid.png \
+       hicolor/22x22/actions/widget-gtk-glarea.png \
+       hicolor/22x22/actions/widget-gtk-handlebox.png \
+       hicolor/22x22/actions/widget-gtk-hbox.png \
+       hicolor/22x22/actions/widget-gtk-hbuttonbox.png \
+       hicolor/22x22/actions/widget-gtk-headerbar.png \
+       hicolor/22x22/actions/widget-gtk-hpaned.png \
+       hicolor/22x22/actions/widget-gtk-hscale.png \
+       hicolor/22x22/actions/widget-gtk-hscrollbar.png \
+       hicolor/22x22/actions/widget-gtk-hseparator.png \
+       hicolor/22x22/actions/widget-gtk-iconview.png \
+       hicolor/22x22/actions/widget-gtk-image.png \
+       hicolor/22x22/actions/widget-gtk-imagemenuitem.png \
+       hicolor/22x22/actions/widget-gtk-infobar.png \
+       hicolor/22x22/actions/widget-gtk-inputdialog.png \
+       hicolor/22x22/actions/widget-gtk-label.png \
+       hicolor/22x22/actions/widget-gtk-layout.png \
+       hicolor/22x22/actions/widget-gtk-linkbutton.png \
+       hicolor/22x22/actions/widget-gtk-lockbutton.png \
+       hicolor/22x22/actions/widget-gtk-menu.png \
+       hicolor/22x22/actions/widget-gtk-menubar.png \
+       hicolor/22x22/actions/widget-gtk-menubutton.png \
+       hicolor/22x22/actions/widget-gtk-menuitem.png \
+       hicolor/22x22/actions/widget-gtk-menutoolbutton.png \
+       hicolor/22x22/actions/widget-gtk-messagedialog.png \
+       hicolor/22x22/actions/widget-gtk-modelbutton.png \
+       hicolor/22x22/actions/widget-gtk-notebook.png \
+       hicolor/22x22/actions/widget-gtk-offscreenwindow.png \
+       hicolor/22x22/actions/widget-gtk-paned.png \
+       hicolor/22x22/actions/widget-gtk-pagesetupdialog.png \
+       hicolor/22x22/actions/widget-gtk-placessidebar.png \
+       hicolor/22x22/actions/widget-gtk-popover.png \
+       hicolor/22x22/actions/widget-gtk-popovermenu.png \
+       hicolor/22x22/actions/widget-gtk-printdialog.png \
+       hicolor/22x22/actions/widget-gtk-progressbar.png \
+       hicolor/22x22/actions/widget-gtk-searchbar.png \
+       hicolor/22x22/actions/widget-gtk-levelbar.png \
+       hicolor/22x22/actions/widget-gtk-radiobutton.png \
+       hicolor/22x22/actions/widget-gtk-radiomenuitem.png \
+       hicolor/22x22/actions/widget-gtk-radiotoolbutton.png \
+       hicolor/22x22/actions/widget-gtk-recentaction.png \
+       hicolor/22x22/actions/widget-gtk-recentchooser.png \
+       hicolor/22x22/actions/widget-gtk-recentchooserdialog.png \
+       hicolor/22x22/actions/widget-gtk-recentchoosermenu.png \
+       hicolor/22x22/actions/widget-gtk-recentfilter.png \
+       hicolor/22x22/actions/widget-gtk-recentmanager.png \
+       hicolor/22x22/actions/widget-gtk-scale.png \
+       hicolor/22x22/actions/widget-gtk-scrollbar.png \
+       hicolor/22x22/actions/widget-gtk-scrolledwindow.png \
+       hicolor/22x22/actions/widget-gtk-separator.png \
+       hicolor/22x22/actions/widget-gtk-separatormenuitem.png \
+       hicolor/22x22/actions/widget-gtk-separatortoolitem.png \
+       hicolor/22x22/actions/widget-gtk-stacksidebar.png \
+       hicolor/22x22/actions/widget-gtk-sizegroup.png \
+       hicolor/22x22/actions/widget-gtk-spinbutton.png \
+       hicolor/22x22/actions/widget-gtk-spinner.png \
+       hicolor/22x22/actions/widget-gtk-stack.png \
+       hicolor/22x22/actions/widget-gtk-stackswitcher.png \
+       hicolor/22x22/actions/widget-gtk-statusbar.png \
+       hicolor/22x22/actions/widget-gtk-statusicon.png \
+       hicolor/22x22/actions/widget-gtk-table.png \
+       hicolor/22x22/actions/widget-gtk-tearoffmenuitem.png \
+       hicolor/22x22/actions/widget-gtk-textbuffer.png \
+       hicolor/22x22/actions/widget-gtk-texttag.png \
+       hicolor/22x22/actions/widget-gtk-texttagtable.png \
+       hicolor/22x22/actions/widget-gtk-textview.png \
+       hicolor/22x22/actions/widget-gtk-togglebutton.png \
+       hicolor/22x22/actions/widget-gtk-switch.png \
+       hicolor/22x22/actions/widget-gtk-toggletoolbutton.png \
+       hicolor/22x22/actions/widget-gtk-toolbar.png \
+       hicolor/22x22/actions/widget-gtk-toolbutton.png \
+       hicolor/22x22/actions/widget-gtk-toolitem.png \
+       hicolor/22x22/actions/widget-gtk-toolitemgroup.png \
+       hicolor/22x22/actions/widget-gtk-toolpalette.png \
+       hicolor/22x22/actions/widget-gtk-treemodelfilter.png \
+       hicolor/22x22/actions/widget-gtk-treemodelsort.png \
+       hicolor/22x22/actions/widget-gtk-treeselection.png \
+       hicolor/22x22/actions/widget-gtk-treeview.png \
+       hicolor/22x22/actions/widget-gtk-treeviewcolumn.png \
+       hicolor/22x22/actions/widget-gtk-vbox.png \
+       hicolor/22x22/actions/widget-gtk-vbuttonbox.png \
+       hicolor/22x22/actions/widget-gtk-viewport.png \
+       hicolor/22x22/actions/widget-gtk-vpaned.png \
+       hicolor/22x22/actions/widget-gtk-vscale.png \
+       hicolor/22x22/actions/widget-gtk-vscrollbar.png \
+       hicolor/22x22/actions/widget-gtk-vseparator.png \
+       hicolor/22x22/actions/widget-gtk-window.png \
+       hicolor/22x22/actions/widget-gtk-entrycompletion.png \
+       hicolor/22x22/actions/widget-gtk-action.png \
+       hicolor/22x22/actions/widget-gtk-actiongroup.png \
+       hicolor/22x22/actions/widget-gtk-radioaction.png \
+       hicolor/22x22/actions/widget-gtk-toggleaction.png \
+       hicolor/22x22/actions/widget-gtk-volumebutton.png \
+       hicolor/22x22/actions/widget-gtk-windowgroup.png \
+       hicolor/22x22/actions/widget-gtk-treestore.png \
+       hicolor/22x22/actions/widget-gtk-liststore.png \
+       hicolor/22x22/actions/widget-gtk-scalebutton.png \
+       hicolor/22x22/actions/widget-gtk-revealer.png \
+       hicolor/22x22/actions/widget-gtk-overlay.png \
+       hicolor/22x22/actions/widget-gtk-listbox.png \
+       hicolor/22x22/actions/widget-gtk-listboxrow.png \
+       hicolor/22x22/actions/widget-gtk-searchentry.png \
+       hicolor/22x22/actions/widget-gtk-iconfactory.png
+
+EXTRA_DIST = \
+       $(icons16_DATA) \
+       $(icons22_DATA)
diff --git a/plugins/gtk+/icons/16x16/widget-gtk-aboutdialog.png 
b/plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-aboutdialog.png
similarity index 100%
rename from plugins/gtk+/icons/16x16/widget-gtk-aboutdialog.png
rename to plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-aboutdialog.png
diff --git a/plugins/gtk+/icons/16x16/widget-gtk-accelgroup.png 
b/plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-accelgroup.png
similarity index 100%
rename from plugins/gtk+/icons/16x16/widget-gtk-accelgroup.png
rename to plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-accelgroup.png
diff --git a/plugins/gtk+/icons/16x16/widget-gtk-accellabel.png 
b/plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-accellabel.png
similarity index 100%
rename from plugins/gtk+/icons/16x16/widget-gtk-accellabel.png
rename to plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-accellabel.png
diff --git a/plugins/gtk+/icons/16x16/widget-gtk-action.png 
b/plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-action.png
similarity index 100%
rename from plugins/gtk+/icons/16x16/widget-gtk-action.png
rename to plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-action.png
diff --git a/plugins/gtk+/icons/16x16/widget-gtk-actionbar.png 
b/plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-actionbar.png
similarity index 100%
rename from plugins/gtk+/icons/16x16/widget-gtk-actionbar.png
rename to plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-actionbar.png
diff --git a/plugins/gtk+/icons/16x16/widget-gtk-actiongroup.png 
b/plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-actiongroup.png
similarity index 100%
rename from plugins/gtk+/icons/16x16/widget-gtk-actiongroup.png
rename to plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-actiongroup.png
diff --git a/plugins/gtk+/icons/16x16/widget-gtk-adjustment.png 
b/plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-adjustment.png
similarity index 100%
rename from plugins/gtk+/icons/16x16/widget-gtk-adjustment.png
rename to plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-adjustment.png
diff --git a/plugins/gtk+/icons/16x16/widget-gtk-alignment.png 
b/plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-alignment.png
similarity index 100%
rename from plugins/gtk+/icons/16x16/widget-gtk-alignment.png
rename to plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-alignment.png
diff --git a/plugins/gtk+/icons/16x16/widget-gtk-appchooserbutton.png 
b/plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-appchooserbutton.png
similarity index 100%
rename from plugins/gtk+/icons/16x16/widget-gtk-appchooserbutton.png
rename to plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-appchooserbutton.png
diff --git a/plugins/gtk+/icons/16x16/widget-gtk-appchooserdialog.png 
b/plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-appchooserdialog.png
similarity index 100%
rename from plugins/gtk+/icons/16x16/widget-gtk-appchooserdialog.png
rename to plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-appchooserdialog.png
diff --git a/plugins/gtk+/icons/16x16/widget-gtk-appchooserwidget.png 
b/plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-appchooserwidget.png
similarity index 100%
rename from plugins/gtk+/icons/16x16/widget-gtk-appchooserwidget.png
rename to plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-appchooserwidget.png
diff --git a/plugins/gtk+/icons/16x16/widget-gtk-arrow.png 
b/plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-arrow.png
similarity index 100%
rename from plugins/gtk+/icons/16x16/widget-gtk-arrow.png
rename to plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-arrow.png
diff --git a/plugins/gtk+/icons/16x16/widget-gtk-aspectframe.png 
b/plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-aspectframe.png
similarity index 100%
rename from plugins/gtk+/icons/16x16/widget-gtk-aspectframe.png
rename to plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-aspectframe.png
diff --git a/plugins/gtk+/icons/16x16/widget-gtk-assistant.png 
b/plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-assistant.png
similarity index 100%
rename from plugins/gtk+/icons/16x16/widget-gtk-assistant.png
rename to plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-assistant.png
diff --git a/plugins/gtk+/icons/16x16/widget-gtk-box.png 
b/plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-box.png
similarity index 100%
rename from plugins/gtk+/icons/16x16/widget-gtk-box.png
rename to plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-box.png
diff --git a/plugins/gtk+/icons/16x16/widget-gtk-button.png 
b/plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-button.png
similarity index 100%
rename from plugins/gtk+/icons/16x16/widget-gtk-button.png
rename to plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-button.png
diff --git a/plugins/gtk+/icons/16x16/widget-gtk-buttonbox.png 
b/plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-buttonbox.png
similarity index 100%
rename from plugins/gtk+/icons/16x16/widget-gtk-buttonbox.png
rename to plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-buttonbox.png
diff --git a/plugins/gtk+/icons/16x16/widget-gtk-calendar.png 
b/plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-calendar.png
similarity index 100%
rename from plugins/gtk+/icons/16x16/widget-gtk-calendar.png
rename to plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-calendar.png
diff --git a/plugins/gtk+/icons/16x16/widget-gtk-cellareabox.png 
b/plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-cellareabox.png
similarity index 100%
rename from plugins/gtk+/icons/16x16/widget-gtk-cellareabox.png
rename to plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-cellareabox.png
diff --git a/plugins/gtk+/icons/16x16/widget-gtk-cellrendereraccel.png 
b/plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-cellrendereraccel.png
similarity index 100%
rename from plugins/gtk+/icons/16x16/widget-gtk-cellrendereraccel.png
rename to plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-cellrendereraccel.png
diff --git a/plugins/gtk+/icons/16x16/widget-gtk-cellrenderercombo.png 
b/plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-cellrenderercombo.png
similarity index 100%
rename from plugins/gtk+/icons/16x16/widget-gtk-cellrenderercombo.png
rename to plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-cellrenderercombo.png
diff --git a/plugins/gtk+/icons/16x16/widget-gtk-cellrendererpixbuf.png 
b/plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-cellrendererpixbuf.png
similarity index 100%
rename from plugins/gtk+/icons/16x16/widget-gtk-cellrendererpixbuf.png
rename to plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-cellrendererpixbuf.png
diff --git a/plugins/gtk+/icons/16x16/widget-gtk-cellrendererprogress.png 
b/plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-cellrendererprogress.png
similarity index 100%
rename from plugins/gtk+/icons/16x16/widget-gtk-cellrendererprogress.png
rename to plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-cellrendererprogress.png
diff --git a/plugins/gtk+/icons/16x16/widget-gtk-cellrendererspin.png 
b/plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-cellrendererspin.png
similarity index 100%
rename from plugins/gtk+/icons/16x16/widget-gtk-cellrendererspin.png
rename to plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-cellrendererspin.png
diff --git a/plugins/gtk+/icons/16x16/widget-gtk-cellrendererspinner.png 
b/plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-cellrendererspinner.png
similarity index 100%
rename from plugins/gtk+/icons/16x16/widget-gtk-cellrendererspinner.png
rename to plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-cellrendererspinner.png
diff --git a/plugins/gtk+/icons/16x16/widget-gtk-cellrenderertext.png 
b/plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-cellrenderertext.png
similarity index 100%
rename from plugins/gtk+/icons/16x16/widget-gtk-cellrenderertext.png
rename to plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-cellrenderertext.png
diff --git a/plugins/gtk+/icons/16x16/widget-gtk-cellrenderertoggle.png 
b/plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-cellrenderertoggle.png
similarity index 100%
rename from plugins/gtk+/icons/16x16/widget-gtk-cellrenderertoggle.png
rename to plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-cellrenderertoggle.png
diff --git a/plugins/gtk+/icons/16x16/widget-gtk-checkbutton.png 
b/plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-checkbutton.png
similarity index 100%
rename from plugins/gtk+/icons/16x16/widget-gtk-checkbutton.png
rename to plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-checkbutton.png
diff --git a/plugins/gtk+/icons/16x16/widget-gtk-checkmenuitem.png 
b/plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-checkmenuitem.png
similarity index 100%
rename from plugins/gtk+/icons/16x16/widget-gtk-checkmenuitem.png
rename to plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-checkmenuitem.png
diff --git a/plugins/gtk+/icons/16x16/widget-gtk-colorbutton.png 
b/plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-colorbutton.png
similarity index 100%
rename from plugins/gtk+/icons/16x16/widget-gtk-colorbutton.png
rename to plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-colorbutton.png
diff --git a/plugins/gtk+/icons/16x16/widget-gtk-colorselection.png 
b/plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-colorselection.png
similarity index 100%
rename from plugins/gtk+/icons/16x16/widget-gtk-colorselection.png
rename to plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-colorselection.png
diff --git a/plugins/gtk+/icons/16x16/widget-gtk-colorselectiondialog.png 
b/plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-colorselectiondialog.png
similarity index 100%
rename from plugins/gtk+/icons/16x16/widget-gtk-colorselectiondialog.png
rename to plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-colorselectiondialog.png
diff --git a/plugins/gtk+/icons/16x16/widget-gtk-combobox.png 
b/plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-combobox.png
similarity index 100%
rename from plugins/gtk+/icons/16x16/widget-gtk-combobox.png
rename to plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-combobox.png
diff --git a/plugins/gtk+/icons/16x16/widget-gtk-comboboxtext.png 
b/plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-comboboxtext.png
similarity index 100%
rename from plugins/gtk+/icons/16x16/widget-gtk-comboboxtext.png
rename to plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-comboboxtext.png
diff --git a/plugins/gtk+/icons/16x16/widget-gtk-custom.png 
b/plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-custom.png
similarity index 100%
rename from plugins/gtk+/icons/16x16/widget-gtk-custom.png
rename to plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-custom.png
diff --git a/plugins/gtk+/icons/16x16/widget-gtk-default.png 
b/plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-default.png
similarity index 100%
rename from plugins/gtk+/icons/16x16/widget-gtk-default.png
rename to plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-default.png
diff --git a/plugins/gtk+/icons/16x16/widget-gtk-dialog.png 
b/plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-dialog.png
similarity index 100%
rename from plugins/gtk+/icons/16x16/widget-gtk-dialog.png
rename to plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-dialog.png
diff --git a/plugins/gtk+/icons/16x16/widget-gtk-drawingarea.png 
b/plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-drawingarea.png
similarity index 100%
rename from plugins/gtk+/icons/16x16/widget-gtk-drawingarea.png
rename to plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-drawingarea.png
diff --git a/plugins/gtk+/icons/16x16/widget-gtk-entry.png 
b/plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-entry.png
similarity index 100%
rename from plugins/gtk+/icons/16x16/widget-gtk-entry.png
rename to plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-entry.png
diff --git a/plugins/gtk+/icons/16x16/widget-gtk-entrybuffer.png 
b/plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-entrybuffer.png
similarity index 100%
rename from plugins/gtk+/icons/16x16/widget-gtk-entrybuffer.png
rename to plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-entrybuffer.png
diff --git a/plugins/gtk+/icons/16x16/widget-gtk-entrycompletion.png 
b/plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-entrycompletion.png
similarity index 100%
rename from plugins/gtk+/icons/16x16/widget-gtk-entrycompletion.png
rename to plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-entrycompletion.png
diff --git a/plugins/gtk+/icons/16x16/widget-gtk-eventbox.png 
b/plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-eventbox.png
similarity index 100%
rename from plugins/gtk+/icons/16x16/widget-gtk-eventbox.png
rename to plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-eventbox.png
diff --git a/plugins/gtk+/icons/16x16/widget-gtk-expander.png 
b/plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-expander.png
similarity index 100%
rename from plugins/gtk+/icons/16x16/widget-gtk-expander.png
rename to plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-expander.png
diff --git a/plugins/gtk+/icons/16x16/widget-gtk-filechooserbutton.png 
b/plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-filechooserbutton.png
similarity index 100%
rename from plugins/gtk+/icons/16x16/widget-gtk-filechooserbutton.png
rename to plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-filechooserbutton.png
diff --git a/plugins/gtk+/icons/16x16/widget-gtk-filechooserdialog.png 
b/plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-filechooserdialog.png
similarity index 100%
rename from plugins/gtk+/icons/16x16/widget-gtk-filechooserdialog.png
rename to plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-filechooserdialog.png
diff --git a/plugins/gtk+/icons/16x16/widget-gtk-filechooserwidget.png 
b/plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-filechooserwidget.png
similarity index 100%
rename from plugins/gtk+/icons/16x16/widget-gtk-filechooserwidget.png
rename to plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-filechooserwidget.png
diff --git a/plugins/gtk+/icons/16x16/widget-gtk-filefilter.png 
b/plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-filefilter.png
similarity index 100%
rename from plugins/gtk+/icons/16x16/widget-gtk-filefilter.png
rename to plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-filefilter.png
diff --git a/plugins/gtk+/icons/16x16/widget-gtk-fixed.png 
b/plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-fixed.png
similarity index 100%
rename from plugins/gtk+/icons/16x16/widget-gtk-fixed.png
rename to plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-fixed.png
diff --git a/plugins/gtk+/icons/16x16/widget-gtk-flowbox.png 
b/plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-flowbox.png
similarity index 100%
rename from plugins/gtk+/icons/16x16/widget-gtk-flowbox.png
rename to plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-flowbox.png
diff --git a/plugins/gtk+/icons/16x16/widget-gtk-flowboxchild.png 
b/plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-flowboxchild.png
similarity index 100%
rename from plugins/gtk+/icons/16x16/widget-gtk-flowboxchild.png
rename to plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-flowboxchild.png
diff --git a/plugins/gtk+/icons/16x16/widget-gtk-fontbutton.png 
b/plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-fontbutton.png
similarity index 100%
rename from plugins/gtk+/icons/16x16/widget-gtk-fontbutton.png
rename to plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-fontbutton.png
diff --git a/plugins/gtk+/icons/16x16/widget-gtk-fontselection.png 
b/plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-fontselection.png
similarity index 100%
rename from plugins/gtk+/icons/16x16/widget-gtk-fontselection.png
rename to plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-fontselection.png
diff --git a/plugins/gtk+/icons/16x16/widget-gtk-fontselectiondialog.png 
b/plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-fontselectiondialog.png
similarity index 100%
rename from plugins/gtk+/icons/16x16/widget-gtk-fontselectiondialog.png
rename to plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-fontselectiondialog.png
diff --git a/plugins/gtk+/icons/16x16/widget-gtk-frame.png 
b/plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-frame.png
similarity index 100%
rename from plugins/gtk+/icons/16x16/widget-gtk-frame.png
rename to plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-frame.png
diff --git a/plugins/gtk+/icons/16x16/widget-gtk-glarea.png 
b/plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-glarea.png
similarity index 100%
rename from plugins/gtk+/icons/16x16/widget-gtk-glarea.png
rename to plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-glarea.png
diff --git a/plugins/gtk+/icons/16x16/widget-gtk-grid.png 
b/plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-grid.png
similarity index 100%
rename from plugins/gtk+/icons/16x16/widget-gtk-grid.png
rename to plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-grid.png
diff --git a/plugins/gtk+/icons/16x16/widget-gtk-gtktextview.png 
b/plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-gtktextview.png
similarity index 100%
rename from plugins/gtk+/icons/16x16/widget-gtk-gtktextview.png
rename to plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-gtktextview.png
diff --git a/plugins/gtk+/icons/16x16/widget-gtk-handlebox.png 
b/plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-handlebox.png
similarity index 100%
rename from plugins/gtk+/icons/16x16/widget-gtk-handlebox.png
rename to plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-handlebox.png
diff --git a/plugins/gtk+/icons/16x16/widget-gtk-hbox.png 
b/plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-hbox.png
similarity index 100%
rename from plugins/gtk+/icons/16x16/widget-gtk-hbox.png
rename to plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-hbox.png
diff --git a/plugins/gtk+/icons/16x16/widget-gtk-hbuttonbox.png 
b/plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-hbuttonbox.png
similarity index 100%
rename from plugins/gtk+/icons/16x16/widget-gtk-hbuttonbox.png
rename to plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-hbuttonbox.png
diff --git a/plugins/gtk+/icons/16x16/widget-gtk-headerbar.png 
b/plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-headerbar.png
similarity index 100%
rename from plugins/gtk+/icons/16x16/widget-gtk-headerbar.png
rename to plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-headerbar.png
diff --git a/plugins/gtk+/icons/16x16/widget-gtk-hpaned.png 
b/plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-hpaned.png
similarity index 100%
rename from plugins/gtk+/icons/16x16/widget-gtk-hpaned.png
rename to plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-hpaned.png
diff --git a/plugins/gtk+/icons/16x16/widget-gtk-hscale.png 
b/plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-hscale.png
similarity index 100%
rename from plugins/gtk+/icons/16x16/widget-gtk-hscale.png
rename to plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-hscale.png
diff --git a/plugins/gtk+/icons/16x16/widget-gtk-hscrollbar.png 
b/plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-hscrollbar.png
similarity index 100%
rename from plugins/gtk+/icons/16x16/widget-gtk-hscrollbar.png
rename to plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-hscrollbar.png
diff --git a/plugins/gtk+/icons/16x16/widget-gtk-hseparator.png 
b/plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-hseparator.png
similarity index 100%
rename from plugins/gtk+/icons/16x16/widget-gtk-hseparator.png
rename to plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-hseparator.png
diff --git a/plugins/gtk+/icons/16x16/widget-gtk-iconfactory.png 
b/plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-iconfactory.png
similarity index 100%
rename from plugins/gtk+/icons/16x16/widget-gtk-iconfactory.png
rename to plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-iconfactory.png
diff --git a/plugins/gtk+/icons/16x16/widget-gtk-iconview.png 
b/plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-iconview.png
similarity index 100%
rename from plugins/gtk+/icons/16x16/widget-gtk-iconview.png
rename to plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-iconview.png
diff --git a/plugins/gtk+/icons/16x16/widget-gtk-image.png 
b/plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-image.png
similarity index 100%
rename from plugins/gtk+/icons/16x16/widget-gtk-image.png
rename to plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-image.png
diff --git a/plugins/gtk+/icons/16x16/widget-gtk-imagemenuitem.png 
b/plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-imagemenuitem.png
similarity index 100%
rename from plugins/gtk+/icons/16x16/widget-gtk-imagemenuitem.png
rename to plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-imagemenuitem.png
diff --git a/plugins/gtk+/icons/16x16/widget-gtk-infobar.png 
b/plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-infobar.png
similarity index 100%
rename from plugins/gtk+/icons/16x16/widget-gtk-infobar.png
rename to plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-infobar.png
diff --git a/plugins/gtk+/icons/16x16/widget-gtk-inputdialog.png 
b/plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-inputdialog.png
similarity index 100%
rename from plugins/gtk+/icons/16x16/widget-gtk-inputdialog.png
rename to plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-inputdialog.png
diff --git a/plugins/gtk+/icons/16x16/widget-gtk-label.png 
b/plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-label.png
similarity index 100%
rename from plugins/gtk+/icons/16x16/widget-gtk-label.png
rename to plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-label.png
diff --git a/plugins/gtk+/icons/16x16/widget-gtk-layout.png 
b/plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-layout.png
similarity index 100%
rename from plugins/gtk+/icons/16x16/widget-gtk-layout.png
rename to plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-layout.png
diff --git a/plugins/gtk+/icons/16x16/widget-gtk-levelbar.png 
b/plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-levelbar.png
similarity index 100%
rename from plugins/gtk+/icons/16x16/widget-gtk-levelbar.png
rename to plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-levelbar.png
diff --git a/plugins/gtk+/icons/16x16/widget-gtk-linkbutton.png 
b/plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-linkbutton.png
similarity index 100%
rename from plugins/gtk+/icons/16x16/widget-gtk-linkbutton.png
rename to plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-linkbutton.png
diff --git a/plugins/gtk+/icons/16x16/widget-gtk-listbox.png 
b/plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-listbox.png
similarity index 100%
rename from plugins/gtk+/icons/16x16/widget-gtk-listbox.png
rename to plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-listbox.png
diff --git a/plugins/gtk+/icons/16x16/widget-gtk-listboxrow.png 
b/plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-listboxrow.png
similarity index 100%
rename from plugins/gtk+/icons/16x16/widget-gtk-listboxrow.png
rename to plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-listboxrow.png
diff --git a/plugins/gtk+/icons/16x16/widget-gtk-liststore.png 
b/plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-liststore.png
similarity index 100%
rename from plugins/gtk+/icons/16x16/widget-gtk-liststore.png
rename to plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-liststore.png
diff --git a/plugins/gtk+/icons/16x16/widget-gtk-lockbutton.png 
b/plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-lockbutton.png
similarity index 100%
rename from plugins/gtk+/icons/16x16/widget-gtk-lockbutton.png
rename to plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-lockbutton.png
diff --git a/plugins/gtk+/icons/16x16/widget-gtk-menu.png 
b/plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-menu.png
similarity index 100%
rename from plugins/gtk+/icons/16x16/widget-gtk-menu.png
rename to plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-menu.png
diff --git a/plugins/gtk+/icons/16x16/widget-gtk-menubar.png 
b/plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-menubar.png
similarity index 100%
rename from plugins/gtk+/icons/16x16/widget-gtk-menubar.png
rename to plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-menubar.png
diff --git a/plugins/gtk+/icons/16x16/widget-gtk-menubutton.png 
b/plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-menubutton.png
similarity index 100%
rename from plugins/gtk+/icons/16x16/widget-gtk-menubutton.png
rename to plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-menubutton.png
diff --git a/plugins/gtk+/icons/16x16/widget-gtk-menuitem.png 
b/plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-menuitem.png
similarity index 100%
rename from plugins/gtk+/icons/16x16/widget-gtk-menuitem.png
rename to plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-menuitem.png
diff --git a/plugins/gtk+/icons/16x16/widget-gtk-menutoolbutton.png 
b/plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-menutoolbutton.png
similarity index 100%
rename from plugins/gtk+/icons/16x16/widget-gtk-menutoolbutton.png
rename to plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-menutoolbutton.png
diff --git a/plugins/gtk+/icons/16x16/widget-gtk-messagedialog.png 
b/plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-messagedialog.png
similarity index 100%
rename from plugins/gtk+/icons/16x16/widget-gtk-messagedialog.png
rename to plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-messagedialog.png
diff --git a/plugins/gtk+/icons/16x16/widget-gtk-modelbutton.png 
b/plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-modelbutton.png
similarity index 100%
rename from plugins/gtk+/icons/16x16/widget-gtk-modelbutton.png
rename to plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-modelbutton.png
diff --git a/plugins/gtk+/icons/16x16/widget-gtk-notebook.png 
b/plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-notebook.png
similarity index 100%
rename from plugins/gtk+/icons/16x16/widget-gtk-notebook.png
rename to plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-notebook.png
diff --git a/plugins/gtk+/icons/16x16/widget-gtk-offscreenwindow.png 
b/plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-offscreenwindow.png
similarity index 100%
rename from plugins/gtk+/icons/16x16/widget-gtk-offscreenwindow.png
rename to plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-offscreenwindow.png
diff --git a/plugins/gtk+/icons/16x16/widget-gtk-overlay.png 
b/plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-overlay.png
similarity index 100%
rename from plugins/gtk+/icons/16x16/widget-gtk-overlay.png
rename to plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-overlay.png
diff --git a/plugins/gtk+/icons/16x16/widget-gtk-pagesetupdialog.png 
b/plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-pagesetupdialog.png
similarity index 100%
rename from plugins/gtk+/icons/16x16/widget-gtk-pagesetupdialog.png
rename to plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-pagesetupdialog.png
diff --git a/plugins/gtk+/icons/16x16/widget-gtk-paned.png 
b/plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-paned.png
similarity index 100%
rename from plugins/gtk+/icons/16x16/widget-gtk-paned.png
rename to plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-paned.png
diff --git a/plugins/gtk+/icons/16x16/widget-gtk-placessidebar.png 
b/plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-placessidebar.png
similarity index 100%
rename from plugins/gtk+/icons/16x16/widget-gtk-placessidebar.png
rename to plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-placessidebar.png
diff --git a/plugins/gtk+/icons/16x16/widget-gtk-popover.png 
b/plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-popover.png
similarity index 100%
rename from plugins/gtk+/icons/16x16/widget-gtk-popover.png
rename to plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-popover.png
diff --git a/plugins/gtk+/icons/16x16/widget-gtk-popovermenu.png 
b/plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-popovermenu.png
similarity index 100%
rename from plugins/gtk+/icons/16x16/widget-gtk-popovermenu.png
rename to plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-popovermenu.png
diff --git a/plugins/gtk+/icons/16x16/widget-gtk-printdialog.png 
b/plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-printdialog.png
similarity index 100%
rename from plugins/gtk+/icons/16x16/widget-gtk-printdialog.png
rename to plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-printdialog.png
diff --git a/plugins/gtk+/icons/16x16/widget-gtk-progressbar.png 
b/plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-progressbar.png
similarity index 100%
rename from plugins/gtk+/icons/16x16/widget-gtk-progressbar.png
rename to plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-progressbar.png
diff --git a/plugins/gtk+/icons/16x16/widget-gtk-radioaction.png 
b/plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-radioaction.png
similarity index 100%
rename from plugins/gtk+/icons/16x16/widget-gtk-radioaction.png
rename to plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-radioaction.png
diff --git a/plugins/gtk+/icons/16x16/widget-gtk-radiobutton.png 
b/plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-radiobutton.png
similarity index 100%
rename from plugins/gtk+/icons/16x16/widget-gtk-radiobutton.png
rename to plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-radiobutton.png
diff --git a/plugins/gtk+/icons/16x16/widget-gtk-radiomenuitem.png 
b/plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-radiomenuitem.png
similarity index 100%
rename from plugins/gtk+/icons/16x16/widget-gtk-radiomenuitem.png
rename to plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-radiomenuitem.png
diff --git a/plugins/gtk+/icons/16x16/widget-gtk-radiotoolbutton.png 
b/plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-radiotoolbutton.png
similarity index 100%
rename from plugins/gtk+/icons/16x16/widget-gtk-radiotoolbutton.png
rename to plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-radiotoolbutton.png
diff --git a/plugins/gtk+/icons/16x16/widget-gtk-recentaction.png 
b/plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-recentaction.png
similarity index 100%
rename from plugins/gtk+/icons/16x16/widget-gtk-recentaction.png
rename to plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-recentaction.png
diff --git a/plugins/gtk+/icons/16x16/widget-gtk-recentchooser.png 
b/plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-recentchooser.png
similarity index 100%
rename from plugins/gtk+/icons/16x16/widget-gtk-recentchooser.png
rename to plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-recentchooser.png
diff --git a/plugins/gtk+/icons/16x16/widget-gtk-recentchooserdialog.png 
b/plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-recentchooserdialog.png
similarity index 100%
rename from plugins/gtk+/icons/16x16/widget-gtk-recentchooserdialog.png
rename to plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-recentchooserdialog.png
diff --git a/plugins/gtk+/icons/16x16/widget-gtk-recentchoosermenu.png 
b/plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-recentchoosermenu.png
similarity index 100%
rename from plugins/gtk+/icons/16x16/widget-gtk-recentchoosermenu.png
rename to plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-recentchoosermenu.png
diff --git a/plugins/gtk+/icons/16x16/widget-gtk-recentfilter.png 
b/plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-recentfilter.png
similarity index 100%
rename from plugins/gtk+/icons/16x16/widget-gtk-recentfilter.png
rename to plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-recentfilter.png
diff --git a/plugins/gtk+/icons/16x16/widget-gtk-recentmanager.png 
b/plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-recentmanager.png
similarity index 100%
rename from plugins/gtk+/icons/16x16/widget-gtk-recentmanager.png
rename to plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-recentmanager.png
diff --git a/plugins/gtk+/icons/16x16/widget-gtk-revealer.png 
b/plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-revealer.png
similarity index 100%
rename from plugins/gtk+/icons/16x16/widget-gtk-revealer.png
rename to plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-revealer.png
diff --git a/plugins/gtk+/icons/16x16/widget-gtk-scale.png 
b/plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-scale.png
similarity index 100%
rename from plugins/gtk+/icons/16x16/widget-gtk-scale.png
rename to plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-scale.png
diff --git a/plugins/gtk+/icons/16x16/widget-gtk-scalebutton.png 
b/plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-scalebutton.png
similarity index 100%
rename from plugins/gtk+/icons/16x16/widget-gtk-scalebutton.png
rename to plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-scalebutton.png
diff --git a/plugins/gtk+/icons/16x16/widget-gtk-scrollbar.png 
b/plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-scrollbar.png
similarity index 100%
rename from plugins/gtk+/icons/16x16/widget-gtk-scrollbar.png
rename to plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-scrollbar.png
diff --git a/plugins/gtk+/icons/16x16/widget-gtk-scrolledwindow.png 
b/plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-scrolledwindow.png
similarity index 100%
rename from plugins/gtk+/icons/16x16/widget-gtk-scrolledwindow.png
rename to plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-scrolledwindow.png
diff --git a/plugins/gtk+/icons/16x16/widget-gtk-searchbar.png 
b/plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-searchbar.png
similarity index 100%
rename from plugins/gtk+/icons/16x16/widget-gtk-searchbar.png
rename to plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-searchbar.png
diff --git a/plugins/gtk+/icons/16x16/widget-gtk-searchentry.png 
b/plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-searchentry.png
similarity index 100%
rename from plugins/gtk+/icons/16x16/widget-gtk-searchentry.png
rename to plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-searchentry.png
diff --git a/plugins/gtk+/icons/16x16/widget-gtk-separator.png 
b/plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-separator.png
similarity index 100%
rename from plugins/gtk+/icons/16x16/widget-gtk-separator.png
rename to plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-separator.png
diff --git a/plugins/gtk+/icons/16x16/widget-gtk-separatormenuitem.png 
b/plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-separatormenuitem.png
similarity index 100%
rename from plugins/gtk+/icons/16x16/widget-gtk-separatormenuitem.png
rename to plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-separatormenuitem.png
diff --git a/plugins/gtk+/icons/16x16/widget-gtk-separatortoolitem.png 
b/plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-separatortoolitem.png
similarity index 100%
rename from plugins/gtk+/icons/16x16/widget-gtk-separatortoolitem.png
rename to plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-separatortoolitem.png
diff --git a/plugins/gtk+/icons/16x16/widget-gtk-sizegroup.png 
b/plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-sizegroup.png
similarity index 100%
rename from plugins/gtk+/icons/16x16/widget-gtk-sizegroup.png
rename to plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-sizegroup.png
diff --git a/plugins/gtk+/icons/16x16/widget-gtk-spinbutton.png 
b/plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-spinbutton.png
similarity index 100%
rename from plugins/gtk+/icons/16x16/widget-gtk-spinbutton.png
rename to plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-spinbutton.png
diff --git a/plugins/gtk+/icons/16x16/widget-gtk-spinner.png 
b/plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-spinner.png
similarity index 100%
rename from plugins/gtk+/icons/16x16/widget-gtk-spinner.png
rename to plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-spinner.png
diff --git a/plugins/gtk+/icons/16x16/widget-gtk-stack.png 
b/plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-stack.png
similarity index 100%
rename from plugins/gtk+/icons/16x16/widget-gtk-stack.png
rename to plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-stack.png
diff --git a/plugins/gtk+/icons/16x16/widget-gtk-stacksidebar.png 
b/plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-stacksidebar.png
similarity index 100%
rename from plugins/gtk+/icons/16x16/widget-gtk-stacksidebar.png
rename to plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-stacksidebar.png
diff --git a/plugins/gtk+/icons/16x16/widget-gtk-stackswitcher.png 
b/plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-stackswitcher.png
similarity index 100%
rename from plugins/gtk+/icons/16x16/widget-gtk-stackswitcher.png
rename to plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-stackswitcher.png
diff --git a/plugins/gtk+/icons/16x16/widget-gtk-statusbar.png 
b/plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-statusbar.png
similarity index 100%
rename from plugins/gtk+/icons/16x16/widget-gtk-statusbar.png
rename to plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-statusbar.png
diff --git a/plugins/gtk+/icons/16x16/widget-gtk-statusicon.png 
b/plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-statusicon.png
similarity index 100%
rename from plugins/gtk+/icons/16x16/widget-gtk-statusicon.png
rename to plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-statusicon.png
diff --git a/plugins/gtk+/icons/16x16/widget-gtk-switch.png 
b/plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-switch.png
similarity index 100%
rename from plugins/gtk+/icons/16x16/widget-gtk-switch.png
rename to plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-switch.png
diff --git a/plugins/gtk+/icons/16x16/widget-gtk-table.png 
b/plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-table.png
similarity index 100%
rename from plugins/gtk+/icons/16x16/widget-gtk-table.png
rename to plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-table.png
diff --git a/plugins/gtk+/icons/16x16/widget-gtk-tearoffmenuitem.png 
b/plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-tearoffmenuitem.png
similarity index 100%
rename from plugins/gtk+/icons/16x16/widget-gtk-tearoffmenuitem.png
rename to plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-tearoffmenuitem.png
diff --git a/plugins/gtk+/icons/16x16/widget-gtk-textbuffer.png 
b/plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-textbuffer.png
similarity index 100%
rename from plugins/gtk+/icons/16x16/widget-gtk-textbuffer.png
rename to plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-textbuffer.png
diff --git a/plugins/gtk+/icons/16x16/widget-gtk-texttag.png 
b/plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-texttag.png
similarity index 100%
rename from plugins/gtk+/icons/16x16/widget-gtk-texttag.png
rename to plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-texttag.png
diff --git a/plugins/gtk+/icons/16x16/widget-gtk-texttagtable.png 
b/plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-texttagtable.png
similarity index 100%
rename from plugins/gtk+/icons/16x16/widget-gtk-texttagtable.png
rename to plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-texttagtable.png
diff --git a/plugins/gtk+/icons/16x16/widget-gtk-textview.png 
b/plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-textview.png
similarity index 100%
rename from plugins/gtk+/icons/16x16/widget-gtk-textview.png
rename to plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-textview.png
diff --git a/plugins/gtk+/icons/16x16/widget-gtk-toggleaction.png 
b/plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-toggleaction.png
similarity index 100%
rename from plugins/gtk+/icons/16x16/widget-gtk-toggleaction.png
rename to plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-toggleaction.png
diff --git a/plugins/gtk+/icons/16x16/widget-gtk-togglebutton.png 
b/plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-togglebutton.png
similarity index 100%
rename from plugins/gtk+/icons/16x16/widget-gtk-togglebutton.png
rename to plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-togglebutton.png
diff --git a/plugins/gtk+/icons/16x16/widget-gtk-toggletoolbutton.png 
b/plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-toggletoolbutton.png
similarity index 100%
rename from plugins/gtk+/icons/16x16/widget-gtk-toggletoolbutton.png
rename to plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-toggletoolbutton.png
diff --git a/plugins/gtk+/icons/16x16/widget-gtk-toolbar.png 
b/plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-toolbar.png
similarity index 100%
rename from plugins/gtk+/icons/16x16/widget-gtk-toolbar.png
rename to plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-toolbar.png
diff --git a/plugins/gtk+/icons/16x16/widget-gtk-toolbutton.png 
b/plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-toolbutton.png
similarity index 100%
rename from plugins/gtk+/icons/16x16/widget-gtk-toolbutton.png
rename to plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-toolbutton.png
diff --git a/plugins/gtk+/icons/16x16/widget-gtk-toolitem.png 
b/plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-toolitem.png
similarity index 100%
rename from plugins/gtk+/icons/16x16/widget-gtk-toolitem.png
rename to plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-toolitem.png
diff --git a/plugins/gtk+/icons/16x16/widget-gtk-toolitemgroup.png 
b/plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-toolitemgroup.png
similarity index 100%
rename from plugins/gtk+/icons/16x16/widget-gtk-toolitemgroup.png
rename to plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-toolitemgroup.png
diff --git a/plugins/gtk+/icons/16x16/widget-gtk-toolpalette.png 
b/plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-toolpalette.png
similarity index 100%
rename from plugins/gtk+/icons/16x16/widget-gtk-toolpalette.png
rename to plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-toolpalette.png
diff --git a/plugins/gtk+/icons/16x16/widget-gtk-treemodelfilter.png 
b/plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-treemodelfilter.png
similarity index 100%
rename from plugins/gtk+/icons/16x16/widget-gtk-treemodelfilter.png
rename to plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-treemodelfilter.png
diff --git a/plugins/gtk+/icons/16x16/widget-gtk-treemodelsort.png 
b/plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-treemodelsort.png
similarity index 100%
rename from plugins/gtk+/icons/16x16/widget-gtk-treemodelsort.png
rename to plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-treemodelsort.png
diff --git a/plugins/gtk+/icons/16x16/widget-gtk-treeselection.png 
b/plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-treeselection.png
similarity index 100%
rename from plugins/gtk+/icons/16x16/widget-gtk-treeselection.png
rename to plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-treeselection.png
diff --git a/plugins/gtk+/icons/16x16/widget-gtk-treestore.png 
b/plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-treestore.png
similarity index 100%
rename from plugins/gtk+/icons/16x16/widget-gtk-treestore.png
rename to plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-treestore.png
diff --git a/plugins/gtk+/icons/16x16/widget-gtk-treeview.png 
b/plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-treeview.png
similarity index 100%
rename from plugins/gtk+/icons/16x16/widget-gtk-treeview.png
rename to plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-treeview.png
diff --git a/plugins/gtk+/icons/16x16/widget-gtk-treeviewcolumn.png 
b/plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-treeviewcolumn.png
similarity index 100%
rename from plugins/gtk+/icons/16x16/widget-gtk-treeviewcolumn.png
rename to plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-treeviewcolumn.png
diff --git a/plugins/gtk+/icons/16x16/widget-gtk-uimanager.png 
b/plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-uimanager.png
similarity index 100%
rename from plugins/gtk+/icons/16x16/widget-gtk-uimanager.png
rename to plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-uimanager.png
diff --git a/plugins/gtk+/icons/16x16/widget-gtk-vbox.png 
b/plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-vbox.png
similarity index 100%
rename from plugins/gtk+/icons/16x16/widget-gtk-vbox.png
rename to plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-vbox.png
diff --git a/plugins/gtk+/icons/16x16/widget-gtk-vbuttonbox.png 
b/plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-vbuttonbox.png
similarity index 100%
rename from plugins/gtk+/icons/16x16/widget-gtk-vbuttonbox.png
rename to plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-vbuttonbox.png
diff --git a/plugins/gtk+/icons/16x16/widget-gtk-viewport.png 
b/plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-viewport.png
similarity index 100%
rename from plugins/gtk+/icons/16x16/widget-gtk-viewport.png
rename to plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-viewport.png
diff --git a/plugins/gtk+/icons/16x16/widget-gtk-volumebutton.png 
b/plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-volumebutton.png
similarity index 100%
rename from plugins/gtk+/icons/16x16/widget-gtk-volumebutton.png
rename to plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-volumebutton.png
diff --git a/plugins/gtk+/icons/16x16/widget-gtk-vpaned.png 
b/plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-vpaned.png
similarity index 100%
rename from plugins/gtk+/icons/16x16/widget-gtk-vpaned.png
rename to plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-vpaned.png
diff --git a/plugins/gtk+/icons/16x16/widget-gtk-vscale.png 
b/plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-vscale.png
similarity index 100%
rename from plugins/gtk+/icons/16x16/widget-gtk-vscale.png
rename to plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-vscale.png
diff --git a/plugins/gtk+/icons/16x16/widget-gtk-vscrollbar.png 
b/plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-vscrollbar.png
similarity index 100%
rename from plugins/gtk+/icons/16x16/widget-gtk-vscrollbar.png
rename to plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-vscrollbar.png
diff --git a/plugins/gtk+/icons/16x16/widget-gtk-vseparator.png 
b/plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-vseparator.png
similarity index 100%
rename from plugins/gtk+/icons/16x16/widget-gtk-vseparator.png
rename to plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-vseparator.png
diff --git a/plugins/gtk+/icons/16x16/widget-gtk-window.png 
b/plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-window.png
similarity index 100%
rename from plugins/gtk+/icons/16x16/widget-gtk-window.png
rename to plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-window.png
diff --git a/plugins/gtk+/icons/16x16/widget-gtk-windowgroup.png 
b/plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-windowgroup.png
similarity index 100%
rename from plugins/gtk+/icons/16x16/widget-gtk-windowgroup.png
rename to plugins/gtk+/icons/hicolor/16x16/actions/widget-gtk-windowgroup.png
diff --git a/plugins/gtk+/icons/22x22/widget-gtk-aboutdialog.png 
b/plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-aboutdialog.png
similarity index 100%
rename from plugins/gtk+/icons/22x22/widget-gtk-aboutdialog.png
rename to plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-aboutdialog.png
diff --git a/plugins/gtk+/icons/22x22/widget-gtk-accelgroup.png 
b/plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-accelgroup.png
similarity index 100%
rename from plugins/gtk+/icons/22x22/widget-gtk-accelgroup.png
rename to plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-accelgroup.png
diff --git a/plugins/gtk+/icons/22x22/widget-gtk-accellabel.png 
b/plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-accellabel.png
similarity index 100%
rename from plugins/gtk+/icons/22x22/widget-gtk-accellabel.png
rename to plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-accellabel.png
diff --git a/plugins/gtk+/icons/22x22/widget-gtk-action.png 
b/plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-action.png
similarity index 100%
rename from plugins/gtk+/icons/22x22/widget-gtk-action.png
rename to plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-action.png
diff --git a/plugins/gtk+/icons/22x22/widget-gtk-actionbar.png 
b/plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-actionbar.png
similarity index 100%
rename from plugins/gtk+/icons/22x22/widget-gtk-actionbar.png
rename to plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-actionbar.png
diff --git a/plugins/gtk+/icons/22x22/widget-gtk-actiongroup.png 
b/plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-actiongroup.png
similarity index 100%
rename from plugins/gtk+/icons/22x22/widget-gtk-actiongroup.png
rename to plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-actiongroup.png
diff --git a/plugins/gtk+/icons/22x22/widget-gtk-adjustment.png 
b/plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-adjustment.png
similarity index 100%
rename from plugins/gtk+/icons/22x22/widget-gtk-adjustment.png
rename to plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-adjustment.png
diff --git a/plugins/gtk+/icons/22x22/widget-gtk-alignment.png 
b/plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-alignment.png
similarity index 100%
rename from plugins/gtk+/icons/22x22/widget-gtk-alignment.png
rename to plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-alignment.png
diff --git a/plugins/gtk+/icons/22x22/widget-gtk-appchooserbutton.png 
b/plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-appchooserbutton.png
similarity index 100%
rename from plugins/gtk+/icons/22x22/widget-gtk-appchooserbutton.png
rename to plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-appchooserbutton.png
diff --git a/plugins/gtk+/icons/22x22/widget-gtk-appchooserdialog.png 
b/plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-appchooserdialog.png
similarity index 100%
rename from plugins/gtk+/icons/22x22/widget-gtk-appchooserdialog.png
rename to plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-appchooserdialog.png
diff --git a/plugins/gtk+/icons/22x22/widget-gtk-appchooserwidget.png 
b/plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-appchooserwidget.png
similarity index 100%
rename from plugins/gtk+/icons/22x22/widget-gtk-appchooserwidget.png
rename to plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-appchooserwidget.png
diff --git a/plugins/gtk+/icons/22x22/widget-gtk-arrow.png 
b/plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-arrow.png
similarity index 100%
rename from plugins/gtk+/icons/22x22/widget-gtk-arrow.png
rename to plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-arrow.png
diff --git a/plugins/gtk+/icons/22x22/widget-gtk-aspectframe.png 
b/plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-aspectframe.png
similarity index 100%
rename from plugins/gtk+/icons/22x22/widget-gtk-aspectframe.png
rename to plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-aspectframe.png
diff --git a/plugins/gtk+/icons/22x22/widget-gtk-assistant.png 
b/plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-assistant.png
similarity index 100%
rename from plugins/gtk+/icons/22x22/widget-gtk-assistant.png
rename to plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-assistant.png
diff --git a/plugins/gtk+/icons/22x22/widget-gtk-box.png 
b/plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-box.png
similarity index 100%
rename from plugins/gtk+/icons/22x22/widget-gtk-box.png
rename to plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-box.png
diff --git a/plugins/gtk+/icons/22x22/widget-gtk-button.png 
b/plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-button.png
similarity index 100%
rename from plugins/gtk+/icons/22x22/widget-gtk-button.png
rename to plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-button.png
diff --git a/plugins/gtk+/icons/22x22/widget-gtk-buttonbox.png 
b/plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-buttonbox.png
similarity index 100%
rename from plugins/gtk+/icons/22x22/widget-gtk-buttonbox.png
rename to plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-buttonbox.png
diff --git a/plugins/gtk+/icons/22x22/widget-gtk-calendar.png 
b/plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-calendar.png
similarity index 100%
rename from plugins/gtk+/icons/22x22/widget-gtk-calendar.png
rename to plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-calendar.png
diff --git a/plugins/gtk+/icons/22x22/widget-gtk-cellareabox.png 
b/plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-cellareabox.png
similarity index 100%
rename from plugins/gtk+/icons/22x22/widget-gtk-cellareabox.png
rename to plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-cellareabox.png
diff --git a/plugins/gtk+/icons/22x22/widget-gtk-cellrendereraccel.png 
b/plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-cellrendereraccel.png
similarity index 100%
rename from plugins/gtk+/icons/22x22/widget-gtk-cellrendereraccel.png
rename to plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-cellrendereraccel.png
diff --git a/plugins/gtk+/icons/22x22/widget-gtk-cellrenderercombo.png 
b/plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-cellrenderercombo.png
similarity index 100%
rename from plugins/gtk+/icons/22x22/widget-gtk-cellrenderercombo.png
rename to plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-cellrenderercombo.png
diff --git a/plugins/gtk+/icons/22x22/widget-gtk-cellrendererpixbuf.png 
b/plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-cellrendererpixbuf.png
similarity index 100%
rename from plugins/gtk+/icons/22x22/widget-gtk-cellrendererpixbuf.png
rename to plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-cellrendererpixbuf.png
diff --git a/plugins/gtk+/icons/22x22/widget-gtk-cellrendererprogress.png 
b/plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-cellrendererprogress.png
similarity index 100%
rename from plugins/gtk+/icons/22x22/widget-gtk-cellrendererprogress.png
rename to plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-cellrendererprogress.png
diff --git a/plugins/gtk+/icons/22x22/widget-gtk-cellrendererspin.png 
b/plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-cellrendererspin.png
similarity index 100%
rename from plugins/gtk+/icons/22x22/widget-gtk-cellrendererspin.png
rename to plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-cellrendererspin.png
diff --git a/plugins/gtk+/icons/22x22/widget-gtk-cellrendererspinner.png 
b/plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-cellrendererspinner.png
similarity index 100%
rename from plugins/gtk+/icons/22x22/widget-gtk-cellrendererspinner.png
rename to plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-cellrendererspinner.png
diff --git a/plugins/gtk+/icons/22x22/widget-gtk-cellrenderertext.png 
b/plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-cellrenderertext.png
similarity index 100%
rename from plugins/gtk+/icons/22x22/widget-gtk-cellrenderertext.png
rename to plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-cellrenderertext.png
diff --git a/plugins/gtk+/icons/22x22/widget-gtk-cellrenderertoggle.png 
b/plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-cellrenderertoggle.png
similarity index 100%
rename from plugins/gtk+/icons/22x22/widget-gtk-cellrenderertoggle.png
rename to plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-cellrenderertoggle.png
diff --git a/plugins/gtk+/icons/22x22/widget-gtk-checkbutton.png 
b/plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-checkbutton.png
similarity index 100%
rename from plugins/gtk+/icons/22x22/widget-gtk-checkbutton.png
rename to plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-checkbutton.png
diff --git a/plugins/gtk+/icons/22x22/widget-gtk-checkmenuitem.png 
b/plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-checkmenuitem.png
similarity index 100%
rename from plugins/gtk+/icons/22x22/widget-gtk-checkmenuitem.png
rename to plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-checkmenuitem.png
diff --git a/plugins/gtk+/icons/22x22/widget-gtk-colorbutton.png 
b/plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-colorbutton.png
similarity index 100%
rename from plugins/gtk+/icons/22x22/widget-gtk-colorbutton.png
rename to plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-colorbutton.png
diff --git a/plugins/gtk+/icons/22x22/widget-gtk-colorselection.png 
b/plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-colorselection.png
similarity index 100%
rename from plugins/gtk+/icons/22x22/widget-gtk-colorselection.png
rename to plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-colorselection.png
diff --git a/plugins/gtk+/icons/22x22/widget-gtk-colorselectiondialog.png 
b/plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-colorselectiondialog.png
similarity index 100%
rename from plugins/gtk+/icons/22x22/widget-gtk-colorselectiondialog.png
rename to plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-colorselectiondialog.png
diff --git a/plugins/gtk+/icons/22x22/widget-gtk-combobox.png 
b/plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-combobox.png
similarity index 100%
rename from plugins/gtk+/icons/22x22/widget-gtk-combobox.png
rename to plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-combobox.png
diff --git a/plugins/gtk+/icons/22x22/widget-gtk-comboboxtext.png 
b/plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-comboboxtext.png
similarity index 100%
rename from plugins/gtk+/icons/22x22/widget-gtk-comboboxtext.png
rename to plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-comboboxtext.png
diff --git a/plugins/gtk+/icons/22x22/widget-gtk-custom.png 
b/plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-custom.png
similarity index 100%
rename from plugins/gtk+/icons/22x22/widget-gtk-custom.png
rename to plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-custom.png
diff --git a/plugins/gtk+/icons/22x22/widget-gtk-default.png 
b/plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-default.png
similarity index 100%
rename from plugins/gtk+/icons/22x22/widget-gtk-default.png
rename to plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-default.png
diff --git a/plugins/gtk+/icons/22x22/widget-gtk-dialog.png 
b/plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-dialog.png
similarity index 100%
rename from plugins/gtk+/icons/22x22/widget-gtk-dialog.png
rename to plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-dialog.png
diff --git a/plugins/gtk+/icons/22x22/widget-gtk-drawingarea.png 
b/plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-drawingarea.png
similarity index 100%
rename from plugins/gtk+/icons/22x22/widget-gtk-drawingarea.png
rename to plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-drawingarea.png
diff --git a/plugins/gtk+/icons/22x22/widget-gtk-entry.png 
b/plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-entry.png
similarity index 100%
rename from plugins/gtk+/icons/22x22/widget-gtk-entry.png
rename to plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-entry.png
diff --git a/plugins/gtk+/icons/22x22/widget-gtk-entrybuffer.png 
b/plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-entrybuffer.png
similarity index 100%
rename from plugins/gtk+/icons/22x22/widget-gtk-entrybuffer.png
rename to plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-entrybuffer.png
diff --git a/plugins/gtk+/icons/22x22/widget-gtk-entrycompletion.png 
b/plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-entrycompletion.png
similarity index 100%
rename from plugins/gtk+/icons/22x22/widget-gtk-entrycompletion.png
rename to plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-entrycompletion.png
diff --git a/plugins/gtk+/icons/22x22/widget-gtk-eventbox.png 
b/plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-eventbox.png
similarity index 100%
rename from plugins/gtk+/icons/22x22/widget-gtk-eventbox.png
rename to plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-eventbox.png
diff --git a/plugins/gtk+/icons/22x22/widget-gtk-expander.png 
b/plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-expander.png
similarity index 100%
rename from plugins/gtk+/icons/22x22/widget-gtk-expander.png
rename to plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-expander.png
diff --git a/plugins/gtk+/icons/22x22/widget-gtk-filechooserbutton.png 
b/plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-filechooserbutton.png
similarity index 100%
rename from plugins/gtk+/icons/22x22/widget-gtk-filechooserbutton.png
rename to plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-filechooserbutton.png
diff --git a/plugins/gtk+/icons/22x22/widget-gtk-filechooserdialog.png 
b/plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-filechooserdialog.png
similarity index 100%
rename from plugins/gtk+/icons/22x22/widget-gtk-filechooserdialog.png
rename to plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-filechooserdialog.png
diff --git a/plugins/gtk+/icons/22x22/widget-gtk-filechooserwidget.png 
b/plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-filechooserwidget.png
similarity index 100%
rename from plugins/gtk+/icons/22x22/widget-gtk-filechooserwidget.png
rename to plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-filechooserwidget.png
diff --git a/plugins/gtk+/icons/22x22/widget-gtk-filefilter.png 
b/plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-filefilter.png
similarity index 100%
rename from plugins/gtk+/icons/22x22/widget-gtk-filefilter.png
rename to plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-filefilter.png
diff --git a/plugins/gtk+/icons/22x22/widget-gtk-fixed.png 
b/plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-fixed.png
similarity index 100%
rename from plugins/gtk+/icons/22x22/widget-gtk-fixed.png
rename to plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-fixed.png
diff --git a/plugins/gtk+/icons/22x22/widget-gtk-flowbox.png 
b/plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-flowbox.png
similarity index 100%
rename from plugins/gtk+/icons/22x22/widget-gtk-flowbox.png
rename to plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-flowbox.png
diff --git a/plugins/gtk+/icons/22x22/widget-gtk-flowboxchild.png 
b/plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-flowboxchild.png
similarity index 100%
rename from plugins/gtk+/icons/22x22/widget-gtk-flowboxchild.png
rename to plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-flowboxchild.png
diff --git a/plugins/gtk+/icons/22x22/widget-gtk-fontbutton.png 
b/plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-fontbutton.png
similarity index 100%
rename from plugins/gtk+/icons/22x22/widget-gtk-fontbutton.png
rename to plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-fontbutton.png
diff --git a/plugins/gtk+/icons/22x22/widget-gtk-fontselection.png 
b/plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-fontselection.png
similarity index 100%
rename from plugins/gtk+/icons/22x22/widget-gtk-fontselection.png
rename to plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-fontselection.png
diff --git a/plugins/gtk+/icons/22x22/widget-gtk-fontselectiondialog.png 
b/plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-fontselectiondialog.png
similarity index 100%
rename from plugins/gtk+/icons/22x22/widget-gtk-fontselectiondialog.png
rename to plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-fontselectiondialog.png
diff --git a/plugins/gtk+/icons/22x22/widget-gtk-frame.png 
b/plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-frame.png
similarity index 100%
rename from plugins/gtk+/icons/22x22/widget-gtk-frame.png
rename to plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-frame.png
diff --git a/plugins/gtk+/icons/22x22/widget-gtk-glarea.png 
b/plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-glarea.png
similarity index 100%
rename from plugins/gtk+/icons/22x22/widget-gtk-glarea.png
rename to plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-glarea.png
diff --git a/plugins/gtk+/icons/22x22/widget-gtk-grid.png 
b/plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-grid.png
similarity index 100%
rename from plugins/gtk+/icons/22x22/widget-gtk-grid.png
rename to plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-grid.png
diff --git a/plugins/gtk+/icons/22x22/widget-gtk-handlebox.png 
b/plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-handlebox.png
similarity index 100%
rename from plugins/gtk+/icons/22x22/widget-gtk-handlebox.png
rename to plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-handlebox.png
diff --git a/plugins/gtk+/icons/22x22/widget-gtk-hbox.png 
b/plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-hbox.png
similarity index 100%
rename from plugins/gtk+/icons/22x22/widget-gtk-hbox.png
rename to plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-hbox.png
diff --git a/plugins/gtk+/icons/22x22/widget-gtk-hbuttonbox.png 
b/plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-hbuttonbox.png
similarity index 100%
rename from plugins/gtk+/icons/22x22/widget-gtk-hbuttonbox.png
rename to plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-hbuttonbox.png
diff --git a/plugins/gtk+/icons/22x22/widget-gtk-headerbar.png 
b/plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-headerbar.png
similarity index 100%
rename from plugins/gtk+/icons/22x22/widget-gtk-headerbar.png
rename to plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-headerbar.png
diff --git a/plugins/gtk+/icons/22x22/widget-gtk-hpaned.png 
b/plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-hpaned.png
similarity index 100%
rename from plugins/gtk+/icons/22x22/widget-gtk-hpaned.png
rename to plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-hpaned.png
diff --git a/plugins/gtk+/icons/22x22/widget-gtk-hscale.png 
b/plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-hscale.png
similarity index 100%
rename from plugins/gtk+/icons/22x22/widget-gtk-hscale.png
rename to plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-hscale.png
diff --git a/plugins/gtk+/icons/22x22/widget-gtk-hscrollbar.png 
b/plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-hscrollbar.png
similarity index 100%
rename from plugins/gtk+/icons/22x22/widget-gtk-hscrollbar.png
rename to plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-hscrollbar.png
diff --git a/plugins/gtk+/icons/22x22/widget-gtk-hseparator.png 
b/plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-hseparator.png
similarity index 100%
rename from plugins/gtk+/icons/22x22/widget-gtk-hseparator.png
rename to plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-hseparator.png
diff --git a/plugins/gtk+/icons/22x22/widget-gtk-iconfactory.png 
b/plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-iconfactory.png
similarity index 100%
rename from plugins/gtk+/icons/22x22/widget-gtk-iconfactory.png
rename to plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-iconfactory.png
diff --git a/plugins/gtk+/icons/22x22/widget-gtk-iconview.png 
b/plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-iconview.png
similarity index 100%
rename from plugins/gtk+/icons/22x22/widget-gtk-iconview.png
rename to plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-iconview.png
diff --git a/plugins/gtk+/icons/22x22/widget-gtk-image.png 
b/plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-image.png
similarity index 100%
rename from plugins/gtk+/icons/22x22/widget-gtk-image.png
rename to plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-image.png
diff --git a/plugins/gtk+/icons/22x22/widget-gtk-imagemenuitem.png 
b/plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-imagemenuitem.png
similarity index 100%
rename from plugins/gtk+/icons/22x22/widget-gtk-imagemenuitem.png
rename to plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-imagemenuitem.png
diff --git a/plugins/gtk+/icons/22x22/widget-gtk-infobar.png 
b/plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-infobar.png
similarity index 100%
rename from plugins/gtk+/icons/22x22/widget-gtk-infobar.png
rename to plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-infobar.png
diff --git a/plugins/gtk+/icons/22x22/widget-gtk-inputdialog.png 
b/plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-inputdialog.png
similarity index 100%
rename from plugins/gtk+/icons/22x22/widget-gtk-inputdialog.png
rename to plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-inputdialog.png
diff --git a/plugins/gtk+/icons/22x22/widget-gtk-label.png 
b/plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-label.png
similarity index 100%
rename from plugins/gtk+/icons/22x22/widget-gtk-label.png
rename to plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-label.png
diff --git a/plugins/gtk+/icons/22x22/widget-gtk-layout.png 
b/plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-layout.png
similarity index 100%
rename from plugins/gtk+/icons/22x22/widget-gtk-layout.png
rename to plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-layout.png
diff --git a/plugins/gtk+/icons/22x22/widget-gtk-levelbar.png 
b/plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-levelbar.png
similarity index 100%
rename from plugins/gtk+/icons/22x22/widget-gtk-levelbar.png
rename to plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-levelbar.png
diff --git a/plugins/gtk+/icons/22x22/widget-gtk-linkbutton.png 
b/plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-linkbutton.png
similarity index 100%
rename from plugins/gtk+/icons/22x22/widget-gtk-linkbutton.png
rename to plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-linkbutton.png
diff --git a/plugins/gtk+/icons/22x22/widget-gtk-listbox.png 
b/plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-listbox.png
similarity index 100%
rename from plugins/gtk+/icons/22x22/widget-gtk-listbox.png
rename to plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-listbox.png
diff --git a/plugins/gtk+/icons/22x22/widget-gtk-listboxrow.png 
b/plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-listboxrow.png
similarity index 100%
rename from plugins/gtk+/icons/22x22/widget-gtk-listboxrow.png
rename to plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-listboxrow.png
diff --git a/plugins/gtk+/icons/22x22/widget-gtk-liststore.png 
b/plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-liststore.png
similarity index 100%
rename from plugins/gtk+/icons/22x22/widget-gtk-liststore.png
rename to plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-liststore.png
diff --git a/plugins/gtk+/icons/22x22/widget-gtk-lockbutton.png 
b/plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-lockbutton.png
similarity index 100%
rename from plugins/gtk+/icons/22x22/widget-gtk-lockbutton.png
rename to plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-lockbutton.png
diff --git a/plugins/gtk+/icons/22x22/widget-gtk-menu.png 
b/plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-menu.png
similarity index 100%
rename from plugins/gtk+/icons/22x22/widget-gtk-menu.png
rename to plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-menu.png
diff --git a/plugins/gtk+/icons/22x22/widget-gtk-menubar.png 
b/plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-menubar.png
similarity index 100%
rename from plugins/gtk+/icons/22x22/widget-gtk-menubar.png
rename to plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-menubar.png
diff --git a/plugins/gtk+/icons/22x22/widget-gtk-menubutton.png 
b/plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-menubutton.png
similarity index 100%
rename from plugins/gtk+/icons/22x22/widget-gtk-menubutton.png
rename to plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-menubutton.png
diff --git a/plugins/gtk+/icons/22x22/widget-gtk-menuitem.png 
b/plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-menuitem.png
similarity index 100%
rename from plugins/gtk+/icons/22x22/widget-gtk-menuitem.png
rename to plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-menuitem.png
diff --git a/plugins/gtk+/icons/22x22/widget-gtk-menutoolbutton.png 
b/plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-menutoolbutton.png
similarity index 100%
rename from plugins/gtk+/icons/22x22/widget-gtk-menutoolbutton.png
rename to plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-menutoolbutton.png
diff --git a/plugins/gtk+/icons/22x22/widget-gtk-messagedialog.png 
b/plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-messagedialog.png
similarity index 100%
rename from plugins/gtk+/icons/22x22/widget-gtk-messagedialog.png
rename to plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-messagedialog.png
diff --git a/plugins/gtk+/icons/22x22/widget-gtk-modelbutton.png 
b/plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-modelbutton.png
similarity index 100%
rename from plugins/gtk+/icons/22x22/widget-gtk-modelbutton.png
rename to plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-modelbutton.png
diff --git a/plugins/gtk+/icons/22x22/widget-gtk-notebook.png 
b/plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-notebook.png
similarity index 100%
rename from plugins/gtk+/icons/22x22/widget-gtk-notebook.png
rename to plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-notebook.png
diff --git a/plugins/gtk+/icons/22x22/widget-gtk-offscreenwindow.png 
b/plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-offscreenwindow.png
similarity index 100%
rename from plugins/gtk+/icons/22x22/widget-gtk-offscreenwindow.png
rename to plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-offscreenwindow.png
diff --git a/plugins/gtk+/icons/22x22/widget-gtk-overlay.png 
b/plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-overlay.png
similarity index 100%
rename from plugins/gtk+/icons/22x22/widget-gtk-overlay.png
rename to plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-overlay.png
diff --git a/plugins/gtk+/icons/22x22/widget-gtk-pagesetupdialog.png 
b/plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-pagesetupdialog.png
similarity index 100%
rename from plugins/gtk+/icons/22x22/widget-gtk-pagesetupdialog.png
rename to plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-pagesetupdialog.png
diff --git a/plugins/gtk+/icons/22x22/widget-gtk-paned.png 
b/plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-paned.png
similarity index 100%
rename from plugins/gtk+/icons/22x22/widget-gtk-paned.png
rename to plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-paned.png
diff --git a/plugins/gtk+/icons/22x22/widget-gtk-placessidebar.png 
b/plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-placessidebar.png
similarity index 100%
rename from plugins/gtk+/icons/22x22/widget-gtk-placessidebar.png
rename to plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-placessidebar.png
diff --git a/plugins/gtk+/icons/22x22/widget-gtk-popover.png 
b/plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-popover.png
similarity index 100%
rename from plugins/gtk+/icons/22x22/widget-gtk-popover.png
rename to plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-popover.png
diff --git a/plugins/gtk+/icons/22x22/widget-gtk-popovermenu.png 
b/plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-popovermenu.png
similarity index 100%
rename from plugins/gtk+/icons/22x22/widget-gtk-popovermenu.png
rename to plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-popovermenu.png
diff --git a/plugins/gtk+/icons/22x22/widget-gtk-printdialog.png 
b/plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-printdialog.png
similarity index 100%
rename from plugins/gtk+/icons/22x22/widget-gtk-printdialog.png
rename to plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-printdialog.png
diff --git a/plugins/gtk+/icons/22x22/widget-gtk-progressbar.png 
b/plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-progressbar.png
similarity index 100%
rename from plugins/gtk+/icons/22x22/widget-gtk-progressbar.png
rename to plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-progressbar.png
diff --git a/plugins/gtk+/icons/22x22/widget-gtk-radioaction.png 
b/plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-radioaction.png
similarity index 100%
rename from plugins/gtk+/icons/22x22/widget-gtk-radioaction.png
rename to plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-radioaction.png
diff --git a/plugins/gtk+/icons/22x22/widget-gtk-radiobutton.png 
b/plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-radiobutton.png
similarity index 100%
rename from plugins/gtk+/icons/22x22/widget-gtk-radiobutton.png
rename to plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-radiobutton.png
diff --git a/plugins/gtk+/icons/22x22/widget-gtk-radiomenuitem.png 
b/plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-radiomenuitem.png
similarity index 100%
rename from plugins/gtk+/icons/22x22/widget-gtk-radiomenuitem.png
rename to plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-radiomenuitem.png
diff --git a/plugins/gtk+/icons/22x22/widget-gtk-radiotoolbutton.png 
b/plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-radiotoolbutton.png
similarity index 100%
rename from plugins/gtk+/icons/22x22/widget-gtk-radiotoolbutton.png
rename to plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-radiotoolbutton.png
diff --git a/plugins/gtk+/icons/22x22/widget-gtk-recentaction.png 
b/plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-recentaction.png
similarity index 100%
rename from plugins/gtk+/icons/22x22/widget-gtk-recentaction.png
rename to plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-recentaction.png
diff --git a/plugins/gtk+/icons/22x22/widget-gtk-recentchooser.png 
b/plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-recentchooser.png
similarity index 100%
rename from plugins/gtk+/icons/22x22/widget-gtk-recentchooser.png
rename to plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-recentchooser.png
diff --git a/plugins/gtk+/icons/22x22/widget-gtk-recentchooserdialog.png 
b/plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-recentchooserdialog.png
similarity index 100%
rename from plugins/gtk+/icons/22x22/widget-gtk-recentchooserdialog.png
rename to plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-recentchooserdialog.png
diff --git a/plugins/gtk+/icons/22x22/widget-gtk-recentchoosermenu.png 
b/plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-recentchoosermenu.png
similarity index 100%
rename from plugins/gtk+/icons/22x22/widget-gtk-recentchoosermenu.png
rename to plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-recentchoosermenu.png
diff --git a/plugins/gtk+/icons/22x22/widget-gtk-recentfilter.png 
b/plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-recentfilter.png
similarity index 100%
rename from plugins/gtk+/icons/22x22/widget-gtk-recentfilter.png
rename to plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-recentfilter.png
diff --git a/plugins/gtk+/icons/22x22/widget-gtk-recentmanager.png 
b/plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-recentmanager.png
similarity index 100%
rename from plugins/gtk+/icons/22x22/widget-gtk-recentmanager.png
rename to plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-recentmanager.png
diff --git a/plugins/gtk+/icons/22x22/widget-gtk-revealer.png 
b/plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-revealer.png
similarity index 100%
rename from plugins/gtk+/icons/22x22/widget-gtk-revealer.png
rename to plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-revealer.png
diff --git a/plugins/gtk+/icons/22x22/widget-gtk-scale.png 
b/plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-scale.png
similarity index 100%
rename from plugins/gtk+/icons/22x22/widget-gtk-scale.png
rename to plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-scale.png
diff --git a/plugins/gtk+/icons/22x22/widget-gtk-scalebutton.png 
b/plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-scalebutton.png
similarity index 100%
rename from plugins/gtk+/icons/22x22/widget-gtk-scalebutton.png
rename to plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-scalebutton.png
diff --git a/plugins/gtk+/icons/22x22/widget-gtk-scrollbar.png 
b/plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-scrollbar.png
similarity index 100%
rename from plugins/gtk+/icons/22x22/widget-gtk-scrollbar.png
rename to plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-scrollbar.png
diff --git a/plugins/gtk+/icons/22x22/widget-gtk-scrolledwindow.png 
b/plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-scrolledwindow.png
similarity index 100%
rename from plugins/gtk+/icons/22x22/widget-gtk-scrolledwindow.png
rename to plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-scrolledwindow.png
diff --git a/plugins/gtk+/icons/22x22/widget-gtk-searchbar.png 
b/plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-searchbar.png
similarity index 100%
rename from plugins/gtk+/icons/22x22/widget-gtk-searchbar.png
rename to plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-searchbar.png
diff --git a/plugins/gtk+/icons/22x22/widget-gtk-searchentry.png 
b/plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-searchentry.png
similarity index 100%
rename from plugins/gtk+/icons/22x22/widget-gtk-searchentry.png
rename to plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-searchentry.png
diff --git a/plugins/gtk+/icons/22x22/widget-gtk-separator.png 
b/plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-separator.png
similarity index 100%
rename from plugins/gtk+/icons/22x22/widget-gtk-separator.png
rename to plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-separator.png
diff --git a/plugins/gtk+/icons/22x22/widget-gtk-separatormenuitem.png 
b/plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-separatormenuitem.png
similarity index 100%
rename from plugins/gtk+/icons/22x22/widget-gtk-separatormenuitem.png
rename to plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-separatormenuitem.png
diff --git a/plugins/gtk+/icons/22x22/widget-gtk-separatortoolitem.png 
b/plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-separatortoolitem.png
similarity index 100%
rename from plugins/gtk+/icons/22x22/widget-gtk-separatortoolitem.png
rename to plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-separatortoolitem.png
diff --git a/plugins/gtk+/icons/22x22/widget-gtk-sizegroup.png 
b/plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-sizegroup.png
similarity index 100%
rename from plugins/gtk+/icons/22x22/widget-gtk-sizegroup.png
rename to plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-sizegroup.png
diff --git a/plugins/gtk+/icons/22x22/widget-gtk-spinbutton.png 
b/plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-spinbutton.png
similarity index 100%
rename from plugins/gtk+/icons/22x22/widget-gtk-spinbutton.png
rename to plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-spinbutton.png
diff --git a/plugins/gtk+/icons/22x22/widget-gtk-spinner.png 
b/plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-spinner.png
similarity index 100%
rename from plugins/gtk+/icons/22x22/widget-gtk-spinner.png
rename to plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-spinner.png
diff --git a/plugins/gtk+/icons/22x22/widget-gtk-stack.png 
b/plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-stack.png
similarity index 100%
rename from plugins/gtk+/icons/22x22/widget-gtk-stack.png
rename to plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-stack.png
diff --git a/plugins/gtk+/icons/22x22/widget-gtk-stacksidebar.png 
b/plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-stacksidebar.png
similarity index 100%
rename from plugins/gtk+/icons/22x22/widget-gtk-stacksidebar.png
rename to plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-stacksidebar.png
diff --git a/plugins/gtk+/icons/22x22/widget-gtk-stackswitcher.png 
b/plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-stackswitcher.png
similarity index 100%
rename from plugins/gtk+/icons/22x22/widget-gtk-stackswitcher.png
rename to plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-stackswitcher.png
diff --git a/plugins/gtk+/icons/22x22/widget-gtk-statusbar.png 
b/plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-statusbar.png
similarity index 100%
rename from plugins/gtk+/icons/22x22/widget-gtk-statusbar.png
rename to plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-statusbar.png
diff --git a/plugins/gtk+/icons/22x22/widget-gtk-statusicon.png 
b/plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-statusicon.png
similarity index 100%
rename from plugins/gtk+/icons/22x22/widget-gtk-statusicon.png
rename to plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-statusicon.png
diff --git a/plugins/gtk+/icons/22x22/widget-gtk-switch.png 
b/plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-switch.png
similarity index 100%
rename from plugins/gtk+/icons/22x22/widget-gtk-switch.png
rename to plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-switch.png
diff --git a/plugins/gtk+/icons/22x22/widget-gtk-table.png 
b/plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-table.png
similarity index 100%
rename from plugins/gtk+/icons/22x22/widget-gtk-table.png
rename to plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-table.png
diff --git a/plugins/gtk+/icons/22x22/widget-gtk-tearoffmenuitem.png 
b/plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-tearoffmenuitem.png
similarity index 100%
rename from plugins/gtk+/icons/22x22/widget-gtk-tearoffmenuitem.png
rename to plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-tearoffmenuitem.png
diff --git a/plugins/gtk+/icons/22x22/widget-gtk-textbuffer.png 
b/plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-textbuffer.png
similarity index 100%
rename from plugins/gtk+/icons/22x22/widget-gtk-textbuffer.png
rename to plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-textbuffer.png
diff --git a/plugins/gtk+/icons/22x22/widget-gtk-texttag.png 
b/plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-texttag.png
similarity index 100%
rename from plugins/gtk+/icons/22x22/widget-gtk-texttag.png
rename to plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-texttag.png
diff --git a/plugins/gtk+/icons/22x22/widget-gtk-texttagtable.png 
b/plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-texttagtable.png
similarity index 100%
rename from plugins/gtk+/icons/22x22/widget-gtk-texttagtable.png
rename to plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-texttagtable.png
diff --git a/plugins/gtk+/icons/22x22/widget-gtk-textview.png 
b/plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-textview.png
similarity index 100%
rename from plugins/gtk+/icons/22x22/widget-gtk-textview.png
rename to plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-textview.png
diff --git a/plugins/gtk+/icons/22x22/widget-gtk-toggleaction.png 
b/plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-toggleaction.png
similarity index 100%
rename from plugins/gtk+/icons/22x22/widget-gtk-toggleaction.png
rename to plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-toggleaction.png
diff --git a/plugins/gtk+/icons/22x22/widget-gtk-togglebutton.png 
b/plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-togglebutton.png
similarity index 100%
rename from plugins/gtk+/icons/22x22/widget-gtk-togglebutton.png
rename to plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-togglebutton.png
diff --git a/plugins/gtk+/icons/22x22/widget-gtk-toggletoolbutton.png 
b/plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-toggletoolbutton.png
similarity index 100%
rename from plugins/gtk+/icons/22x22/widget-gtk-toggletoolbutton.png
rename to plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-toggletoolbutton.png
diff --git a/plugins/gtk+/icons/22x22/widget-gtk-toolbar.png 
b/plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-toolbar.png
similarity index 100%
rename from plugins/gtk+/icons/22x22/widget-gtk-toolbar.png
rename to plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-toolbar.png
diff --git a/plugins/gtk+/icons/22x22/widget-gtk-toolbutton.png 
b/plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-toolbutton.png
similarity index 100%
rename from plugins/gtk+/icons/22x22/widget-gtk-toolbutton.png
rename to plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-toolbutton.png
diff --git a/plugins/gtk+/icons/22x22/widget-gtk-toolitem.png 
b/plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-toolitem.png
similarity index 100%
rename from plugins/gtk+/icons/22x22/widget-gtk-toolitem.png
rename to plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-toolitem.png
diff --git a/plugins/gtk+/icons/22x22/widget-gtk-toolitemgroup.png 
b/plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-toolitemgroup.png
similarity index 100%
rename from plugins/gtk+/icons/22x22/widget-gtk-toolitemgroup.png
rename to plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-toolitemgroup.png
diff --git a/plugins/gtk+/icons/22x22/widget-gtk-toolpalette.png 
b/plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-toolpalette.png
similarity index 100%
rename from plugins/gtk+/icons/22x22/widget-gtk-toolpalette.png
rename to plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-toolpalette.png
diff --git a/plugins/gtk+/icons/22x22/widget-gtk-treemodelfilter.png 
b/plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-treemodelfilter.png
similarity index 100%
rename from plugins/gtk+/icons/22x22/widget-gtk-treemodelfilter.png
rename to plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-treemodelfilter.png
diff --git a/plugins/gtk+/icons/22x22/widget-gtk-treemodelsort.png 
b/plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-treemodelsort.png
similarity index 100%
rename from plugins/gtk+/icons/22x22/widget-gtk-treemodelsort.png
rename to plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-treemodelsort.png
diff --git a/plugins/gtk+/icons/22x22/widget-gtk-treeselection.png 
b/plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-treeselection.png
similarity index 100%
rename from plugins/gtk+/icons/22x22/widget-gtk-treeselection.png
rename to plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-treeselection.png
diff --git a/plugins/gtk+/icons/22x22/widget-gtk-treestore.png 
b/plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-treestore.png
similarity index 100%
rename from plugins/gtk+/icons/22x22/widget-gtk-treestore.png
rename to plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-treestore.png
diff --git a/plugins/gtk+/icons/22x22/widget-gtk-treeview.png 
b/plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-treeview.png
similarity index 100%
rename from plugins/gtk+/icons/22x22/widget-gtk-treeview.png
rename to plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-treeview.png
diff --git a/plugins/gtk+/icons/22x22/widget-gtk-treeviewcolumn.png 
b/plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-treeviewcolumn.png
similarity index 100%
rename from plugins/gtk+/icons/22x22/widget-gtk-treeviewcolumn.png
rename to plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-treeviewcolumn.png
diff --git a/plugins/gtk+/icons/22x22/widget-gtk-uimanager.png 
b/plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-uimanager.png
similarity index 100%
rename from plugins/gtk+/icons/22x22/widget-gtk-uimanager.png
rename to plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-uimanager.png
diff --git a/plugins/gtk+/icons/22x22/widget-gtk-vbox.png 
b/plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-vbox.png
similarity index 100%
rename from plugins/gtk+/icons/22x22/widget-gtk-vbox.png
rename to plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-vbox.png
diff --git a/plugins/gtk+/icons/22x22/widget-gtk-vbuttonbox.png 
b/plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-vbuttonbox.png
similarity index 100%
rename from plugins/gtk+/icons/22x22/widget-gtk-vbuttonbox.png
rename to plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-vbuttonbox.png
diff --git a/plugins/gtk+/icons/22x22/widget-gtk-viewport.png 
b/plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-viewport.png
similarity index 100%
rename from plugins/gtk+/icons/22x22/widget-gtk-viewport.png
rename to plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-viewport.png
diff --git a/plugins/gtk+/icons/22x22/widget-gtk-volumebutton.png 
b/plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-volumebutton.png
similarity index 100%
rename from plugins/gtk+/icons/22x22/widget-gtk-volumebutton.png
rename to plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-volumebutton.png
diff --git a/plugins/gtk+/icons/22x22/widget-gtk-vpaned.png 
b/plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-vpaned.png
similarity index 100%
rename from plugins/gtk+/icons/22x22/widget-gtk-vpaned.png
rename to plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-vpaned.png
diff --git a/plugins/gtk+/icons/22x22/widget-gtk-vscale.png 
b/plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-vscale.png
similarity index 100%
rename from plugins/gtk+/icons/22x22/widget-gtk-vscale.png
rename to plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-vscale.png
diff --git a/plugins/gtk+/icons/22x22/widget-gtk-vscrollbar.png 
b/plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-vscrollbar.png
similarity index 100%
rename from plugins/gtk+/icons/22x22/widget-gtk-vscrollbar.png
rename to plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-vscrollbar.png
diff --git a/plugins/gtk+/icons/22x22/widget-gtk-vseparator.png 
b/plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-vseparator.png
similarity index 100%
rename from plugins/gtk+/icons/22x22/widget-gtk-vseparator.png
rename to plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-vseparator.png
diff --git a/plugins/gtk+/icons/22x22/widget-gtk-window.png 
b/plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-window.png
similarity index 100%
rename from plugins/gtk+/icons/22x22/widget-gtk-window.png
rename to plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-window.png
diff --git a/plugins/gtk+/icons/22x22/widget-gtk-windowgroup.png 
b/plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-windowgroup.png
similarity index 100%
rename from plugins/gtk+/icons/22x22/widget-gtk-windowgroup.png
rename to plugins/gtk+/icons/hicolor/22x22/actions/widget-gtk-windowgroup.png
diff --git a/plugins/gtk+/meson.build b/plugins/gtk+/meson.build
index f86dafeb..e375505e 100644
--- a/plugins/gtk+/meson.build
+++ b/plugins/gtk+/meson.build
@@ -1,5 +1,3 @@
-subdir('icons')
-
 sources = files(
   'glade-about-dialog-editor.c',
   'glade-accels.c',
@@ -246,3 +244,17 @@ install_data(
   catalog_data,
   install_dir: glade_datadir / glade_catalogdir,
 )
+
+exclude_data = [
+  '16x16/actions/widget-gtk-custom.png',
+  '16x16/actions/widget-gtk-gtktextview.png',
+  '16x16/actions/widget-gtk-uimanager.png',
+  '22x22/actions/widget-gtk-custom.png',
+  '22x22/actions/widget-gtk-uimanager.png',
+]
+
+install_subdir(
+  'icons/hicolor',
+  exclude_files: exclude_data,
+  install_dir: glade_datadir / glade_pixmapdir,
+)
diff --git a/tests/meson.build b/tests/meson.build
index 52594753..7fb015fd 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -32,7 +32,7 @@ envs = [
   'GLADE_CATALOG_SEARCH_PATH=' + (source_root / 'plugins/gtk+'),
   'GLADE_MODULE_SEARCH_PATH=' + (build_root / 'plugins/gtk+'),
   'GLADE_PIXMAP_DIR=' + (source_root / 'data/icons'),
-  'GLADE_ICON_THEME_PATH=' + (source_root / 'plugins/gtk+/icons/22x22'),
+  'GLADE_ICON_THEME_PATH=' + (source_root / 'plugins/gtk+/icons/hicolor/22x22/actions'),
 ]
 
 foreach unit: test_unit