diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 39284111fa..5fafcab509 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -1278,8 +1278,7 @@ gtk_extra_sources =				\
 MAINTAINERCLEANFILES = \
 	$(gtk_built_sources) 			\
 	$(gtk_dbus_built_sources)		\
-	$(stamp_files) 				\
-	stock-icons/icon-theme.cache
+	$(stamp_files)
 
 DISTCLEANFILES =
 
@@ -1401,9 +1400,9 @@ gtk.gresource.xml: Makefile.am
 	  echo -e "    <file compressed=\"true\">ui/$$n</file>" >> $@; \
 	done; \
 	for s in 16x16 22x22 24x24 32x32; do \
-	  for f in $(srcdir)/resources/icons/hicolor/$$s/actions/*.png; do \
+	  for f in $(srcdir)/resources/icons/$$s/actions/*.png; do \
 	    n=`basename $$f`; \
-	    echo -e "    <file>icons/hicolor/$$s/actions/$$n</file>" >> $@; \
+	    echo -e "    <file>icons/$$s/actions/$$n</file>" >> $@; \
 	  done; \
 	done; \
 	echo -e "  </gresource>" >> $@; \
diff --git a/gtk/gtkicontheme.c b/gtk/gtkicontheme.c
index 360e244185..3e6e2e0144 100644
--- a/gtk/gtkicontheme.c
+++ b/gtk/gtkicontheme.c
@@ -3265,7 +3265,7 @@ theme_subdir_load (GtkIconTheme *icon_theme,
     { 
       for (d = icon_theme->priv->resource_paths; d; d = d->next)
         {
-          full_dir = g_build_filename ((const gchar *)d->data, theme->name, subdir, NULL);
+          full_dir = g_build_filename ((const gchar *)d->data, subdir, NULL);
           dir = g_new0 (IconThemeDir, 1);
           dir->type = type;
           dir->is_resource = TRUE;
diff --git a/gtk/resources/icons/hicolor/16x16/actions/gtk-caps-lock-warning.png b/gtk/resources/icons/16x16/actions/gtk-caps-lock-warning.png
similarity index 100%
rename from gtk/resources/icons/hicolor/16x16/actions/gtk-caps-lock-warning.png
rename to gtk/resources/icons/16x16/actions/gtk-caps-lock-warning.png
diff --git a/gtk/resources/icons/hicolor/16x16/actions/gtk-color-picker.png b/gtk/resources/icons/16x16/actions/gtk-color-picker.png
similarity index 100%
rename from gtk/resources/icons/hicolor/16x16/actions/gtk-color-picker.png
rename to gtk/resources/icons/16x16/actions/gtk-color-picker.png
diff --git a/gtk/resources/icons/hicolor/16x16/actions/gtk-connect.png b/gtk/resources/icons/16x16/actions/gtk-connect.png
similarity index 100%
rename from gtk/resources/icons/hicolor/16x16/actions/gtk-connect.png
rename to gtk/resources/icons/16x16/actions/gtk-connect.png
diff --git a/gtk/resources/icons/hicolor/16x16/actions/gtk-convert.png b/gtk/resources/icons/16x16/actions/gtk-convert.png
similarity index 100%
rename from gtk/resources/icons/hicolor/16x16/actions/gtk-convert.png
rename to gtk/resources/icons/16x16/actions/gtk-convert.png
diff --git a/gtk/resources/icons/hicolor/16x16/actions/gtk-disconnect.png b/gtk/resources/icons/16x16/actions/gtk-disconnect.png
similarity index 100%
rename from gtk/resources/icons/hicolor/16x16/actions/gtk-disconnect.png
rename to gtk/resources/icons/16x16/actions/gtk-disconnect.png
diff --git a/gtk/resources/icons/hicolor/16x16/actions/gtk-edit.png b/gtk/resources/icons/16x16/actions/gtk-edit.png
similarity index 100%
rename from gtk/resources/icons/hicolor/16x16/actions/gtk-edit.png
rename to gtk/resources/icons/16x16/actions/gtk-edit.png
diff --git a/gtk/resources/icons/hicolor/16x16/actions/gtk-index.png b/gtk/resources/icons/16x16/actions/gtk-index.png
similarity index 100%
rename from gtk/resources/icons/hicolor/16x16/actions/gtk-index.png
rename to gtk/resources/icons/16x16/actions/gtk-index.png
diff --git a/gtk/resources/icons/hicolor/16x16/actions/gtk-orientation-landscape.png b/gtk/resources/icons/16x16/actions/gtk-orientation-landscape.png
similarity index 100%
rename from gtk/resources/icons/hicolor/16x16/actions/gtk-orientation-landscape.png
rename to gtk/resources/icons/16x16/actions/gtk-orientation-landscape.png
diff --git a/gtk/resources/icons/hicolor/16x16/actions/gtk-orientation-portrait.png b/gtk/resources/icons/16x16/actions/gtk-orientation-portrait.png
similarity index 100%
rename from gtk/resources/icons/hicolor/16x16/actions/gtk-orientation-portrait.png
rename to gtk/resources/icons/16x16/actions/gtk-orientation-portrait.png
diff --git a/gtk/resources/icons/hicolor/16x16/actions/gtk-orientation-reverse-landscape.png b/gtk/resources/icons/16x16/actions/gtk-orientation-reverse-landscape.png
similarity index 100%
rename from gtk/resources/icons/hicolor/16x16/actions/gtk-orientation-reverse-landscape.png
rename to gtk/resources/icons/16x16/actions/gtk-orientation-reverse-landscape.png
diff --git a/gtk/resources/icons/hicolor/16x16/actions/gtk-orientation-reverse-portrait.png b/gtk/resources/icons/16x16/actions/gtk-orientation-reverse-portrait.png
similarity index 100%
rename from gtk/resources/icons/hicolor/16x16/actions/gtk-orientation-reverse-portrait.png
rename to gtk/resources/icons/16x16/actions/gtk-orientation-reverse-portrait.png
diff --git a/gtk/resources/icons/hicolor/16x16/actions/gtk-page-setup.png b/gtk/resources/icons/16x16/actions/gtk-page-setup.png
similarity index 100%
rename from gtk/resources/icons/hicolor/16x16/actions/gtk-page-setup.png
rename to gtk/resources/icons/16x16/actions/gtk-page-setup.png
diff --git a/gtk/resources/icons/hicolor/16x16/actions/gtk-preferences.png b/gtk/resources/icons/16x16/actions/gtk-preferences.png
similarity index 100%
rename from gtk/resources/icons/hicolor/16x16/actions/gtk-preferences.png
rename to gtk/resources/icons/16x16/actions/gtk-preferences.png
diff --git a/gtk/resources/icons/hicolor/16x16/actions/gtk-select-color.png b/gtk/resources/icons/16x16/actions/gtk-select-color.png
similarity index 100%
rename from gtk/resources/icons/hicolor/16x16/actions/gtk-select-color.png
rename to gtk/resources/icons/16x16/actions/gtk-select-color.png
diff --git a/gtk/resources/icons/hicolor/16x16/actions/gtk-select-font.png b/gtk/resources/icons/16x16/actions/gtk-select-font.png
similarity index 100%
rename from gtk/resources/icons/hicolor/16x16/actions/gtk-select-font.png
rename to gtk/resources/icons/16x16/actions/gtk-select-font.png
diff --git a/gtk/resources/icons/hicolor/16x16/actions/gtk-undelete-ltr.png b/gtk/resources/icons/16x16/actions/gtk-undelete-ltr.png
similarity index 100%
rename from gtk/resources/icons/hicolor/16x16/actions/gtk-undelete-ltr.png
rename to gtk/resources/icons/16x16/actions/gtk-undelete-ltr.png
diff --git a/gtk/resources/icons/hicolor/16x16/actions/gtk-undelete-rtl.png b/gtk/resources/icons/16x16/actions/gtk-undelete-rtl.png
similarity index 100%
rename from gtk/resources/icons/hicolor/16x16/actions/gtk-undelete-rtl.png
rename to gtk/resources/icons/16x16/actions/gtk-undelete-rtl.png
diff --git a/gtk/resources/icons/hicolor/22x22/actions/gtk-apply.png b/gtk/resources/icons/22x22/actions/gtk-apply.png
similarity index 100%
rename from gtk/resources/icons/hicolor/22x22/actions/gtk-apply.png
rename to gtk/resources/icons/22x22/actions/gtk-apply.png
diff --git a/gtk/resources/icons/hicolor/22x22/actions/gtk-cancel.png b/gtk/resources/icons/22x22/actions/gtk-cancel.png
similarity index 100%
rename from gtk/resources/icons/hicolor/22x22/actions/gtk-cancel.png
rename to gtk/resources/icons/22x22/actions/gtk-cancel.png
diff --git a/gtk/resources/icons/hicolor/22x22/actions/gtk-no.png b/gtk/resources/icons/22x22/actions/gtk-no.png
similarity index 100%
rename from gtk/resources/icons/hicolor/22x22/actions/gtk-no.png
rename to gtk/resources/icons/22x22/actions/gtk-no.png
diff --git a/gtk/resources/icons/hicolor/22x22/actions/gtk-ok.png b/gtk/resources/icons/22x22/actions/gtk-ok.png
similarity index 100%
rename from gtk/resources/icons/hicolor/22x22/actions/gtk-ok.png
rename to gtk/resources/icons/22x22/actions/gtk-ok.png
diff --git a/gtk/resources/icons/hicolor/22x22/actions/gtk-yes.png b/gtk/resources/icons/22x22/actions/gtk-yes.png
similarity index 100%
rename from gtk/resources/icons/hicolor/22x22/actions/gtk-yes.png
rename to gtk/resources/icons/22x22/actions/gtk-yes.png
diff --git a/gtk/resources/icons/hicolor/24x24/actions/gtk-caps-lock-warning.png b/gtk/resources/icons/24x24/actions/gtk-caps-lock-warning.png
similarity index 100%
rename from gtk/resources/icons/hicolor/24x24/actions/gtk-caps-lock-warning.png
rename to gtk/resources/icons/24x24/actions/gtk-caps-lock-warning.png
diff --git a/gtk/resources/icons/hicolor/24x24/actions/gtk-color-picker.png b/gtk/resources/icons/24x24/actions/gtk-color-picker.png
similarity index 100%
rename from gtk/resources/icons/hicolor/24x24/actions/gtk-color-picker.png
rename to gtk/resources/icons/24x24/actions/gtk-color-picker.png
diff --git a/gtk/resources/icons/hicolor/24x24/actions/gtk-connect.png b/gtk/resources/icons/24x24/actions/gtk-connect.png
similarity index 100%
rename from gtk/resources/icons/hicolor/24x24/actions/gtk-connect.png
rename to gtk/resources/icons/24x24/actions/gtk-connect.png
diff --git a/gtk/resources/icons/hicolor/24x24/actions/gtk-convert.png b/gtk/resources/icons/24x24/actions/gtk-convert.png
similarity index 100%
rename from gtk/resources/icons/hicolor/24x24/actions/gtk-convert.png
rename to gtk/resources/icons/24x24/actions/gtk-convert.png
diff --git a/gtk/resources/icons/hicolor/24x24/actions/gtk-disconnect.png b/gtk/resources/icons/24x24/actions/gtk-disconnect.png
similarity index 100%
rename from gtk/resources/icons/hicolor/24x24/actions/gtk-disconnect.png
rename to gtk/resources/icons/24x24/actions/gtk-disconnect.png
diff --git a/gtk/resources/icons/hicolor/24x24/actions/gtk-edit.png b/gtk/resources/icons/24x24/actions/gtk-edit.png
similarity index 100%
rename from gtk/resources/icons/hicolor/24x24/actions/gtk-edit.png
rename to gtk/resources/icons/24x24/actions/gtk-edit.png
diff --git a/gtk/resources/icons/hicolor/24x24/actions/gtk-index.png b/gtk/resources/icons/24x24/actions/gtk-index.png
similarity index 100%
rename from gtk/resources/icons/hicolor/24x24/actions/gtk-index.png
rename to gtk/resources/icons/24x24/actions/gtk-index.png
diff --git a/gtk/resources/icons/hicolor/24x24/actions/gtk-orientation-landscape.png b/gtk/resources/icons/24x24/actions/gtk-orientation-landscape.png
similarity index 100%
rename from gtk/resources/icons/hicolor/24x24/actions/gtk-orientation-landscape.png
rename to gtk/resources/icons/24x24/actions/gtk-orientation-landscape.png
diff --git a/gtk/resources/icons/hicolor/24x24/actions/gtk-orientation-portrait.png b/gtk/resources/icons/24x24/actions/gtk-orientation-portrait.png
similarity index 100%
rename from gtk/resources/icons/hicolor/24x24/actions/gtk-orientation-portrait.png
rename to gtk/resources/icons/24x24/actions/gtk-orientation-portrait.png
diff --git a/gtk/resources/icons/hicolor/24x24/actions/gtk-orientation-reverse-landscape.png b/gtk/resources/icons/24x24/actions/gtk-orientation-reverse-landscape.png
similarity index 100%
rename from gtk/resources/icons/hicolor/24x24/actions/gtk-orientation-reverse-landscape.png
rename to gtk/resources/icons/24x24/actions/gtk-orientation-reverse-landscape.png
diff --git a/gtk/resources/icons/hicolor/24x24/actions/gtk-orientation-reverse-portrait.png b/gtk/resources/icons/24x24/actions/gtk-orientation-reverse-portrait.png
similarity index 100%
rename from gtk/resources/icons/hicolor/24x24/actions/gtk-orientation-reverse-portrait.png
rename to gtk/resources/icons/24x24/actions/gtk-orientation-reverse-portrait.png
diff --git a/gtk/resources/icons/hicolor/24x24/actions/gtk-page-setup.png b/gtk/resources/icons/24x24/actions/gtk-page-setup.png
similarity index 100%
rename from gtk/resources/icons/hicolor/24x24/actions/gtk-page-setup.png
rename to gtk/resources/icons/24x24/actions/gtk-page-setup.png
diff --git a/gtk/resources/icons/hicolor/24x24/actions/gtk-preferences.png b/gtk/resources/icons/24x24/actions/gtk-preferences.png
similarity index 100%
rename from gtk/resources/icons/hicolor/24x24/actions/gtk-preferences.png
rename to gtk/resources/icons/24x24/actions/gtk-preferences.png
diff --git a/gtk/resources/icons/hicolor/24x24/actions/gtk-select-color.png b/gtk/resources/icons/24x24/actions/gtk-select-color.png
similarity index 100%
rename from gtk/resources/icons/hicolor/24x24/actions/gtk-select-color.png
rename to gtk/resources/icons/24x24/actions/gtk-select-color.png
diff --git a/gtk/resources/icons/hicolor/24x24/actions/gtk-select-font.png b/gtk/resources/icons/24x24/actions/gtk-select-font.png
similarity index 100%
rename from gtk/resources/icons/hicolor/24x24/actions/gtk-select-font.png
rename to gtk/resources/icons/24x24/actions/gtk-select-font.png
diff --git a/gtk/resources/icons/hicolor/24x24/actions/gtk-undelete-ltr.png b/gtk/resources/icons/24x24/actions/gtk-undelete-ltr.png
similarity index 100%
rename from gtk/resources/icons/hicolor/24x24/actions/gtk-undelete-ltr.png
rename to gtk/resources/icons/24x24/actions/gtk-undelete-ltr.png
diff --git a/gtk/resources/icons/hicolor/24x24/actions/gtk-undelete-rtl.png b/gtk/resources/icons/24x24/actions/gtk-undelete-rtl.png
similarity index 100%
rename from gtk/resources/icons/hicolor/24x24/actions/gtk-undelete-rtl.png
rename to gtk/resources/icons/24x24/actions/gtk-undelete-rtl.png
diff --git a/gtk/resources/icons/hicolor/32x32/actions/gtk-dnd-multiple.png b/gtk/resources/icons/32x32/actions/gtk-dnd-multiple.png
similarity index 100%
rename from gtk/resources/icons/hicolor/32x32/actions/gtk-dnd-multiple.png
rename to gtk/resources/icons/32x32/actions/gtk-dnd-multiple.png
diff --git a/gtk/resources/icons/hicolor/32x32/actions/gtk-dnd.png b/gtk/resources/icons/32x32/actions/gtk-dnd.png
similarity index 100%
rename from gtk/resources/icons/hicolor/32x32/actions/gtk-dnd.png
rename to gtk/resources/icons/32x32/actions/gtk-dnd.png