84 files changed, 111 insertions, 350 deletions

diff --git a/ChangeLog b/ChangeLog
index f62e45e26..8efbd3a91 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2007-08-09  Christian Persch  <chpe@gnome.org>
+
+	* configure.ac:
+	A data/icons/*:
+	R data/icons/*/*/*:
+
+	Reorganise icons.
+
 2007-08-06  Christian Persch  <chpe@gnome.org>
 
 	* data/bme.desktop.in.in:
diff --git a/configure.ac b/configure.ac
index af8342c1f..08016e220 100644
--- a/configure.ac
+++ b/configure.ac
@@ -35,7 +35,7 @@ AC_SUBST([EPIPHANY_MAJOR])
 AC_SUBST([EPIPHANY_API_VERSION])
 AC_SUBST([EPIPHANY_UA_VERSION])
 
-AM_INIT_AUTOMAKE([1.9 foreign dist-bzip2 no-dist-gzip])
+AM_INIT_AUTOMAKE([1.9 foreign dist-bzip2 no-dist-gzip tar-ustar])
 
 AM_MAINTAINER_MODE
 
@@ -699,31 +699,6 @@ data/chrome/brand.dtd
 data/chrome/brand.properties
 data/glade/Makefile
 data/icons/Makefile
-data/icons/16x16/Makefile
-data/icons/16x16/apps/Makefile
-data/icons/16x16/actions/Makefile
-data/icons/16x16/places/Makefile
-data/icons/16x16/status/Makefile
-data/icons/22x22/Makefile
-data/icons/22x22/apps/Makefile
-data/icons/22x22/actions/Makefile
-data/icons/22x22/places/Makefile
-data/icons/22x22/status/Makefile
-data/icons/24x24/Makefile
-data/icons/24x24/apps/Makefile
-data/icons/24x24/actions/Makefile
-data/icons/24x24/places/Makefile
-data/icons/24x24/status/Makefile
-data/icons/32x32/Makefile
-data/icons/32x32/apps/Makefile
-data/icons/32x32/actions/Makefile
-data/icons/32x32/status/Makefile
-data/icons/48x48/Makefile
-data/icons/48x48/status/Makefile
-data/icons/scalable/Makefile
-data/icons/scalable/apps/Makefile
-data/icons/scalable/actions/Makefile
-data/icons/scalable/status/Makefile
 data/art/Makefile
 data/ui/Makefile
 data/weasel-ua-pref.js
diff --git a/data/icons/16x16/Makefile.am b/data/icons/16x16/Makefile.am
deleted file mode 100644
index fadfc9020..000000000
--- a/data/icons/16x16/Makefile.am
+++ /dev/null
@@ -1,5 +0,0 @@
-SUBDIRS = \
-	apps	\
-	actions \
-	places	\
-	status
diff --git a/data/icons/16x16/actions/Makefile.am b/data/icons/16x16/actions/Makefile.am
deleted file mode 100644
index d49ba5c68..000000000
--- a/data/icons/16x16/actions/Makefile.am
+++ /dev/null
@@ -1,18 +0,0 @@
-themedir = $(pkgdatadir)/icons/hicolor
-size = 16x16
-context = actions
-
-iconsdir = $(themedir)/$(size)/$(context)
-
-icons_DATA = \
-	bookmark-view.png	\
-	history-view.png	\
-	location-entry.png
-
-noinst_DATA = \
-	bookmark-view.xcf	\
-	history-view.svg
-
-EXTRA_DIST = \
-	$(icons_DATA)	\
-	$(noinst_DATA)
diff --git a/data/icons/16x16/apps/Makefile.am b/data/icons/16x16/apps/Makefile.am
deleted file mode 100644
index 4995cf3e5..000000000
--- a/data/icons/16x16/apps/Makefile.am
+++ /dev/null
@@ -1,15 +0,0 @@
-themedir = $(datadir)/icons/hicolor
-size = 16x16
-context = apps
-
-iconsdir = $(themedir)/$(size)/$(context)
-
-icons_DATA = \
-	gnome-web-browser.png
-
-noinst_DATA = \
-	gnome-web-browser.svg
-
-EXTRA_DIST =		\
-	$(icons_DATA)	\
-	$(noinst_DATA)
diff --git a/data/icons/16x16/places/Makefile.am b/data/icons/16x16/places/Makefile.am
deleted file mode 100644
index e0280192d..000000000
--- a/data/icons/16x16/places/Makefile.am
+++ /dev/null
@@ -1,15 +0,0 @@
-themedir = $(pkgdatadir)/icons/hicolor
-size = 16x16
-context = actions
-
-iconsdir = $(themedir)/$(size)/$(context)
-
-icons_DATA = \
-	bookmark-web.png
-
-noinst_DATA = \
-	bookmark-web.svg
-
-EXTRA_DIST = \
-	$(icons_DATA)	\
-	$(noinst_DATA)
diff --git a/data/icons/16x16/status/Makefile.am b/data/icons/16x16/status/Makefile.am
deleted file mode 100644
index c0083e54f..000000000
--- a/data/icons/16x16/status/Makefile.am
+++ /dev/null
@@ -1,19 +0,0 @@
-themedir = $(pkgdatadir)/icons/hicolor
-size = 16x16
-context = status
-
-iconsdir = $(themedir)/$(size)/$(context)
-
-icons_DATA = \
-	lock-broken.png		\
-        lock-insecure.png	\
-	lock-secure.png		\
-	lock-secure-checked.png	\
-	popup-hidden.png
-
-noinst_DATA = \
-	popup-hidden.xcf
-
-EXTRA_DIST = \
-	$(icons_DATA)	\
-	$(noinst_DATA)
diff --git a/data/icons/22x22/Makefile.am b/data/icons/22x22/Makefile.am
deleted file mode 100644
index fadfc9020..000000000
--- a/data/icons/22x22/Makefile.am
+++ /dev/null
@@ -1,5 +0,0 @@
-SUBDIRS = \
-	apps	\
-	actions \
-	places	\
-	status
diff --git a/data/icons/22x22/actions/Makefile.am b/data/icons/22x22/actions/Makefile.am
deleted file mode 100644
index b015bd769..000000000
--- a/data/icons/22x22/actions/Makefile.am
+++ /dev/null
@@ -1,18 +0,0 @@
-themedir = $(pkgdatadir)/icons/hicolor
-size = 22x22
-context = actions
-
-iconsdir = $(themedir)/$(size)/$(context)
-
-icons_DATA = \
-	bookmark-view.png	\
-	history-view.png	\
-	location-entry.png
-
-noinst_DATA = \
-	bookmark-view.xcf	\
-	history-view.svg
-
-EXTRA_DIST = \
-	$(icons_DATA)	\
-	$(noinst_DATA)
diff --git a/data/icons/22x22/apps/Makefile.am b/data/icons/22x22/apps/Makefile.am
deleted file mode 100644
index 9f65c874d..000000000
--- a/data/icons/22x22/apps/Makefile.am
+++ /dev/null
@@ -1,15 +0,0 @@
-themedir = $(datadir)/icons/hicolor
-size = 22x22
-context = apps
-
-iconsdir = $(themedir)/$(size)/$(context)
-
-icons_DATA = \
-	gnome-web-browser.png
-
-noinst_DATA = \
-	gnome-web-browser.svg
-
-EXTRA_DIST =		\
-	$(icons_DATA)	\
-	$(noinst_DATA)
diff --git a/data/icons/22x22/places/Makefile.am b/data/icons/22x22/places/Makefile.am
deleted file mode 100644
index 8c6f09410..000000000
--- a/data/icons/22x22/places/Makefile.am
+++ /dev/null
@@ -1,15 +0,0 @@
-themedir = $(pkgdatadir)/icons/hicolor
-size = 22x22
-context = actions
-
-iconsdir = $(themedir)/$(size)/$(context)
-
-icons_DATA = \
-	bookmark-web.png
-
-noinst_DATA = \
-	bookmark-web.svg
-
-EXTRA_DIST = \
-	$(icons_DATA)	\
-	$(noinst_DATA)
diff --git a/data/icons/22x22/status/Makefile.am b/data/icons/22x22/status/Makefile.am
deleted file mode 100644
index 31b6ec70b..000000000
--- a/data/icons/22x22/status/Makefile.am
+++ /dev/null
@@ -1,15 +0,0 @@
-themedir = $(pkgdatadir)/icons/hicolor
-size = 22x22
-context = status
-
-iconsdir = $(themedir)/$(size)/$(context)
-
-icons_DATA = \
-	popup-hidden.png
-
-noinst_DATA = \
-	popup-hidden.xcf
-
-EXTRA_DIST = \
-	$(icons_DATA)	\
-	$(noinst_DATA)
diff --git a/data/icons/24x24/Makefile.am b/data/icons/24x24/Makefile.am
deleted file mode 100644
index d6b3a849a..000000000
--- a/data/icons/24x24/Makefile.am
+++ /dev/null
@@ -1,5 +0,0 @@
-SUBDIRS = \
-	apps	\
-	actions	\
-	places	\
-	status
diff --git a/data/icons/24x24/actions/Makefile.am b/data/icons/24x24/actions/Makefile.am
deleted file mode 100644
index fe9cb6535..000000000
--- a/data/icons/24x24/actions/Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-themedir = $(pkgdatadir)/icons/hicolor
-size = 24x24
-context = actions
-
-iconsdir = $(themedir)/$(size)/$(context)
-
-icons_DATA = \
-	bookmark-view.png	\
-	history-view.png	\
-	location-entry.png
-
-EXTRA_DIST = \
-	$(icons_DATA)	\
-	$(noinst_DATA)
diff --git a/data/icons/24x24/apps/Makefile.am b/data/icons/24x24/apps/Makefile.am
deleted file mode 100644
index 23967c6f4..000000000
--- a/data/icons/24x24/apps/Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-themedir = $(datadir)/icons/hicolor
-size = 24x24
-context = apps
-
-iconsdir = $(themedir)/$(size)/$(context)
-
-icons_DATA = \
-	gnome-web-browser.png
-
-noinst_DATA =
-
-EXTRA_DIST =		\
-	$(icons_DATA)	\
-	$(noinst_DATA)
diff --git a/data/icons/24x24/places/Makefile.am b/data/icons/24x24/places/Makefile.am
deleted file mode 100644
index 226d76fee..000000000
--- a/data/icons/24x24/places/Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-themedir = $(pkgdatadir)/icons/hicolor
-size = 24x24
-context = actions
-
-iconsdir = $(themedir)/$(size)/$(context)
-
-icons_DATA = \
-	bookmark-web.png
-
-noinst_DATA = 
-
-EXTRA_DIST = \
-	$(icons_DATA)	\
-	$(noinst_DATA)
diff --git a/data/icons/24x24/status/Makefile.am b/data/icons/24x24/status/Makefile.am
deleted file mode 100644
index cad15b17f..000000000
--- a/data/icons/24x24/status/Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-themedir = $(pkgdatadir)/icons/hicolor
-size = 24x24
-context = status
-
-iconsdir = $(themedir)/$(size)/$(context)
-icons_DATA = \
-	lock-broken.png		\
-        lock-insecure.png	\
-	lock-secure.png		\
-	lock-secure-checked.png	\
-	popup-hidden.png
-
-EXTRA_DIST = \
-	$(icons_DATA)
diff --git a/data/icons/32x32/Makefile.am b/data/icons/32x32/Makefile.am
deleted file mode 100644
index 6e7f8f92c..000000000
--- a/data/icons/32x32/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-SUBDIRS = \
-	apps	\
-	actions	\
-	status
diff --git a/data/icons/32x32/actions/Makefile.am b/data/icons/32x32/actions/Makefile.am
deleted file mode 100644
index 47d797b81..000000000
--- a/data/icons/32x32/actions/Makefile.am
+++ /dev/null
@@ -1,19 +0,0 @@
-themedir = $(pkgdatadir)/icons/hicolor
-size = 32x32
-context = actions
-
-iconsdir = $(themedir)/$(size)/$(context)
-
-icons_DATA = \
-	bookmark-view.png	\
-	history-view.png	\
-	location-entry.png
-
-noinst_DATA = \
-	bookmark-view.svg	\
-	history-view.svg	\
-	location-entry.svg
-
-EXTRA_DIST = \
-	$(icons_DATA)	\
-	$(noinst_DATA)
diff --git a/data/icons/32x32/apps/Makefile.am b/data/icons/32x32/apps/Makefile.am
deleted file mode 100644
index 3d7e73a35..000000000
--- a/data/icons/32x32/apps/Makefile.am
+++ /dev/null
@@ -1,15 +0,0 @@
-themedir = $(datadir)/icons/hicolor
-size = 32x32
-context = apps
-
-iconsdir = $(themedir)/$(size)/$(context)
-
-icons_DATA = \
-	gnome-web-browser.png
-
-noinst_DATA = \
-	gnome-web-browser.svg
-
-EXTRA_DIST =		\
-	$(icons_DATA)	\
-	$(noinst_DATA)
diff --git a/data/icons/32x32/status/Makefile.am b/data/icons/32x32/status/Makefile.am
deleted file mode 100644
index 5ea26773d..000000000
--- a/data/icons/32x32/status/Makefile.am
+++ /dev/null
@@ -1,15 +0,0 @@
-themedir = $(pkgdatadir)/icons/hicolor
-size = 32x32
-context = status
-
-iconsdir = $(themedir)/$(size)/$(context)
-
-icons_DATA = \
-	popup-hidden.png
-
-noinst_DATA = \
-	popup-hidden.svg
-
-EXTRA_DIST = \
-	$(icons_DATA)	\
-	$(noinst_DATA)
diff --git a/data/icons/48x48/Makefile.am b/data/icons/48x48/Makefile.am
deleted file mode 100644
index c2b486dae..000000000
--- a/data/icons/48x48/Makefile.am
+++ /dev/null
@@ -1,2 +0,0 @@
-SUBDIRS = \
-	status
diff --git a/data/icons/48x48/status/Makefile.am b/data/icons/48x48/status/Makefile.am
deleted file mode 100644
index 147e7cfcf..000000000
--- a/data/icons/48x48/status/Makefile.am
+++ /dev/null
@@ -1,15 +0,0 @@
-themedir = $(pkgdatadir)/icons/hicolor
-size = 48x48
-context = status
-
-iconsdir = $(themedir)/$(size)/$(context)
-
-icons_DATA = \
-	lock-broken.png		\
-        lock-insecure.png	\
-	lock-secure.png		\
-	lock-secure-checked.png
-
-EXTRA_DIST = \
-	$(icons_DATA)
-
diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am
index 47504f4fd..0b16c6e8b 100644
--- a/data/icons/Makefile.am
+++ b/data/icons/Makefile.am
@@ -1,20 +1,111 @@
-SUBDIRS = \
-	16x16	\
-	22x22	\
-	24x24	\
-	32x32	\
-	48x48	\
-	scalable
+NULL =
+
+themes = \
+	hicolor	\
+	$(NULL)
+
+icons = \
+	hicolor_actions_16x16_bookmark-view.png \
+	hicolor_actions_16x16_history-view.png \
+	hicolor_actions_16x16_location-entry.png \
+	hicolor_actions_22x22_bookmark-view.png \
+	hicolor_actions_22x22_history-view.png \
+	hicolor_actions_22x22_location-entry.png \
+	hicolor_actions_24x24_bookmark-view.png \
+	hicolor_actions_24x24_history-view.png \
+	hicolor_actions_24x24_location-entry.png \
+	hicolor_actions_32x32_bookmark-view.png \
+	hicolor_actions_32x32_history-view.png \
+	hicolor_actions_32x32_location-entry.png \
+	hicolor_actions_32x32_location-entry.svg \
+	hicolor_actions_scalable_bookmark-view.svg \
+	hicolor_actions_scalable_history-view.svg \
+	hicolor_actions_scalable_location-entry.svg \
+	hicolor_apps_16x16_gnome-web-browser.png \
+	hicolor_apps_22x22_gnome-web-browser.png \
+	hicolor_apps_24x24_gnome-web-browser.png \
+	hicolor_apps_32x32_gnome-web-browser.png \
+	hicolor_apps_scalable_gnome-web-browser.svg \
+	hicolor_places_16x16_bookmark-web.png \
+	hicolor_places_22x22_bookmark-web.png \
+	hicolor_places_24x24_bookmark-web.png \
+	hicolor_status_16x16_lock-broken.png \
+	hicolor_status_16x16_lock-insecure.png \
+	hicolor_status_16x16_lock-secure-checked.png \
+	hicolor_status_16x16_lock-secure.png \
+	hicolor_status_16x16_popup-hidden.png \
+	hicolor_status_22x22_popup-hidden.png \
+	hicolor_status_24x24_lock-broken.png \
+	hicolor_status_24x24_lock-insecure.png \
+	hicolor_status_24x24_lock-secure-checked.png \
+	hicolor_status_24x24_lock-secure.png \
+	hicolor_status_24x24_popup-hidden.png \
+	hicolor_status_32x32_popup-hidden.png \
+	hicolor_status_48x48_lock-broken.png \
+	hicolor_status_48x48_lock-insecure.png \
+	hicolor_status_48x48_lock-secure-checked.png \
+	hicolor_status_48x48_lock-secure.png \
+	hicolor_status_scalable_popup-hidden.svg \
+	$(NULL)
+
+source_icons = \
+	hicolor_actions_16x16_history-view.svg \
+	hicolor_actions_22x22_history-view.svg \
+	hicolor_actions_32x32_bookmark-view.svg \
+	hicolor_actions_32x32_history-view.svg \
+	hicolor_actions_16x16_bookmark-view.xcf \
+	hicolor_actions_22x22_bookmark-view.xcf \
+	hicolor_apps_16x16_gnome-web-browser.svg \
+	hicolor_apps_22x22_gnome-web-browser.svg \
+	hicolor_apps_32x32_gnome-web-browser.svg \
+	hicolor_places_16x16_bookmark-web.svg \
+	hicolor_places_22x22_bookmark-web.svg \
+	hicolor_status_16x16_popup-hidden.xcf \
+	hicolor_status_22x22_popup-hidden.xcf \
+	hicolor_status_32x32_popup-hidden.svg \
+	$(NULL)
+
+EXTRA_DIST = \
+	$(icons)	\
+	$(source_icons)	\
+	$(NULL)
+
+###############################################################################
 
 gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
 
-install-data-hook: update-icon-cache
-uninstall-hook: update-icon-cache
 update-icon-cache:
 	@-if test -z "$(DESTDIR)"; then \
 		echo "Updating Gtk icon cache."; \
-		$(gtk_update_icon_cache); \
+		for theme in $(themes); do \
+			$(gtk_update_icon_cache) $(datadir)/icons/$$theme; \
+		done; \
 	else \
 		echo "*** Icon cache not updated.  After (un)install, run this:"; \
-		echo "***   $(gtk_update_icon_cache)"; \
+		for theme in $(themes); do \
+			echo "***   $(gtk_update_icon_cache) $(datadir)/icons/$$theme"; \
+		done; \
 	fi
+
+install-icons:
+	for icon in $(icons); do \
+		THEME=`echo $$icon | cut -d_ -f1`; \
+		CONTEXT=`echo $$icon | cut -d_ -f2`; \
+		SIZE=`echo $$icon | cut -d_ -f3`; \
+		ICONFILE=`echo $$icon | cut -d_ -f4`; \
+		mkdir -p $(DESTDIR)$(datadir)/icons/$$THEME/$$SIZE/$$CONTEXT; \
+		$(INSTALL_DATA) $(srcdir)/$$icon $(DESTDIR)$(datadir)/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \
+	done
+
+uninstall-icons:
+	-for icon in $(icons); do \
+		THEME=`echo $$icon | cut -d_ -f1`; \
+		CONTEXT=`echo $$icon | cut -d_ -f2`; \
+		SIZE=`echo $$icon | cut -d_ -f3`; \
+		ICONFILE=`echo $$icon | cut -d_ -f4`; \
+		rm -f $(DESTDIR)$(datadir)/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \
+	done
+
+install-data-local: install-icons update-icon-cache
+
+uninstall-local: uninstall-icons update-icon-cache
diff --git a/data/icons/24x24/actions/README b/data/icons/README
index 4d49699c6..4d49699c6 100644
--- a/data/icons/24x24/actions/README
+++ b/data/icons/README
diff --git a/data/icons/16x16/actions/bookmark-view.png b/data/icons/hicolor_actions_16x16_bookmark-view.png
index 7817a0fa7..7817a0fa7 100644
--- a/data/icons/16x16/actions/bookmark-view.png
+++ b/data/icons/hicolor_actions_16x16_bookmark-view.png
diff --git a/data/icons/16x16/actions/bookmark-view.xcf b/data/icons/hicolor_actions_16x16_bookmark-view.xcf
index 653e3472e..653e3472e 100644
--- a/data/icons/16x16/actions/bookmark-view.xcf
+++ b/data/icons/hicolor_actions_16x16_bookmark-view.xcf
diff --git a/data/icons/16x16/actions/history-view.png b/data/icons/hicolor_actions_16x16_history-view.png
index 63e1bc888..63e1bc888 100644
--- a/data/icons/16x16/actions/history-view.png
+++ b/data/icons/hicolor_actions_16x16_history-view.png
diff --git a/data/icons/16x16/actions/history-view.svg b/data/icons/hicolor_actions_16x16_history-view.svg
index ca370ee66..ca370ee66 100644
--- a/data/icons/16x16/actions/history-view.svg
+++ b/data/icons/hicolor_actions_16x16_history-view.svg
diff --git a/data/icons/16x16/actions/location-entry.png b/data/icons/hicolor_actions_16x16_location-entry.png
index 90699bde0..90699bde0 100644
--- a/data/icons/16x16/actions/location-entry.png
+++ b/data/icons/hicolor_actions_16x16_location-entry.png
diff --git a/data/icons/22x22/actions/bookmark-view.png b/data/icons/hicolor_actions_22x22_bookmark-view.png
index 3c94640fb..3c94640fb 100644
--- a/data/icons/22x22/actions/bookmark-view.png
+++ b/data/icons/hicolor_actions_22x22_bookmark-view.png
diff --git a/data/icons/22x22/actions/bookmark-view.xcf b/data/icons/hicolor_actions_22x22_bookmark-view.xcf
index a9da95aca..a9da95aca 100644
--- a/data/icons/22x22/actions/bookmark-view.xcf
+++ b/data/icons/hicolor_actions_22x22_bookmark-view.xcf
diff --git a/data/icons/22x22/actions/history-view.png b/data/icons/hicolor_actions_22x22_history-view.png
index c57a14046..c57a14046 100644
--- a/data/icons/22x22/actions/history-view.png
+++ b/data/icons/hicolor_actions_22x22_history-view.png
diff --git a/data/icons/22x22/actions/history-view.svg b/data/icons/hicolor_actions_22x22_history-view.svg
index 383f4471b..383f4471b 100644
--- a/data/icons/22x22/actions/history-view.svg
+++ b/data/icons/hicolor_actions_22x22_history-view.svg
diff --git a/data/icons/22x22/actions/location-entry.png b/data/icons/hicolor_actions_22x22_location-entry.png
index 7d445982a..7d445982a 100644
--- a/data/icons/22x22/actions/location-entry.png
+++ b/data/icons/hicolor_actions_22x22_location-entry.png
diff --git a/data/icons/24x24/actions/bookmark-view.png b/data/icons/hicolor_actions_24x24_bookmark-view.png
index a2b5dd484..a2b5dd484 100644
--- a/data/icons/24x24/actions/bookmark-view.png
+++ b/data/icons/hicolor_actions_24x24_bookmark-view.png
diff --git a/data/icons/24x24/actions/history-view.png b/data/icons/hicolor_actions_24x24_history-view.png
index 7174be0c2..7174be0c2 100644
--- a/data/icons/24x24/actions/history-view.png
+++ b/data/icons/hicolor_actions_24x24_history-view.png
diff --git a/data/icons/24x24/actions/location-entry.png b/data/icons/hicolor_actions_24x24_location-entry.png
index 4c08d86d7..4c08d86d7 100644
--- a/data/icons/24x24/actions/location-entry.png
+++ b/data/icons/hicolor_actions_24x24_location-entry.png
diff --git a/data/icons/32x32/actions/bookmark-view.png b/data/icons/hicolor_actions_32x32_bookmark-view.png
index 3b9616477..3b9616477 100644
--- a/data/icons/32x32/actions/bookmark-view.png
+++ b/data/icons/hicolor_actions_32x32_bookmark-view.png
diff --git a/data/icons/32x32/actions/bookmark-view.svg b/data/icons/hicolor_actions_32x32_bookmark-view.svg
index 2e3284602..2e3284602 100644
--- a/data/icons/32x32/actions/bookmark-view.svg
+++ b/data/icons/hicolor_actions_32x32_bookmark-view.svg
diff --git a/data/icons/32x32/actions/history-view.png b/data/icons/hicolor_actions_32x32_history-view.png
index 275789ffe..275789ffe 100644
--- a/data/icons/32x32/actions/history-view.png
+++ b/data/icons/hicolor_actions_32x32_history-view.png
diff --git a/data/icons/32x32/actions/history-view.svg b/data/icons/hicolor_actions_32x32_history-view.svg
index 288c39aad..288c39aad 100644
--- a/data/icons/32x32/actions/history-view.svg
+++ b/data/icons/hicolor_actions_32x32_history-view.svg
diff --git a/data/icons/32x32/actions/location-entry.png b/data/icons/hicolor_actions_32x32_location-entry.png
index 50ac77f28..50ac77f28 100644
--- a/data/icons/32x32/actions/location-entry.png
+++ b/data/icons/hicolor_actions_32x32_location-entry.png
diff --git a/data/icons/32x32/actions/location-entry.svg b/data/icons/hicolor_actions_32x32_location-entry.svg
index f999d4f1b..f999d4f1b 100644
--- a/data/icons/32x32/actions/location-entry.svg
+++ b/data/icons/hicolor_actions_32x32_location-entry.svg
diff --git a/data/icons/scalable/actions/bookmark-view.svg b/data/icons/hicolor_actions_scalable_bookmark-view.svg
index 3f87fd15a..3f87fd15a 100644
--- a/data/icons/scalable/actions/bookmark-view.svg
+++ b/data/icons/hicolor_actions_scalable_bookmark-view.svg
diff --git a/data/icons/scalable/actions/history-view.svg b/data/icons/hicolor_actions_scalable_history-view.svg
index 2253fafce..2253fafce 100644
--- a/data/icons/scalable/actions/history-view.svg
+++ b/data/icons/hicolor_actions_scalable_history-view.svg
diff --git a/data/icons/scalable/actions/location-entry.svg b/data/icons/hicolor_actions_scalable_location-entry.svg
index c0a7d07f8..c0a7d07f8 100644
--- a/data/icons/scalable/actions/location-entry.svg
+++ b/data/icons/hicolor_actions_scalable_location-entry.svg
diff --git a/data/icons/16x16/apps/gnome-web-browser.png b/data/icons/hicolor_apps_16x16_gnome-web-browser.png
index 12191acf2..12191acf2 100644
--- a/data/icons/16x16/apps/gnome-web-browser.png
+++ b/data/icons/hicolor_apps_16x16_gnome-web-browser.png
diff --git a/data/icons/16x16/apps/gnome-web-browser.svg b/data/icons/hicolor_apps_16x16_gnome-web-browser.svg
index 5e05ecc98..5e05ecc98 100644
--- a/data/icons/16x16/apps/gnome-web-browser.svg
+++ b/data/icons/hicolor_apps_16x16_gnome-web-browser.svg
diff --git a/data/icons/22x22/apps/gnome-web-browser.png b/data/icons/hicolor_apps_22x22_gnome-web-browser.png
index edfaa2f17..edfaa2f17 100644
--- a/data/icons/22x22/apps/gnome-web-browser.png
+++ b/data/icons/hicolor_apps_22x22_gnome-web-browser.png
diff --git a/data/icons/22x22/apps/gnome-web-browser.svg b/data/icons/hicolor_apps_22x22_gnome-web-browser.svg
index 7008463fa..7008463fa 100644
--- a/data/icons/22x22/apps/gnome-web-browser.svg
+++ b/data/icons/hicolor_apps_22x22_gnome-web-browser.svg
diff --git a/data/icons/24x24/apps/gnome-web-browser.png b/data/icons/hicolor_apps_24x24_gnome-web-browser.png
index c25adec96..c25adec96 100644
--- a/data/icons/24x24/apps/gnome-web-browser.png
+++ b/data/icons/hicolor_apps_24x24_gnome-web-browser.png
diff --git a/data/icons/32x32/apps/gnome-web-browser.png b/data/icons/hicolor_apps_32x32_gnome-web-browser.png
index 442e5c42d..442e5c42d 100644
--- a/data/icons/32x32/apps/gnome-web-browser.png
+++ b/data/icons/hicolor_apps_32x32_gnome-web-browser.png
diff --git a/data/icons/32x32/apps/gnome-web-browser.svg b/data/icons/hicolor_apps_32x32_gnome-web-browser.svg
index 979e3b85c..979e3b85c 100644
--- a/data/icons/32x32/apps/gnome-web-browser.svg
+++ b/data/icons/hicolor_apps_32x32_gnome-web-browser.svg
diff --git a/data/icons/scalable/apps/gnome-web-browser.svg b/data/icons/hicolor_apps_scalable_gnome-web-browser.svg
index d8be1c4d6..d8be1c4d6 100644
--- a/data/icons/scalable/apps/gnome-web-browser.svg
+++ b/data/icons/hicolor_apps_scalable_gnome-web-browser.svg
diff --git a/data/icons/16x16/places/bookmark-web.png b/data/icons/hicolor_places_16x16_bookmark-web.png
index 627f7ade1..627f7ade1 100644
--- a/data/icons/16x16/places/bookmark-web.png
+++ b/data/icons/hicolor_places_16x16_bookmark-web.png
diff --git a/data/icons/16x16/places/bookmark-web.svg b/data/icons/hicolor_places_16x16_bookmark-web.svg
index 80d969a32..80d969a32 100644
--- a/data/icons/16x16/places/bookmark-web.svg
+++ b/data/icons/hicolor_places_16x16_bookmark-web.svg
diff --git a/data/icons/22x22/places/bookmark-web.png b/data/icons/hicolor_places_22x22_bookmark-web.png
index f254b2c91..f254b2c91 100644
--- a/data/icons/22x22/places/bookmark-web.png
+++ b/data/icons/hicolor_places_22x22_bookmark-web.png
diff --git a/data/icons/22x22/places/bookmark-web.svg b/data/icons/hicolor_places_22x22_bookmark-web.svg
index d59a6e07a..d59a6e07a 100644
--- a/data/icons/22x22/places/bookmark-web.svg
+++ b/data/icons/hicolor_places_22x22_bookmark-web.svg
diff --git a/data/icons/24x24/places/bookmark-web.png b/data/icons/hicolor_places_24x24_bookmark-web.png
index f86e7b78a..f86e7b78a 100644
--- a/data/icons/24x24/places/bookmark-web.png
+++ b/data/icons/hicolor_places_24x24_bookmark-web.png
diff --git a/data/icons/16x16/status/lock-broken.png b/data/icons/hicolor_status_16x16_lock-broken.png
index b0268917d..b0268917d 100644
--- a/data/icons/16x16/status/lock-broken.png
+++ b/data/icons/hicolor_status_16x16_lock-broken.png
diff --git a/data/icons/16x16/status/lock-insecure.png b/data/icons/hicolor_status_16x16_lock-insecure.png
index 5bc6cd62b..5bc6cd62b 100644
--- a/data/icons/16x16/status/lock-insecure.png
+++ b/data/icons/hicolor_status_16x16_lock-insecure.png
diff --git a/data/icons/16x16/status/lock-secure-checked.png b/data/icons/hicolor_status_16x16_lock-secure-checked.png
index 437f79750..437f79750 100644
--- a/data/icons/16x16/status/lock-secure-checked.png
+++ b/data/icons/hicolor_status_16x16_lock-secure-checked.png
diff --git a/data/icons/16x16/status/lock-secure.png b/data/icons/hicolor_status_16x16_lock-secure.png
index 33091eb85..33091eb85 100644
--- a/data/icons/16x16/status/lock-secure.png
+++ b/data/icons/hicolor_status_16x16_lock-secure.png
diff --git a/data/icons/16x16/status/popup-hidden.png b/data/icons/hicolor_status_16x16_popup-hidden.png
index 731401374..731401374 100644
--- a/data/icons/16x16/status/popup-hidden.png
+++ b/data/icons/hicolor_status_16x16_popup-hidden.png
diff --git a/data/icons/16x16/status/popup-hidden.xcf b/data/icons/hicolor_status_16x16_popup-hidden.xcf
index 6b30badda..6b30badda 100644
--- a/data/icons/16x16/status/popup-hidden.xcf
+++ b/data/icons/hicolor_status_16x16_popup-hidden.xcf
diff --git a/data/icons/22x22/status/popup-hidden.png b/data/icons/hicolor_status_22x22_popup-hidden.png
index 0d70dd04d..0d70dd04d 100644
--- a/data/icons/22x22/status/popup-hidden.png
+++ b/data/icons/hicolor_status_22x22_popup-hidden.png
diff --git a/data/icons/22x22/status/popup-hidden.xcf b/data/icons/hicolor_status_22x22_popup-hidden.xcf
index 64fbedea9..64fbedea9 100644
--- a/data/icons/22x22/status/popup-hidden.xcf
+++ b/data/icons/hicolor_status_22x22_popup-hidden.xcf
diff --git a/data/icons/24x24/status/lock-broken.png b/data/icons/hicolor_status_24x24_lock-broken.png
index 097cd417d..097cd417d 100644
--- a/data/icons/24x24/status/lock-broken.png
+++ b/data/icons/hicolor_status_24x24_lock-broken.png
diff --git a/data/icons/24x24/status/lock-insecure.png b/data/icons/hicolor_status_24x24_lock-insecure.png
index f2e05a425..f2e05a425 100644
--- a/data/icons/24x24/status/lock-insecure.png
+++ b/data/icons/hicolor_status_24x24_lock-insecure.png
diff --git a/data/icons/24x24/status/lock-secure-checked.png b/data/icons/hicolor_status_24x24_lock-secure-checked.png
index 92b7d1c75..92b7d1c75 100644
--- a/data/icons/24x24/status/lock-secure-checked.png
+++ b/data/icons/hicolor_status_24x24_lock-secure-checked.png
diff --git a/data/icons/24x24/status/lock-secure.png b/data/icons/hicolor_status_24x24_lock-secure.png
index 41d2ba9ac..41d2ba9ac 100644
--- a/data/icons/24x24/status/lock-secure.png
+++ b/data/icons/hicolor_status_24x24_lock-secure.png
diff --git a/data/icons/24x24/status/popup-hidden.png b/data/icons/hicolor_status_24x24_popup-hidden.png
index 315b53988..315b53988 100644
--- a/data/icons/24x24/status/popup-hidden.png
+++ b/data/icons/hicolor_status_24x24_popup-hidden.png
diff --git a/data/icons/32x32/status/popup-hidden.png b/data/icons/hicolor_status_32x32_popup-hidden.png
index f59b05cb3..f59b05cb3 100644
--- a/data/icons/32x32/status/popup-hidden.png
+++ b/data/icons/hicolor_status_32x32_popup-hidden.png
diff --git a/data/icons/32x32/status/popup-hidden.svg b/data/icons/hicolor_status_32x32_popup-hidden.svg
index 7dace6e50..7dace6e50 100644
--- a/data/icons/32x32/status/popup-hidden.svg
+++ b/data/icons/hicolor_status_32x32_popup-hidden.svg
diff --git a/data/icons/48x48/status/lock-broken.png b/data/icons/hicolor_status_48x48_lock-broken.png
index 4c9f14569..4c9f14569 100644
--- a/data/icons/48x48/status/lock-broken.png
+++ b/data/icons/hicolor_status_48x48_lock-broken.png
diff --git a/data/icons/48x48/status/lock-insecure.png b/data/icons/hicolor_status_48x48_lock-insecure.png
index 1f0190541..1f0190541 100644
--- a/data/icons/48x48/status/lock-insecure.png
+++ b/data/icons/hicolor_status_48x48_lock-insecure.png
diff --git a/data/icons/48x48/status/lock-secure-checked.png b/data/icons/hicolor_status_48x48_lock-secure-checked.png
index 246e615ac..246e615ac 100644
--- a/data/icons/48x48/status/lock-secure-checked.png
+++ b/data/icons/hicolor_status_48x48_lock-secure-checked.png
diff --git a/data/icons/48x48/status/lock-secure.png b/data/icons/hicolor_status_48x48_lock-secure.png
index f24ae3a60..f24ae3a60 100644
--- a/data/icons/48x48/status/lock-secure.png
+++ b/data/icons/hicolor_status_48x48_lock-secure.png
diff --git a/data/icons/scalable/status/popup-hidden.svg b/data/icons/hicolor_status_scalable_popup-hidden.svg
index 74a258f05..74a258f05 100644
--- a/data/icons/scalable/status/popup-hidden.svg
+++ b/data/icons/hicolor_status_scalable_popup-hidden.svg
diff --git a/data/icons/scalable/Makefile.am b/data/icons/scalable/Makefile.am
deleted file mode 100644
index 6e7f8f92c..000000000
--- a/data/icons/scalable/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-SUBDIRS = \
-	apps	\
-	actions	\
-	status
diff --git a/data/icons/scalable/actions/Makefile.am b/data/icons/scalable/actions/Makefile.am
deleted file mode 100644
index cbea23319..000000000
--- a/data/icons/scalable/actions/Makefile.am
+++ /dev/null
@@ -1,13 +0,0 @@
-themedir = $(pkgdatadir)/icons/hicolor
-size = scalable
-context = actions
-
-iconsdir = $(themedir)/$(size)/$(context)
-
-icons_DATA = \
-	bookmark-view.svg	\
-	history-view.svg	\
-	location-entry.svg
-
-EXTRA_DIST = \
-	$(icons_DATA)
diff --git a/data/icons/scalable/apps/Makefile.am b/data/icons/scalable/apps/Makefile.am
deleted file mode 100644
index 935f2d772..000000000
--- a/data/icons/scalable/apps/Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-themedir = $(datadir)/icons/hicolor
-size = scalable
-context = apps
-
-iconsdir = $(themedir)/$(size)/$(context)
-
-icons_DATA = \
-	gnome-web-browser.svg
-
-noinst_DATA =
-
-EXTRA_DIST =		\
-	$(icons_DATA)	\
-	$(noinst_DATA)
diff --git a/data/icons/scalable/status/Makefile.am b/data/icons/scalable/status/Makefile.am
deleted file mode 100644
index c742b21aa..000000000
--- a/data/icons/scalable/status/Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
-themedir = $(pkgdatadir)/icons/hicolor
-size = scalable
-context = status
-
-iconsdir = $(themedir)/$(size)/$(context)
-
-icons_DATA = \
-	popup-hidden.svg
-
-EXTRA_DIST = \
-	$(icons_DATA)