diff --git a/data/artwork/icons/Server_MailDaemon b/data/artwork/icons/Server_MailDaemon
new file mode 100644
index 0000000000..219c2e0b0d
Binary files /dev/null and b/data/artwork/icons/Server_MailDaemon differ
diff --git a/src/servers/mail/mail_daemon.rdef b/src/servers/mail/mail_daemon.rdef
index c1c13ee49e..f363588c23 100644
--- a/src/servers/mail/mail_daemon.rdef
+++ b/src/servers/mail/mail_daemon.rdef
@@ -125,6 +125,57 @@ resource(0, "BEOS:L:text/x-partial-email") #'ICON' array {
 	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF0F0F0FFFFFFFFFFFFFFFFFFFFF"
 };
 
+resource(0, "BEOS:M:text/x-partial-email") #'MICN' array
+{
+	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
+	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
+	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
+	$"FFFFFFFFFF00FFFFFFFFFFFFFFFFFFFF"
+	$"FFFFFFFF001B0000FFFFFFFFFFFFFFFF"
+	$"FFFFFF001B3F1B1B00FFFFFFFFFFFFFF"
+	$"FFFF001B3F3F3F3F1B0FFF00FFFFFFFF"
+	$"FF001B3F3F00000F0F0FFF1B0000FFFF"
+	$"001B3F3F1C1C1C0FFFFFFF2B1B1B0000"
+	$"001B1B3F00001C0FFF1C7B2B2C1B000F"
+	$"0F00001B0F0F0F0FFF1C3F7B1B000FFF"
+	$"FF0F0F000FFFFFFFFF1C3F1B000FFFFF"
+	$"FFFFFF0F0FFF001B1B1C1B000FFFFFFF"
+	$"FFFFFFFFFFFF0F00001B000FFFFFFFFF"
+	$"FFFFFFFFFFFFFF0F0F000FFFFFFFFFFF"
+	$"FFFFFFFFFFFFFFFFFF0FFFFFFFFFFFFF"
+};
+
+#ifdef HAIKU_TARGET_PLATFORM_HAIKU
+
+resource vector_icon {
+	$"6E6369660A04016A0501020116023D5F72B9240538B7E13CEB504758E9489EE5"
+	$"7CFFFDA9020116023C848B3B432FBBCE623CEFF849000048C0007CFF00A90201"
+	$"16033CA678B855AB36D0E03B325649022C493FC300FF7AEAFFAE05FF02010602"
+	$"3A96BFB896BF3696BF3896BF4761C8478000B0FFC10600C4830503C704400201"
+	$"06023D00000000000000003C80004A20004A6000FFFFEA0600D9AF05038D8026"
+	$"0B060AFE9B0B38563E523C523E5250504E52524E504A4E4C56445834523A5834"
+	$"323A4A2F53364E344E384E3852020A4A3C4C3B4B3D4E3C4D3B4E3E46404A4046"
+	$"40484248414644BE0EC221BF8DC21E3846303E3044303A3438343837363E363C"
+	$"363E36483648364A3650324F3250360202312A2F2A332A312D332D2F2D020328"
+	$"30B695B95228302A2A282C2C2A2E2E2E2C2C2E02092D24292433243429342734"
+	$"2D3935333239353B373B363B37373C373C334029442F442644243E2440243C26"
+	$"38B523BCFFB5BCBBF6292F2B332629020B4E304C304F30523250315433563456"
+	$"3356364E385036C4FBBCE8493D4B3B4640404442433C46324A364A2E4A28462A"
+	$"482644243E2442243A283626382A3441343B34433402033A503D4F395039493B"
+	$"4B39473E443B4440470A08375634593655325739513C533A5337590604FE292C"
+	$"2B2B2A2C2B2CB8212DB7482D2F2D2B2A2E2A292A0605EE035C4C4C5CC4F15C4A"
+	$"5C34503D49384C42464442434245420604EE4444464E444D484F584C44504751"
+	$"414F150A00010930212101178400040A0101091001178400040A080109000A09"
+	$"010A000A000100000A01010720181C0A01010630181C01178400040A01010130"
+	$"161C01178400040A04010120161C0A010205041001178400040A010107000A01"
+	$"01061001178400040A020106000A020105000A030104000A010101123FC74400"
+	$"000000000040000042FF4800000001178400040A040101000A070102000A0101"
+	$"03123F34DC0000000000003F3E3A41F7B04381C001178400040A060103000A05"
+	$"010800"
+};
+
+#else // HAIKU_TARGET_PLATFORM_HAIKU
+
 resource large_icon {
 	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
 	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
@@ -160,26 +211,6 @@ resource large_icon {
 	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
 };
 
-resource(0, "BEOS:M:text/x-partial-email") #'MICN' array
-{
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFF00FFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFF001B0000FFFFFFFFFFFFFFFF"
-	$"FFFFFF001B3F1B1B00FFFFFFFFFFFFFF"
-	$"FFFF001B3F3F3F3F1B0FFF00FFFFFFFF"
-	$"FF001B3F3F00000F0F0FFF1B0000FFFF"
-	$"001B3F3F1C1C1C0FFFFFFF2B1B1B0000"
-	$"001B1B3F00001C0FFF1C7B2B2C1B000F"
-	$"0F00001B0F0F0F0FFF1C3F7B1B000FFF"
-	$"FF0F0F000FFFFFFFFF1C3F1B000FFFFF"
-	$"FFFFFF0F0FFF001B1B1C1B000FFFFFFF"
-	$"FFFFFFFFFFFF0F00001B000FFFFFFFFF"
-	$"FFFFFFFFFFFFFF0F0F000FFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFF0FFFFFFFFFFFFF"
-};
-
 resource mini_icon {
 	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
 	$"FFFFFFFFFFFFFFFFFFFFFF0000FFFFFF"
@@ -199,3 +230,4 @@ resource mini_icon {
 	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
 };
 
+#endif // HAIKU_TARGET_PLATFORM_HAIKU