[evolution/gnome-2-30] Bug 612209 - Missing stock icons in Evolution

[Matthew Barnes <mbarnes src gnome org>]

commit 8c37f8d4a598c4074179cdf9df1c525341f691b7
Author: Matthew Barnes <mbarnes redhat com>
Date:   Thu Mar 18 12:25:29 2010 -0400

    Bug 612209 - Missing stock icons in Evolution
    
    Bundle needed stock icons recently dropped from gnome-icon-theme.
    
    Need to reevaluate which icons we really need and drop the rest.
    Many are not Tango-compliant and look dated and out of place.
    
    The following icon names are bundled:
    
        stock_alarm
        stock_bell
        stock_check-filled
        stock_contact-list
        stock_insert-note
        stock_mail-filters-apply
        stock_mail-flag-for-followup
        stock_mail-flag-for-followup-done
        stock_mail-open-multiple
        stock_mail-unread-multiple
        stock_new-meeting
        stock_score-high
        stock_score-higher
        stock_score-highest
        stock_score-low
        stock_score-lower
        stock_score-lowest
        stock_score-normal
        stock_shared-by-me
        stock_shared-to-me
        stock_show-all
        stock_signature
        stock_signature-bad
        stock_signature-ok
        stock_task
        stock_task-assigned
        stock_task-assigned-to
        stock_task-recurring
        stock_timezone
        stock_todo
        stock_video-conferencing
        stock_view-details

 data/icons/Makefile.am                             |   83 ++++++++++++++++++++
 .../gnome_stock_data_16x16_stock_signature-bad.png |  Bin 0 -> 839 bytes
 .../gnome_stock_data_16x16_stock_signature-ok.png  |  Bin 0 -> 1110 bytes
 .../gnome_stock_data_16x16_stock_signature.png     |  Bin 0 -> 1108 bytes
 .../gnome_stock_data_24x24_stock_signature-bad.png |  Bin 0 -> 1618 bytes
 .../gnome_stock_data_24x24_stock_signature-ok.png  |  Bin 0 -> 1659 bytes
 .../gnome_stock_data_24x24_stock_signature.png     |  Bin 0 -> 1548 bytes
 .../gnome_stock_data_48x48_stock_signature-bad.png |  Bin 0 -> 4764 bytes
 .../gnome_stock_data_48x48_stock_signature-ok.png  |  Bin 0 -> 4273 bytes
 .../gnome_stock_data_48x48_stock_signature.png     |  Bin 0 -> 3730 bytes
 ...stock_document_16x16_stock_task-assigned-to.png |  Bin 0 -> 467 bytes
 ...me_stock_document_16x16_stock_task-assigned.png |  Bin 0 -> 482 bytes
 ...e_stock_document_16x16_stock_task-recurring.png |  Bin 0 -> 475 bytes
 .../gnome_stock_document_16x16_stock_task.png      |  Bin 0 -> 292 bytes
 .../gnome_stock_document_16x16_stock_todo.png      |  Bin 0 -> 560 bytes
 ...stock_document_24x24_stock_task-assigned-to.png |  Bin 0 -> 899 bytes
 ...me_stock_document_24x24_stock_task-assigned.png |  Bin 0 -> 907 bytes
 ...e_stock_document_24x24_stock_task-recurring.png |  Bin 0 -> 814 bytes
 .../gnome_stock_document_24x24_stock_task.png      |  Bin 0 -> 608 bytes
 .../gnome_stock_document_24x24_stock_todo.png      |  Bin 0 -> 853 bytes
 .../gnome_stock_document_48x48_stock_todo.png      |  Bin 0 -> 2936 bytes
 .../icons/gnome_stock_generic_16x16_stock_bell.png |  Bin 0 -> 491 bytes
 ...nome_stock_generic_16x16_stock_check-filled.png |  Bin 0 -> 270 bytes
 ...gnome_stock_generic_16x16_stock_new-meeting.png |  Bin 0 -> 827 bytes
 .../gnome_stock_generic_16x16_stock_score-high.png |  Bin 0 -> 383 bytes
 ...nome_stock_generic_16x16_stock_score-higher.png |  Bin 0 -> 381 bytes
 ...ome_stock_generic_16x16_stock_score-highest.png |  Bin 0 -> 376 bytes
 .../gnome_stock_generic_16x16_stock_score-low.png  |  Bin 0 -> 387 bytes
 ...gnome_stock_generic_16x16_stock_score-lower.png |  Bin 0 -> 382 bytes
 ...nome_stock_generic_16x16_stock_score-lowest.png |  Bin 0 -> 378 bytes
 ...nome_stock_generic_16x16_stock_score-normal.png |  Bin 0 -> 343 bytes
 .../gnome_stock_generic_16x16_stock_show-all.png   |  Bin 0 -> 186 bytes
 .../gnome_stock_generic_16x16_stock_timezone.png   |  Bin 0 -> 922 bytes
 ...nome_stock_generic_16x16_stock_view-details.png |  Bin 0 -> 467 bytes
 ...gnome_stock_generic_24x24_stock_new-meeting.png |  Bin 0 -> 1801 bytes
 .../gnome_stock_generic_24x24_stock_show-all.png   |  Bin 0 -> 543 bytes
 .../gnome_stock_generic_24x24_stock_timezone.png   |  Bin 0 -> 1124 bytes
 .../gnome_stock_generic_48x48_stock_alarm.png      |  Bin 0 -> 5022 bytes
 ...gnome_stock_generic_48x48_stock_new-meeting.png |  Bin 0 -> 3766 bytes
 .../gnome_stock_generic_48x48_stock_timezone.png   |  Bin 0 -> 2870 bytes
 .../gnome_stock_net_16x16_stock_contact-list.png   |  Bin 0 -> 450 bytes
 ...me_stock_net_16x16_stock_mail-filters-apply.png |  Bin 0 -> 475 bytes
 ...net_16x16_stock_mail-flag-for-followup-done.png |  Bin 0 -> 515 bytes
 ...tock_net_16x16_stock_mail-flag-for-followup.png |  Bin 0 -> 562 bytes
 ...me_stock_net_16x16_stock_mail-open-multiple.png |  Bin 0 -> 661 bytes
 ..._stock_net_16x16_stock_mail-unread-multiple.png |  Bin 0 -> 553 bytes
 .../gnome_stock_net_16x16_stock_shared-by-me.png   |  Bin 0 -> 777 bytes
 .../gnome_stock_net_16x16_stock_shared-to-me.png   |  Bin 0 -> 825 bytes
 ...me_stock_net_16x16_stock_video-conferencing.png |  Bin 0 -> 1090 bytes
 .../gnome_stock_net_24x24_stock_contact-list.png   |  Bin 0 -> 899 bytes
 ...me_stock_net_24x24_stock_mail-filters-apply.png |  Bin 0 -> 849 bytes
 ...me_stock_net_24x24_stock_mail-open-multiple.png |  Bin 0 -> 1033 bytes
 ..._stock_net_24x24_stock_mail-unread-multiple.png |  Bin 0 -> 813 bytes
 .../gnome_stock_net_24x24_stock_shared-by-me.png   |  Bin 0 -> 1078 bytes
 .../gnome_stock_net_24x24_stock_shared-to-me.png   |  Bin 0 -> 959 bytes
 ...me_stock_net_24x24_stock_video-conferencing.png |  Bin 0 -> 1724 bytes
 ...net_48x48_stock_mail-flag-for-followup-done.png |  Bin 0 -> 3273 bytes
 ...tock_net_48x48_stock_mail-flag-for-followup.png |  Bin 0 -> 3397 bytes
 .../gnome_stock_object_16x16_stock_insert-note.png |  Bin 0 -> 265 bytes
 .../gnome_stock_object_24x24_stock_insert-note.png |  Bin 0 -> 1284 bytes
 mail/em-format-html-display.c                      |    2 +-
 61 files changed, 84 insertions(+), 1 deletions(-)
---
diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am
index 54b5f4b..c6d2ba0 100644
--- a/data/icons/Makefile.am
+++ b/data/icons/Makefile.am
@@ -84,6 +84,71 @@ private_icons = \
 	hicolor_status_32x32_online.png \
 	$(NULL)
 
+# These icons were in gnome-icon-theme prior to GNOME 2.30.
+# 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 = \
+	gnome_stock_data_16x16_stock_signature-bad.png \
+	gnome_stock_data_16x16_stock_signature-ok.png \
+	gnome_stock_data_16x16_stock_signature.png \
+	gnome_stock_data_24x24_stock_signature-bad.png \
+	gnome_stock_data_24x24_stock_signature-ok.png \
+	gnome_stock_data_24x24_stock_signature.png \
+	gnome_stock_data_48x48_stock_signature-bad.png \
+	gnome_stock_data_48x48_stock_signature-ok.png \
+	gnome_stock_data_48x48_stock_signature.png \
+	gnome_stock_document_16x16_stock_task-assigned.png \
+	gnome_stock_document_16x16_stock_task-assigned-to.png \
+	gnome_stock_document_16x16_stock_task.png \
+	gnome_stock_document_16x16_stock_task-recurring.png \
+	gnome_stock_document_16x16_stock_todo.png \
+	gnome_stock_document_24x24_stock_task-assigned.png \
+	gnome_stock_document_24x24_stock_task-assigned-to.png \
+	gnome_stock_document_24x24_stock_task.png \
+	gnome_stock_document_24x24_stock_task-recurring.png \
+	gnome_stock_document_24x24_stock_todo.png \
+	gnome_stock_document_48x48_stock_todo.png \
+	gnome_stock_generic_16x16_stock_bell.png \
+	gnome_stock_generic_16x16_stock_check-filled.png \
+	gnome_stock_generic_16x16_stock_new-meeting.png \
+	gnome_stock_generic_16x16_stock_score-higher.png \
+	gnome_stock_generic_16x16_stock_score-highest.png \
+	gnome_stock_generic_16x16_stock_score-high.png \
+	gnome_stock_generic_16x16_stock_score-lower.png \
+	gnome_stock_generic_16x16_stock_score-lowest.png \
+	gnome_stock_generic_16x16_stock_score-low.png \
+	gnome_stock_generic_16x16_stock_score-normal.png \
+	gnome_stock_generic_16x16_stock_show-all.png \
+	gnome_stock_generic_16x16_stock_timezone.png \
+	gnome_stock_generic_16x16_stock_view-details.png \
+	gnome_stock_generic_24x24_stock_new-meeting.png \
+	gnome_stock_generic_24x24_stock_show-all.png \
+	gnome_stock_generic_24x24_stock_timezone.png \
+	gnome_stock_generic_48x48_stock_alarm.png \
+	gnome_stock_generic_48x48_stock_new-meeting.png \
+	gnome_stock_generic_48x48_stock_timezone.png \
+	gnome_stock_net_16x16_stock_contact-list.png \
+	gnome_stock_net_16x16_stock_mail-filters-apply.png \
+	gnome_stock_net_16x16_stock_mail-flag-for-followup-done.png \
+	gnome_stock_net_16x16_stock_mail-flag-for-followup.png \
+	gnome_stock_net_16x16_stock_mail-open-multiple.png \
+	gnome_stock_net_16x16_stock_mail-unread-multiple.png \
+	gnome_stock_net_16x16_stock_shared-by-me.png \
+	gnome_stock_net_16x16_stock_shared-to-me.png \
+	gnome_stock_net_16x16_stock_video-conferencing.png \
+	gnome_stock_net_24x24_stock_contact-list.png \
+	gnome_stock_net_24x24_stock_mail-filters-apply.png \
+	gnome_stock_net_24x24_stock_mail-open-multiple.png \
+	gnome_stock_net_24x24_stock_mail-unread-multiple.png \
+	gnome_stock_net_24x24_stock_shared-by-me.png \
+	gnome_stock_net_24x24_stock_shared-to-me.png \
+	gnome_stock_net_24x24_stock_video-conferencing.png \
+	gnome_stock_net_48x48_stock_mail-flag-for-followup-done.png \
+	gnome_stock_net_48x48_stock_mail-flag-for-followup.png \
+	gnome_stock_object_16x16_stock_insert-note.png \
+	gnome_stock_object_24x24_stock_insert-note.png \
+	$(NULL)
+
 # hicolor_status_16x16_wrapped.png was copied from Firefox
 # (toolkit/themes/gnomestripe/global/icons/wrap.png), which
 # contained the following notice:
@@ -124,6 +189,7 @@ noinst_DATA = \
 EXTRA_DIST = \
 	$(public_icons)		\
 	$(private_icons)	\
+	$(stock_private_icons)	\
 	$(noinst_DATA)		\
 	$(NULL)
 
@@ -157,6 +223,15 @@ install-icons:
 		mkdir -p $(DESTDIR)$(pkgdatadir)/$(BASE_VERSION)/icons/$$THEME/$$SIZE/$$CONTEXT; \
 		$(INSTALL_DATA) $(srcdir)/$$icon $(DESTDIR)$(pkgdatadir)/$(BASE_VERSION)/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \
 	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; \
+	done
 
 uninstall-icons:
 	-for icon in $(public_icons); do \
@@ -173,6 +248,14 @@ uninstall-icons:
 		ICONFILE=`echo $$icon | cut -d_ -f4`; \
 		rm -f $(DESTDIR)$(pkgdatadir)/$(BASE_VERSION)/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \
 	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; \
+	done
 
 install-data-local: install-icons update-icon-cache
 
diff --git a/data/icons/gnome_stock_data_16x16_stock_signature-bad.png b/data/icons/gnome_stock_data_16x16_stock_signature-bad.png
new file mode 100644
index 0000000..40083ad
Binary files /dev/null and b/data/icons/gnome_stock_data_16x16_stock_signature-bad.png differ
diff --git a/data/icons/gnome_stock_data_16x16_stock_signature-ok.png b/data/icons/gnome_stock_data_16x16_stock_signature-ok.png
new file mode 100644
index 0000000..65b33d3
Binary files /dev/null and b/data/icons/gnome_stock_data_16x16_stock_signature-ok.png differ
diff --git a/data/icons/gnome_stock_data_16x16_stock_signature.png b/data/icons/gnome_stock_data_16x16_stock_signature.png
new file mode 100644
index 0000000..8de8d2a
Binary files /dev/null and b/data/icons/gnome_stock_data_16x16_stock_signature.png differ
diff --git a/data/icons/gnome_stock_data_24x24_stock_signature-bad.png b/data/icons/gnome_stock_data_24x24_stock_signature-bad.png
new file mode 100644
index 0000000..0c5bf33
Binary files /dev/null and b/data/icons/gnome_stock_data_24x24_stock_signature-bad.png differ
diff --git a/data/icons/gnome_stock_data_24x24_stock_signature-ok.png b/data/icons/gnome_stock_data_24x24_stock_signature-ok.png
new file mode 100644
index 0000000..7bd0882
Binary files /dev/null and b/data/icons/gnome_stock_data_24x24_stock_signature-ok.png differ
diff --git a/data/icons/gnome_stock_data_24x24_stock_signature.png b/data/icons/gnome_stock_data_24x24_stock_signature.png
new file mode 100644
index 0000000..53a7388
Binary files /dev/null and b/data/icons/gnome_stock_data_24x24_stock_signature.png differ
diff --git a/data/icons/gnome_stock_data_48x48_stock_signature-bad.png b/data/icons/gnome_stock_data_48x48_stock_signature-bad.png
new file mode 100644
index 0000000..bfb72c6
Binary files /dev/null and b/data/icons/gnome_stock_data_48x48_stock_signature-bad.png differ
diff --git a/data/icons/gnome_stock_data_48x48_stock_signature-ok.png b/data/icons/gnome_stock_data_48x48_stock_signature-ok.png
new file mode 100644
index 0000000..11723f1
Binary files /dev/null and b/data/icons/gnome_stock_data_48x48_stock_signature-ok.png differ
diff --git a/data/icons/gnome_stock_data_48x48_stock_signature.png b/data/icons/gnome_stock_data_48x48_stock_signature.png
new file mode 100644
index 0000000..4018195
Binary files /dev/null and b/data/icons/gnome_stock_data_48x48_stock_signature.png differ
diff --git a/data/icons/gnome_stock_document_16x16_stock_task-assigned-to.png b/data/icons/gnome_stock_document_16x16_stock_task-assigned-to.png
new file mode 100644
index 0000000..58c0652
Binary files /dev/null and b/data/icons/gnome_stock_document_16x16_stock_task-assigned-to.png differ
diff --git a/data/icons/gnome_stock_document_16x16_stock_task-assigned.png b/data/icons/gnome_stock_document_16x16_stock_task-assigned.png
new file mode 100644
index 0000000..2cd6a0b
Binary files /dev/null and b/data/icons/gnome_stock_document_16x16_stock_task-assigned.png differ
diff --git a/data/icons/gnome_stock_document_16x16_stock_task-recurring.png b/data/icons/gnome_stock_document_16x16_stock_task-recurring.png
new file mode 100644
index 0000000..6e3506a
Binary files /dev/null and b/data/icons/gnome_stock_document_16x16_stock_task-recurring.png differ
diff --git a/data/icons/gnome_stock_document_16x16_stock_task.png b/data/icons/gnome_stock_document_16x16_stock_task.png
new file mode 100644
index 0000000..10efd55
Binary files /dev/null and b/data/icons/gnome_stock_document_16x16_stock_task.png differ
diff --git a/data/icons/gnome_stock_document_16x16_stock_todo.png b/data/icons/gnome_stock_document_16x16_stock_todo.png
new file mode 100644
index 0000000..e5869ad
Binary files /dev/null and b/data/icons/gnome_stock_document_16x16_stock_todo.png differ
diff --git a/data/icons/gnome_stock_document_24x24_stock_task-assigned-to.png b/data/icons/gnome_stock_document_24x24_stock_task-assigned-to.png
new file mode 100644
index 0000000..f7e7de9
Binary files /dev/null and b/data/icons/gnome_stock_document_24x24_stock_task-assigned-to.png differ
diff --git a/data/icons/gnome_stock_document_24x24_stock_task-assigned.png b/data/icons/gnome_stock_document_24x24_stock_task-assigned.png
new file mode 100644
index 0000000..5331a37
Binary files /dev/null and b/data/icons/gnome_stock_document_24x24_stock_task-assigned.png differ
diff --git a/data/icons/gnome_stock_document_24x24_stock_task-recurring.png b/data/icons/gnome_stock_document_24x24_stock_task-recurring.png
new file mode 100644
index 0000000..4b91be0
Binary files /dev/null and b/data/icons/gnome_stock_document_24x24_stock_task-recurring.png differ
diff --git a/data/icons/gnome_stock_document_24x24_stock_task.png b/data/icons/gnome_stock_document_24x24_stock_task.png
new file mode 100644
index 0000000..0845605
Binary files /dev/null and b/data/icons/gnome_stock_document_24x24_stock_task.png differ
diff --git a/data/icons/gnome_stock_document_24x24_stock_todo.png b/data/icons/gnome_stock_document_24x24_stock_todo.png
new file mode 100644
index 0000000..48bd5d0
Binary files /dev/null and b/data/icons/gnome_stock_document_24x24_stock_todo.png differ
diff --git a/data/icons/gnome_stock_document_48x48_stock_todo.png b/data/icons/gnome_stock_document_48x48_stock_todo.png
new file mode 100644
index 0000000..f1ee3ff
Binary files /dev/null and b/data/icons/gnome_stock_document_48x48_stock_todo.png differ
diff --git a/data/icons/gnome_stock_generic_16x16_stock_bell.png b/data/icons/gnome_stock_generic_16x16_stock_bell.png
new file mode 100644
index 0000000..2183762
Binary files /dev/null and b/data/icons/gnome_stock_generic_16x16_stock_bell.png differ
diff --git a/data/icons/gnome_stock_generic_16x16_stock_check-filled.png b/data/icons/gnome_stock_generic_16x16_stock_check-filled.png
new file mode 100644
index 0000000..a43a2b2
Binary files /dev/null and b/data/icons/gnome_stock_generic_16x16_stock_check-filled.png differ
diff --git a/data/icons/gnome_stock_generic_16x16_stock_new-meeting.png b/data/icons/gnome_stock_generic_16x16_stock_new-meeting.png
new file mode 100644
index 0000000..1c9b944
Binary files /dev/null and b/data/icons/gnome_stock_generic_16x16_stock_new-meeting.png differ
diff --git a/data/icons/gnome_stock_generic_16x16_stock_score-high.png b/data/icons/gnome_stock_generic_16x16_stock_score-high.png
new file mode 100644
index 0000000..d0b832c
Binary files /dev/null and b/data/icons/gnome_stock_generic_16x16_stock_score-high.png differ
diff --git a/data/icons/gnome_stock_generic_16x16_stock_score-higher.png b/data/icons/gnome_stock_generic_16x16_stock_score-higher.png
new file mode 100644
index 0000000..04bca9b
Binary files /dev/null and b/data/icons/gnome_stock_generic_16x16_stock_score-higher.png differ
diff --git a/data/icons/gnome_stock_generic_16x16_stock_score-highest.png b/data/icons/gnome_stock_generic_16x16_stock_score-highest.png
new file mode 100644
index 0000000..09ea0e4
Binary files /dev/null and b/data/icons/gnome_stock_generic_16x16_stock_score-highest.png differ
diff --git a/data/icons/gnome_stock_generic_16x16_stock_score-low.png b/data/icons/gnome_stock_generic_16x16_stock_score-low.png
new file mode 100644
index 0000000..8863c9e
Binary files /dev/null and b/data/icons/gnome_stock_generic_16x16_stock_score-low.png differ
diff --git a/data/icons/gnome_stock_generic_16x16_stock_score-lower.png b/data/icons/gnome_stock_generic_16x16_stock_score-lower.png
new file mode 100644
index 0000000..f16aab9
Binary files /dev/null and b/data/icons/gnome_stock_generic_16x16_stock_score-lower.png differ
diff --git a/data/icons/gnome_stock_generic_16x16_stock_score-lowest.png b/data/icons/gnome_stock_generic_16x16_stock_score-lowest.png
new file mode 100644
index 0000000..637118b
Binary files /dev/null and b/data/icons/gnome_stock_generic_16x16_stock_score-lowest.png differ
diff --git a/data/icons/gnome_stock_generic_16x16_stock_score-normal.png b/data/icons/gnome_stock_generic_16x16_stock_score-normal.png
new file mode 100644
index 0000000..a2d9dfe
Binary files /dev/null and b/data/icons/gnome_stock_generic_16x16_stock_score-normal.png differ
diff --git a/data/icons/gnome_stock_generic_16x16_stock_show-all.png b/data/icons/gnome_stock_generic_16x16_stock_show-all.png
new file mode 100644
index 0000000..a168c38
Binary files /dev/null and b/data/icons/gnome_stock_generic_16x16_stock_show-all.png differ
diff --git a/data/icons/gnome_stock_generic_16x16_stock_timezone.png b/data/icons/gnome_stock_generic_16x16_stock_timezone.png
new file mode 100644
index 0000000..de4eb39
Binary files /dev/null and b/data/icons/gnome_stock_generic_16x16_stock_timezone.png differ
diff --git a/data/icons/gnome_stock_generic_16x16_stock_view-details.png b/data/icons/gnome_stock_generic_16x16_stock_view-details.png
new file mode 100644
index 0000000..7995fdd
Binary files /dev/null and b/data/icons/gnome_stock_generic_16x16_stock_view-details.png differ
diff --git a/data/icons/gnome_stock_generic_24x24_stock_new-meeting.png b/data/icons/gnome_stock_generic_24x24_stock_new-meeting.png
new file mode 100644
index 0000000..55f9b31
Binary files /dev/null and b/data/icons/gnome_stock_generic_24x24_stock_new-meeting.png differ
diff --git a/data/icons/gnome_stock_generic_24x24_stock_show-all.png b/data/icons/gnome_stock_generic_24x24_stock_show-all.png
new file mode 100644
index 0000000..2e52ddc
Binary files /dev/null and b/data/icons/gnome_stock_generic_24x24_stock_show-all.png differ
diff --git a/data/icons/gnome_stock_generic_24x24_stock_timezone.png b/data/icons/gnome_stock_generic_24x24_stock_timezone.png
new file mode 100644
index 0000000..180c140
Binary files /dev/null and b/data/icons/gnome_stock_generic_24x24_stock_timezone.png differ
diff --git a/data/icons/gnome_stock_generic_48x48_stock_alarm.png b/data/icons/gnome_stock_generic_48x48_stock_alarm.png
new file mode 100644
index 0000000..8df8fa5
Binary files /dev/null and b/data/icons/gnome_stock_generic_48x48_stock_alarm.png differ
diff --git a/data/icons/gnome_stock_generic_48x48_stock_new-meeting.png b/data/icons/gnome_stock_generic_48x48_stock_new-meeting.png
new file mode 100644
index 0000000..9dcfc89
Binary files /dev/null and b/data/icons/gnome_stock_generic_48x48_stock_new-meeting.png differ
diff --git a/data/icons/gnome_stock_generic_48x48_stock_timezone.png b/data/icons/gnome_stock_generic_48x48_stock_timezone.png
new file mode 100644
index 0000000..d5a5756
Binary files /dev/null and b/data/icons/gnome_stock_generic_48x48_stock_timezone.png differ
diff --git a/data/icons/gnome_stock_net_16x16_stock_contact-list.png b/data/icons/gnome_stock_net_16x16_stock_contact-list.png
new file mode 100644
index 0000000..5ebfe92
Binary files /dev/null and b/data/icons/gnome_stock_net_16x16_stock_contact-list.png differ
diff --git a/data/icons/gnome_stock_net_16x16_stock_mail-filters-apply.png b/data/icons/gnome_stock_net_16x16_stock_mail-filters-apply.png
new file mode 100644
index 0000000..b3127c8
Binary files /dev/null and b/data/icons/gnome_stock_net_16x16_stock_mail-filters-apply.png differ
diff --git a/data/icons/gnome_stock_net_16x16_stock_mail-flag-for-followup-done.png b/data/icons/gnome_stock_net_16x16_stock_mail-flag-for-followup-done.png
new file mode 100644
index 0000000..c21a388
Binary files /dev/null and b/data/icons/gnome_stock_net_16x16_stock_mail-flag-for-followup-done.png differ
diff --git a/data/icons/gnome_stock_net_16x16_stock_mail-flag-for-followup.png b/data/icons/gnome_stock_net_16x16_stock_mail-flag-for-followup.png
new file mode 100644
index 0000000..08e5e6d
Binary files /dev/null and b/data/icons/gnome_stock_net_16x16_stock_mail-flag-for-followup.png differ
diff --git a/data/icons/gnome_stock_net_16x16_stock_mail-open-multiple.png b/data/icons/gnome_stock_net_16x16_stock_mail-open-multiple.png
new file mode 100644
index 0000000..fca1b54
Binary files /dev/null and b/data/icons/gnome_stock_net_16x16_stock_mail-open-multiple.png differ
diff --git a/data/icons/gnome_stock_net_16x16_stock_mail-unread-multiple.png b/data/icons/gnome_stock_net_16x16_stock_mail-unread-multiple.png
new file mode 100644
index 0000000..c448d27
Binary files /dev/null and b/data/icons/gnome_stock_net_16x16_stock_mail-unread-multiple.png differ
diff --git a/data/icons/gnome_stock_net_16x16_stock_shared-by-me.png b/data/icons/gnome_stock_net_16x16_stock_shared-by-me.png
new file mode 100644
index 0000000..7ade49f
Binary files /dev/null and b/data/icons/gnome_stock_net_16x16_stock_shared-by-me.png differ
diff --git a/data/icons/gnome_stock_net_16x16_stock_shared-to-me.png b/data/icons/gnome_stock_net_16x16_stock_shared-to-me.png
new file mode 100644
index 0000000..823651b
Binary files /dev/null and b/data/icons/gnome_stock_net_16x16_stock_shared-to-me.png differ
diff --git a/data/icons/gnome_stock_net_16x16_stock_video-conferencing.png b/data/icons/gnome_stock_net_16x16_stock_video-conferencing.png
new file mode 100644
index 0000000..dd9bbbd
Binary files /dev/null and b/data/icons/gnome_stock_net_16x16_stock_video-conferencing.png differ
diff --git a/data/icons/gnome_stock_net_24x24_stock_contact-list.png b/data/icons/gnome_stock_net_24x24_stock_contact-list.png
new file mode 100644
index 0000000..2f71a84
Binary files /dev/null and b/data/icons/gnome_stock_net_24x24_stock_contact-list.png differ
diff --git a/data/icons/gnome_stock_net_24x24_stock_mail-filters-apply.png b/data/icons/gnome_stock_net_24x24_stock_mail-filters-apply.png
new file mode 100644
index 0000000..f9c6359
Binary files /dev/null and b/data/icons/gnome_stock_net_24x24_stock_mail-filters-apply.png differ
diff --git a/data/icons/gnome_stock_net_24x24_stock_mail-open-multiple.png b/data/icons/gnome_stock_net_24x24_stock_mail-open-multiple.png
new file mode 100644
index 0000000..1233ff1
Binary files /dev/null and b/data/icons/gnome_stock_net_24x24_stock_mail-open-multiple.png differ
diff --git a/data/icons/gnome_stock_net_24x24_stock_mail-unread-multiple.png b/data/icons/gnome_stock_net_24x24_stock_mail-unread-multiple.png
new file mode 100644
index 0000000..27a62fc
Binary files /dev/null and b/data/icons/gnome_stock_net_24x24_stock_mail-unread-multiple.png differ
diff --git a/data/icons/gnome_stock_net_24x24_stock_shared-by-me.png b/data/icons/gnome_stock_net_24x24_stock_shared-by-me.png
new file mode 100644
index 0000000..6d0f811
Binary files /dev/null and b/data/icons/gnome_stock_net_24x24_stock_shared-by-me.png differ
diff --git a/data/icons/gnome_stock_net_24x24_stock_shared-to-me.png b/data/icons/gnome_stock_net_24x24_stock_shared-to-me.png
new file mode 100644
index 0000000..455fc97
Binary files /dev/null and b/data/icons/gnome_stock_net_24x24_stock_shared-to-me.png differ
diff --git a/data/icons/gnome_stock_net_24x24_stock_video-conferencing.png b/data/icons/gnome_stock_net_24x24_stock_video-conferencing.png
new file mode 100644
index 0000000..8bbea0b
Binary files /dev/null and b/data/icons/gnome_stock_net_24x24_stock_video-conferencing.png differ
diff --git a/data/icons/gnome_stock_net_48x48_stock_mail-flag-for-followup-done.png b/data/icons/gnome_stock_net_48x48_stock_mail-flag-for-followup-done.png
new file mode 100644
index 0000000..76f5c0b
Binary files /dev/null and b/data/icons/gnome_stock_net_48x48_stock_mail-flag-for-followup-done.png differ
diff --git a/data/icons/gnome_stock_net_48x48_stock_mail-flag-for-followup.png b/data/icons/gnome_stock_net_48x48_stock_mail-flag-for-followup.png
new file mode 100644
index 0000000..a387bd9
Binary files /dev/null and b/data/icons/gnome_stock_net_48x48_stock_mail-flag-for-followup.png differ
diff --git a/data/icons/gnome_stock_object_16x16_stock_insert-note.png b/data/icons/gnome_stock_object_16x16_stock_insert-note.png
new file mode 100644
index 0000000..0b3205b
Binary files /dev/null and b/data/icons/gnome_stock_object_16x16_stock_insert-note.png differ
diff --git a/data/icons/gnome_stock_object_24x24_stock_insert-note.png b/data/icons/gnome_stock_object_24x24_stock_insert-note.png
new file mode 100644
index 0000000..3f72c18
Binary files /dev/null and b/data/icons/gnome_stock_object_24x24_stock_insert-note.png differ
diff --git a/mail/em-format-html-display.c b/mail/em-format-html-display.c
index a0ed73e..14a74af 100644
--- a/mail/em-format-html-display.c
+++ b/mail/em-format-html-display.c
@@ -713,7 +713,7 @@ efhd_message_prefix(EMFormat *emf, CamelStream *stream, CamelMimePart *part, EMF
 	camel_stream_printf(stream, "<table border=1 width=\"100%%\" cellspacing=2 cellpadding=2><tr>");
 
 	comp = camel_folder_get_message_user_tag(emf->folder, emf->uid, "completed-on");
-	iconpath = e_icon_factory_get_icon_filename (comp && comp[0] ? "stock_flag-for-followup-done" : "stock_flag-for-followup", GTK_ICON_SIZE_MENU);
+	iconpath = e_icon_factory_get_icon_filename (comp && comp[0] ? "stock_mail-flag-for-followup-done" : "stock_mail-flag-for-followup", GTK_ICON_SIZE_MENU);
 	if (iconpath) {
 		CamelMimePart *iconpart;