diff --git a/build/jam/HaikuImage b/build/jam/HaikuImage
index f9ac09aa24..cdfe61a99f 100644
--- a/build/jam/HaikuImage
+++ b/build/jam/HaikuImage
@@ -477,7 +477,7 @@ AddFilesToHaikuImage system add-ons media : $(SYSTEM_ADD_ONS_MEDIA) ;
 AddFilesToHaikuImage system add-ons media plugins
 	: $(SYSTEM_ADD_ONS_MEDIA_PLUGINS) ;
 AddFilesToHaikuImage system add-ons Tracker
-	: FileType-F ZipOMatic-Z Open\ Target\ Folder-T OpenTerminal-T ;
+	: FileType-F Mark\ as\ New-N Mark\ as\ Read-R Open\ Target\ Folder-T OpenTerminal-T ZipOMatic-Z ;
 AddSymlinkToHaikuImage system add-ons Tracker
 	: /boot/system/preferences/Backgrounds : Background-B ;
 AddSymlinkToHaikuImage system add-ons Tracker
diff --git a/src/add-ons/tracker/mark_as/MarkAsNew.rdef b/src/add-ons/tracker/mark_as/MarkAsNew.rdef
index 72a71db0ac..a528b5e929 100644
--- a/src/add-ons/tracker/mark_as/MarkAsNew.rdef
+++ b/src/add-ons/tracker/mark_as/MarkAsNew.rdef
@@ -20,59 +20,14 @@ resource app_version {
 	internal = 1,
 
 	short_info = "Marks emails as New",
-	long_info = "MarkAsNew, Copyright 2006 Haiku Inc. A Tracker Add-on which marks the status of emails as New."
+	long_info = "MarkAsNew, Copyright 2006-2009 Haiku, Inc. A Tracker Add-on which marks the status of emails as New."
 };
 
-resource mini_icon array {
-	$"FFFFFFFFF900F9FFFFF9FFF9F9FFFFFF"
-	$"F9FFFFF9001B0000F9FFF9FFFFFFF9FF"
-	$"FFF9F9003F3F3F1B0000F9FFF9F9FFFF"
-	$"FFF9003F3F3F1B3F3F1B0000F9FFFFFF"
-	$"F9003F3F3F0000111B3F3F1B0000F9FF"
-	$"001B3F3F0011000000113F2B3F1B0000"
-	$"0000001C00001100111B7B2B2C1C00F9"
-	$"FFF90000FAFA0000113F3F7B1B00F9FF"
-	$"F90000FAFAFAFA00003F3F1B00F9FFFF"
-	$"FF00F9F9F9FAF95D001B1C00F9F9F9F9"
-	$"00F9F90000F95D5D000000F9FFFFFFFF"
-	$"00F9F99D00F95D0000F9F9FFF9FFFFFF"
-	$"00F90000F9F9009D000EF9FFFFF9FFFF"
-	$"FF00F99D00009D00000EF9FFFFFFFFFF"
-	$"FF0000F9F9F900000E0FFFFFFFFFFFFF"
-	$"FFFFFF000000000E0FFFFFFFFFFFFFFF"
+resource vector_icon {
+	$"6E636966040500040178020006023A94CD3C078ABE370B3CD1394B9EF949A6E5"
+	$"00FFFCACFFE6E27C03A07D32050604BA47584A595E455E485E4254430A042246"
+	$"46585A4436350A063742234639443E46455741480A0436355A44465822460804"
+	$"3635384340475A44050A010100000A0001011001178402040A020103000A0301"
+	$"02000A030104100117820004"
 };
 
-resource large_icon array {
-	$"FFFFFFFFFFFFFFFFFFFFF9F9FFFFFFFFFFFFF9FFFFFFFFFFF9FFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFF90000F9F9FFFFFFFFF9FFFFFFFFF9FFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFF9001B1C0000F9F9FFFFFFFFFFFFF9FFFFFFFFFFFFFFFFFF"
-	$"FFFFF9FFFFFFFFF9003F3F3F1B1C0000F9F9FFFFFFF9FFFFFFFFFFFFF9F9FFFF"
-	$"FFFFFFF9FFFFF9003F3F3F3F3F3F1B1C0000F9F9FFFFFFFFFFFFF9F9FFFFFFFF"
-	$"FFFFFFFFFFF9003F3F3F3F3F3F3F3F3F1B1C0000F9F9FFFFFFF9FFFFFFFFFFFF"
-	$"FFFFFFFFF9003F3F3F3F3F3F3F3F3F3F3F3F1B1C0000F9F9FFFFFFFFFFFFFFFF"
-	$"FFFFFFF9003F3F3F3F3F3F3F1B1C3F3F3F3F3F3F1B1C0000F9F9FFFFFFFFFFFF"
-	$"FFFFF9003F3F3F3F3F3F3F3F00001B1C3F3F3F3F3F3F1B1C0000F9F9FFFFFFFF"
-	$"FFF9003F3F3F3F3F3F3F3F001B1C00001B1C3F3F3F3F3F3F1B1C0000F9F9FFFF"
-	$"F9003F3F3F3F3F3F3F001B1C00001B1C00001C1B3F3F3F3F2B7B1B1C0000F9F9"
-	$"001B1C3F3F3F3F3F3F3F00001B1C00001B1C00003F3F3F2B2C2B2B3F1B1C00F9"
-	$"F900001B1C3F3F3F3F3F3F3F00001B1C3F3F3F1B3F3F2B2C2B2B3F3F1B00F9F9"
-	$"FFF9F900001B1C3F000000003F3F11001B1C3F3F3F3F3F7B2B3F3F1B00F9F9FF"
-	$"FFFFFFF9F9000000FAFAFAFA00003F3F00003F3F3F3F3F3F3F3F1B00F9F9FFFF"
-	$"FFFFFFFFFF00FAFAFAFAFAFAFAFA00001B3F3F3F3F3F3F3F3F1B00F9F9FFFFFF"
-	$"FFFFFFFF00FAFAFAFAFAFAFAFAFAFA0000003F3F3F3F3F3F1B00F9F9FFFFFFFF"
-	$"F9F9FF003F3F3F3FFAFAFAFAFAFAF9F9003F3F3F3F3F3F1B00F9F9FFFFFFFFFF"
-	$"FFFF00F9F9F9F9F93F3FFAFAFAF9F95D003F3F3F3F3F1B00F9F9FFF9F9FFFFFF"
-	$"FFFF00F9F9F9F9F9F9F93FFAF9F95D5D001B1C3F3F1B00F9F9FFFFFFFFF9F9FF"
-	$"FF00F9F9F9F90000F9F9F93FF95D5D5D0000001B1C00F9F9FFFFFFFFFFFFFFFF"
-	$"FF00F9F9F9009D9D00F9F9F95D5D5D5D00F9F90000F9F9FFFFFFFFFFFFFFFFFF"
-	$"FF00F9F9F900002D00F9F9F95D5D5D00FFFFFFF9F9FFFFFFFFF9FFFFFFFFFFFF"
-	$"FF00F9F9F9F9F90000F9F9F95D5D009D00FFFFFFFFF9FFFFFFFFF9FFFFFFFFFF"
-	$"FF00F9F9F90000F9F9F9F9F95D009D5D000F0FFFFFF9FFFFFFFFFFF9FFFFFFFF"
-	$"FF00F9F9F9009D0000F9F9F9009D5D5D000E0F0FFFF9FFFFFFFFFFFFFFFFFFFF"
-	$"FFFF00F9F9009D7D9D9D00009D5D5D5D000E0F0FFFF9FFFFFFFFFFFFFFFFFFFF"
-	$"FFFF00F9F9F9007D7D003F3F5D5D5D000E0F0F0FFFF9FFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFF00F9F9F90000F9F9F95D5D00080F0F0FFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFF0000F9F9F9F9F95D5D00080F0F0FFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFF0000F9F95D0000080F0F0FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFF00000008090E0FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-};
diff --git a/src/add-ons/tracker/mark_as/MarkAsRead.rdef b/src/add-ons/tracker/mark_as/MarkAsRead.rdef
index 7f4245b511..1c32c62ced 100644
--- a/src/add-ons/tracker/mark_as/MarkAsRead.rdef
+++ b/src/add-ons/tracker/mark_as/MarkAsRead.rdef
@@ -20,59 +20,18 @@ resource app_version {
 	internal = 1,
 
 	short_info = "Marks email as Read",
-	long_info = "MarkAsRead, Copyright 2006 Haiku Inc. A Tracker Add-on which marks the status of emails as Read."
+	long_info = "MarkAsRead, Copyright 2006-2009 Haiku, Inc. A Tracker Add-on which marks the status of emails as Read."
 };
 
-resource mini_icon array {
-	$"FFFFFFFFF900F9FFFFF9FFF9F9FFFFFF"
-	$"F9FFFFF9001B0000F9FFF9FFFFFFF9FF"
-	$"FFF9F9003F3F3F1B0000F9FFF9F9FFFF"
-	$"FFF9003F3F3F1B3F3F1B0000F9FFFFFF"
-	$"F9003F3F3F0000111B3F3F1B0000F9FF"
-	$"001B3F3F0011000000113F2B3F1B0000"
-	$"0000001C00001100111B7B2B2C1C00F9"
-	$"FFF90000FAFA0000113F3F7B1B00F9FF"
-	$"F90000FAFAFAFA00003F3F1B00F9FFFF"
-	$"FF00F9F9F9FAF95D001B1C00F9F9F9F9"
-	$"00F9F90000F95D5D000000F9FFFFFFFF"
-	$"00F9F99D00F95D0000F9F9FFF9FFFFFF"
-	$"00F90000F9F9009D000EF9FFFFF9FFFF"
-	$"FF00F99D00009D00000EF9FFFFFFFFFF"
-	$"FF0000F9F9F900000E0FFFFFFFFFFFFF"
-	$"FFFFFF000000000E0FFFFFFFFFFFFFFF"
+resource vector_icon {
+	$"6E636966070500040178020006023A94CE3C078BBE370C3CD1394B9EF949A6E5"
+	$"00FFFCACFFE6E27C03A07D3303A0893C02000602B4491E38CD95BCF086B8659B"
+	$"4B4F4E49909100ECE986FFC9C55C020016023A4998B6DADD38AE423C25DB4932"
+	$"6F49265100D6FFFF070605EA0247584A59594A604460476041563C0605EA0222"
+	$"4646585A444A2E4E2E462E36350A0C36353742234639443E46455741485A4441"
+	$"463F443B4239420A0436355A4442463A4306032E5A444A2E4E2E462E36350A07"
+	$"363538433E4541485A44465822460A043939534345532C46080A010100000A00"
+	$"01011001178402040A040103000A050104000A0001061001178200040A060106"
+	$"000A020105000A03010200"
 };
 
-resource large_icon array {
-	$"FFFFFFFFFFFFFFFFFFFFF9F9FFFFFFFFFFFFF9FFFFFFFFFFF9FFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFF90000F9F9FFFFFFFFF9FFFFFFFFF9FFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFF9001B1C0000F9F9FFFFFFFFFFFFF9FFFFFFFFFFFFFFFFFF"
-	$"FFFFF9FFFFFFFFF9003F3F3F1B1C0000F9F9FFFFFFF9FFFFFFFFFFFFF9F9FFFF"
-	$"FFFFFFF9FFFFF9003F3F3F3F3F3F1B1C0000F9F9FFFFFFFFFFFFF9F9FFFFFFFF"
-	$"FFFFFFFFFFF9003F3F3F3F3F3F3F3F3F1B1C0000F9F9FFFFFFF9FFFFFFFFFFFF"
-	$"FFFFFFFFF9003F3F3F3F3F3F3F3F3F3F3F3F1B1C0000F9F9FFFFFFFFFFFFFFFF"
-	$"FFFFFFF9003F3F3F3F3F3F3F1B1C3F3F3F3F3F3F1B1C0000F9F9FFFFFFFFFFFF"
-	$"FFFFF9003F3F3F3F3F3F3F3F00001B1C3F3F3F3F3F3F1B1C0000F9F9FFFFFFFF"
-	$"FFF9003F3F3F3F3F3F3F3F001B1C00001B1C3F3F3F3F3F3F1B1C0000F9F9FFFF"
-	$"F9003F3F3F3F3F3F3F001B1C00001B1C00001C1B3F3F3F3F2B7B1B1C0000F9F9"
-	$"001B1C3F3F3F3F3F3F3F00001B1C00001B1C00003F3F3F2B2C2B2B3F1B1C00F9"
-	$"F900001B1C3F3F3F3F3F3F3F00001B1C3F3F3F1B3F3F2B2C2B2B3F3F1B00F9F9"
-	$"FFF9F900001B1C3F000000003F3F11001B1C3F3F3F3F3F7B2B3F3F1B00F9F9FF"
-	$"FFFFFFF9F9000000FAFAFAFA00003F3F00003F3F3F3F3F3F3F3F1B00F9F9FFFF"
-	$"FFFFFFFFFF00FAFAFAFAFAFAFAFA00001B3F3F3F3F3F3F3F3F1B00F9F9FFFFFF"
-	$"FFFFFFFF00FAFAFAFAFAFAFAFAFAFA0000003F3F3F3F3F3F1B00F9F9FFFFFFFF"
-	$"F9F9FF003F3F3F3FFAFAFAFAFAFAF9F9003F3F3F3F3F3F1B00F9F9FFFFFFFFFF"
-	$"FFFF00F9F9F9F9F93F3FFAFAFAF9F95D003F3F3F3F3F1B00F9F9FFF9F9FFFFFF"
-	$"FFFF00F9F9F9F9F9F9F93FFAF9F95D5D001B1C3F3F1B00F9F9FFFFFFFFF9F9FF"
-	$"FF00F9F9F9F90000F9F9F93FF95D5D5D0000001B1C00F9F9FFFFFFFFFFFFFFFF"
-	$"FF00F9F9F9009D9D00F9F9F95D5D5D5D00F9F90000F9F9FFFFFFFFFFFFFFFFFF"
-	$"FF00F9F9F900002D00F9F9F95D5D5D00FFFFFFF9F9FFFFFFFFF9FFFFFFFFFFFF"
-	$"FF00F9F9F9F9F90000F9F9F95D5D009D00FFFFFFFFF9FFFFFFFFF9FFFFFFFFFF"
-	$"FF00F9F9F90000F9F9F9F9F95D009D5D000F0FFFFFF9FFFFFFFFFFF9FFFFFFFF"
-	$"FF00F9F9F9009D0000F9F9F9009D5D5D000E0F0FFFF9FFFFFFFFFFFFFFFFFFFF"
-	$"FFFF00F9F9009D7D9D9D00009D5D5D5D000E0F0FFFF9FFFFFFFFFFFFFFFFFFFF"
-	$"FFFF00F9F9F9007D7D003F3F5D5D5D000E0F0F0FFFF9FFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFF00F9F9F90000F9F9F95D5D00080F0F0FFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFF0000F9F9F9F9F95D5D00080F0F0FFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFF0000F9F95D0000080F0F0FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFF00000008090E0FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-};