Revise legacy stock icon contexts.

The legacy stock icons need to be installed into context directories
that gnome-icon-theme still supports (actions, places, status, etc.).

60 files changed, 68 insertions, 70 deletions

diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am
index 1f5f74aa17..022e9735fd 100644
--- a/data/icons/Makefile.am
+++ b/data/icons/Makefile.am
@@ -88,65 +88,65 @@ private_icons = \
 # XXX Need to reevaluate which icons we really need and drop the rest.
 #     Many are not Tango-compliant and look dated and out of place.
 stock_private_icons = \
-	hicolor_stock_data_16x16_stock_signature-bad.png \
-	hicolor_stock_data_16x16_stock_signature-ok.png \
-	hicolor_stock_data_16x16_stock_signature.png \
-	hicolor_stock_data_24x24_stock_signature-bad.png \
-	hicolor_stock_data_24x24_stock_signature-ok.png \
-	hicolor_stock_data_24x24_stock_signature.png \
-	hicolor_stock_data_48x48_stock_signature-bad.png \
-	hicolor_stock_data_48x48_stock_signature-ok.png \
-	hicolor_stock_data_48x48_stock_signature.png \
-	hicolor_stock_document_16x16_stock_task-assigned.png \
-	hicolor_stock_document_16x16_stock_task-assigned-to.png \
-	hicolor_stock_document_16x16_stock_task.png \
-	hicolor_stock_document_16x16_stock_task-recurring.png \
-	hicolor_stock_document_16x16_stock_todo.png \
-	hicolor_stock_document_24x24_stock_task-assigned.png \
-	hicolor_stock_document_24x24_stock_task-assigned-to.png \
-	hicolor_stock_document_24x24_stock_task.png \
-	hicolor_stock_document_24x24_stock_task-recurring.png \
-	hicolor_stock_document_24x24_stock_todo.png \
-	hicolor_stock_document_48x48_stock_todo.png \
-	hicolor_stock_generic_16x16_stock_bell.png \
-	hicolor_stock_generic_16x16_stock_check-filled.png \
-	hicolor_stock_generic_16x16_stock_new-meeting.png \
-	hicolor_stock_generic_16x16_stock_score-higher.png \
-	hicolor_stock_generic_16x16_stock_score-highest.png \
-	hicolor_stock_generic_16x16_stock_score-high.png \
-	hicolor_stock_generic_16x16_stock_score-lower.png \
-	hicolor_stock_generic_16x16_stock_score-lowest.png \
-	hicolor_stock_generic_16x16_stock_score-low.png \
-	hicolor_stock_generic_16x16_stock_score-normal.png \
-	hicolor_stock_generic_16x16_stock_show-all.png \
-	hicolor_stock_generic_16x16_stock_timezone.png \
-	hicolor_stock_generic_16x16_stock_view-details.png \
-	hicolor_stock_generic_24x24_stock_new-meeting.png \
-	hicolor_stock_generic_24x24_stock_show-all.png \
-	hicolor_stock_generic_24x24_stock_timezone.png \
-	hicolor_stock_generic_48x48_stock_alarm.png \
-	hicolor_stock_generic_48x48_stock_new-meeting.png \
-	hicolor_stock_generic_48x48_stock_timezone.png \
-	hicolor_stock_net_16x16_stock_contact-list.png \
-	hicolor_stock_net_16x16_stock_mail-filters-apply.png \
-	hicolor_stock_net_16x16_stock_mail-flag-for-followup-done.png \
-	hicolor_stock_net_16x16_stock_mail-flag-for-followup.png \
-	hicolor_stock_net_16x16_stock_mail-open-multiple.png \
-	hicolor_stock_net_16x16_stock_mail-unread-multiple.png \
-	hicolor_stock_net_16x16_stock_shared-by-me.png \
-	hicolor_stock_net_16x16_stock_shared-to-me.png \
-	hicolor_stock_net_16x16_stock_video-conferencing.png \
-	hicolor_stock_net_24x24_stock_contact-list.png \
-	hicolor_stock_net_24x24_stock_mail-filters-apply.png \
-	hicolor_stock_net_24x24_stock_mail-open-multiple.png \
-	hicolor_stock_net_24x24_stock_mail-unread-multiple.png \
-	hicolor_stock_net_24x24_stock_shared-by-me.png \
-	hicolor_stock_net_24x24_stock_shared-to-me.png \
-	hicolor_stock_net_24x24_stock_video-conferencing.png \
-	hicolor_stock_net_48x48_stock_mail-flag-for-followup-done.png \
-	hicolor_stock_net_48x48_stock_mail-flag-for-followup.png \
-	hicolor_stock_object_16x16_stock_insert-note.png \
-	hicolor_stock_object_24x24_stock_insert-note.png \
+	hicolor_actions_16x16_stock_bell.png \
+	hicolor_actions_16x16_stock_contact-list.png \
+	hicolor_actions_16x16_stock_insert-note.png \
+	hicolor_actions_16x16_stock_mail-filters-apply.png \
+	hicolor_actions_16x16_stock_mail-flag-for-followup-done.png \
+	hicolor_actions_16x16_stock_mail-flag-for-followup.png \
+	hicolor_actions_16x16_stock_mail-open-multiple.png \
+	hicolor_actions_16x16_stock_mail-unread-multiple.png \
+	hicolor_actions_16x16_stock_new-meeting.png \
+	hicolor_actions_16x16_stock_shared-by-me.png \
+	hicolor_actions_16x16_stock_shared-to-me.png \
+	hicolor_actions_16x16_stock_show-all.png \
+	hicolor_actions_16x16_stock_task-assigned-to.png \
+	hicolor_actions_16x16_stock_task-assigned.png \
+	hicolor_actions_16x16_stock_task-recurring.png \
+	hicolor_actions_16x16_stock_task.png \
+	hicolor_actions_16x16_stock_timezone.png \
+	hicolor_actions_16x16_stock_todo.png \
+	hicolor_actions_16x16_stock_video-conferencing.png \
+	hicolor_actions_16x16_stock_view-details.png \
+	hicolor_actions_24x24_stock_contact-list.png \
+	hicolor_actions_24x24_stock_insert-note.png \
+	hicolor_actions_24x24_stock_mail-filters-apply.png \
+	hicolor_actions_24x24_stock_mail-open-multiple.png \
+	hicolor_actions_24x24_stock_mail-unread-multiple.png \
+	hicolor_actions_24x24_stock_new-meeting.png \
+	hicolor_actions_24x24_stock_shared-by-me.png \
+	hicolor_actions_24x24_stock_shared-to-me.png \
+	hicolor_actions_24x24_stock_show-all.png \
+	hicolor_actions_24x24_stock_task-assigned-to.png \
+	hicolor_actions_24x24_stock_task-assigned.png \
+	hicolor_actions_24x24_stock_task-recurring.png \
+	hicolor_actions_24x24_stock_task.png \
+	hicolor_actions_24x24_stock_timezone.png \
+	hicolor_actions_24x24_stock_todo.png \
+	hicolor_actions_24x24_stock_video-conferencing.png \
+	hicolor_actions_48x48_stock_alarm.png \
+	hicolor_actions_48x48_stock_mail-flag-for-followup-done.png \
+	hicolor_actions_48x48_stock_mail-flag-for-followup.png \
+	hicolor_actions_48x48_stock_new-meeting.png \
+	hicolor_actions_48x48_stock_timezone.png \
+	hicolor_actions_48x48_stock_todo.png \
+	hicolor_status_16x16_stock_check-filled.png \
+	hicolor_status_16x16_stock_score-high.png \
+	hicolor_status_16x16_stock_score-higher.png \
+	hicolor_status_16x16_stock_score-highest.png \
+	hicolor_status_16x16_stock_score-low.png \
+	hicolor_status_16x16_stock_score-lower.png \
+	hicolor_status_16x16_stock_score-lowest.png \
+	hicolor_status_16x16_stock_score-normal.png \
+	hicolor_status_16x16_stock_signature-bad.png \
+	hicolor_status_16x16_stock_signature-ok.png \
+	hicolor_status_16x16_stock_signature.png \
+	hicolor_status_24x24_stock_signature-bad.png \
+	hicolor_status_24x24_stock_signature-ok.png \
+	hicolor_status_24x24_stock_signature.png \
+	hicolor_status_48x48_stock_signature-bad.png \
+	hicolor_status_48x48_stock_signature-ok.png \
+	hicolor_status_48x48_stock_signature.png \
 	$(NULL)
 
 # hicolor_status_16x16_wrapped.png was copied from Firefox
@@ -225,12 +225,11 @@ install-icons:
 	done
 	for icon in $(stock_private_icons); do \
 		THEME=`echo $$icon | cut -d_ -f1`; \
-		STOCK=`echo $$icon | cut -d_ -f2`; \
-		CONTEXT=`echo $$icon | cut -d_ -f3`; \
-		SIZE=`echo $$icon | cut -d_ -f4`; \
-		ICONFILE=`echo $$icon | cut -d_ -f6`; \
-		mkdir -p $(DESTDIR)$(pkgdatadir)/$(BASE_VERSION)/icons/$$THEME/$$SIZE/$$STOCK/$$CONTEXT; \
-		$(INSTALL_DATA) $(srcdir)/$$icon $(DESTDIR)$(pkgdatadir)/$(BASE_VERSION)/icons/$$THEME/$$SIZE/$$STOCK/$$CONTEXT/stock_$$ICONFILE; \
+		CONTEXT=`echo $$icon | cut -d_ -f2`; \
+		SIZE=`echo $$icon | cut -d_ -f3`; \
+		ICONFILE=`echo $$icon | cut -d_ -f5`; \
+		mkdir -p $(DESTDIR)$(pkgdatadir)/$(BASE_VERSION)/icons/$$THEME/$$SIZE/$$CONTEXT; \
+		$(INSTALL_DATA) $(srcdir)/$$icon $(DESTDIR)$(pkgdatadir)/$(BASE_VERSION)/icons/$$THEME/$$SIZE/$$CONTEXT/stock_$$ICONFILE; \
 	done
 
 uninstall-icons:
@@ -250,11 +249,10 @@ uninstall-icons:
 	done
 	for icon in $(stock_private_icons); do \
 		THEME=`echo $$icon | cut -d_ -f1`; \
-		STOCK=`echo $$icon | cut -d_ -f2`; \
-		CONTEXT=`echo $$icon | cut -d_ -f3`; \
-		SIZE=`echo $$icon | cut -d_ -f4`; \
-		ICONFILE=`echo $$icon | cut -d_ -f6`; \
-		rm -f $(DESTDIR)$(pkgdatadir)/$(BASE_VERSION)/icons/$$THEME/$$SIZE/$$STOCK/$$CONTEXT/stock_$$ICONFILE; \
+		CONTEXT=`echo $$icon | cut -d_ -f2`; \
+		SIZE=`echo $$icon | cut -d_ -f3`; \
+		ICONFILE=`echo $$icon | cut -d_ -f5`; \
+		rm -f $(DESTDIR)$(pkgdatadir)/$(BASE_VERSION)/icons/$$THEME/$$SIZE/$$CONTEXT/stock_$$ICONFILE; \
 	done
 
 install-data-local: install-icons update-icon-cache
diff --git a/data/icons/hicolor_stock_generic_16x16_stock_bell.png b/data/icons/hicolor_actions_16x16_stock_bell.png
index 2183762ce1..2183762ce1 100644
--- a/data/icons/hicolor_stock_generic_16x16_stock_bell.png
+++ b/data/icons/hicolor_actions_16x16_stock_bell.png
diff --git a/data/icons/hicolor_stock_net_16x16_stock_contact-list.png b/data/icons/hicolor_actions_16x16_stock_contact-list.png
index 5ebfe92745..5ebfe92745 100644
--- a/data/icons/hicolor_stock_net_16x16_stock_contact-list.png
+++ b/data/icons/hicolor_actions_16x16_stock_contact-list.png
diff --git a/data/icons/hicolor_stock_object_16x16_stock_insert-note.png b/data/icons/hicolor_actions_16x16_stock_insert-note.png
index 0b3205b7d9..0b3205b7d9 100644
--- a/data/icons/hicolor_stock_object_16x16_stock_insert-note.png
+++ b/data/icons/hicolor_actions_16x16_stock_insert-note.png
diff --git a/data/icons/hicolor_stock_net_16x16_stock_mail-filters-apply.png b/data/icons/hicolor_actions_16x16_stock_mail-filters-apply.png
index b3127c8dce..b3127c8dce 100644
--- a/data/icons/hicolor_stock_net_16x16_stock_mail-filters-apply.png
+++ b/data/icons/hicolor_actions_16x16_stock_mail-filters-apply.png
diff --git a/data/icons/hicolor_stock_net_16x16_stock_mail-flag-for-followup-done.png b/data/icons/hicolor_actions_16x16_stock_mail-flag-for-followup-done.png
index c21a388135..c21a388135 100644
--- a/data/icons/hicolor_stock_net_16x16_stock_mail-flag-for-followup-done.png
+++ b/data/icons/hicolor_actions_16x16_stock_mail-flag-for-followup-done.png
diff --git a/data/icons/hicolor_stock_net_16x16_stock_mail-flag-for-followup.png b/data/icons/hicolor_actions_16x16_stock_mail-flag-for-followup.png
index 08e5e6dcd4..08e5e6dcd4 100644
--- a/data/icons/hicolor_stock_net_16x16_stock_mail-flag-for-followup.png
+++ b/data/icons/hicolor_actions_16x16_stock_mail-flag-for-followup.png
diff --git a/data/icons/hicolor_stock_net_16x16_stock_mail-open-multiple.png b/data/icons/hicolor_actions_16x16_stock_mail-open-multiple.png
index fca1b54db5..fca1b54db5 100644
--- a/data/icons/hicolor_stock_net_16x16_stock_mail-open-multiple.png
+++ b/data/icons/hicolor_actions_16x16_stock_mail-open-multiple.png
diff --git a/data/icons/hicolor_stock_net_16x16_stock_mail-unread-multiple.png b/data/icons/hicolor_actions_16x16_stock_mail-unread-multiple.png
index c448d2793f..c448d2793f 100644
--- a/data/icons/hicolor_stock_net_16x16_stock_mail-unread-multiple.png
+++ b/data/icons/hicolor_actions_16x16_stock_mail-unread-multiple.png
diff --git a/data/icons/hicolor_stock_generic_16x16_stock_new-meeting.png b/data/icons/hicolor_actions_16x16_stock_new-meeting.png
index 1c9b944e14..1c9b944e14 100644
--- a/data/icons/hicolor_stock_generic_16x16_stock_new-meeting.png
+++ b/data/icons/hicolor_actions_16x16_stock_new-meeting.png
diff --git a/data/icons/hicolor_stock_net_16x16_stock_shared-by-me.png b/data/icons/hicolor_actions_16x16_stock_shared-by-me.png
index 7ade49fc3d..7ade49fc3d 100644
--- a/data/icons/hicolor_stock_net_16x16_stock_shared-by-me.png
+++ b/data/icons/hicolor_actions_16x16_stock_shared-by-me.png
diff --git a/data/icons/hicolor_stock_net_16x16_stock_shared-to-me.png b/data/icons/hicolor_actions_16x16_stock_shared-to-me.png
index 823651bb5c..823651bb5c 100644
--- a/data/icons/hicolor_stock_net_16x16_stock_shared-to-me.png
+++ b/data/icons/hicolor_actions_16x16_stock_shared-to-me.png
diff --git a/data/icons/hicolor_stock_generic_16x16_stock_show-all.png b/data/icons/hicolor_actions_16x16_stock_show-all.png
index a168c38fe8..a168c38fe8 100644
--- a/data/icons/hicolor_stock_generic_16x16_stock_show-all.png
+++ b/data/icons/hicolor_actions_16x16_stock_show-all.png
diff --git a/data/icons/hicolor_stock_document_16x16_stock_task-assigned-to.png b/data/icons/hicolor_actions_16x16_stock_task-assigned-to.png
index 58c0652d78..58c0652d78 100644
--- a/data/icons/hicolor_stock_document_16x16_stock_task-assigned-to.png
+++ b/data/icons/hicolor_actions_16x16_stock_task-assigned-to.png
diff --git a/data/icons/hicolor_stock_document_16x16_stock_task-assigned.png b/data/icons/hicolor_actions_16x16_stock_task-assigned.png
index 2cd6a0ba9f..2cd6a0ba9f 100644
--- a/data/icons/hicolor_stock_document_16x16_stock_task-assigned.png
+++ b/data/icons/hicolor_actions_16x16_stock_task-assigned.png
diff --git a/data/icons/hicolor_stock_document_16x16_stock_task-recurring.png b/data/icons/hicolor_actions_16x16_stock_task-recurring.png
index 6e3506ae80..6e3506ae80 100644
--- a/data/icons/hicolor_stock_document_16x16_stock_task-recurring.png
+++ b/data/icons/hicolor_actions_16x16_stock_task-recurring.png
diff --git a/data/icons/hicolor_stock_document_16x16_stock_task.png b/data/icons/hicolor_actions_16x16_stock_task.png
index 10efd55a59..10efd55a59 100644
--- a/data/icons/hicolor_stock_document_16x16_stock_task.png
+++ b/data/icons/hicolor_actions_16x16_stock_task.png
diff --git a/data/icons/hicolor_stock_generic_16x16_stock_timezone.png b/data/icons/hicolor_actions_16x16_stock_timezone.png
index de4eb39359..de4eb39359 100644
--- a/data/icons/hicolor_stock_generic_16x16_stock_timezone.png
+++ b/data/icons/hicolor_actions_16x16_stock_timezone.png
diff --git a/data/icons/hicolor_stock_document_16x16_stock_todo.png b/data/icons/hicolor_actions_16x16_stock_todo.png
index e5869ad8c3..e5869ad8c3 100644
--- a/data/icons/hicolor_stock_document_16x16_stock_todo.png
+++ b/data/icons/hicolor_actions_16x16_stock_todo.png
diff --git a/data/icons/hicolor_stock_net_16x16_stock_video-conferencing.png b/data/icons/hicolor_actions_16x16_stock_video-conferencing.png
index dd9bbbd96e..dd9bbbd96e 100644
--- a/data/icons/hicolor_stock_net_16x16_stock_video-conferencing.png
+++ b/data/icons/hicolor_actions_16x16_stock_video-conferencing.png
diff --git a/data/icons/hicolor_stock_generic_16x16_stock_view-details.png b/data/icons/hicolor_actions_16x16_stock_view-details.png
index 7995fdd515..7995fdd515 100644
--- a/data/icons/hicolor_stock_generic_16x16_stock_view-details.png
+++ b/data/icons/hicolor_actions_16x16_stock_view-details.png
diff --git a/data/icons/hicolor_stock_net_24x24_stock_contact-list.png b/data/icons/hicolor_actions_24x24_stock_contact-list.png
index 2f71a843e7..2f71a843e7 100644
--- a/data/icons/hicolor_stock_net_24x24_stock_contact-list.png
+++ b/data/icons/hicolor_actions_24x24_stock_contact-list.png
diff --git a/data/icons/hicolor_stock_object_24x24_stock_insert-note.png b/data/icons/hicolor_actions_24x24_stock_insert-note.png
index 3f72c1840a..3f72c1840a 100644
--- a/data/icons/hicolor_stock_object_24x24_stock_insert-note.png
+++ b/data/icons/hicolor_actions_24x24_stock_insert-note.png
diff --git a/data/icons/hicolor_stock_net_24x24_stock_mail-filters-apply.png b/data/icons/hicolor_actions_24x24_stock_mail-filters-apply.png
index f9c635910d..f9c635910d 100644
--- a/data/icons/hicolor_stock_net_24x24_stock_mail-filters-apply.png
+++ b/data/icons/hicolor_actions_24x24_stock_mail-filters-apply.png
diff --git a/data/icons/hicolor_stock_net_24x24_stock_mail-open-multiple.png b/data/icons/hicolor_actions_24x24_stock_mail-open-multiple.png
index 1233ff1e09..1233ff1e09 100644
--- a/data/icons/hicolor_stock_net_24x24_stock_mail-open-multiple.png
+++ b/data/icons/hicolor_actions_24x24_stock_mail-open-multiple.png
diff --git a/data/icons/hicolor_stock_net_24x24_stock_mail-unread-multiple.png b/data/icons/hicolor_actions_24x24_stock_mail-unread-multiple.png
index 27a62fcf2e..27a62fcf2e 100644
--- a/data/icons/hicolor_stock_net_24x24_stock_mail-unread-multiple.png
+++ b/data/icons/hicolor_actions_24x24_stock_mail-unread-multiple.png
diff --git a/data/icons/hicolor_stock_generic_24x24_stock_new-meeting.png b/data/icons/hicolor_actions_24x24_stock_new-meeting.png
index 55f9b310e5..55f9b310e5 100644
--- a/data/icons/hicolor_stock_generic_24x24_stock_new-meeting.png
+++ b/data/icons/hicolor_actions_24x24_stock_new-meeting.png
diff --git a/data/icons/hicolor_stock_net_24x24_stock_shared-by-me.png b/data/icons/hicolor_actions_24x24_stock_shared-by-me.png
index 6d0f8114d6..6d0f8114d6 100644
--- a/data/icons/hicolor_stock_net_24x24_stock_shared-by-me.png
+++ b/data/icons/hicolor_actions_24x24_stock_shared-by-me.png
diff --git a/data/icons/hicolor_stock_net_24x24_stock_shared-to-me.png b/data/icons/hicolor_actions_24x24_stock_shared-to-me.png
index 455fc97af7..455fc97af7 100644
--- a/data/icons/hicolor_stock_net_24x24_stock_shared-to-me.png
+++ b/data/icons/hicolor_actions_24x24_stock_shared-to-me.png
diff --git a/data/icons/hicolor_stock_generic_24x24_stock_show-all.png b/data/icons/hicolor_actions_24x24_stock_show-all.png
index 2e52ddc938..2e52ddc938 100644
--- a/data/icons/hicolor_stock_generic_24x24_stock_show-all.png
+++ b/data/icons/hicolor_actions_24x24_stock_show-all.png
diff --git a/data/icons/hicolor_stock_document_24x24_stock_task-assigned-to.png b/data/icons/hicolor_actions_24x24_stock_task-assigned-to.png
index f7e7de9ebd..f7e7de9ebd 100644
--- a/data/icons/hicolor_stock_document_24x24_stock_task-assigned-to.png
+++ b/data/icons/hicolor_actions_24x24_stock_task-assigned-to.png
diff --git a/data/icons/hicolor_stock_document_24x24_stock_task-assigned.png b/data/icons/hicolor_actions_24x24_stock_task-assigned.png
index 5331a3764c..5331a3764c 100644
--- a/data/icons/hicolor_stock_document_24x24_stock_task-assigned.png
+++ b/data/icons/hicolor_actions_24x24_stock_task-assigned.png
diff --git a/data/icons/hicolor_stock_document_24x24_stock_task-recurring.png b/data/icons/hicolor_actions_24x24_stock_task-recurring.png
index 4b91be0ef6..4b91be0ef6 100644
--- a/data/icons/hicolor_stock_document_24x24_stock_task-recurring.png
+++ b/data/icons/hicolor_actions_24x24_stock_task-recurring.png
diff --git a/data/icons/hicolor_stock_document_24x24_stock_task.png b/data/icons/hicolor_actions_24x24_stock_task.png
index 0845605b06..0845605b06 100644
--- a/data/icons/hicolor_stock_document_24x24_stock_task.png
+++ b/data/icons/hicolor_actions_24x24_stock_task.png
diff --git a/data/icons/hicolor_stock_generic_24x24_stock_timezone.png b/data/icons/hicolor_actions_24x24_stock_timezone.png
index 180c14061d..180c14061d 100644
--- a/data/icons/hicolor_stock_generic_24x24_stock_timezone.png
+++ b/data/icons/hicolor_actions_24x24_stock_timezone.png
diff --git a/data/icons/hicolor_stock_document_24x24_stock_todo.png b/data/icons/hicolor_actions_24x24_stock_todo.png
index 48bd5d01f8..48bd5d01f8 100644
--- a/data/icons/hicolor_stock_document_24x24_stock_todo.png
+++ b/data/icons/hicolor_actions_24x24_stock_todo.png
diff --git a/data/icons/hicolor_stock_net_24x24_stock_video-conferencing.png b/data/icons/hicolor_actions_24x24_stock_video-conferencing.png
index 8bbea0ba1b..8bbea0ba1b 100644
--- a/data/icons/hicolor_stock_net_24x24_stock_video-conferencing.png
+++ b/data/icons/hicolor_actions_24x24_stock_video-conferencing.png
diff --git a/data/icons/hicolor_stock_generic_48x48_stock_alarm.png b/data/icons/hicolor_actions_48x48_stock_alarm.png
index 8df8fa5f85..8df8fa5f85 100644
--- a/data/icons/hicolor_stock_generic_48x48_stock_alarm.png
+++ b/data/icons/hicolor_actions_48x48_stock_alarm.png
diff --git a/data/icons/hicolor_stock_net_48x48_stock_mail-flag-for-followup-done.png b/data/icons/hicolor_actions_48x48_stock_mail-flag-for-followup-done.png
index 76f5c0b04e..76f5c0b04e 100644
--- a/data/icons/hicolor_stock_net_48x48_stock_mail-flag-for-followup-done.png
+++ b/data/icons/hicolor_actions_48x48_stock_mail-flag-for-followup-done.png
diff --git a/data/icons/hicolor_stock_net_48x48_stock_mail-flag-for-followup.png b/data/icons/hicolor_actions_48x48_stock_mail-flag-for-followup.png
index a387bd9521..a387bd9521 100644
--- a/data/icons/hicolor_stock_net_48x48_stock_mail-flag-for-followup.png
+++ b/data/icons/hicolor_actions_48x48_stock_mail-flag-for-followup.png
diff --git a/data/icons/hicolor_stock_generic_48x48_stock_new-meeting.png b/data/icons/hicolor_actions_48x48_stock_new-meeting.png
index 9dcfc896cd..9dcfc896cd 100644
--- a/data/icons/hicolor_stock_generic_48x48_stock_new-meeting.png
+++ b/data/icons/hicolor_actions_48x48_stock_new-meeting.png
diff --git a/data/icons/hicolor_stock_generic_48x48_stock_timezone.png b/data/icons/hicolor_actions_48x48_stock_timezone.png
index d5a5756220..d5a5756220 100644
--- a/data/icons/hicolor_stock_generic_48x48_stock_timezone.png
+++ b/data/icons/hicolor_actions_48x48_stock_timezone.png
diff --git a/data/icons/hicolor_stock_document_48x48_stock_todo.png b/data/icons/hicolor_actions_48x48_stock_todo.png
index f1ee3ffe4f..f1ee3ffe4f 100644
--- a/data/icons/hicolor_stock_document_48x48_stock_todo.png
+++ b/data/icons/hicolor_actions_48x48_stock_todo.png
diff --git a/data/icons/hicolor_stock_generic_16x16_stock_check-filled.png b/data/icons/hicolor_status_16x16_stock_check-filled.png
index a43a2b2d40..a43a2b2d40 100644
--- a/data/icons/hicolor_stock_generic_16x16_stock_check-filled.png
+++ b/data/icons/hicolor_status_16x16_stock_check-filled.png
diff --git a/data/icons/hicolor_stock_generic_16x16_stock_score-high.png b/data/icons/hicolor_status_16x16_stock_score-high.png
index d0b832cabe..d0b832cabe 100644
--- a/data/icons/hicolor_stock_generic_16x16_stock_score-high.png
+++ b/data/icons/hicolor_status_16x16_stock_score-high.png
diff --git a/data/icons/hicolor_stock_generic_16x16_stock_score-higher.png b/data/icons/hicolor_status_16x16_stock_score-higher.png
index 04bca9b6a1..04bca9b6a1 100644
--- a/data/icons/hicolor_stock_generic_16x16_stock_score-higher.png
+++ b/data/icons/hicolor_status_16x16_stock_score-higher.png
diff --git a/data/icons/hicolor_stock_generic_16x16_stock_score-highest.png b/data/icons/hicolor_status_16x16_stock_score-highest.png
index 09ea0e4470..09ea0e4470 100644
--- a/data/icons/hicolor_stock_generic_16x16_stock_score-highest.png
+++ b/data/icons/hicolor_status_16x16_stock_score-highest.png
diff --git a/data/icons/hicolor_stock_generic_16x16_stock_score-low.png b/data/icons/hicolor_status_16x16_stock_score-low.png
index 8863c9ee63..8863c9ee63 100644
--- a/data/icons/hicolor_stock_generic_16x16_stock_score-low.png
+++ b/data/icons/hicolor_status_16x16_stock_score-low.png
diff --git a/data/icons/hicolor_stock_generic_16x16_stock_score-lower.png b/data/icons/hicolor_status_16x16_stock_score-lower.png
index f16aab9a02..f16aab9a02 100644
--- a/data/icons/hicolor_stock_generic_16x16_stock_score-lower.png
+++ b/data/icons/hicolor_status_16x16_stock_score-lower.png
diff --git a/data/icons/hicolor_stock_generic_16x16_stock_score-lowest.png b/data/icons/hicolor_status_16x16_stock_score-lowest.png
index 637118bbdc..637118bbdc 100644
--- a/data/icons/hicolor_stock_generic_16x16_stock_score-lowest.png
+++ b/data/icons/hicolor_status_16x16_stock_score-lowest.png
diff --git a/data/icons/hicolor_stock_generic_16x16_stock_score-normal.png b/data/icons/hicolor_status_16x16_stock_score-normal.png
index a2d9dfee48..a2d9dfee48 100644
--- a/data/icons/hicolor_stock_generic_16x16_stock_score-normal.png
+++ b/data/icons/hicolor_status_16x16_stock_score-normal.png
diff --git a/data/icons/hicolor_stock_data_16x16_stock_signature-bad.png b/data/icons/hicolor_status_16x16_stock_signature-bad.png
index 40083adc57..40083adc57 100644
--- a/data/icons/hicolor_stock_data_16x16_stock_signature-bad.png
+++ b/data/icons/hicolor_status_16x16_stock_signature-bad.png
diff --git a/data/icons/hicolor_stock_data_16x16_stock_signature-ok.png b/data/icons/hicolor_status_16x16_stock_signature-ok.png
index 65b33d3d47..65b33d3d47 100644
--- a/data/icons/hicolor_stock_data_16x16_stock_signature-ok.png
+++ b/data/icons/hicolor_status_16x16_stock_signature-ok.png
diff --git a/data/icons/hicolor_stock_data_16x16_stock_signature.png b/data/icons/hicolor_status_16x16_stock_signature.png
index 8de8d2a5e3..8de8d2a5e3 100644
--- a/data/icons/hicolor_stock_data_16x16_stock_signature.png
+++ b/data/icons/hicolor_status_16x16_stock_signature.png
diff --git a/data/icons/hicolor_stock_data_24x24_stock_signature-bad.png b/data/icons/hicolor_status_24x24_stock_signature-bad.png
index 0c5bf3371b..0c5bf3371b 100644
--- a/data/icons/hicolor_stock_data_24x24_stock_signature-bad.png
+++ b/data/icons/hicolor_status_24x24_stock_signature-bad.png
diff --git a/data/icons/hicolor_stock_data_24x24_stock_signature-ok.png b/data/icons/hicolor_status_24x24_stock_signature-ok.png
index 7bd088224f..7bd088224f 100644
--- a/data/icons/hicolor_stock_data_24x24_stock_signature-ok.png
+++ b/data/icons/hicolor_status_24x24_stock_signature-ok.png
diff --git a/data/icons/hicolor_stock_data_24x24_stock_signature.png b/data/icons/hicolor_status_24x24_stock_signature.png
index 53a738880c..53a738880c 100644
--- a/data/icons/hicolor_stock_data_24x24_stock_signature.png
+++ b/data/icons/hicolor_status_24x24_stock_signature.png
diff --git a/data/icons/hicolor_stock_data_48x48_stock_signature-bad.png b/data/icons/hicolor_status_48x48_stock_signature-bad.png
index bfb72c6761..bfb72c6761 100644
--- a/data/icons/hicolor_stock_data_48x48_stock_signature-bad.png
+++ b/data/icons/hicolor_status_48x48_stock_signature-bad.png
diff --git a/data/icons/hicolor_stock_data_48x48_stock_signature-ok.png b/data/icons/hicolor_status_48x48_stock_signature-ok.png
index 11723f158b..11723f158b 100644
--- a/data/icons/hicolor_stock_data_48x48_stock_signature-ok.png
+++ b/data/icons/hicolor_status_48x48_stock_signature-ok.png
diff --git a/data/icons/hicolor_stock_data_48x48_stock_signature.png b/data/icons/hicolor_status_48x48_stock_signature.png
index 401819560f..401819560f 100644
--- a/data/icons/hicolor_stock_data_48x48_stock_signature.png
+++ b/data/icons/hicolor_status_48x48_stock_signature.png