aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2010-03-19 00:25:29 +0800
committerMatthew Barnes <mbarnes@redhat.com>2010-03-19 00:53:33 +0800
commit8c37f8d4a598c4074179cdf9df1c525341f691b7 (patch)
tree53533f7af825de990998ec0e69542668b188f839
parenta6de00fcc291115c65cd4495304ff89b0b4ef15c (diff)
downloadgsoc2013-evolution-8c37f8d4a598c4074179cdf9df1c525341f691b7.tar.gz
gsoc2013-evolution-8c37f8d4a598c4074179cdf9df1c525341f691b7.tar.zst
gsoc2013-evolution-8c37f8d4a598c4074179cdf9df1c525341f691b7.zip
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
-rw-r--r--data/icons/Makefile.am83
-rw-r--r--data/icons/gnome_stock_data_16x16_stock_signature-bad.pngbin0 -> 839 bytes
-rw-r--r--data/icons/gnome_stock_data_16x16_stock_signature-ok.pngbin0 -> 1110 bytes
-rw-r--r--data/icons/gnome_stock_data_16x16_stock_signature.pngbin0 -> 1108 bytes
-rw-r--r--data/icons/gnome_stock_data_24x24_stock_signature-bad.pngbin0 -> 1618 bytes
-rw-r--r--data/icons/gnome_stock_data_24x24_stock_signature-ok.pngbin0 -> 1659 bytes
-rw-r--r--data/icons/gnome_stock_data_24x24_stock_signature.pngbin0 -> 1548 bytes
-rw-r--r--data/icons/gnome_stock_data_48x48_stock_signature-bad.pngbin0 -> 4764 bytes
-rw-r--r--data/icons/gnome_stock_data_48x48_stock_signature-ok.pngbin0 -> 4273 bytes
-rw-r--r--data/icons/gnome_stock_data_48x48_stock_signature.pngbin0 -> 3730 bytes
-rw-r--r--data/icons/gnome_stock_document_16x16_stock_task-assigned-to.pngbin0 -> 467 bytes
-rw-r--r--data/icons/gnome_stock_document_16x16_stock_task-assigned.pngbin0 -> 482 bytes
-rw-r--r--data/icons/gnome_stock_document_16x16_stock_task-recurring.pngbin0 -> 475 bytes
-rw-r--r--data/icons/gnome_stock_document_16x16_stock_task.pngbin0 -> 292 bytes
-rw-r--r--data/icons/gnome_stock_document_16x16_stock_todo.pngbin0 -> 560 bytes
-rw-r--r--data/icons/gnome_stock_document_24x24_stock_task-assigned-to.pngbin0 -> 899 bytes
-rw-r--r--data/icons/gnome_stock_document_24x24_stock_task-assigned.pngbin0 -> 907 bytes
-rw-r--r--data/icons/gnome_stock_document_24x24_stock_task-recurring.pngbin0 -> 814 bytes
-rw-r--r--data/icons/gnome_stock_document_24x24_stock_task.pngbin0 -> 608 bytes
-rw-r--r--data/icons/gnome_stock_document_24x24_stock_todo.pngbin0 -> 853 bytes
-rw-r--r--data/icons/gnome_stock_document_48x48_stock_todo.pngbin0 -> 2936 bytes
-rw-r--r--data/icons/gnome_stock_generic_16x16_stock_bell.pngbin0 -> 491 bytes
-rw-r--r--data/icons/gnome_stock_generic_16x16_stock_check-filled.pngbin0 -> 270 bytes
-rw-r--r--data/icons/gnome_stock_generic_16x16_stock_new-meeting.pngbin0 -> 827 bytes
-rw-r--r--data/icons/gnome_stock_generic_16x16_stock_score-high.pngbin0 -> 383 bytes
-rw-r--r--data/icons/gnome_stock_generic_16x16_stock_score-higher.pngbin0 -> 381 bytes
-rw-r--r--data/icons/gnome_stock_generic_16x16_stock_score-highest.pngbin0 -> 376 bytes
-rw-r--r--data/icons/gnome_stock_generic_16x16_stock_score-low.pngbin0 -> 387 bytes
-rw-r--r--data/icons/gnome_stock_generic_16x16_stock_score-lower.pngbin0 -> 382 bytes
-rw-r--r--data/icons/gnome_stock_generic_16x16_stock_score-lowest.pngbin0 -> 378 bytes
-rw-r--r--data/icons/gnome_stock_generic_16x16_stock_score-normal.pngbin0 -> 343 bytes
-rw-r--r--data/icons/gnome_stock_generic_16x16_stock_show-all.pngbin0 -> 186 bytes
-rw-r--r--data/icons/gnome_stock_generic_16x16_stock_timezone.pngbin0 -> 922 bytes
-rw-r--r--data/icons/gnome_stock_generic_16x16_stock_view-details.pngbin0 -> 467 bytes
-rw-r--r--data/icons/gnome_stock_generic_24x24_stock_new-meeting.pngbin0 -> 1801 bytes
-rw-r--r--data/icons/gnome_stock_generic_24x24_stock_show-all.pngbin0 -> 543 bytes
-rw-r--r--data/icons/gnome_stock_generic_24x24_stock_timezone.pngbin0 -> 1124 bytes
-rw-r--r--data/icons/gnome_stock_generic_48x48_stock_alarm.pngbin0 -> 5022 bytes
-rw-r--r--data/icons/gnome_stock_generic_48x48_stock_new-meeting.pngbin0 -> 3766 bytes
-rw-r--r--data/icons/gnome_stock_generic_48x48_stock_timezone.pngbin0 -> 2870 bytes
-rw-r--r--data/icons/gnome_stock_net_16x16_stock_contact-list.pngbin0 -> 450 bytes
-rw-r--r--data/icons/gnome_stock_net_16x16_stock_mail-filters-apply.pngbin0 -> 475 bytes
-rw-r--r--data/icons/gnome_stock_net_16x16_stock_mail-flag-for-followup-done.pngbin0 -> 515 bytes
-rw-r--r--data/icons/gnome_stock_net_16x16_stock_mail-flag-for-followup.pngbin0 -> 562 bytes
-rw-r--r--data/icons/gnome_stock_net_16x16_stock_mail-open-multiple.pngbin0 -> 661 bytes
-rw-r--r--data/icons/gnome_stock_net_16x16_stock_mail-unread-multiple.pngbin0 -> 553 bytes
-rw-r--r--data/icons/gnome_stock_net_16x16_stock_shared-by-me.pngbin0 -> 777 bytes
-rw-r--r--data/icons/gnome_stock_net_16x16_stock_shared-to-me.pngbin0 -> 825 bytes
-rw-r--r--data/icons/gnome_stock_net_16x16_stock_video-conferencing.pngbin0 -> 1090 bytes
-rw-r--r--data/icons/gnome_stock_net_24x24_stock_contact-list.pngbin0 -> 899 bytes
-rw-r--r--data/icons/gnome_stock_net_24x24_stock_mail-filters-apply.pngbin0 -> 849 bytes
-rw-r--r--data/icons/gnome_stock_net_24x24_stock_mail-open-multiple.pngbin0 -> 1033 bytes
-rw-r--r--data/icons/gnome_stock_net_24x24_stock_mail-unread-multiple.pngbin0 -> 813 bytes
-rw-r--r--data/icons/gnome_stock_net_24x24_stock_shared-by-me.pngbin0 -> 1078 bytes
-rw-r--r--data/icons/gnome_stock_net_24x24_stock_shared-to-me.pngbin0 -> 959 bytes
-rw-r--r--data/icons/gnome_stock_net_24x24_stock_video-conferencing.pngbin0 -> 1724 bytes
-rw-r--r--data/icons/gnome_stock_net_48x48_stock_mail-flag-for-followup-done.pngbin0 -> 3273 bytes
-rw-r--r--data/icons/gnome_stock_net_48x48_stock_mail-flag-for-followup.pngbin0 -> 3397 bytes
-rw-r--r--data/icons/gnome_stock_object_16x16_stock_insert-note.pngbin0 -> 265 bytes
-rw-r--r--data/icons/gnome_stock_object_24x24_stock_insert-note.pngbin0 -> 1284 bytes
-rw-r--r--mail/em-format-html-display.c2
61 files changed, 84 insertions, 1 deletions
diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am
index 54b5f4bbf4..c6d2ba0d76 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 0000000000..40083adc57
--- /dev/null
+++ b/data/icons/gnome_stock_data_16x16_stock_signature-bad.png
Binary files 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 0000000000..65b33d3d47
--- /dev/null
+++ b/data/icons/gnome_stock_data_16x16_stock_signature-ok.png
Binary files 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 0000000000..8de8d2a5e3
--- /dev/null
+++ b/data/icons/gnome_stock_data_16x16_stock_signature.png
Binary files 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 0000000000..0c5bf3371b
--- /dev/null
+++ b/data/icons/gnome_stock_data_24x24_stock_signature-bad.png
Binary files 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 0000000000..7bd088224f
--- /dev/null
+++ b/data/icons/gnome_stock_data_24x24_stock_signature-ok.png
Binary files 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 0000000000..53a738880c
--- /dev/null
+++ b/data/icons/gnome_stock_data_24x24_stock_signature.png
Binary files 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 0000000000..bfb72c6761
--- /dev/null
+++ b/data/icons/gnome_stock_data_48x48_stock_signature-bad.png
Binary files 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 0000000000..11723f158b
--- /dev/null
+++ b/data/icons/gnome_stock_data_48x48_stock_signature-ok.png
Binary files 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 0000000000..401819560f
--- /dev/null
+++ b/data/icons/gnome_stock_data_48x48_stock_signature.png
Binary files 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 0000000000..58c0652d78
--- /dev/null
+++ b/data/icons/gnome_stock_document_16x16_stock_task-assigned-to.png
Binary files 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 0000000000..2cd6a0ba9f
--- /dev/null
+++ b/data/icons/gnome_stock_document_16x16_stock_task-assigned.png
Binary files 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 0000000000..6e3506ae80
--- /dev/null
+++ b/data/icons/gnome_stock_document_16x16_stock_task-recurring.png
Binary files 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 0000000000..10efd55a59
--- /dev/null
+++ b/data/icons/gnome_stock_document_16x16_stock_task.png
Binary files 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 0000000000..e5869ad8c3
--- /dev/null
+++ b/data/icons/gnome_stock_document_16x16_stock_todo.png
Binary files 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 0000000000..f7e7de9ebd
--- /dev/null
+++ b/data/icons/gnome_stock_document_24x24_stock_task-assigned-to.png
Binary files 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 0000000000..5331a3764c
--- /dev/null
+++ b/data/icons/gnome_stock_document_24x24_stock_task-assigned.png
Binary files 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 0000000000..4b91be0ef6
--- /dev/null
+++ b/data/icons/gnome_stock_document_24x24_stock_task-recurring.png
Binary files 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 0000000000..0845605b06
--- /dev/null
+++ b/data/icons/gnome_stock_document_24x24_stock_task.png
Binary files 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 0000000000..48bd5d01f8
--- /dev/null
+++ b/data/icons/gnome_stock_document_24x24_stock_todo.png
Binary files 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 0000000000..f1ee3ffe4f
--- /dev/null
+++ b/data/icons/gnome_stock_document_48x48_stock_todo.png
Binary files 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 0000000000..2183762ce1
--- /dev/null
+++ b/data/icons/gnome_stock_generic_16x16_stock_bell.png
Binary files 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 0000000000..a43a2b2d40
--- /dev/null
+++ b/data/icons/gnome_stock_generic_16x16_stock_check-filled.png
Binary files 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 0000000000..1c9b944e14
--- /dev/null
+++ b/data/icons/gnome_stock_generic_16x16_stock_new-meeting.png
Binary files 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 0000000000..d0b832cabe
--- /dev/null
+++ b/data/icons/gnome_stock_generic_16x16_stock_score-high.png
Binary files 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 0000000000..04bca9b6a1
--- /dev/null
+++ b/data/icons/gnome_stock_generic_16x16_stock_score-higher.png
Binary files 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 0000000000..09ea0e4470
--- /dev/null
+++ b/data/icons/gnome_stock_generic_16x16_stock_score-highest.png
Binary files 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 0000000000..8863c9ee63
--- /dev/null
+++ b/data/icons/gnome_stock_generic_16x16_stock_score-low.png
Binary files 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 0000000000..f16aab9a02
--- /dev/null
+++ b/data/icons/gnome_stock_generic_16x16_stock_score-lower.png
Binary files 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 0000000000..637118bbdc
--- /dev/null
+++ b/data/icons/gnome_stock_generic_16x16_stock_score-lowest.png
Binary files 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 0000000000..a2d9dfee48
--- /dev/null
+++ b/data/icons/gnome_stock_generic_16x16_stock_score-normal.png
Binary files 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 0000000000..a168c38fe8
--- /dev/null
+++ b/data/icons/gnome_stock_generic_16x16_stock_show-all.png
Binary files 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 0000000000..de4eb39359
--- /dev/null
+++ b/data/icons/gnome_stock_generic_16x16_stock_timezone.png
Binary files 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 0000000000..7995fdd515
--- /dev/null
+++ b/data/icons/gnome_stock_generic_16x16_stock_view-details.png
Binary files 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 0000000000..55f9b310e5
--- /dev/null
+++ b/data/icons/gnome_stock_generic_24x24_stock_new-meeting.png
Binary files 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 0000000000..2e52ddc938
--- /dev/null
+++ b/data/icons/gnome_stock_generic_24x24_stock_show-all.png
Binary files 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 0000000000..180c14061d
--- /dev/null
+++ b/data/icons/gnome_stock_generic_24x24_stock_timezone.png
Binary files 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 0000000000..8df8fa5f85
--- /dev/null
+++ b/data/icons/gnome_stock_generic_48x48_stock_alarm.png
Binary files 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 0000000000..9dcfc896cd
--- /dev/null
+++ b/data/icons/gnome_stock_generic_48x48_stock_new-meeting.png
Binary files 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 0000000000..d5a5756220
--- /dev/null
+++ b/data/icons/gnome_stock_generic_48x48_stock_timezone.png
Binary files 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 0000000000..5ebfe92745
--- /dev/null
+++ b/data/icons/gnome_stock_net_16x16_stock_contact-list.png
Binary files 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 0000000000..b3127c8dce
--- /dev/null
+++ b/data/icons/gnome_stock_net_16x16_stock_mail-filters-apply.png
Binary files 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 0000000000..c21a388135
--- /dev/null
+++ b/data/icons/gnome_stock_net_16x16_stock_mail-flag-for-followup-done.png
Binary files 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 0000000000..08e5e6dcd4
--- /dev/null
+++ b/data/icons/gnome_stock_net_16x16_stock_mail-flag-for-followup.png
Binary files 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 0000000000..fca1b54db5
--- /dev/null
+++ b/data/icons/gnome_stock_net_16x16_stock_mail-open-multiple.png
Binary files 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 0000000000..c448d2793f
--- /dev/null
+++ b/data/icons/gnome_stock_net_16x16_stock_mail-unread-multiple.png
Binary files 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 0000000000..7ade49fc3d
--- /dev/null
+++ b/data/icons/gnome_stock_net_16x16_stock_shared-by-me.png
Binary files 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 0000000000..823651bb5c
--- /dev/null
+++ b/data/icons/gnome_stock_net_16x16_stock_shared-to-me.png
Binary files 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 0000000000..dd9bbbd96e
--- /dev/null
+++ b/data/icons/gnome_stock_net_16x16_stock_video-conferencing.png
Binary files 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 0000000000..2f71a843e7
--- /dev/null
+++ b/data/icons/gnome_stock_net_24x24_stock_contact-list.png
Binary files 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 0000000000..f9c635910d
--- /dev/null
+++ b/data/icons/gnome_stock_net_24x24_stock_mail-filters-apply.png
Binary files 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 0000000000..1233ff1e09
--- /dev/null
+++ b/data/icons/gnome_stock_net_24x24_stock_mail-open-multiple.png
Binary files 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 0000000000..27a62fcf2e
--- /dev/null
+++ b/data/icons/gnome_stock_net_24x24_stock_mail-unread-multiple.png
Binary files 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 0000000000..6d0f8114d6
--- /dev/null
+++ b/data/icons/gnome_stock_net_24x24_stock_shared-by-me.png
Binary files 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 0000000000..455fc97af7
--- /dev/null
+++ b/data/icons/gnome_stock_net_24x24_stock_shared-to-me.png
Binary files 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 0000000000..8bbea0ba1b
--- /dev/null
+++ b/data/icons/gnome_stock_net_24x24_stock_video-conferencing.png
Binary files 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 0000000000..76f5c0b04e
--- /dev/null
+++ b/data/icons/gnome_stock_net_48x48_stock_mail-flag-for-followup-done.png
Binary files 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 0000000000..a387bd9521
--- /dev/null
+++ b/data/icons/gnome_stock_net_48x48_stock_mail-flag-for-followup.png
Binary files 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 0000000000..0b3205b7d9
--- /dev/null
+++ b/data/icons/gnome_stock_object_16x16_stock_insert-note.png
Binary files 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 0000000000..3f72c1840a
--- /dev/null
+++ b/data/icons/gnome_stock_object_24x24_stock_insert-note.png
Binary files differ
diff --git a/mail/em-format-html-display.c b/mail/em-format-html-display.c
index a0ed73e34a..14a74af12d 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;