diff --git a/src/apps/3dmov/3dmov.rdef b/src/apps/3dmov/3dmov.rdef
index 42d746d12c..c61a264322 100644
--- a/src/apps/3dmov/3dmov.rdef
+++ b/src/apps/3dmov/3dmov.rdef
@@ -1,11 +1,9 @@
 /* 
- * Copyright 2004-2007, Haiku Inc. All rights reserved.
+ * Copyright 2004-2009, Haiku Inc. All rights reserved.
  * Distributed under the terms of the MIT License.
  *
  * Authors:
  * 		François Revol <revol@free.fr>
- * 
- * Copyright Be, Inc. (for the icon)
  */
 
 resource(1, "BEOS:APP_FLAGS") (#'APPF') $"00000000";
@@ -35,61 +33,5 @@ resource(1, "BEOS:APP_VERSION") #'APPV' array {
 	$"8004B38000000000"
 };
 
-resource(101, "BEOS:L:STD_ICON") #'ICON' array {
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF00FFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF005D00FFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF005D5D00FFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF005D5D5D00FFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF003F5D5D5D5D00FFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF003F5D5D5D5D00FFFFFFFFFFFFFF"
-	$"FFFFFFFF000000FFFFFFFFFFFFFFFFFFFF00FA3F5D5D5D5D5D00FFFFFFFFFFFF"
-	$"FFFFFF005E5E5E0000FFFFFFFFFFFFFFFF00FA3F5D5D5D5D5D00FFFFFFFFFFFF"
-	$"FFFF005E5E5E5E5E5E0000FFFFFFFFFF00FAFA3F5D5D5D5D5D00FFFFFFFFFFFF"
-	$"FF005E5E5E5E5E5E5E5E5E00FFFFFFFF00FAFAFA3F5D5D5D5D5D00FFFFFFFFFF"
-	$"005E5E5E5E5E5E5E5E5EB200FFFFFF00FAFAFAFA3F5D5D5D5D5D00FFFFFFFFFF"
-	$"00B2B25E5E5E5E5E5EB22100FFFF00FAFAFAFAFA3F5D5D5D5D5D5D00FFFFFFFF"
-	$"002121B2B25E5E5EB2212400FFFF00FAFAFAFAFAFA3F5D5D5D5D5D00FFFFFFFF"
-	$"0021212021B2B2B221242500FF00FAFAFAFAFAFAFA3F5D5D5D5D5D5D00FFFFFF"
-	$"002121202121BE2124252500FF00FAFAFAFAFAFAFAFA3F5D5D5D5D5D00FFFFFF"
-	$"002121202121BE212425250000FAFAFAFAFAFAFAFAFA3F5D5D5D5D5D00FFFFFF"
-	$"002121202121BE212425250000FAFAFAFAFAFAFAFAFA3F5D5D5D5D5D5D00FFFF"
-	$"002121202121BE2124252500FF0000FAFAFA00000000003F5D5D5D5D5D0011FF"
-	$"002121202121BE2124252500FFFFFF0000002FEB2F302F00005D5D5D5D001111"
-	$"002121202121BE2124252500FFFFFF002F2B2B2B2D2D2F302F005D5D00111111"
-	$"002121202121BE2124252500FFFF002F2B2A2B2A2C2C2BEB2F2F0000111111FF"
-	$"002121202121BE2124252500FFFF002B2B2B2A2B2B2B2D2D2F2F00111111FFFF"
-	$"002121202121BE2124252500FF002F2B2B2A5A2B2B2B2C2D2DEB3000FFFFFFFF"
-	$"002121202121BE212425250011002F2B2B5A3F5A2B2C2C2D2D2F2F00FFFFFFFF"
-	$"002121202121BE212425250011002F2C2C2A5A2C2B2C2C2DEB2F2F00FFFFFFFF"
-	$"002121202121BE21242500111100302E2B2C2B2B2C2C2D2CEB2F2F0011FFFFFF"
-	$"FF0000212120BE2124001111FF002F2F2D2C2C2C2C2D2D2E2EEB30001111FFFF"
-	$"FFFFFF000021BE21001111FFFFFF00302D2D2D2C2D2DEBEB2F2F00111111FFFF"
-	$"FFFFFFFFFF0000001111FFFFFFFF00302EEBEBEBEBEBEB2FEB3000111111FFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFF00302F2FEB2FEB2F2F2F0011111111FFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF0000302F2F302F000011111111FFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF000000000011111111FFFFFFFFFF"
-};
-
-resource(101, "BEOS:M:STD_ICON") #'MICN' array {
-	$"FFFFFFFFFFFFFFFFFFFFFF0000FFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFF005D5D00FFFF"
-	$"FFFF000000FFFFFFFF005D5D5D00FFFF"
-	$"FF005E5E5E00FFFF00FA5D5D5D00FFFF"
-	$"005E5E5E5E5E00FF00FAFA5D5D5D00FF"
-	$"00215E5E5E250000FAFAFA5D5D5D00FF"
-	$"0021212025250000FAFAFA5D5D5D5D00"
-	$"00202121242500FAFAFAFAFA5D5D5D00"
-	$"00212021252400FAFA000000005D5D00"
-	$"00212120252500FA002B2D2F30000000"
-	$"00202121242500002B2B2B2D2D2F0011"
-	$"00212021252400002B5A2C2C2D2F00FF"
-	$"00212120250000002D2B2B2D2D2F0011"
-	$"00002120001111002F2E2C2E2E2F0011"
-	$"FFFF00001111FFFF0030EB2F2F001111"
-	$"FFFFFFFFFFFFFFFFFF00000000111111"
-};
-
 resource(1, "BEOS:APP_SIG") (#'MIMS') "application/x-vnd.Haiku-3DMov";
 
-resource(1, "BEOS:FILE_TYPES") message { };
-
diff --git a/src/apps/aboutsystem/AboutSystem.rdef b/src/apps/aboutsystem/AboutSystem.rdef
index 9a21409e4c..7e0ed2f146 100644
--- a/src/apps/aboutsystem/AboutSystem.rdef
+++ b/src/apps/aboutsystem/AboutSystem.rdef
@@ -11,15 +11,13 @@ resource app_version {
 	internal = 0,
 
 	short_info = "AboutHaiku",
-	long_info = "AboutHaiku ©2005-2007 Haiku, Inc."
+	long_info = "AboutHaiku ©2005-2009 Haiku, Inc."
 };
 
 resource app_flags B_SINGLE_LAUNCH;
 
 resource(1, "haikulogo.png") #'PNG ' import "../../../data/artwork/HAIKU logo - black on white - tiny.png";
 
-#ifdef HAIKU_TARGET_PLATFORM_HAIKU
-
 resource vector_icon {
 	$"6E636966090500020012020000003D4000BDA0000000004AE0004A1000000166"
 	$"FF018502000602BB5489BBA9DC3D6195BD12D54721CD4B2EE500FFAB3EFFDD7A"
@@ -44,60 +42,3 @@ resource vector_icon {
 	$"0102000A080107000A0301010815FF"
 };
 
-#else // HAIKU_TARGET_PLATFORM_HAIKU
-
-resource large_icon {
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF62FFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFA3A3DAFFFFFF62FFFFFFFFFFFFFFFFD983FFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFF83C45ADAFF8282FFFFFFFFFFFFFFFF5BA4FFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFF82C5C5C5C5C4C4C482FFFFFFFFFF82A4C4A483FFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFF82C5C5C5C5C4C4C483FFFFFFFF82A3C4C57C83FFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFF5AC4C5C5C5C4C4C4C482FFFF82C4C4C4C4A4A4FFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFF5AC5C5C5C5C4C4C4C4A3FFFFA3C4C4C4C4A4A4D91BFFFFFF"
-	$"FFFFFFFFFFFFFFD9C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4A4A4A4A4A482FFFF"
-	$"FFFFFFFFFFFFFFFFA4C4C4C4C4C4C4C4C4C4C4C4C4C4A4A4A4A4A47CA4FFFFFF"
-	$"FFFFFFFFFFFFFFFFD9C4C4C4C4C4CBC4C4CBC4C4C4A4A4A4A4A47C5CD9FFFFFF"
-	$"FFFFFFFFFFFFFFFFFFA4C4C4C4C4CBC5C4C4C4C4C4A4A4A4A4A47C5CFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFC4C4C5CBC5C5C4A4A4A4A4A4A4A4A47C5C5BFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFF62C5C5C5CBC4A5A4A4A4A4A4A4A4A4A49898D9FFFFFFFF"
-	$"FFFFFFFFFFFF83D9FFA3C5C5CBCBA4A4A5A4A4A4A4A4A498A4A498FFFFFFFFFF"
-	$"FF8282825AC4C4C5C5C5C4C4C4C4A4A4A498A4A4A498989898985C5CD8D9FFFF"
-	$"FF8383A4C4C4C4C5C4C5C5C4C4C4A498A4848484A45C985C98985C5C8483FFFF"
-	$"FFFFFF82C4C4C4C5C5C4C4C4C4A4A4A484848484845C5C5C5C5C5CD9FFFFFFFF"
-	$"FFFFFFDAC4C4C4C5C4C4C4CAC4A4A4A484848484845C5C5CBD5CBDFFFFFFFFFF"
-	$"FFFFFFFFDAA3C5C4C4C4C4C4A4A4A4A48484848484BDBD84BDD9FFFFFFFFFFFF"
-	$"FFFFFFFFFF83C4C4C4C4C4C4A4A4A4A4848484848484BD63D8FFFFFFFFFFFFFF"
-	$"FFFFFFFFFF83A4C4C4C4C4A4A4A4A4A4A48484831AFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFF5A5B83A3A3C4A4A4A4A4A4A48484621AFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFA4A4A4A4848483FF1BFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFA4A4A4A48483FFFF1DFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFF8383A3D9FFFFFFFFFFFF1BFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF1BFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-};
-
-resource mini_icon {
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFF82A3FF82FFFFFFFF83FFFFFF"
-	$"FFFFFFFFA3C5C5C4FFFFFFA4A4D9FFFF"
-	$"FFFFFFFFA3C5C5C4C4FFA4C4A483FFFF"
-	$"FFFFFFFFC4C4C4C4C4C4C4A4A4A482FF"
-	$"FFFFFFFFFFC4C4CBC4C4C4A4A45CFFFF"
-	$"FFFFFFFFFFC5CBC4A4A4A4A4A45BFFFF"
-	$"FF82A3C5C5C4C4A4A4A49898985CD9FF"
-	$"FFFFC4C5C4C4C4A48484845C5C5BFFFF"
-	$"FFFFFFC4C4C4A4A4848484BDD8FFFFFF"
-	$"FFFFFFA4C4C4A4A484841BFFFFFFFFFF"
-	$"FFFFFFFFFFFFA4A484D91DFFFFFFFFFF"
-	$"FFFFFFFFFFFF83FFFFFF1DFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-};
-
-#endif // HAIKU_TARGET_PLATFORM_HAIKU
diff --git a/src/apps/activitymonitor/ActivityMonitor.rdef b/src/apps/activitymonitor/ActivityMonitor.rdef
index c21d013343..39acf5b039 100644
--- a/src/apps/activitymonitor/ActivityMonitor.rdef
+++ b/src/apps/activitymonitor/ActivityMonitor.rdef
@@ -10,13 +10,11 @@ resource app_version {
 	internal = 3,
 
 	short_info = "ActivityMonitor",
-	long_info = "ActivityMonitor ©2008 Haiku, Inc."
+	long_info = "ActivityMonitor ©2009 Haiku, Inc."
 };
 
 resource app_flags B_MULTIPLE_LAUNCH;
 
-#ifdef HAIKU_TARGET_PLATFORM_HAIKU
-
 resource vector_icon {
 	$"6E6369660E03010000020002023980000000000000004000004BE00008908100"
 	$"010000FFFF01000000020016023CC7EE389BC0BA16573E39B04977C842ADC700"
@@ -43,4 +41,3 @@ resource vector_icon {
 	$"770615FF0A0C010B0A3FEAF70000000000003FEAF7C573B4C2770615FF"
 };
 
-#endif // HAIKU_TARGET_PLATFORM_HAIKU
diff --git a/src/apps/autoraise/AutoRaise.rdef b/src/apps/autoraise/AutoRaise.rdef
index 9cea539ba4..48ea5af02d 100644
--- a/src/apps/autoraise/AutoRaise.rdef
+++ b/src/apps/autoraise/AutoRaise.rdef
@@ -9,15 +9,12 @@ resource app_version {
 	internal   = 0,
 	short_info = "AutoRaise",
 	long_info  = "AutoRaise 0.0.1 ©2002-2008 François Revol.,\n"
-		"©2008 Haiku, Inc.\n"
+		"©2009 Haiku, Inc.\n"
 		"Automatic window raise"
 };
 
 resource app_flags B_SINGLE_LAUNCH;
 
-/*resource file_types message {
-};*/
-
 resource(104, "AddToDeskbar") #'ICON' array {
 	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
 	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
diff --git a/src/apps/bootman/bootman.rdef b/src/apps/bootman/bootman.rdef
index 48c76161e2..2077bcf6af 100644
--- a/src/apps/bootman/bootman.rdef
+++ b/src/apps/bootman/bootman.rdef
@@ -1,5 +1,5 @@
 /* 
- * Copyright 2008, Haiku Inc. All rights reserved.
+ * Copyright 2008-2009, Haiku Inc. All rights reserved.
  * Distributed under the terms of the MIT License.
  *
  * Authors:
diff --git a/src/apps/bsnow/BSnow.rdef b/src/apps/bsnow/BSnow.rdef
index 57a687362b..76420e1c05 100644
--- a/src/apps/bsnow/BSnow.rdef
+++ b/src/apps/bsnow/BSnow.rdef
@@ -12,11 +12,9 @@ resource app_version {
 	internal = 0,
 
 	short_info = "BSnow",
-	long_info = "BSnow ©2007-2008 Haiku"
+	long_info = "BSnow ©2007-2009 Haiku"
 };
 
-#ifdef HAIKU_TARGET_PLATFORM_HAIKU
-
 resource vector_icon {
 	$"6E6369660A010100007503010000020106023D80000000000000003D80004900"
 	$"004A1000AAFFFFFFFF95BCDD020106023D00000000000000003D000048E00049"
@@ -47,61 +45,3 @@ resource vector_icon {
 	$"07301E1E01158800040A01010B1001178400040A09010B00"
 };
 
-#else
-
-resource large_icon {
-	$"FFFFFFFF3FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFF3FFF3FFF3FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF3FFF3FFFFF"
-	$"FFFFFF3F3F3FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF3FFFFFFF"
-	$"FFFF3FFF3FFF3FFFFFFFFFFFFFFFFF3FFF3FFFFFFFFFFFFFFFFFFF3FFF3FFFFF"
-	$"FFFFFFFF3FFFFFFFFFFFFFFFFFFFFFFF3FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFF3FFF3FFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFF3FFF3FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFF3FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFF3FFF3FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF3FFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFF3FFF3FFF3FFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF3F3F3FFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFF3FFF3FFF3FFFFFFFFFFFFFFF3FFF3FFFFF"
-	$"FFFFFFFFFFFFFF3FFFFFFFFFFFFFFFFFFF3FFFFFFFFFFFFFFFFFFFFF3FFFFFFF"
-	$"FFFFFFFFFF3FFF3FFF3FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF3FFF3FFFFF"
-	$"FFFFFFFFFFFF3F3F3FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFF3FFF3FFF3FFFFF0000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFF3FFFFFFF00FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFF0000FFFF0000FFFFFF00FFFF00FFFFFF00FFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFF00FF00FF00FF00FF00FF00FF00FF00FFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFF0000FFFF00FF00FFFF00FFFFFF00FF00FFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFF3FFF3FFFFFFFFFFFFFFF3FFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFF3FFFFFFFFFFFFF3FFF3FFF3FFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFF3FFF3FFFFFFFFFFFFF3F3F3FFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF3FFF3FFF3FFFFFFFFFFFFF3F"
-	$"FFFFFFFF3F3F3F3F3F3F3F3F3F3F3FFFFFFFFFFFFFFF3FFFFFFFFFFFFF3F3F3F"
-	$"FFFF3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3FFFFFFFFFFFFFFF3F3F3F3F3F"
-	$"FF3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F"
-	$"3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F"
-};
-
-resource mini_icon {
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFF3FFF3FFFFF"
-	$"FFFFFFFF3FFFFFFFFFFFFFFF3FFFFFFF"
-	$"FFFF3FFF3FFF3FFFFFFFFF3FFF3FFFFF"
-	$"FFFFFF3F3F3FFFFFFFFFFFFFFFFFFFFF"
-	$"FFFF3FFF3FFF3FFFFF3FFF3FFFFFFFFF"
-	$"FFFFFFFF3FFFFFFFFFFF3FFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFF3FFF3FFFFFFFFF"
-	$"FFFF0000FFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FF0000FFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFF0000FF0013FF0000FF001313FFFF"
-	$"FF0000FFFF0000FF0000FFFF0000FFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFF3F3F"
-	$"FFFF3F3F3F3F3F3F3F3F3FFFFF3F3F3F"
-	$"FF3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F"
-	$"3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F"
-};
-
-#endif
-
diff --git a/src/apps/cdplayer/CDPlayer.rdef b/src/apps/cdplayer/CDPlayer.rdef
index 5734063c18..db2e4560ef 100644
--- a/src/apps/cdplayer/CDPlayer.rdef
+++ b/src/apps/cdplayer/CDPlayer.rdef
@@ -14,11 +14,9 @@ resource app_version {
 	internal = 0,
 
 	short_info = "CDPlayer",
-	long_info  = "CDPlayer ©2005-2007 Haiku, Inc."
+	long_info  = "CDPlayer ©2005-2009 Haiku, Inc."
 };
 
-#ifdef HAIKU_TARGET_PLATFORM_HAIKU
-
 resource vector_icon {
 	$"6E6369660F050004006A02000602AD28AB3B838DBC3FFCAE05CB4B2E7848A224"
 	$"00FF5E06FFFF9806020006023C60000000000000004000004AD00000000000FF"
@@ -44,65 +42,6 @@ resource vector_icon {
 	$"0A00010B000A0A010F0815FF0A0B011000"
 };
 
-#else // HAIKU_TARGET_PLATFORM_HAIKU
-
-resource large_icon {
-	$"FFFFFFFFFFFFFFFF0000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFF000000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFF00F90000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFF005DF9F90000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFF005D5DF9F90000FFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFF007D7D5DF9F90000FFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFF007D7D7D7D5DF9F90000FFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFF00F900007D7D7D7D5DF9F90000FFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFF00F97D7D7D00007D7D7D7D5DF9F90000FFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFF00F97D7DAB7D7D7D00007D7D7D7D5DF9F90000FFFFFFFF"
-	$"FFFFFFFFFFFFFFFF00F97DAB0000000000000000007D7D7D7D5D7D00FFFFFFFF"
-	$"FFFFFFFFFFFFFF00F97D0000131311B1111313000000007D7D7D7D7D00FFFFFF"
-	$"FFFFFFFFFFFF00F97D002313111111B11111111313007D00007D7D7D00FFFFFF"
-	$"FFFFFFFFFF00F97D00191A2037110600061611EE1111007D7D00007D7D00FFFF"
-	$"FFFFFFFF00F97D001D1A191A200013001300EE1111111300AB7D7D000000FFFF"
-	$"FFFFFF00F97D7D001D1E1E1E003F000F0013001314131300ABABABFA5D00FFFF"
-	$"FFFF003F00007D00191A191A19003F003F003F1111111100ABABFA5D5D00FFFF"
-	$"FF003FFAFAFA00001D1A191A19000B000B00191A19111300ABFA5D5D00000FFF"
-	$"003FFAFA0000FAFA000019E0E01A3F8B193420206161007DFA5D5D005D000FFF"
-	$"003F3FFA00370000FAFA0000191A198B1A19342020007DFA5D5D005D000E0FFF"
-	$"00F9F93F3F173736FAFAFAFA0000198B1A1D1E00007DFA5D5D005D000F0F0FFF"
-	$"00F9F9F9F93F3FFAFAFAFAFAFAFA00000000007D7DFA5D5D005D000E0F0FFFFF"
-	$"00F9F90000F9F93F3FFAFAFAFAFAFAFA00007D7DFA5D5D005D000E0F0FFFFFFF"
-	$"00F9F917170000F9F93F3FFAFAFAFAFAFAFA00005D5D005D000E0F0FFFFFFFFF"
-	$"FF0000F9F91717F9F9F9F93F3FFAFAFAFAFA3F005D005D000E0F0FFFFFFFFFFF"
-	$"FFFFFF0000F9F9F9F90000F9F93F3FFAFA3F5D00005D000E0F0FFFFFFFFFFFFF"
-	$"FFFFFFFFFF0000F9F91717F9F9F9F93FFA5D5D005D000E0F0FFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFF0000F9F9F9F90000F95D5D5D5D000F0E0FFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFF0000F9F91717F95D5D5D000F0F0FFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFF0000F9F9F95D5D000E0F0FFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFF0000F95D000E0F0FFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFF00000E0F0FFFFFFFFFFFFFFFFFFFFFFFFF"
-};
-
-resource mini_icon {
-	$"FFFFFFFF000000FFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFF005D0000FFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFF007D7D0000FFFFFFFFFF"
-	$"FFFFFFFFFF000000007D7D0000FFFFFF"
-	$"FFFFFFFF00AB00000000007D7D0000FF"
-	$"FFFFFF00AB00111111110000007D0000"
-	$"FFFF00AB002011000600110000007D00"
-	$"FF00AB001D1E00000000111100AB0000"
-	$"00FAFA001D1A11000A001A1100FA0000"
-	$"003F00FA0000E08B19202000FA005D00"
-	$"00F93F3FFAFA0000193400FA005D000F"
-	$"00F9F9003F3FFAFA0000FA005D000EFF"
-	$"0000F9F9F9003F3FFA5D005D000EFFFF"
-	$"FFFF0000F9F9F9003F5D5D000EFFFFFF"
-	$"FFFFFFFF0000F9F9F95D000EFFFFFFFF"
-	$"FFFFFFFFFFFF000000000EFFFFFFFFFF"
-};
-
-#endif // HAIKU_TARGET_PLATFORM_HAIKU
-
-
 resource(1, "stop_down") #'PNG ' array {
 	$"89504E470D0A1A0A0000000D494844520000001C00000015080300000062DC7E"
 	$"6E0000000467414D410000AFC837058AE90000001974455874536F6674776172"
@@ -463,3 +402,4 @@ resource(22, "play_up_on") #'PNG ' array {
 	$"5D99F3DD4D0ABBAB8A20EE2664524A292519EC9229A5E855001F00D549BD62C7"
 	$"07500000000049454E44AE426082"
 };
+
diff --git a/src/apps/clock/Clock.rdef b/src/apps/clock/Clock.rdef
index 533382e5f1..4d8b885340 100644
--- a/src/apps/clock/Clock.rdef
+++ b/src/apps/clock/Clock.rdef
@@ -10,13 +10,11 @@ resource app_version {
 	internal = 0,
 
 	short_info = "Clock",
-	long_info  = "Clock ©2006-2007 Haiku, Inc."
+	long_info  = "Clock ©2006-2009 Haiku, Inc."
 };
 
 resource app_flags B_SINGLE_LAUNCH;
 
-#ifdef HAIKU_TARGET_PLATFORM_HAIKU
-
 resource vector_icon {
 	$"6E636966080500040071020006043D88273D8827BED4133ED4134B1000C6104F"
 	$"4104A3A585B3FEFFE1026667FF037072020006033B9EE13B9EE1BB9EE13B9EE1"
@@ -48,64 +46,6 @@ resource vector_icon {
 	$"0D0C0B0A09123EFE743DD3DA3559283F4C7FBECFC1C690AD0117832204"
 };
 
-#else // HAIKU_TARGET_PLATFORM_HAIKU
-
-resource large_icon {
-	$"FFFFFFFFFFFFFFFFFFFFFF0000000000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFF00006D474747470000FFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFF006D6D47474747473F470000FFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFF006D6D47474747473F4747474700FFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFF003F3F3F3F3F47473F47474747476D00FFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFF003F94949494943F3F47474747476D6D6D00FFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFF009494940000009494943F3F47476D6D6D6D00FFFFFFFFFFFFFFFFFF"
-	$"FFFFFF009494000086868600009494943F6D6D6D6D949400FFFFFFFFFFFFFFFF"
-	$"FFFF0094940086863F3F868686000094943F6D6D94949400FFFFFFFFFFFFFFFF"
-	$"FFFF009400863F3F3F3F00868686860094943F9494947F00FFFFFFFFFFFFFFFF"
-	$"FF00949400863F3F3F6060606086868600943F94947F7F7F00FFFFFFFFFFFFFF"
-	$"FF009400863F3F3F60600060606086860094946D7F7F7F7F00FFFFFFFFFFFFFF"
-	$"FF009400863F3F6060600060603F60868600946D7F7F7F7F00FFFFFFFFFFFFFF"
-	$"FF00940086003F60606000603F3F3F86860094947F7F7F7F00FFFFFFFFFFFFFF"
-	$"FF009400863F3F6060600060603F6060868600947F7F7F7F00FFFFFFFFFFFFFF"
-	$"FF009400863F3F606060006060606060868601947F7F7F7F00FFFFFFFFFFFFFF"
-	$"FF009400863F60606060000060606060868601947F7F7F7F00FFFFFFFFFFFFFF"
-	$"FF009494008660606060606000006060868601947F7F7F7F00FFFFFFFFFFFFFF"
-	$"FF009494008660606060606060600100868600947F7F7F7F00FFFFFFFFFFFFFF"
-	$"FF009494940086606060606060606086860194947F7F7F7F00FFFFFFFFFFFFFF"
-	$"FF009494940086866060006060608686860194947F7F7F7F00FFFFFFFFFFFFFF"
-	$"FF009494949400008686606060868686019494947F7F7F7F00FFFFFFFFFFFFFF"
-	$"FF009494949494940000868686860000949494947F7F7F7F00FFFFFFFFFFFFFF"
-	$"FF000094949494949494000000009494949494947F7F7F7F010EFFFFFFFFFFFF"
-	$"FFFFFF00009494949494949494949494949494947F7F7F7F010E0F0FFFFFFFFF"
-	$"FFFFFFFFFF0000949494949494949494949494947F7F7F7F010E0F0F0F0FFFFF"
-	$"FFFFFFFFFFFFFF000094949494949494949494947F7F7F7F010E0F0F0FFFFFFF"
-	$"FFFFFFFFFFFFFFFFFF00009494949494949494947F7F7F010E0F0F0FFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFF0000949494949494947F7F000F0F0F0FFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFF000094949494947F000F0F0F0FFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFF0000949494000F0F0F0EFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF0000000E0F0F0FFFFFFFFFFFFFFFFF"
-};
-
-resource mini_icon {
-	$"FFFFFFFF0000000000FFFFFFFFFFFFFF"
-	$"FFFFFF006D6D4747470000FFFFFFFFFF"
-	$"FFFF006D94943F3F476D9400FFFFFFFF"
-	$"FF009494000000943F949400FFFFFFFF"
-	$"FF0094003F868600946D947F00FFFFFF"
-	$"0094003F6000868600947F7F00FFFFFF"
-	$"009400606000608600947F7F00FFFFFF"
-	$"009400606000606086007F7F00FFFFFF"
-	$"009400606000006086007F7F00FFFFFF"
-	$"009400866060600086007F7F00FFFFFF"
-	$"009494008686868600947F7F00FFFFFF"
-	$"009494940000000094947F7F00FFFFFF"
-	$"FF0000949494949494947F7F000F0FFF"
-	$"FFFFFF000094949494947F00000F0FFF"
-	$"FFFFFFFFFF000000949400000F0FFFFF"
-	$"FFFFFFFFFFFFFFFF0000000E0FFFFFFF"
-};
-
-#endif // HAIKU_TARGET_PLATFORM_HAIKU
-
 resource(1, "center") #'MICN' array {
 	$"FFFF0A0B0AFFFFFFFFFFFFFFFFFFFFFF"
 	$"FF0A1515150BFFFFFFFFFFFFFFFFFFFF"
@@ -2123,3 +2063,4 @@ resource(12, "picture") #'PICT' array
 };
 
 resource(13, "picture") #'PICT' $"0A0B0A010B600B900A0B0B65";
+
diff --git a/src/apps/codycam/CodyCam.rdef b/src/apps/codycam/CodyCam.rdef
index 68a57c7beb..ccfde49892 100644
--- a/src/apps/codycam/CodyCam.rdef
+++ b/src/apps/codycam/CodyCam.rdef
@@ -1,8 +1,6 @@
 
 resource(1, "BEOS:FILE_TYPES") message;
 
-#ifdef HAIKU_TARGET_PLATFORM_HAIKU
-
 resource vector_icon {
 	$"6E6369660B03010000020002023A00000000000000004000004BC00000000000"
 	$"010000FFFF01000000020006023CC0000000000000003D000048000048800040"
@@ -25,66 +23,6 @@ resource vector_icon {
 	$"8A0A050103023FF03D3D7A6FBD81013FE8DA495AD5C9C96A"
 };
 
-#else // HAIKU_TARGET_PLATFORM_HAIKU
-
-resource(101, "BEOS:L:STD_ICON") #'ICON' array
-{
-	$"FFFFFFFFFFFFFFFFFFFFFFFF01010101010101FFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFF01011E1E1E1E1E1E1E0101FFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFF01011E1E1E1E1E1E1E1E1E1E1E0101FFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFF011E1E1E1E1E1E1E1E1E1E1E1E1E1E1E01FFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFF011E1E1E3F3F3F1E1E1E1E1E1E1E1E1E1E1C01FFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFF011E3F3F3F3F3F1E1E1E1E1E1E1E1E1E1E1C01FFFFFFFFFFFFFF"
-	$"FFFFFFFFFF011E3F3F3F3F3F1E1E1E1E1E1E1E1E1E1E1E1C1C01FFFFFFFFFFFF"
-	$"FFFFFFFFFF011E3F3F3F3F1E1E1E1E1E1E1E1E1E1E1E1C1C1C01FFFFFFFFFFFF"
-	$"FFFFFFFF011E1E3F3F3F3F1E1E1E1E1E1E1E1E1E1E1C1C1C1C1901FFFFFFFFFF"
-	$"FFFFFFFF011E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1C1C1C1C1C1901FFFFFFFFFF"
-	$"FFFFFFFF011E1E1E1E1E1E1E1E1E1E1E1E1E1C1C1C1C1C1C191901FFFFFFFFFF"
-	$"FFFFFFFF011E0101010101621C1C1C1C1C1C1C1C1C1C1C1C191901FFFFFFFFFF"
-	$"FFFFFFFF010101585858E10119191C1C1C1C1C1C1C1C1C19191901FFFFFFFFFF"
-	$"FFFFFF0101E8E80158E1E1E10119191C1C1C1C1C1C1C1C19191901FFFFFFFFFF"
-	$"FFFFFF01E83F3FE801E1E1E1011919191C1C1C1C1C1C1919191901FFFFFFFFFF"
-	$"FFFF01E83F3F1313E101E1E801191919191C1C1C1C1C19191901FFFFFFFFFFFF"
-	$"FFFF01E83F131313E101E8E801191919191C1C1C1C1919191901FFFFFFFFFFFF"
-	$"FFFF01E8131313135801E80119191919191C1C1C1919191901FFFFFFFFFFFFFF"
-	$"FFFFFF01E113131358010119191919191C1C1C191919191901FFFFFFFFFFFFFF"
-	$"FFFFFFFF01E1E15801011919191919191C1C191919191901160101FFFFFFFFFF"
-	$"FFFFFF011D010101010119191919191919191919190101161616160101FFFFFF"
-	$"FFFF011D1D1D1D1D1D1D0101191919191919190101161616161616161601FFFF"
-	$"FF011D1D1D1D1D1D1D1D1D1D0101010101010116161616161616161601FFFFFF"
-	$"FFFF01011D1D1D1D1D1D1D1D1D1D1D1D1D1D16161616161616161601FFFFFFFF"
-	$"FFFFFFFF01011D1D1D1D1D1D1D1D1D1D1D1D161616161616161601FFFFFFFFFF"
-	$"FFFFFFFFFFFF01011D1D1D1D1D1D1D1D1D1D1616161616161601FFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFF01011D1D1D1D1D1D1D1D16161616161601FFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFF01011D1D1D1D1D1D1D1616161601FFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFF01011D1D1D1D1D16161601FFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFF01011D1D1D161601FFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF01011D1601FFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF0101FFFFFFFFFFFFFFFFFFFFFFFF"
-};
-
-resource(101, "BEOS:M:STD_ICON") #'MICN' array
-{
-	$"FFFFFFFFFFFF01010101FFFFFFFFFFFF"
-	$"FFFFFFFF01011E1E1E1E0101FFFFFFFF"
-	$"FFFFFF011E1E3F1E1E1E1E1C01FFFFFF"
-	$"FFFFFF013F3F3F1E1E1E1C1C01FFFFFF"
-	$"FFFF011E3F3F1E1E1E1E1C1C1C01FFFF"
-	$"FFFF011E1E1E1C1E1E1C1C1C1901FFFF"
-	$"FFFF06070606191C1C1C1C1B1901FFFF"
-	$"FF06A858C8E706191C1C1C191901FFFF"
-	$"FF063F13E8E80619191C191901FFFFFF"
-	$"FF06C813E80619191919191901FFFFFF"
-	$"FFFF060606121919191901011601FFFF"
-	$"FF011D1D1D010101010116161601FFFF"
-	$"FFFF01011E1E1D1D1D16161601FFFFFF"
-	$"FFFFFFFF01011E1E1D161601FFFFFFFF"
-	$"FFFFFFFFFFFF01011E1601FFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFF0101FFFFFFFFFFFF"
-};
-
-#endif // HAIKU_TARGET_PLATFORM_HAIKU
-
 resource(1, "BEOS:APP_SIG") #'MIMS' "application/x-vnd.Haiku.CodyCam";
 
 resource(1, "BEOS:APP_VERSION") #'APPV' array
@@ -114,3 +52,4 @@ resource(1, "BEOS:APP_VERSION") #'APPV' array
 };
 
 resource(1, "BEOS:APP_FLAGS") #'APPF' $"00000000";
+
diff --git a/src/apps/cortex/Resource.rdef b/src/apps/cortex/Resource.rdef
index 8bd8704e7a..d04f5fd5fc 100644
--- a/src/apps/cortex/Resource.rdef
+++ b/src/apps/cortex/Resource.rdef
@@ -143,8 +143,6 @@ resource(1003, "image/x-be-bitmap") array {
 	$"101010FF282828FF000000FF888888FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
 };
 
-#ifdef HAIKU_TARGET_PLATFORM_HAIKU
-
 resource vector_icon {
 	$"6E6369660F0500020016023D800000000000000040000049C00000000000CAFF"
 	$"66020016023BEFCDB9980D3AB2F93CF4E04707844A391C0096FF57020016023B"
@@ -183,64 +181,6 @@ resource vector_icon {
 	$"0C010A000A0D010B00"
 };
 
-#else // HAIKU_TARGET_PLATFORM_HAIKU
-
-resource large_icon {
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF060506FFFF00FFFF00FFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF041E1E1E050600FF00FFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFF043F3F1E1E1E1E0000FFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFF0519193F3F1E1E1E060600FFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFF0519D50C193F3F1E1E1E01FFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFF0519D5600C0A193F3F1601FFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFF0519D5606086D515190F030304FFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFF0519D5606086D360190F041B1B0403FFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFF0519D3868686236019033F3F1B1B1B04FF"
-	$"FFFFFFFFFFFFFFFFFFFFFF04FFFFFF0019191D3FD3D36019041A143F3F0F04FF"
-	$"FFFFFFFFFFFFFFFFFFFF041B0404FFFF020219193F3F6019041A040D1A0F04FF"
-	$"FFFFFFFFFFFFFFFFFF041B3F1B1B0404FFFF0202191A2019031A0E041A0F03FF"
-	$"FFFFFFFFFFFFFFFF041B3F0F3F3F1B1B0404FFFF0202192A041A1A151A0F04FF"
-	$"FFFFFFFFFFFFFF041B3F0F0F0F150F1B1B1B0404FFFF0205041B1A1A2B0F04FF"
-	$"FFFFFFFFFFFF041B1B1B150F0F0F1B1B1B1B1B1B0404FFFFFF03041A1A04FFFF"
-	$"FFFFFFFFFF041B3F1B1B1B1B0F1B0F1B1B1B1B1B1B1B0404FFFF000404FFFFFF"
-	$"FFFFFFFF041B3F0F3F3F1B1B1B1B0F1B1B1B1B1B1B1B1B1B0404FFFFFFFFFFFF"
-	$"FFFFFF041B3F0F0F0F150F1B1B1B0F1B1B1B1B1B1B1B1B1B1B1B0404FFFFFFFF"
-	$"FFFF041B1B1B150F0F0F1B1B1B1B0F1B1B1B1B1B1B1B1B1B1B1B1B1B0404FFFF"
-	$"FF043F3F1B1B1B1B0F1B0F0F0F0F0F151B1B1B1B1B1B1B1B1B1B1B3F0F04FFFF"
-	$"FF0404153F3F1B1B1B1B1B1B1B1B1B0F0F1B3F1B1B1B1B1B1B1B3F0F04FFFFFF"
-	$"FFFFFF0404153F3F1B1B1B1B1B1B1B1B1B3F0F3F3F1B1B1B1B3F0F04FFFFFFFF"
-	$"FFFFFFFFFF0404153F3F1B1B1B1B1B1B3F0F0F0F150F1B1B3F0F04FFFFFFFFFF"
-	$"FFFFFFFFFFFFFF0404153F3F1B1B1B1B1B150F0F0F1B1B3F0F04FFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFF0404153F3F1B1B1B1B1B0F1B1B3F0F04FFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFF0404153F3F1B1B1B1B1B3F0F04FFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFF0404153F3F1B1B3F0F04FFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFF0404153F3F0F04FFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF04040F04FFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF04FFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-};
-
-resource mini_icon {
-	$"FFFFFFFFFFFF0001FFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFF00041C0504FFFFFFFFFFFF"
-	$"FFFFFFFFFF003F3F1E1E0604FFFFFFFF"
-	$"FFFFFFFFFF001986183F3F1705FFFFFF"
-	$"FFFFFFFFFF0018ADAC191A0B0504FFFF"
-	$"FFFFFFFFFF0019ACAD231C0A3F1B0505"
-	$"FFFFFFFFFF00001860861C07133F0F05"
-	$"FFFFFFFF00FFFF040022C4080A120F04"
-	$"FFFFFF001B0000FFFF00000B11820F04"
-	$"FFFF001B170F1B0000FFFF04041105FF"
-	$"FF001B170F0F1B1B1B0000FFFF00FFFF"
-	$"000015151B1B17170F1B1B0000FFFFFF"
-	$"FFFF000015151B1B170F1B1B1500FFFF"
-	$"FFFFFFFF000015151B1B1B1500FFFFFF"
-	$"FFFFFFFFFFFF0000151B1500FFFFFFFF"
-	$"FFFFFFFFFFFFFFFF000000FFFFFFFFFF"
-};
-
-#endif // HAIKU_TARGET_PLATFORM_HAIKU
-
 resource(0, "BEOS:L:text/x-vnd.meadgroup-cortex-nodeset") #'ICON' array {
 	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
 	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
@@ -381,3 +321,4 @@ resource(1, "BEOS:APP_VERSION") #'APPV' array {
 };
 
 resource(1, "BEOS:APP_FLAGS") #'APPF' $"01000000";
+
diff --git a/src/apps/debugger/Debugger.rdef b/src/apps/debugger/Debugger.rdef
index 924959bbfd..b2714e278d 100644
--- a/src/apps/debugger/Debugger.rdef
+++ b/src/apps/debugger/Debugger.rdef
@@ -44,3 +44,4 @@ resource vector_icon {
 	$"30023701178320040A000103023BFFFF0000000000003ECCCC48300049ACCC0A"
 	$"09010B1815FF0117832004"
 };
+
diff --git a/src/apps/deskbar/Deskbar.rdef b/src/apps/deskbar/Deskbar.rdef
index 7e6c0b198d..aae64d4272 100644
--- a/src/apps/deskbar/Deskbar.rdef
+++ b/src/apps/deskbar/Deskbar.rdef
@@ -9,13 +9,11 @@ resource app_version {
 	internal   = 0,
 	short_info = "Deskbar",
 	long_info  = "Deskbar 5.2.1 ©1991-2001 Be, Inc.,\n"
-		"©2006-2007 Haiku, Inc."
+		"©2006-2009 Haiku, Inc."
 };
 
 resource app_flags B_SINGLE_LAUNCH;
 
-#ifdef HAIKU_TARGET_PLATFORM_HAIKU
-
 resource vector_icon {
 	$"6E6369661C050004006B020006023A498437D931BA09203C6B6D4B49E74A11B7"
 	$"01663300FF9B663203603307020006023393B0B84A2E3B59D6369E0646DFD84A"
@@ -55,61 +53,3 @@ resource vector_icon {
 	$"19000A17011A000A18011B00"
 };
 
-#else // HAIKU_TARGET_PLATFORM_HAIKU
-
-resource large_icon array {
-	$"FFFFFF0000FFFFFFFFFFFFFFFFFFFF00FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFF00FAFA0000FFFFFFFFFFFFFF00600000FFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFF00FAF8FAFA0000FFFFFFFF00606060600000FFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FF0000FAF8F8F8FAFA00FFFF00606060606060D500FF00FFFFFFFFFFFFFFFFFF"
-	$"00FAFA0000F8F8F8F800FF003F3F60606060D5D500005A0000FFFFFFFFFFFFFF"
-	$"00FAF8FAFA0000F8F800FF0086863F3F60D5D5D5005A5A5A5A0000FFFFFFFFFF"
-	$"00FAF8F8F8FAFA00F800000086868686D5D5D5005A5A5A5A5A5A2D00FFFFFFFF"
-	$"00FAF8F8F8F8F8000E1C1C0000868686D5D5003F3F5A5A5A5A2D2E00FFFFFFFF"
-	$"001BF8F8F8F8F8003F0E0F1C1C000086D5D500A3A33F3F5A2D2E2D00FFFFFFFF"
-	$"001B0F0F0FF8F800003F3F0E0F1A190000D500A3A3A3A32D2D2E2D0000FFFFFF"
-	$"001B0F3F3F0E0F1C1C00003F3F0E1A1900D500A3A3A3A32D2D2E2D00D90100FF"
-	$"001B0F3F3F3F3F0E0F1C1C00003F1719000000A3A3A3A32D2D2E2D00D93FAA00"
-	$"001B0F3F3F3F3F3F3F0E0F1A1900001A00D900A3A3A3A32D2E2D00D93FAAAA00"
-	$"001B0F3F3F3F3F3F3F3F3F0E1A19001A00D90000A3A3A32D2E00D93FAAAAAA00"
-	$"001B0F3F3F3F3F3F3F3F3F3F1719001A00D9D9D90000A32D00D93FAAAAAAAA00"
-	$"001B0F3F3F3F3F3F3F3F3F3F1719001A00D9D9D9D9D90100D93FAAAAAAAAAA00"
-	$"001B183F3F3F3F3F3F3F3F3F1719001A00D9D9D9D9D9D9D93FAAAAAAAAAAAA00"
-	$"001B1C17183F3F3F3F3F3F3F1719001A0083D9D9D9D9D93FAAAAAAAAAAAAAA00"
-	$"FF0000191A17173F3F3F3F3F1719001A00D18383D9D93FAAAAAAAAAAAAAAAA00"
-	$"FFFFFF0000191A17173F3F3F1719001A00D1AAAA833FAAAAAAAAAAAAAAAAAA00"
-	$"FFFFFFFFFF0000191A17173F1719001A00008383AAD9AAAAAAAAAAAAAAAAAA00"
-	$"FFFFFFFFFFFF000000191A17171A0000000083D183D9AAAAAAAAAAAAAAAAAA00"
-	$"FFFFFFFFFFFF0083D90000191A1900000F0083D9D1D9AAAAAAAAAAAAAAAAAA01"
-	$"FFFFFFFFFFFF008383838300001A000E0F00838383D9AAAAAAAAAAAAAAAA010E"
-	$"FFFFFFFFFFFFFF00008383D1D100000F0F00AAAA83D9AAAAAAAAAAAAAA000F0F"
-	$"FFFFFFFFFFFFFFFFFF0000D1000E0F0F0F008383AAAAAAAAAAAAAAAA000F0FFF"
-	$"FFFFFFFFFFFFFFFFFFFFFF000E0F0F0F0F0083D183D9AAAAAAAAAA000F0FFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF0083D9D1D9AAAAAAAA000F0FFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF00838383D9AAAAAA000F0FFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF00008383D9AAAA000F0FFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF0000D9AA000F0EFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF00000E0FFFFFFFFFFFFFFF"
-};
-
-resource mini_icon array {
-	$"FF000000FFFFFFFF00FFFFFFFFFFFFFF"
-	$"0000FAFA0000FF00600000FFFFFFFFFF"
-	$"00FA0000FA00008660D500000000FFFF"
-	$"00F8FAFA00000086D500005A5A2D00FF"
-	$"00F8F8F8000E1C00D500A33F5A2D00FF"
-	$"000E0FF800000F0F0000A3A32D2E00FF"
-	$"000E3F0E0F0F00000000A3A32D2D0000"
-	$"000F3F3F3F3F0E00000000A32D00AA00"
-	$"000F3F3F3F3F170000D9D90000AAAA00"
-	$"000018173F3F170000D183D9AAAAAA00"
-	$"FFFF000017171800000083D9AAAAAA00"
-	$"FFFFFF0000171700000083D9AAAAAA00"
-	$"FFFFFF00830000000F0083D9AAAAAA00"
-	$"FFFFFF000083D1000F0083D9AAAA000F"
-	$"FFFFFFFFFF00000E0F0083D9AA000FFF"
-	$"FFFFFFFFFFFFFFFFFFFF0000000EFFFF"
-};
-
-#endif // HAIKU_TARGET_PLATFORM_HAIKU
-
diff --git a/src/apps/deskbar/icon-freelogo.rdef b/src/apps/deskbar/icon-freelogo.rdef
index ae0ee69c0a..81883dcd8b 100644
--- a/src/apps/deskbar/icon-freelogo.rdef
+++ b/src/apps/deskbar/icon-freelogo.rdef
@@ -183,3 +183,4 @@ resource(14, "kBeLogoBits") archive BBitmap
 		$"0000000000000000"
 	}
 };
+
diff --git a/src/apps/deskbar/icons.rdef b/src/apps/deskbar/icons.rdef
index ba4b28ae3d..77924bf58b 100644
--- a/src/apps/deskbar/icons.rdef
+++ b/src/apps/deskbar/icons.rdef
@@ -1,10 +1,3 @@
-/*
-** /src/open/deskbar/icons.rdef
-**
-** Automatically generated by BResourceParser on
-** Friday, January 26, 2001 at 11:38:39.
-**
-*/
 
 #include "icons.h"
 
diff --git a/src/apps/deskcalc/DeskCalc.rdef b/src/apps/deskcalc/DeskCalc.rdef
index ce9b81faed..ff21ac528f 100644
--- a/src/apps/deskcalc/DeskCalc.rdef
+++ b/src/apps/deskcalc/DeskCalc.rdef
@@ -10,13 +10,11 @@ resource app_version {
 	internal = 1,
 
 	short_info = "DeskCalc",
-	long_info = "DeskCalc ©2006-2007 Haiku, Inc."
+	long_info = "DeskCalc ©2006-2009 Haiku, Inc."
 };
 
 resource app_flags B_SINGLE_LAUNCH;
 
-#ifdef HAIKU_TARGET_PLATFORM_HAIKU
-
 resource vector_icon {
 	$"6E6369660803010000020016023CC7EE389BC0BA16573E39B04977C842ADC700"
 	$"A5FF7E020016023C529D3753A2B8966F3D9D084B6044496AAF0024FF4C020016"
@@ -32,60 +30,3 @@ resource vector_icon {
 	$"03000A030104000A0706090A0B0D0E0C100117810004"
 };
 
-#else // HAIKU_TARGET_PLATFORM_HAIKU
-
-resource large_icon {
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF0000FFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFF0013130000FFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFF0013060613130000FFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFF0013060808080613130000FFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFF0013080808083408060613130000FFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFF0013080808083408083408060613130000FFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFF00140F1313080808083408343408060613130000FFFF"
-	$"FFFFFFFFFFFFFFFFFF001413140F0F131308080808340808340808130000FFFF"
-	$"FFFFFFFFFFFFFFFF00130F13130F140F0F13130808083434080813000800FFFF"
-	$"FFFFFFFFFFFFFF001414140F0F1413140F0F0F1313080808081300080800F0F0"
-	$"FFFFFFFFFFFF000F1313130F140F0F0F1313130F0F1313081300080800F0F0F0"
-	$"FFFFFFFFFF0014140F0F0F1413130F0F0F130F14140F0F1300080800F0F0F0FF"
-	$"FFFFFFFF00141313140F0F0F130F1413130F0F1313131300080800F0F0F0FFFF"
-	$"FFFFFF00140F13130F1413130F0F13130F14140F0F1300080800F0F0F0FFFFFF"
-	$"FFFF001413140F0F1413130F13130F0F131413131300080800F0F0F0FFFFFFFF"
-	$"FF00001313130F140F0F0F1313130F140F0F131300080800F0F0F0FFFFFFFFFF"
-	$"FF000E04040F1413130F0F0F130F141314130F00080800F0F0F0FFFFFFFFFFFF"
-	$"FF000E0E0E0404130F1313130F0F1313131300080800F0F0F0FFFFFFFFFFFFFF"
-	$"FFFF000E0E0E0E040413130F14140F0F1300080800F0F0F0FFFFFFFFFFFFFFFF"
-	$"FFFFFF00000E0E0E0E0404141313131300080800F0F0F0FFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFF00000E0E0E0E0404131300080800F0F0F0FFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFF00000E0E0E0E0400080800F0F0F0FFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFF00000E0E0E000800F0F0F0FFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFF00000E0000F0F0F0FFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFF0000F0F0F0FFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-};
-
-resource mini_icon {
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFF0000FFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFF0008060000FFFFFFFFFF"
-	$"FFFFFFFFFF0008083734060000FFFFFF"
-	$"FFFFFFFF00140F13080808340800FFFF"
-	$"FFFFFF001417130F13130808040010FF"
-	$"FFFF000F17130F170F140F040B001010"
-	$"FF001317130F170F140F040B001010FF"
-	$"001B0F130F170F0F13040B001010FFFF"
-	$"000E041B130F1313040B001010FFFFFF"
-	$"00000E0E041613040B001010FFFFFFFF"
-	$"FFFF00000E0E040B001010FFFFFFFFFF"
-	$"FFFFFFFF000007001010FFFFFFFFFFFF"
-	$"FFFFFFFFFFFF001010FFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-};
-
-#endif // HAIKU_TARGET_PLATFORM_HAIKU
diff --git a/src/apps/diskprobe/DiskProbe.rdef b/src/apps/diskprobe/DiskProbe.rdef
index 0eb6e61a32..e44bee708c 100644
--- a/src/apps/diskprobe/DiskProbe.rdef
+++ b/src/apps/diskprobe/DiskProbe.rdef
@@ -14,13 +14,11 @@ resource app_version {
 	internal = 3,
 
 	short_info = "DiskProbe",
-	long_info = "DiskProbe ©2004-2007 Haiku, Inc."
+	long_info = "DiskProbe ©2004-2009 Haiku, Inc."
 };
 
 resource app_flags B_SINGLE_LAUNCH;
 
-#ifdef HAIKU_TARGET_PLATFORM_HAIKU
-
 resource vector_icon {
 	$"6E6369660C03010000020016023CC7EE389BC0BA16573E39B04977C842ADC700"
 	$"FFFFD3020006023C96323A4D3FBAFC013D5A974B57A549844D00474747FFA5A0"
@@ -41,61 +39,3 @@ resource vector_icon {
 	$"00000000003C000048B00048F000"
 };
 
-#else // HAIKU_TARGET_PLATFORM_HAIKU
-
-resource large_icon {
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFF00FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFF001C0000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFF001B1818180000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFF001B1818181818180000FFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFF001B1818181818181818180000FFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFF001C1818181818181818181818180000FFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFF001C1818181818181818181818181818180000FFFFFFFFFFFFFF"
-	$"FFFFFFFFFF001B1818181818181818181818181818181818180000FFFFFFFFFF"
-	$"FFFFFFFF001C1818181818181818181818181818181818181818180000FFFFFF"
-	$"FFFFFF001C181818181818181818181818181818181818181818183F0E00FFFF"
-	$"FFFF001B181818181818181818181818181818181818181818183F0F0F00FFFF"
-	$"FF001C181818181818181818181818181818181818181818183F0F0F0F00FFFF"
-	$"000E181818181818181818181818181818181818181818183F0F0F0F0F00FFFF"
-	$"003F3F18181818181818181818181818181818181818183F0F0F0F0F0F00FFFF"
-	$"0017173F3F18181818181818181818181818181818183F0F0F0F0F0F0F000FFF"
-	$"00171718173F3F18181818181818181818181818183F0F0F0F0F0F0F000E0EFF"
-	$"001717181717183F3F18181818181818181818183F0F0F0F0F0F0F000F0F0FFF"
-	$"0018170000181717183F3F18181818181818183F0F0F0F0F0F0F000F0F0FFFFF"
-	$"00181739340000171718173F3F18181818183F0F0F0F0F0F0F000F0F0FFFFFFF"
-	$"00171835342B2C1718171718173F3F18183F0F0F0F0F0F0F000F0F0FFFFFFFFF"
-	$"FF00001717181717181718171718173F3F0F0F0F0F0F0F000F0F0FFFFFFFFFFF"
-	$"FFFFFF0000171718171718171817171C170F0F0F0F0F000F0F0FFFFFFFFFFFFF"
-	$"FFFFFFFFFF000017171817171817181B180E0F0F0F000F0F0FFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFF00001717181717181B180F0F0E000F0F0FFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFF0000171718171C170F0F000F0F0EFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFF000017171C170F000F0F0FFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFF00001B18000E0F0FFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFF00000E0F0FFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-};
-
-resource mini_icon {
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFF0000FFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFF000E180000FFFFFFFFFFFF"
-	$"FFFFFFFF000E181818180000FFFFFFFF"
-	$"FFFFFF000E181818181818180000FFFF"
-	$"FFFF000E181818181818181818180000"
-	$"FF000E18181818181818181818183F00"
-	$"000F18181818181818181818183F0F00"
-	$"003F3F1818181818181818183F0F0F00"
-	$"0018003F3F1818181818183F0F0F000F"
-	$"00183900173F3F1818183F0F0F000F0F"
-	$"FF0000171718173F183F0F0F000F0FFF"
-	$"FFFFFF00001717183F0F0F000F0FFFFF"
-	$"FFFFFFFFFF0000171C0E000F0FFFFFFF"
-	$"FFFFFFFFFFFFFF0000000E0FFFFFFFFF"
-};
-
-#endif // HAIKU_TARGET_PLATFORM_HAIKU
-
diff --git a/src/apps/diskusage/DiskUsage.rdef b/src/apps/diskusage/DiskUsage.rdef
index 5862ed98ec..b0f3305301 100644
--- a/src/apps/diskusage/DiskUsage.rdef
+++ b/src/apps/diskusage/DiskUsage.rdef
@@ -9,7 +9,7 @@ resource app_version {
 		internal = 0,
 
 		short_info = "1.0.1",
-		long_info = "1.0.1 (c) 1999 Mike Steed, (c) 2008 Haiku"
+		long_info = "1.0.1 (c) 1999 Mike Steed, (c) 2009 Haiku"
 };
 
 resource app_flags B_MULTIPLE_LAUNCH;
@@ -78,3 +78,4 @@ resource(116, "STR_MOD") "Modified";
 resource(117, "STR_TIMEFMT") "%a, %d %b %Y, %r";
 resource(118, "STR_KIND") "Kind";
 resource(119, "STR_PATH") "Path";
+
diff --git a/src/apps/fontdemo/FontDemo.rdef b/src/apps/fontdemo/FontDemo.rdef
index 37a031a9d6..9d53590482 100644
--- a/src/apps/fontdemo/FontDemo.rdef
+++ b/src/apps/fontdemo/FontDemo.rdef
@@ -1,6 +1,3 @@
-/*
- * FontDemo
- */
 
 resource app_signature "application/x-vnd.Haiku-FontDemo";
 
@@ -13,13 +10,11 @@ resource app_version {
 	internal = 0,
 
 	short_info = "FontDemo",
-	long_info = "FontDemo ©2006-2007 Haiku, Inc."
+	long_info = "FontDemo ©2006-2009 Haiku, Inc."
 };
 
 resource app_flags B_SINGLE_LAUNCH;
 
-#ifdef HAIKU_TARGET_PLATFORM_HAIKU
-
 resource vector_icon {
 	$"6E63696608050004005F020006023D5F39368F62B905F93FFB6B4ACB36BEDE32"
 	$"00032288FF1944E7020006023AAFCC3BFAA8BF50A93E3D044B460F48AEEC0002"
@@ -36,60 +31,3 @@ resource vector_icon {
 	$"000A070108000A04020405000A05010A00"
 };
 
-#else // HAIKU_TARGET_PLATFORM_HAIKU
-
-resource large_icon array {
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFF0000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFF008C8C0000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFF008C8C8C8C8C0000FFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFF008C8C8C8C8C8C8C6600FFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFF008C8C8C8C8C8C8C662101FFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFF008C8C8C8C8C8C8C6621212000FFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFF0066668C8C8C8C8C662121202101FFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFF00B2B266668C8C66212120212129FFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFF00B2B2B2B2B2666621212021212000FFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFF00B2B2B2B2B2B28C2121202121202100FFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFF00B2B2B2B2B2B2B28C21212021212000FFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFF00B2B2B2B20000B2B28C21212021212000FFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFF00B2B2B2B20000B2B28C21212021212000FFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFF00B2B2B2B2002100B2B28C2121202121202100FFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFF00B2B2B2B2002100B2B2B28C21212021212000FFFFFFFFFFFFFFFFFF"
-	$"FFFFFF00B2B2B2B20021218C00B2B28C21212021212000FFFFFFFFFFFFFFFFFF"
-	$"FFFFFF00B2B2B2B200008C8C00B2B28C21212021212000FFFFFFFFFFFFFFFFFF"
-	$"FFFF00B2B2B2B2B2B2B2000000B2B28C2121202121202100FFFFFFFFFFFFFFFF"
-	$"FFFF00B2B2B2B2B2B2B2B2B200B2B2B28C21212021212000FFFFFFFFFFFFFFFF"
-	$"FFFF00B2B2B20000B2B2B2B2B2B2B2B28C21212021212000FFFFFFFFFFFFFFFF"
-	$"FF00B2B2B2B200210000B2B2B2B2B2B28C21212021212000FFFFFFFFFFFFFFFF"
-	$"FF00B2B2B2B2002121200000B2B2B2B28C2121202121202100FFFFFFFFFFFFFF"
-	$"00B2B2B2B200212120000E0F0000B2B2B28C21212021212000FFFFFFFFFFFFFF"
-	$"0000B2B2B2002121290E0F0F0F00B2B2B28C21212021212000FFFFFFFFFFFFFF"
-	$"FFFF0000000021000E0F0F0F0F00B2B2B28C21212021212021000FFFFFFFFFFF"
-	$"FFFFFFFF0000000E0F0F0F0F0F0F00B2B28C21212021212021000F0F0EFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFF00B2B2B28C212120212120000E0F0F0F0FFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFF00B2B2B28C2121202121290E0F0F0F0F0FFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFF00B2B2B28C21212021000F0E0F0F0F0FFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFF00B2B2B28C2121290E0F0F0F0F0FFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF0000B28C21000F0E0F0F0F0FFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF0000000E0F0F0F0F0FFFFFFFFFFF"
-};
-
-resource mini_icon array {
-	$"FFFFFFFFFFFF0000FFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFF008C8C0000FFFFFFFFFFFF"
-	$"FFFFFFFF00668C8C6600FFFFFFFFFFFF"
-	$"FFFFFF00B2B26666212129FFFFFFFFFF"
-	$"FFFFFF00B2B2B28C212129FFFFFFFFFF"
-	$"FFFF00B2B200B28C212129FFFFFFFFFF"
-	$"FFFF00B2B200B28C212129FFFFFFFFFF"
-	$"FF00B2B2006600B28C212129FFFFFFFF"
-	$"FF00B2B2000000B28C212129FFFFFFFF"
-	$"00B2B200B2B200B28C212129FFFFFFFF"
-	$"00B2B2000000B2B28C212129FFFFFFFF"
-	$"00B20021000E29B2B28C212100FFFFFF"
-	$"FF0000000E0F0000B28C2121290F0FFF"
-	$"FFFFFFFFFFFFFF00B28C2121290E0F0F"
-	$"FFFFFFFFFFFFFF00B28C21000F0E0FFF"
-	$"FFFFFFFFFFFFFFFF0000000E0F0FFFFF"
-};
-
-#endif // HAIKU_TARGET_PLATFORM_HAIKU
diff --git a/src/apps/glteapot/GLTeapot.rdef b/src/apps/glteapot/GLTeapot.rdef
index ea5f35612b..db93053f48 100644
--- a/src/apps/glteapot/GLTeapot.rdef
+++ b/src/apps/glteapot/GLTeapot.rdef
@@ -13,13 +13,11 @@ resource app_version {
 	internal = 0,
 
 	short_info = "GLTeapot",
-	long_info  = "GLTeapot ©2006-2007 Haiku, Inc."
+	long_info  = "GLTeapot ©2006-2009 Haiku, Inc."
 };
 
 resource app_flags B_SINGLE_LAUNCH;
 
-#ifdef HAIKU_TARGET_PLATFORM_HAIKU
-
 resource vector_icon {
 	$"6E6369660B03010000020106043E00000000000000003E080049000049D80000"
 	$"FBC5C56DE40606E2AC0404FFBC0505010100006A02000603B5CB8E350988B67F"
@@ -47,60 +45,3 @@ resource vector_icon {
 	$"178200040A00010500"
 };
 
-#else // HAIKU_TARGET_PLATFORM_HAIKU
-
-resource large_icon array {
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF000000FFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF002B5AEB00FFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFF00000000000000FFFFFF002B5AEBEBEB00FF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFF00002B2A2B2B2A2B2F0000002B9CEBEB00EB00FF"
-	$"FFFFFFFFFFFFFFFFFFFF00002B2A9C9C9C9C9C9C2B2BEB309CEBEB0000EB00FF"
-	$"FFFFFFFFFFFFFFFFFF002F2B9C9C313131F131315ADA2BEB300000FF00EB00FF"
-	$"FFFFFFFFFFFFFFFF002F2B9C313131F1313131F13131DA2B2F2F00FF00EB00FF"
-	$"FFFFFFFFFFFFFF002F2B9C313131F1302F2F302F302FDA2BEB302F0000EB00FF"
-	$"FFFFFFFFFFFFFF002F2B9C3131312F2F30EB2F2FEB30DA2B2EEB3000002E00FF"
-	$"FFFFFFFFFFFF002F2B2A9C31312F2F2F2FEB2F2FEB30DA2BEBEB2F2F00EB00FF"
-	$"FFFFFFFFFFFF00302A2B9C31312F2F2F2FEB302F30DA2B2E2E2EEB30002E00FF"
-	$"FFFFFFFFFF002F2B2A2B2A5ADA302F302F2F9CDADA2C2C2D2DEBEB2F2F000F0F"
-	$"FFFFFFFFFF002F2B2A2B2A2B2BDADADADADA5A2B2C2C2D2D2E2EEB2F2F000F0F"
-	$"FFFFFFFFFF000000002B2A2B2B2A2B2B2B2C2B2B2B2C2C2E2DEBEB2F2F000E0F"
-	$"FF000000002B2C2B2B00002A2B2B2B2B2B2B2C2C2C2C2D2D2E2EEB2F2F000EFF"
-	$"002B305A5A5A5A5A5A2B2A002B2A2C2B3F2B2C2B2C2C2D2D2F2D2F2F2F000EFF"
-	$"002B305A2B2C2E2C2B302F00302B2B2B2C2C2B2C2C2D2D2DEBEB2F2F2F000F0E"
-	$"002B5A302F2F302F302F2F01302C2C2C2B2C2C2C2C2D2D2F2D2F302F2F000E0F"
-	$"FF00000000000000000000302F2B2C2C2C2C2C2D2D2D2E2E2E2EEB30000F0F0F"
-	$"FFFFFFFFFFFF00302F2F302F2F2D2C2D2C2D2D2C2D2D2D2E2FEB302F000E0F0F"
-	$"FFFFFFFFFFFFFF00302F2F2D2C2D2D2D2D2D2D2D2DEB2FEBEB2F30000F0E0F0F"
-	$"FFFFFFFFFFFFFF0030EB2FEB2D2D2D2D2E2D2DEBEBEB2F2FEB2F2F000E0F0FFF"
-	$"FFFFFFFFFFFFFFFF00302FEBEB2F2D2F2D2F2D2E2E2FEB2F2F30000F0F0F0FFF"
-	$"FFFFFFFFFFFFFFFFFF002F2F2F2FEB2F2FEBEB2F2E2F2F2F30000F0F0F0FFFFF"
-	$"FFFFFFFFFFFFFFFFFFFF0000302F2FEB302F2FEB302F3000000F0F0F0FFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFF0000302F2F302F2F3000000E0F0F0F0FFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFF000000000000000E0F0F0FFFFFFFFFFFFFFF"
-};
-
-resource mini_icon array {
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFF0000FF"
-	$"FFFFFFFFFFFF000000000000002B2E00"
-	$"FFFFFFFF00002B9C9C9C9C30002E2E00"
-	$"FFFFFF00302A9C313131F15A30002E00"
-	$"FFFFFF002B9C313131F1315A2F2F0000"
-	$"FFFF00302A2B5A3131315A2D2E2F0000"
-	$"FFFF0000002B2A5A5A5A2D2D2EEB000F"
-	$"0000005A5A002B2B2B2B2D2D2E2F000F"
-	$"00305A2B2C002F2B3F2C2D2D2F2F00FF"
-	$"000000000000302C2D2C2E2D2F2F000E"
-	$"FFFFFF00302F2D2E2D2D2D2F30000F0F"
-	$"FFFFFFFF0030EB2F2FEB302F2F000E0F"
-	$"FFFFFFFFFF0000302F2F3000000F0FFF"
-	$"FFFFFFFFFFFFFF000000000E0F0FFFFF"
-};
-
-#endif // HAIKU_TARGET_PLATFORM_HAIKU
diff --git a/src/apps/gradients/Gradients.rdef b/src/apps/gradients/Gradients.rdef
index 1006d58141..2375c65210 100644
--- a/src/apps/gradients/Gradients.rdef
+++ b/src/apps/gradients/Gradients.rdef
@@ -11,17 +11,14 @@ resource app_version {
 	internal = 0,
 
 	short_info = "Gradients",
-	long_info = "Gradients ©2008 Haiku, Inc."
+	long_info = "Gradients ©2009 Haiku, Inc."
 };
 
 resource app_flags B_SINGLE_LAUNCH;
 
-#ifdef HAIKU_TARGET_PLATFORM_HAIKU
-
 resource vector_icon {
 	$"6E636966020200040269FF0000D000FF000200040308FF0000C700FF00FF0000"
 	$"FF020A0420204020406020600A044020602060604060020A000100000A010101"
 	$"00"
 };
 
-#endif // HAIKU_TARGET_PLATFORM_HAIKU
diff --git a/src/apps/haiku3d/Haiku3d.rdef b/src/apps/haiku3d/Haiku3d.rdef
index 74046df9f4..3c969b4601 100644
--- a/src/apps/haiku3d/Haiku3d.rdef
+++ b/src/apps/haiku3d/Haiku3d.rdef
@@ -53,3 +53,4 @@ resource(4, "LetterI") import "./data/LetterI.hk3d.bin";
 resource(5, "LetterK") import "./data/LetterK.hk3d.bin";
 
 resource(6, "LetterU") import "./data/LetterU.hk3d.bin";
+
diff --git a/src/apps/icon-o-matic/Icon-O-Matic.rdef b/src/apps/icon-o-matic/Icon-O-Matic.rdef
index 437dc01415..469cc95236 100644
--- a/src/apps/icon-o-matic/Icon-O-Matic.rdef
+++ b/src/apps/icon-o-matic/Icon-O-Matic.rdef
@@ -1,6 +1,3 @@
-/*
- * Icon-O-Matic.rdef
- */
 
 resource app_signature "application/x-vnd.haiku-icon_o_matic";
 
@@ -16,15 +13,11 @@ resource app_version {
 	internal = 0,
 
 	short_info = "Icon-O-Matic",
-	long_info = "Icon-O-Matic ©2006-2007 Haiku, Inc."
+	long_info = "Icon-O-Matic ©2006-2009 Haiku, Inc."
 };
 
 resource app_flags B_SINGLE_LAUNCH;
 
-//resource file_types message {
-//	"types" = "application/x-haiku_icon",
-//};
-
 resource vector_icon {
 	$"6E6369660E050102000603399E0F3D9C0ABF82B23B84A94B88504910C900A5B1"
 	$"FFBCEAF1FFFFB3B8FF020106023E49240000000000003CAAAA4940004A8000FF"
diff --git a/src/apps/installer/Installer.rdef b/src/apps/installer/Installer.rdef
index caca6ed83d..14c49551b4 100644
--- a/src/apps/installer/Installer.rdef
+++ b/src/apps/installer/Installer.rdef
@@ -17,8 +17,6 @@ resource app_flags B_EXCLUSIVE_LAUNCH;
 
 resource(1, "haikulogo.png") #'PNG ' import "haikulogo.png";
 
-#ifdef HAIKU_TARGET_PLATFORM_HAIKU
-
 resource vector_icon {
 	$"6E6369660F0500020006023861093AA03CBD302A3AE36E4A1739473BE7009A9A"
 	$"9AFF38415005A203606C7E020006023B243D3CD85EBD486D3B9FF848FB2749CB"
@@ -47,60 +45,3 @@ resource vector_icon {
 	$"820004"
 };
 
-#else // HAIKU_TARGET_PLATFORM_HAIKU
-
-resource large_icon {
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFF000000FFFFFF00FFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFF00BEBEBE0000000A0000FFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFF00BEBEBEBEBE000A0B04000000FFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFF00BEBEBEBEBE000A0B04002D2E2D0000FFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFF00BEBEBEBEBE000A0B04003F3F2D2E2DD20000FFFFFFFFFFFFFF"
-	$"FFFFFFFFFF00BEBEBEBEBE000A0B04003F3F3F3F3FD2D2D2D20000FFFFFFFFFF"
-	$"FFFFFFFF00BEBEBEBEBE000A0B04003F3F3F3F3F3F3F3FD2D2D2D20000FFFFFF"
-	$"FFFFFF00BEBEBEBEBE000A0B04003F3F3F3F3F3F3F3F3F3F3FD2D200170000FF"
-	$"FF000026BEBEBEBE000A0B0A0B1700003F3F3F3F3F3F3F3F3F3F00170B0A0B00"
-	$"001111252625BE000A0B0B0A0B0B171700003F3F3F3F3F3F3F00170B0A0B0400"
-	$"001104051111000A0B0A0B0B0A0B0B0A181700003F3F3F3F00170B0A0B040400"
-	$"0011050411000A0B0B0A1600000A0B0A0B0B171700003F00170B0A0B040400FF"
-	$"001104BE000A0B0B0A1600171700000B0B0A0B0A181700180A0B0A050400FFFF"
-	$"00110425003F3F0A15001817040B1700000B0B0A0B0B170B0A0B040400FFFFFF"
-	$"0011041B0016153F00171705000417181700000B0A0B0A0B0B040400FFFFFFFF"
-	$"0011040F0F000015003F3F0004171817171817000B0A0B0B040400FFFFFFFFFF"
-	$"0011041B0F0F15000016153F3F171718171700180A0B0B040400FFFFFFFFFFFF"
-	$"0011040F1B1C0F0F15000015153F3F171700180A0B0B0404000F0F0FFFFFFFFF"
-	$"001104270F0F1B1C0F0A18000015153F00170B0A0B0404000F0F0F0F0F0FFFFF"
-	$"0011042517180E0F0F0B170403000015003F3F0A0405000F0E0F0F0F0F0F0FFF"
-	$"00110404252417270F0B170502262400001515040000000000000000000F0F0F"
-	$"0011040504042524270B17040226242525000005007D5D5DF9F9F97D000F0F0F"
-	$"0011040411040504250B17040325252524250000005D5DF9F9F97D7D000E0F0F"
-	$"0011040511041104040B1705022525252524000F003FF9F9F9F900000E0F0FFF"
-	$"0011040411041105040A18040225252524000F0F003FF9F93FF9F9F90000FFFF"
-	$"0000000011041104040B170502252525000F0E0F003F7D7D5D3F3FF9F9F900FF"
-	$"FFFFFFFF00001104040B1704022525000F0F0F0F007D7D7D5D5D5D3FF97D000E"
-	$"FFFFFFFFFFFF0000040A18040225000F0F0F0F0F007D7D00005D5D5D7D7D000E"
-	$"FFFFFFFFFFFFFFFF000A180402000F0F0F0E0FFF007D000E0F00005D7D000F0F"
-	$"FFFFFFFFFFFFFFFFFF001704000F0F0F0F0FFFFFFF000E0F0FFFFF00000E0FFF"
-	$"FFFFFFFFFFFFFFFFFFFF00000E0F0F0F0FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-};
-
-resource mini_icon {
-	$"FFFFFFFF000000FF00FFFFFFFFFFFFFF"
-	$"FFFFFF00BEBE0000000000FFFFFFFFFF"
-	$"FFFF00BEBEBE0004002D2E0000FFFFFF"
-	$"FF00BEBEBE0004003F3FD2D2D20000FF"
-	$"00BEBEBE000A00003F3F3F3FD2D20000"
-	$"001111000A0B0A0B00003F3F0A0B0400"
-	$"0011000B0A00000B0B0A000B0A050000"
-	$"0011000A003F1700000B0A0B040000FF"
-	$"0011000015153F3F17000B040000FFFF"
-	$"0011252500001515290B0400000F0FFF"
-	$"00112525112500000A0400000000000F"
-	$"00110504112527250000005DF97D000E"
-	$"0011050411252726000F00F9F901000E"
-	$"FF000004B22626000F0F007D5DF97D00"
-	$"FFFFFF000026000E0F0F2900007D7D00"
-	$"FFFFFFFFFF000E0FFFFF000E0F00000F"
-};
-
-#endif // HAIKU_TARGET_PLATFORM_HAIKU
diff --git a/src/apps/launchbox/LaunchBox.rdef b/src/apps/launchbox/LaunchBox.rdef
index 28f8aba5e5..95fda0646f 100644
--- a/src/apps/launchbox/LaunchBox.rdef
+++ b/src/apps/launchbox/LaunchBox.rdef
@@ -12,11 +12,9 @@ resource app_version {
 	internal = 1,
 
 	short_info = "LaunchBox",
-	long_info = "LaunchBox ©2006 Haiku"
+	long_info = "LaunchBox ©2009 Haiku"
 };
 
-#ifdef HAIKU_TARGET_PLATFORM_HAIKU
-
 resource vector_icon {
 	$"6E6369660D0500020112023DEB47BD4D713B47993BE4594843FB4BC62F000032"
 	$"FF005A03FF990003FFE40003FDFF7502000602000000B6FA0BB6FA0B00000046"
@@ -44,12 +42,3 @@ resource vector_icon {
 	$"0A0A0106000A090107000A0001081001178400040A070108000A0B010900"
 };
 
-#else // HAIKU_TARGET_PLATFORM_HAIKU
-
-//resource large_icon {
-//};
-//
-//resource mini_icon {
-//};
-
-#endif // HAIKU_TARGET_PLATFORM_HAIKU
diff --git a/src/apps/login/Login.rdef b/src/apps/login/Login.rdef
index fe838e9492..455e42cc44 100644
--- a/src/apps/login/Login.rdef
+++ b/src/apps/login/Login.rdef
@@ -9,25 +9,11 @@ resource app_version {
 	internal   = 0,
 	short_info = "Tracker",
 	long_info  = "Tracker 5.2.1 ©1991-2001 Be, Inc.,\n"
-		"©2006-2007 Haiku, Inc."
+		"©2006-2009 Haiku, Inc."
 };
 
 resource app_flags B_SINGLE_LAUNCH;
 
-/*resource file_types message {
-	"types" = "application/x-vnd.Be-symlink",
-	"types" = "application/x-vnd.Be-directory",
-	"types" = "application/x-vnd.Be-query",
-	"types" = "application/x-vnd.Be-volume",
-	"types" = "application/x-vnd.Be-queryTemplate",
-	"types" = "application/x-vnd.Be-root",
-	"types" = "application/x-vnd.Be-elfexecutable",
-	"types" = "application/x-vnd.Be.printer",
-	"types" = "application/octet-stream"
-};*/
-
-#ifdef HAIKU_TARGET_PLATFORM_HAIKU
-
 resource vector_icon {
 	$"6E636966120500040068020106023ECFFF0000000000003EFFFF486000474000"
 	$"00DDA771FEA97644020006033C0564379BD6B9B4043E12EF49C94948FD140087"
@@ -68,61 +54,3 @@ resource vector_icon {
 	$"040A0D0112000A0E0113000A0F0114000A100115000A11011600"
 };
 
-#else // HAIKU_TARGET_PLATFORM_HAIKU
-
-resource large_icon array {
-	$"FFFF000000FFFFFFFFFFFFFFFFFFFFFF0000000000000000000000FFFFFFFFFF"
-	$"FF00D9D9D900FFFFFFFFFFFFFFFF0000838383838383008383D9D900FFFFFFFF"
-	$"00D9D98383000000000000FFFF00838383838383838383010000D9D900FFFFFF"
-	$"00D9838383D9D9D9D9D9D90000AA00008383D9D9838383AAAA0183D900FFFFFF"
-	$"00D90083D9D9D983838383D9D900D9D901D9D9D9D9D983AAAA00AAD900FFFFFF"
-	$"00D900D90000D98383838383D9D9D9D900D9D9D9838383AAAAAA018300FFFFFF"
-	$"00D900D90083838383000083D90083D983008383838383AAAAAA01AA00FFFFFF"
-	$"0000D9D98383838383008383D9AA00D983008383838383AAAAAA01AA00FFFFFF"
-	$"FF0083AAAAAAAAD9D9838383D9AA00D983008383838383AAAAAA01AAD900FFFF"
-	$"FFAA00AAD983838383D9D9D9D90083D983008383838383AAAAAA01AA83D900FF"
-	$"FF00D9D98383D98383AAAAD98300D9D983008383830083AAAAAA0100AA83D900"
-	$"FF00D900D9D9AAAAAAAAAAD9AA00D9D983008383008383AAAAAA01FF00AAAA00"
-	$"00D9000000AAAAAAAAAAD9AAAA00D983AA0083AA008383AAAAAA00FFFF0000FF"
-	$"0000D900AAAA00000000D9AA0000AAAA008383AA008383AAAAAA00FFFFFFFFFF"
-	$"00FA00000000008383AAAA00AAAA0000838300AA00838383AAAAAA00FFFFFFFF"
-	$"00170FF8F8FA0000000000AAAAAAAAAA838300000083838383AAAA00FFFFFFFF"
-	$"00170F0F0FF81B000000AAAAAAAA00AA838301FFFF00000000AAAAAA00FFFFFF"
-	$"00170F3F3F0E0F3F3F3F0000AAAA00AA838300FFFFFFFFFFFF00AAAA00FFFFFF"
-	$"00170F3F3F3F3F0E0F0F3F1900AAAA00838300FFFFFFFFFFFFFF00AAAA00FFFF"
-	$"00170F3F3F3F3F3F3F3F0E180000000083AA00FFFFFFFFFFFF00D9AAAA000FFF"
-	$"00170F3F3F3F3F3F3F3F3F1700FFFF00838300FFFFFFFFFFFF00D9AAAA000F0E"
-	$"001C173F3F3F3F3F3F3F3F1700FFFF008383AA00FFFFFFFFFF000000000E0F0F"
-	$"001C17183F3F3F3F3F3F3F1700FFFF008383AA00FFFFFFFFFF0E0F0F0F0F0F0F"
-	$"00003F3F17173F3F3F3F3F1700FFFF008383AA00FFFFFFFFFFFFFFFFFFFFFFFF"
-	$"1BFF00003F3F17173F3F3F1700FFFF00838300FFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"1B1C00FF00003F3F17173F1700FFFF00838300FFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"1B0083AAAA0000003F3F171700FFFF00838300FFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"00AAAAAAAA000EFF00003F3F00FF0083838300FFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FF000000000E0F0F0F0F000000FF008383AA000F0F0E0F0F0F0F0FFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFF00FFFF0000000E0F0F0F0F0F0FFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-};
-
-resource mini_icon array {
-	$"FF0000FFFFFFFFFF000000000000FFFF"
-	$"00D900000000FF008383D900838300FF"
-	$"00D98383838300D900D983AA00AA00FF"
-	$"00D900830083AAD9008383AAAA0000FF"
-	$"00AAAAAA83830083008383AAAA0000FF"
-	$"FF00008383AA008300830083AA008300"
-	$"0000000000AA0000AAAA0083AA000000"
-	$"00F800000000AAAAD90000D9AA00FFFF"
-	$"00F8F8F817170000D9000000D9AA01FF"
-	$"00173F3F3F3F1700D900FFFF00AA00FF"
-	$"00173F3F3F3F1700D900FFFF00AA000E"
-	$"00183F3F3F3F17008300FFFF0000000E"
-	$"0000003F3F3F17008300FFFFFFFFFFFF"
-	$"FF008300003F17008300FFFFFFFFFFFF"
-	$"00000000FF000083AA000F0E0F0FFFFF"
-	$"FFFFFFFFFFFFFF00000E0F0F0FFFFFFF"
-};
-
-#endif // HAIKU_TARGET_PLATFORM_HAIKU
-
diff --git a/src/apps/magnify/Magnify.rdef b/src/apps/magnify/Magnify.rdef
index c71992521d..dad6d920d2 100644
--- a/src/apps/magnify/Magnify.rdef
+++ b/src/apps/magnify/Magnify.rdef
@@ -10,13 +10,11 @@ resource app_version {
 	internal = 0,
 
 	short_info = "Magnify",
-	long_info  = "Magnify ©2006-2007 Haiku, Inc."
+	long_info  = "Magnify ©2006-2009 Haiku, Inc."
 };
 
 resource app_flags B_SINGLE_LAUNCH;
 
-#ifdef HAIKU_TARGET_PLATFORM_HAIKU
-
 resource vector_icon {
 	$"6E6369660B05000400540510057802001604378852378852378852B788524B07"
 	$"8548705100883FFFBF88FF88020016033B1FD73CCE7EBF7EBC3DE4084BE51A48"
@@ -44,60 +42,3 @@ resource vector_icon {
 	$"020B0C000A0301041001178320040A0A010D00"
 };
 
-#else // HAIKU_TARGET_PLATFORM_HAIKU
-
-resource large_icon {
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF00000000FF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF00040F040200"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF00040F04020000"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF00040F0402000000"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF00040F040200000000"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF00040F0402000000000F"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF00040F0402000000000F0F"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF0000000002000000000F0EFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF00173F3F17000000000F0FFFFF"
-	$"FFFFFFFFFFFFFFFFFF00000000000000000000173F3F17171800000F0EFFFFFF"
-	$"FFFFFFFFFFFF0000003F3F3F3F3F3F3F3F3F3F000017171811000F0EFFFFFFFF"
-	$"FFFFFFFF00003F3F3F3F3F3F3F3F3F3F3F3F3F3F3F000011000E0FFFFFFFFFFF"
-	$"FFFFFF003F3F3F3F3F000000000000000000003F3F3F3F000E0FFFFFFFFFFFFF"
-	$"FFFF003F3F3F0000008787878787878787878701003F3F3F00FFFFFFFFFFFFFF"
-	$"FF003F3F3F00878787878787878787878787878787013F3F3F00FFFFFFFFFFFF"
-	$"003F3F3F008787878760868686868686868686871586003F3F3F000EFFFFFFFF"
-	$"003F3F0087878786603F60AEAEAEAEAEAEAEAE86878787003F3F000E0FFFFFFF"
-	$"003F3F00878786AEAE6086868686868686863FAEAE8687003F3F000E0F0FFFFF"
-	$"003F3F008786AE86868686868686868686863F8686AE86003F3F000E0F0FFFFF"
-	$"003F3F3F00AE8686868686868686863F3F3F86868686003F3F3F000E0F0F0FFF"
-	$"00003F3F3F00868686868686868686868686868686011F3F3F00000E0F0F0FFF"
-	$"0087003F3F3F0000868686868686868686860100003F3F3F0087000F0E0F0FFF"
-	$"008787003F3F3F3F000000000000000000003F3F3F3F3F008787000F0F0EFFFF"
-	$"0087878700003F3F3F3F3F3F3F3F3F3F3F3F3F3F3F0000878787000F0F0FFFFF"
-	$"0087878787870000003F3F3F3F3F3F3F3F3F0000008787878787000F0FFFFFFF"
-	$"FF008787878760606000000000000000000087878787878787010F0F0FFFFFFF"
-	$"FFFF00878787606060606060603F873F8787878787878787010E0F0FFFFFFFFF"
-	$"FFFFFF008787606060606060603F873F87878787878787000F0F0FFFFFFFFFFF"
-	$"FFFFFFFF0000606060606060603F873F878787878700000F0F0FFFFFFFFFFFFF"
-	$"FFFFFFFFFFFF000000606060603F873F87870000000F0F0EFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFF0000000000000000000E0F0FFFFFFFFFFFFFFFFFFFFFFF"
-};
-
-resource mini_icon {
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFF000000"
-	$"FFFFFFFFFFFFFFFFFFFFFFFF000E0000"
-	$"FFFFFFFFFFFFFFFFFFFFFF000E000000"
-	$"FFFFFFFFFFFFFFFFFFFF00000000000E"
-	$"FFFFFFFF000000000000173F04000FFF"
-	$"FFFF00003F3F3F3F3F3F0000000EFFFF"
-	$"FF003F3F0000000000003F3F00FFFFFF"
-	$"003F0E00878787878787010F3F00FFFF"
-	$"003F00AEAEAEAEAEAEAEAE003F000EFF"
-	$"003F0EAE868686868686AE101F000F0F"
-	$"00003F0E0000000000000F3F00000E0F"
-	$"0087003F3F3F3F3F3F3F3F0087000FFF"
-	$"00878700000000000000008787000FFF"
-	$"FF0087606060603F87878787000FFFFF"
-	$"FFFF00006060603F878700000FFFFFFF"
-	$"FFFFFFFF0000000000000E0FFFFFFFFF"
-};
-
-#endif // HAIKU_TARGET_PLATFORM_HAIKU
diff --git a/src/apps/mail/Mail.rdef b/src/apps/mail/Mail.rdef
index efbf7c760d..54f65d781b 100644
--- a/src/apps/mail/Mail.rdef
+++ b/src/apps/mail/Mail.rdef
@@ -19,11 +19,9 @@ resource app_version {
 	internal = 3,
 
 	short_info = "Mail",
-	long_info = "Mail ©2005-2007 Haiku, Inc."
+	long_info = "Mail ©2005-2009 Haiku, Inc."
 };
 
-#ifdef HAIKU_TARGET_PLATFORM_HAIKU
-
 resource vector_icon {
 	$"6E63696611050004006A020006063C55F93D5C9ABF48EE3E484E4B6A43C35976"
 	$"495F849385EAF7FFA2A5B7C2C2A0BCCCDC748994FF829AB2020006033B9EE13B"
@@ -72,169 +70,15 @@ resource(0, "BEOS:L:text/x-email") #'VICN' array {
 	$"000A020105000A03010200"
 };
 
-#else // HAIKU_TARGET_PLATFORM_HAIKU
-
-resource large_icon {
-	$"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"
-};
-
-resource mini_icon {
-	$"FFFFFFFFF900F9FFFFF9FFF9F9FFFFFF"
-	$"F9FFFFF9001B0000F9FFF9FFFFFFF9FF"
-	$"FFF9F9003F3F3F1B0000F9FFF9F9FFFF"
-	$"FFF9003F3F3F1B3F3F1B0000F9FFFFFF"
-	$"F9003F3F3F0000111B3F3F1B0000F9FF"
-	$"001B3F3F0011000000113F2B3F1B0000"
-	$"0000001C00001100111B7B2B2C1C00F9"
-	$"FFF90000FAFA0000113F3F7B1B00F9FF"
-	$"F90000FAFAFAFA00003F3F1B00F9FFFF"
-	$"FF00F9F9F9FAF95D001B1C00F9F9F9F9"
-	$"00F9F90000F95D5D000000F9FFFFFFFF"
-	$"00F9F99D00F95D0000F9F9FFF9FFFFFF"
-	$"00F90000F9F9009D000EF9FFFFF9FFFF"
-	$"FF00F99D00009D00000EF9FFFFFFFFFF"
-	$"FF0000F9F9F900000E0FFFFFFFFFFFFF"
-	$"FFFFFF000000000E0FFFFFFFFFFFFFFF"
-};
-
-resource(0, "BEOS:L:text/x-email") #'ICON' array {
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFF9F9FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFF90000F9F9FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFF9001B1C0000F9F9FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFF9003F3F3F1B1C0000F9F9FFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFF9003F3F3F3F3F3F1B1C0000F9F9FFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFF9003F3F3F3F3F3F3F3F3F1B1C0000F9F9FFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFF9003F3F3F3F3F3F3F3F3F3F3F3F1B1C0000F9F9FFFFFFFFFFFFFFFF"
-	$"FFFFFFF9003F3F3F3F3F3F3F1B1C3F3F3F3F3F3F1B1C0000F9F9FFFFFFFFFFFF"
-	$"FFFFF9003F3F3F3F3F3F3F3F00001B1C3F3F3F3F3F3F1B1C0000F9F9FFFFFFFF"
-	$"FFF9003F3F3F3F3F3F3F3F001B1C00001B1C3F3F3F3F3F3F1B1C0000F9F9FFFF"
-	$"F9003F3F3F3F3F3F3F001B1C00001B1C00001C1B3F3F3F3F2B7B1B1C0000F9F9"
-	$"001B1C3F3F3F3F3F3F3F00001B1C00001B1C00003F3F3F2B2C2B2B3F1B1C00F9"
-	$"F900001B1C3F3F3F3F3F3F3F00001B1C3F3F3F1B3F3F2B2C2B2B3F3F1B00F9F9"
-	$"FFF9F900001B1C3F3F3F3F3F3F3F11001B1C3F3F3F3F3F7B2B3F3F1B00F9F9FF"
-	$"FFFFFFF9F900001B1C3F3F3F3F3F3F3F00003F3F3F3F3F3F3F3F1B00F9F9FFFF"
-	$"FFFFFFFFFFF9F900001B1C3F3F3F3F3F1B3F3F3F3F3F3F3F3F1B00F9F9FFFFFF"
-	$"FFFFFFFFFFFFFFF9F900001B1C3F3F3F3F3F3F3F3F3F3F3F1B00F9F9FFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFF9F900001B1C3F3F3F3F3F3F3F3F1B00F9F9FFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFF9F900001B1C3F3F3F3F3F1B00F9F9FFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFF9F900001B1C3F3F1B00F9F9FFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF9F900001B1C00F9F9FFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF9F90000F9F9FFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF9F9FFFFFFFFFFFFFFFFFFFFFF"
-};
-
-resource(0, "BEOS:M:text/x-email") #'MICN' array {
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFF900F9F9FFFFFFFFFFFFFFFF"
-	$"FFFFFFF9001B0000F9F9FFFFFFFFFFFF"
-	$"FFFFF9003F3F3F1B0000F9FFFFFFFFFF"
-	$"FFF9003F3F3F1B3F3F1B0000F9F9FFFF"
-	$"F9003F3F3F0000111B3F3F1B0000F9FF"
-	$"001B3F3F0011000000113F2B3F1B0000"
-	$"003F3F3F00001100111B7B2B2C1C00F9"
-	$"F900003F3F3F0011113F3F7B1B00F9FF"
-	$"FFF9F900003F3F3F003F3F1B00F9FFFF"
-	$"FFFFFFF9F900003F3F1B1C00F9FFFFFF"
-	$"FFFFFFFFFFF9F900003F00F9FFFFFFFF"
-	$"FFFFFFFFFFFFFFF9F900FFFFFFFFFFFF"
-};
-
-#endif // HAIKU_TARGET_PLATFORM_HAIKU
-
-resource(1, "BEOS:L:text/x-vnd.be-maildraft") #'ICON' array {
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF000000FFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF000B3F5A00FF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF005A0B3F5A5A00"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF000B5A0B3F5A5A00"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF008F0B5A3F085A5A00"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF008F680A3FA3A3080900"
-	$"FFFFFFFFFFFFFFFFFFFF0000FFFFFFFFFFFFFFFFFF008F68113F08A3A3CA00FF"
-	$"FFFFFFFFFFFFFFFFFF001B1B0000FFFFFFFFFFFF008F68113F6808090800FFFF"
-	$"FFFFFFFFFFFFFFFF003F3F3F1B1B0000FFFFFF008F68113F68088F8F00FFFFFF"
-	$"FFFFFFFFFFFFFF003F3F3F3F3F3F1B1B0000008F68113F68088F8F00FFFFFFFF"
-	$"FFFFFFFFFFFF003F3F3F3F3F3F3F3F3F1B0A8F68113F68088F8F00FFFFFFFFFF"
-	$"FFFFFFFFFF003F3F3F3F3F3F3F3F3F3F0A8F68113F68088F8F00FFFFFFFFFFFF"
-	$"FFFFFFFF003F3F3F3F3F3F3F1B1B3F0A8F68113F68088F8F00FFFFFFFFFFFFFF"
-	$"FFFFFF003F3F3F3F3F3F3F3F00001B0A68113F68088F8F000000FFFFFFFFFFFF"
-	$"FFFF003F3F3F3F3F3F3F3F001B1B0A0B0A3F68088F8F003F1B1C0000FFFFFFFF"
-	$"FF003F3F3F3F3F3F3F001B1C00000A3F0A68088F8F003F3F2B7B1B1C0000FFFF"
-	$"001B1C3F3F3F3F3F3F3F00001B1B0A3F0A000000003F3F2B2C2B2B3F1B1C00FF"
-	$"0F00001B1C3F3F3F3F3F3F3F000A3F5A5B5B5B003F3F2B2C2B2B3F3F1B000FFF"
-	$"FF0F0F00001B1C3F3F3F3F3F3F0A095B5B00003F3F3F3F7B2B3F3F1B000F0FFF"
-	$"FFFFFF0F0F00001B1C3F3F3F3F0A090000003F3F3F3F3F3F3F3F1B000F0FFFFF"
-	$"FFFFFFFFFF0F0F00001B1C3F3F3F3F3F1B3F3F3F3F3F3F3F3F1B000F0FFFFFFF"
-	$"FFFFFFFFFFFFFF0F0F00001B1C3F3F3F3F3F3F3F3F3F3F3F1B000F0FFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFF0F0F00001B1C3F3F3F3F3F3F3F3F1B000F0FFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFF0F0F00001B1C3F3F3F3F3F1B000F0FFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFF0F0F00001B1C3F3F1B000F0FFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFF0F0F00001B1C000F0FFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF0F0F00000F0FFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF0F0F0FFFFFFFFFFFFFFFFFFFFF"
-};
-
-resource(1, "BEOS:M:text/x-vnd.be-maildraft") #'MICN' array {
-	$"FFFFFFFFFFFFFFFFFFFFFFFF000000FF"
-	$"FFFFFFFFFFFFFFFFFFFFFF000B3F5A00"
-	$"FFFFFFFFFFFFFFFFFFFF00095A0A5A01"
-	$"FFFFFFFFFF0000FFFF008F09A3A30000"
-	$"FFFFFFFF001B1B00008F3F6808A300FF"
-	$"FFFFFF001B3F3F0A0B3F688F8F00FFFF"
-	$"FFFF001B3F3F3F0A0B688F8F00FFFFFF"
-	$"FF001B3F3F000A5B0B0B0A001B0000FF"
-	$"001B3F3F1C1C0A5B5B00002C1B1B0000"
-	$"001B1B3F00002900003F7B2B2C0100B0"
-	$"0F00001B1B3F00001C3F3F7B1B000FFF"
-	$"FF0F0F00001B1B3F3F3F3F1B000FFFFF"
-	$"FFFFFF0F0F00001B1B3F1B000FFFFFFF"
-	$"FFFFFFFFFF0F0F00001B000FFFFFFFFF"
-	$"FFFFFFFFFFFFFF0F0F000FFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFF0FFFFFFFFFFFFF"
+resource(1, "BEOS:L:text/x-vnd.be-maildraft") #'VICN' array {
+	$"6E636966070500040178020006023A94CE3C078BBE370C3CD1394B9EF949A6E5"
+	$"00FFFCACFFE6E27C03A07D3303A0893C02000602B4491E38CD95BCF086B8659B"
+	$"4B4F4E49909100ECE986FFC9C55C020016023A4998B6DADD38AE423C25DB4932"
+	$"6F49265100D6FFFF070605EA0247584A59594A604460476041563C0605EA0222"
+	$"4646585A444A2E4E2E462E36350A0C36353742234639443E46455741485A4441"
+	$"463F443B4239420A0436355A4442463A4306032E5A444A2E4E2E462E36350A07"
+	$"363538433E4541485A44465822460A043939534345532C46080A010100000A00"
+	$"01011001178402040A040103000A050104000A0001061001178200040A060106"
+	$"000A020105000A03010200"
 };
 
diff --git a/src/apps/mandelbrot/Mandelbrot.rdef b/src/apps/mandelbrot/Mandelbrot.rdef
index 0754054c6d..75d91dd8ec 100644
--- a/src/apps/mandelbrot/Mandelbrot.rdef
+++ b/src/apps/mandelbrot/Mandelbrot.rdef
@@ -1,4 +1,3 @@
-#ifdef HAIKU_TARGET_PLATFORM_HAIKU
 
 resource vector_icon {
 	$"6E6369660C04006B0500020006023B4FDF3A26DEBE07943F1FB649C6A13E02F4"
@@ -25,64 +24,6 @@ resource vector_icon {
 	$"09010A000A09010C000A0A010D000A0A010B00"
 };
 
-#else // !HAIKU_TARGET_PLATFORM_HAIKU
-
-resource large_icon {
-	$"FFFFFF000000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFF001B1C1B0000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FF003F1B1C1B1C1C0000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FF0015153F1B1C1B1C1C0000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FF00150A16153F3F1B1C1B1C0000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FF00150A0B0B15153F1B1C1B1C1C0000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FF00150A0B000B0A16153F1B1C1B1C1C0000FFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FF00150A0B0000000B0A16153F3F1B1C1B1C0000FFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FF00150A0B00000000000B0A16153F3F1B1C1B1C0000FFFFFFFFFFFFFFFFFFFF"
-	$"FF00150A0B000000000000000B0A16153F3F1B1C1B1C0000FFFFFFFFFFFFFFFF"
-	$"FF00150A0B000000000000FC3E920A0B15153F3F1B1C1B3F00FFFFFFFFFFFFFF"
-	$"FF00150A0B0000000000FC0000FC3E670A0B15163F3F3F0E00FFFFFFFFFFFFFF"
-	$"FF00150A0B000000000000000000007494730B0B15150F0F00FFFFFFFFFFFFFF"
-	$"FF00150A0B0000000000000000000043FC743E1B16150F0F29FFFFFFFFFFFFFF"
-	$"FF00150A0B0000FC0000000000000000FC943E1B16150F0F29FFFFFFFFFFFFFF"
-	$"FF00150A0B0069FC00000000000000006F94941C15150F0F00FFFFFFFFFFFFFF"
-	$"FF00150A0BFC3EFE000000000000000094736D1C15150F0F00FFFFFFFFFFFFFF"
-	$"FF00150A0B3E5E4300000000000000FCFC3E5E4116150F0F01FFFFFFFFFFFFFF"
-	$"FF00150A0B7394FCFC0000000000000000947E4116150F0F01FFFFFFFFFFFFFF"
-	$"FF00150A0B6D7394FCFC000000FCFC0000747E4116150F0F01FFFFFFFFFFFFFF"
-	$"FF00150A0B1C6D6E693EFEFC946E3EFE6994FC1B15160F0E00FFFFFFFFFFFFFF"
-	$"FF0015150B1B1C1C6D737494947394949473944682140F0F00FFFFFFFFFFFFFF"
-	$"FF11000015151C1B1C1C3EFEFC6D6D6D6D6D941C15150F0F00FFFFFFFFFFFFFF"
-	$"FFFF1111000015151C1B1C1C6D6D6D6D6D6D3E1C1516AE1000FFFFFFFFFFFFFF"
-	$"FFFFFFFF1111000015151C1B1C1C67676D6D731C15150F0F001111FFFFFFFFFF"
-	$"FFFFFFFFFFFF1111000015151C1B1C1C6D6D6E1C15150F0F0011111111FFFFFF"
-	$"FFFFFFFFFFFFFFFF1111000015151C1B1C1CFC1B15160F0E00111111111111FF"
-	$"FFFFFFFFFFFFFFFFFFFF1111000015151C1B1C1C15150F0F001111111111FFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFF1111000015151C1B16150F0F0011111111FFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFF11110000151515160E0F00111111FFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF1111000015150F00111111FFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF1111000000111111FFFFFFFFFFFF"
-};
-
-resource mini_icon {
-	$"FF000000FFFFFFFFFFFFFFFFFFFFFFFF"
-	$"00151B1C0000FFFFFFFFFFFFFFFFFFFF"
-	$"00150A161B1C0000FFFFFFFFFFFFFFFF"
-	$"00150A000B151C1C0000FFFFFFFFFFFF"
-	$"00150A0000000B151C1C0000FFFFFFFF"
-	$"00150A000000FC0A0B151C0F00FFFFFF"
-	$"00150A0000FC00FC940A160E00FFFFFF"
-	$"00150A0000000000941C150F00FFFFFF"
-	$"00150A00FC000000FC1B150F00FFFFFF"
-	$"00150A9494FC00FC001B150F00FFFFFF"
-	$"00150A1C1C9494FCFC1B150F00FFFFFF"
-	$"11000015151C1B6D6D1C150F00FFFFFF"
-	$"FFFF11000015151C1B1C150F001111FF"
-	$"FFFFFFFF11000015151C150F00111111"
-	$"FFFFFFFFFFFF11000015150F001111FF"
-	$"FFFFFFFFFFFFFFFF110000001111FFFF"
-};
-
-#endif // !HAIKU_TARGET_PLATFORM_HAIKU
-
 resource app_signature "application/x-vnd.Haiku-Mandelbrot";
 
 resource app_flags B_MULTIPLE_LAUNCH;
diff --git a/src/apps/mediaplayer/MediaPlayer.rdef b/src/apps/mediaplayer/MediaPlayer.rdef
index 88b038a06b..c2e8729a19 100644
--- a/src/apps/mediaplayer/MediaPlayer.rdef
+++ b/src/apps/mediaplayer/MediaPlayer.rdef
@@ -8,7 +8,7 @@ resource app_version {
 	variety    = B_APPV_BETA,
 	internal   = 0,
 	short_info = "MediaPlayer",
-	long_info  = "MediaPlayer ©2006-2007 Haiku, Inc."
+	long_info  = "MediaPlayer ©2006-2009 Haiku, Inc."
 };
 
 resource app_flags B_SINGLE_LAUNCH;
@@ -62,8 +62,6 @@ resource file_types message {
 	"types" = "video/x-theora"
 };
 
-#ifdef HAIKU_TARGET_PLATFORM_HAIKU
-
 resource vector_icon {
 	$"6E6369660D05000401740200060238FD543D29B3BD87203955A34A81F24A9838"
 	$"0075E9FFFF46D3EC0200060238E9203CA6E8BD037C394EBB4B224D4A495A0013"
@@ -96,60 +94,3 @@ resource vector_icon {
 	$"020E0F1815FF01178400040A09020E0F0815FF"
 };
 
-#else // HAIKU_TARGET_PLATFORM_HAIKU
-
-resource large_icon {
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFF0000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFF001B1C000000000000FFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFF003F1B1C1B1C0B0A1C1C0000FFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFF00153F3F1B1C1B1C0B0A1C190000FFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFF001515153F3F1B1C1B1C0B0A1A190000FFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFF0015151516153F3F1B1C1B1C0B0A1A1900FFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFF00150B15151516153F3F1B1C1B1A0B0A00FFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFF00150B0A0B15151615153F3F1B1C1B1100FFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFF00150B86860B0B15151516153F1B0F0F00FFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFF00150A868686860C0A151615150F0F0F00FFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFF00150B8686868686860D0D15160E0F0F00FFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFF00150B86868686868686863F150F0F0E00FFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFF00160A86868686868686863F150F0F0E00FFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFF00160A86868686868686863F150F0F0E00FFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFF00160A3F868686868686863F150F0F0E00FFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFF001615153F3F86868686863F150F0F0E00111111FFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFF000A1516153F3F8686863F150F0F0E0011111111FFFF"
-	$"FFFFFFFFFFFFFFFFFF003F3F0A0B1515163F3F863F150F0F0E0000111111FFFF"
-	$"FFFFFFFFFFFFFFFFFF0015153F3F0A0B1515163F3F150F0F0E0B0B001111FFFF"
-	$"FFFFFFFFFFFFFFFFFF00151515163F3F0A0B15202A150F0F0E0B0F001111FFFF"
-	$"FFFFFFFFFFFFFFFFFF001515150B0B153F3F0A0B15150F0F0B0F0E001111FFFF"
-	$"FFFFFFFFFFFFFFFFFFFF00001515150B0B153F3F0A0B0A0B0F0F0F001111FFFF"
-	$"FFFFFF000000FFFFFFFFFFFF00001515150B15153F3F0E0F0F0F001111FFFFFF"
-	$"FFFF000A0B0A0000FFFFFFFFFFFF00001515152D16150F0F0E001111FFFFFFFF"
-	$"FF000A07060B0A0B0000FFFFFFFFFFFF0000151515160E0F001111FFFFFFFFFF"
-	$"FF000A0B0AFA060B0A0700FFFFFFFFFFFFFF000015150F001111FFFFFFFFFFFF"
-	$"FF0013130A0B0B0A070600FFFFFFFFFFFFFFFFFF0000001111FFFFFFFFFFFFFF"
-	$"FFFF000013130A070600FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFF0000130600FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFF0000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-};
-
-resource mini_icon {
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFF0B0B0C0FFFFFFFFFFFFFFFFF"
-	$"FFFFFFFF011B3F120B0A07FFFFFFFFFF"
-	$"FFFFFFFF010F1C3F3F1A0F0709FFFFFF"
-	$"FFFFFFFF00100C89193F3F1D00FFFFFF"
-	$"FFFFFFFF011186AE0C89191602FFFFFF"
-	$"FFFFFFFF0011861786AE180D03FFFFFF"
-	$"FFFFFFFF0111868686861E0E03FFFFFF"
-	$"FFFFFF05000E3F6086ACFE0E040EFFFF"
-	$"FFFFFF0012140F0E3F1A1D0F03060EFF"
-	$"FFFFFF0512161E130F0E1A0F06020EFF"
-	$"FFFFFFFF04020C1419160E0612040EFF"
-	$"FF06000EFFFF04050BEB3F110606FFFF"
-	$"0A00120600FFFFFF0404040305FFFFFF"
-	$"0D030D0C000DFFFFFFFFFFFFFFFFFFFF"
-	$"FFFF0D000DFFFFFFFFFFFFFFFFFFFFFF"
-};
-
-#endif // HAIKU_TARGET_PLATFORM_HAIKU
diff --git a/src/apps/midiplayer/MidiPlayer.rdef b/src/apps/midiplayer/MidiPlayer.rdef
index e8c4653460..8b85cbc08a 100644
--- a/src/apps/midiplayer/MidiPlayer.rdef
+++ b/src/apps/midiplayer/MidiPlayer.rdef
@@ -8,7 +8,7 @@ resource app_version {
 	variety    = B_APPV_BETA,
 	internal   = 0,
 	short_info = "MidiPlayer",
-	long_info  = "MidiPlayer ©2004-2007 Haiku, Inc."
+	long_info  = "MidiPlayer ©2004-2009 Haiku, Inc."
 };
 
 resource app_flags B_SINGLE_LAUNCH;
@@ -17,8 +17,6 @@ resource file_types message {
 	"types" = "audio/x-midi"
 };
 
-#ifdef HAIKU_TARGET_PLATFORM_HAIKU
-
 resource vector_icon {
 	$"6E6369660D0500040063020006023A9CFB3B0744BD682D3CF09A498CD74A02F0"
 	$"003578DCFF124EA90200060239D8C838576FBB1EA33C90064B3B2849919A0003"
@@ -43,61 +41,3 @@ resource vector_icon {
 	$"01178200040A0A010C202F11"
 };
 
-#else // HAIKU_TARGET_PLATFORM_HAIKU
-
-resource large_icon array {
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFF00FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFF003F0000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFF003F1818180000FFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFF003F1818181818180000FFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFF003F1818181818181818170000FFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFF003F1818181818181818181818180000FFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFF003F1718181818181818181818181818180000FFFFFFFFFFFF"
-	$"FFFFFFFFFFFF003F1717181818181818181818181818181818180000FFFFFFFF"
-	$"FFFFFFFFFF003F183C361818181818171818181818181818181818180000FFFF"
-	$"FFFFFFFF003F18181818312B18183F16181718181818181818181818180A00FF"
-	$"FFFFFF003F181818181818181800003F0A0B171818181818181818170B0B00FF"
-	$"FFFF003F17181818181818181816110B3F110017171818181818180A0B0A00FF"
-	$"FF003F18181818181818181818180B3F1100003F3F17181818170B0B0A0000FF"
-	$"003F181818181818181818181818180000111100003F1718180A0B0B000A00FF"
-	$"003F3F1818181818181818181818181817171811110017170B0B0A000B0B000E"
-	$"0011113F3F1718181818181818181818181818181818180A0B0A000B0B0A000F"
-	$"00111111113F3F1718181818181818181818181818180B0B0A000B0B0A000F0F"
-	$"001111111111113F3F1818181818181818181818180A0B0B000A0B0A000F0F0F"
-	$"0000001111111111113F3F1818181818181818180A0B0B000A0B0B000E0F0FFF"
-	$"00111100001111111111113F3F1818181818180A0B0B000A0B0B000E0F0FFFFF"
-	$"001111111100001111111111113F3F1818180A0B0B000A0B0A000F0F0FFFFFFF"
-	$"0011111111111100001111111111113F170B0A0B000A0B0B000F0E0FFFFFFFFF"
-	$"FF0000111111111111000011111111110A0B0A000B0B0A000F0F0FFFFFFFFFFF"
-	$"FFFFFF000011111111111100001111110A0B000A0B0B000F0E0FFFFFFFFFFFFF"
-	$"FFFFFFFFFF00001111111111110000110A000B0A0B000F0F0FFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFF000011111111111100000A0B0A000F0F0FFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFF000011111111110A0B0A000F0F0FFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFF00001111110A0B000F0F0EFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFF0000110A000F0F0FFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFF00000E0F0FFFFFFFFFFFFFFFFFFFFFFFFF"
-};
-
-resource mini_icon array
-{
-	$"FFFFFFFFFFFF00FFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFF00170000FFFFFFFFFFFFFF"
-	$"FFFFFFFF00171718180000FFFFFFFFFF"
-	$"FFFFFF00171718181818180000FFFFFF"
-	$"FFFF0017362B3F1717181818180000FF"
-	$"FF0017171800003F0017171818181700"
-	$"0017181818181700003F3F1717180A00"
-	$"003F3F171818180017000018170B0400"
-	$"0017183F3F181818181717180A050A00"
-	$"00111118173F3F181817170B040B000F"
-	$"000404111118173F3F170B040A000FFF"
-	$"0011110404111117180A050A000FFFFF"
-	$"FF000011110404110B040B000EFFFFFF"
-	$"FFFFFF0000111104040B000FFFFFFFFF"
-	$"FFFFFFFFFF0000110A000FFFFFFFFFFF"
-	$"FFFFFFFFFFFFFF00000EFFFFFFFFFFFF"
-};
-
-#endif // HAIKU_TARGET_PLATFORM_HAIKU
diff --git a/src/apps/networkstatus/NetworkStatus.rdef b/src/apps/networkstatus/NetworkStatus.rdef
index 2f18682c9f..1815fbdcc2 100644
--- a/src/apps/networkstatus/NetworkStatus.rdef
+++ b/src/apps/networkstatus/NetworkStatus.rdef
@@ -12,11 +12,9 @@ resource app_version {
 	internal = 0,
 
 	short_info = "NetworkStatus",
-	long_info = "NetworkStatus ©2007 Haiku"
+	long_info = "NetworkStatus ©2009 Haiku"
 };
 
-#ifdef HAIKU_TARGET_PLATFORM_HAIKU
-
 resource vector_icon {
 	$"6E63696608050005B8020016023A692E36692FBA2ECD3E2ECD4B89A449631800"
 	$"5CFF8305E7020106023C00000000000000003C00004680004680000029B6FFFF"
@@ -39,4 +37,3 @@ resource vector_icon {
 	$"00010B1001178800040A07010B00"
 };
 
-#endif
diff --git a/src/apps/packageinstaller/PackageInstaller.rdef b/src/apps/packageinstaller/PackageInstaller.rdef
index 073f86defe..8961128746 100644
--- a/src/apps/packageinstaller/PackageInstaller.rdef
+++ b/src/apps/packageinstaller/PackageInstaller.rdef
@@ -14,13 +14,11 @@ resource app_version {
 	internal = 0,
 
 	short_info = "Package Installer",
-	long_info = "Package Installer ©2007-2008 Haiku, Inc."
+	long_info = "Package Installer ©2007-2009 Haiku, Inc."
 };
 
 resource app_flags B_SINGLE_LAUNCH;
 
-#ifdef HAIKU_TARGET_PLATFORM_HAIKU
-
 resource vector_icon {
 	$"6E6369660E0500040065035D2B0C0385501C0200060238B0AD39B313BC39613B"
 	$"3C1049FADA48DA6900663200FF834F1C02000602BAC477B68B1E383D42BC6FBF"
@@ -42,4 +40,3 @@ resource vector_icon {
 	$"0A0C010E00"
 };
 
-#endif
diff --git a/src/apps/pairs/Pairs.rdef b/src/apps/pairs/Pairs.rdef
index c8d106b58e..27fd89ba59 100644
--- a/src/apps/pairs/Pairs.rdef
+++ b/src/apps/pairs/Pairs.rdef
@@ -1,6 +1,3 @@
-/*
- * Pairs.rdef
- */
 
 resource app_signature "application/x-vnd.Haiku-Pairs";
 
@@ -19,7 +16,7 @@ resource app_version {
 	internal = 1,
 
 	short_info = "Pairs",
-	long_info = "Pairs, Copyright 2008 Haiku Inc."
+	long_info = "Pairs, Copyright 2009 Haiku Inc."
 };
 
 
@@ -42,3 +39,4 @@ resource vector_icon {
 	$"070108000A060107000A0001041815FF01178400040A00010418001501178600"
 	$"040A040104000A0301090815FF"
 };
+
diff --git a/src/apps/poorman/PoorMan.rdef b/src/apps/poorman/PoorMan.rdef
index 55fefb85b2..01ae455af3 100644
--- a/src/apps/poorman/PoorMan.rdef
+++ b/src/apps/poorman/PoorMan.rdef
@@ -16,8 +16,6 @@ resource app_flags B_EXCLUSIVE_LAUNCH;
 
 resource file_types message;
 
-#ifdef HAIKU_TARGET_PLATFORM_HAIKU
-
 resource vector_icon {
 	$"6E63696606040059020006033B52123BE398BF0AC03E98EC4AFDFD43719100FF"
 	$"D4007DBF8F00FF9965000200060339B0453A1B90BF02A03EA2524B2E0E4637E9"
@@ -38,62 +36,3 @@ resource vector_icon {
 	$"0A01010A2022200A05010B30222001178400040A04010B202220"
 };
 
-#else // HAIKU_TARGET_PLATFORM_HAIKU
-
-resource large_icon array
-{
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFF0001330000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFF00040000000033FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFF040000000A000000FFFFFFFFFFFFFF0000FFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFF010A83D90A000000FFFF00005A00005A00FFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFF040A83AAD9010000FFFFFF00005A005A000000FFFFFFFFFF"
-	$"FFFFFFFFFFFFFF0001AA83D9D9000000FFFFFFFFFF00000000FFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFF00D80000AAAAAAAA0000FFFFFF00007B7B5A5A00FFFFFFFFFFFF"
-	$"FFFFFFFFFF00D8D8D80A000000000B00000000FF007B5A5A7B00FFFFFFFFFFFF"
-	$"FFFFFFFFFF00D8D83F3F0A0B0A0B0B0A00FFFFFF005A7B5A7B00FFFFFFFFFFFF"
-	$"FFFFFFFF0000D83FB1D83F3F0000D8D8D80000FF005A5A5A7B00FFFFFFFFFFFF"
-	$"FFFFFFFF00D8D8D8000000003F3F3FD8D8D800FF005A5A7B7B00FFFFFFFFFFFF"
-	$"FFFFFFFF003FD8000083D8D8D8D8D83F3FD800FFFF007B7B00FFFFFFFFFFFFFF"
-	$"FFFFFF00D90000D80083D8D8D8D8D8D800D800FFFFFF0000FFFFFFFFFFFFFFFF"
-	$"FFFFFF00D9D9000000D8D8D800D8B100D8D800FFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFF00000000FF00D8D8D800D8B100D8D800FFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFF000000AA00B100D8D800FFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFF00AAAAAAAA000000D8D800FFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFF003FAA83AAAAAA00D8D800FFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFF003F3FAA83833FAA00000000FFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFF003FAA8383833F3F00D9D900FFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFF00AA8300833F3F00D9D900FFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFF0083830083AAAA000000FFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFF008383008383AA000000FFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFF000083008383AA00FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFF00830083830000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFF00000000AA00FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFF00D900D900001111111111111111111111FFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFF00D900D9D9D9001111111111111111111111FFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFF00D900D9D9D900001111111111111111FFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFF0000000000111111FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-};
-
-resource mini_icon array
-{
-	$"FFFFFFFFFF000000FFFFFFFFFFFFFFFF"
-	$"FFFFFFFF0000000000FFFFFFFFFFFFFF"
-	$"FFFFFFFF0483830000FFFF0000FFFFFF"
-	$"FFFFFFFF00D9830000FF00000000FFFF"
-	$"FFFFFF00D800AA000000005A5A00FFFF"
-	$"FFFF0000B1D80000D800005A7B00FFFF"
-	$"FFFF00D8B100D8D8D80000000000FFFF"
-	$"FFFF00D900D8D800D800FF0000FFFFFF"
-	$"FFFF00000000D800D800FFFFFFFFFFFF"
-	$"FFFFFFFF008300000000FFFFFFFFFFFF"
-	$"FFFFFFFF00838300D900FFFFFFFFFFFF"
-	$"FFFFFFFF0083008300FFFFFFFFFFFFFF"
-	$"FFFFFFFF0083008300FFFFFFFFFFFFFF"
-	$"FFFFFFFF0000000000FFFFFFFFFFFFFF"
-	$"FFFFFF00D900D900111111111111FFFF"
-	$"FFFFFFFF0000000011111111FFFFFFFF"
-};
-
-#endif // HAIKU_TARGET_PLATFORM_HAIKU
diff --git a/src/apps/powerstatus/PowerStatus.rdef b/src/apps/powerstatus/PowerStatus.rdef
index 8678a658da..6b230db9a2 100644
--- a/src/apps/powerstatus/PowerStatus.rdef
+++ b/src/apps/powerstatus/PowerStatus.rdef
@@ -12,11 +12,9 @@ resource app_version {
 	internal = 0,
 
 	short_info = "PowerStatus",
-	long_info = "PowerStatus ©2006-2007 Haiku"
+	long_info = "PowerStatus ©2006-2009 Haiku"
 };
 
-#ifdef HAIKU_TARGET_PLATFORM_HAIKU
-
 resource vector_icon {
 	$"6E6369660A03000100010001007102000604BC00000000000000003C00004940"
 	$"004B0000003DAE3D2B237823D250E550FF2EAA2E02000604BC00000000000000"
@@ -46,4 +44,3 @@ resource vector_icon {
 	$"4C0A04010700"
 };
 
-#endif // HAIKU_TARGET_PLATFORM_HAIKU
diff --git a/src/apps/processcontroller/ProcessController.rdef b/src/apps/processcontroller/ProcessController.rdef
index b59685fd75..a66c0b61fc 100644
--- a/src/apps/processcontroller/ProcessController.rdef
+++ b/src/apps/processcontroller/ProcessController.rdef
@@ -11,13 +11,11 @@ resource app_version {
 
 	short_info = "ProcessController",
 	long_info = "ProcessController ©1997-2001 G.E. Berenger,\n"
-		"©2006-2007 Haiku, Inc."
+		"©2006-2009 Haiku, Inc."
 };
 
 resource app_flags B_SINGLE_LAUNCH;
 
-#ifdef HAIKU_TARGET_PLATFORM_HAIKU
-
 resource vector_icon {
 	$"6E6369660E03010000020002023980000000000000004000004BE00008908100"
 	$"010000FFFF01000000020016023CC7EE389BC0BA16573E39B04977C842ADC700"
@@ -44,60 +42,3 @@ resource vector_icon {
 	$"770615FF0A0C010B0A3FEAF70000000000003FEAF7C573B4C2770615FF"
 };
 
-#else // HAIKU_TARGET_PLATFORM_HAIKU
-
-resource large_icon array {
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF02020008FFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF041B18110802FFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFF041B3F3F1B15090BFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFF021B3F3F1B150B00FFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFF04151C1B18110800FFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFF02081516150B080BFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFF000060000A0B080B00FFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFF00873F600A00000000D50000FFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFF0087873F3FD5D5D5D5D5D56000FFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFF00878787873F3F60606060D500FFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFF0202000887878787873F3FD5D5D500FFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFF041B18110802878787878787D5D5D500FFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFF041B3F3F1B1509D58787878787D5D5D500FFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFF021B3F3F1B150B008787878787D5D5D500FFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFF04151C1B181108008787878787D5D5D500FFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFF02081516150B08D58787878787D5D5D500FFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFF0060000A0B080B00878787878787D5D5D500FFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFF0087600A000000D500008787878787D5D5D500FFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFF00873F3FD5D5D5D5D5600087878787D5D5D500FFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFF008787873F3F606060D50087878787D5D5D500FFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFF0087878787873FD5D5D50087878787D5D5D5000E0EFFFFFFFFFF"
-	$"FFFFFFFFFFFF00878787878787D5D5D50087878787D5D5D5000E0E0EFFFFFFFF"
-	$"FFFFFFFFFFFF00878787878787D5D5D50087878787D5D5D5000E0E0EFFFFFFFF"
-	$"FFFFFFFFFFFF00878787878787D5D5D50087878787D5D5D5000E0EFFFFFFFFFF"
-	$"FFFFFFFFFFFF00878787878787D5D5D50087878787D5D5D5000E0F0F0FFFFFFF"
-	$"FFFFFFFFFFFF00878787878787D5D5D50087878787D5D5D500000F0F0FFFFFFF"
-	$"FFFFFFFFFFFF00878787878787D5D5D50087878787D5D5D5000F0F0FFFFFFFFF"
-	$"FFFFFFFFFFFF00878787878787D5D5D50087878787D5D5000F0F0FFFFFFFFFFF"
-	$"FFFFFFFFFFFF00878787878787D500D5D587878787D5000F0F0FFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFF00878787878700D5D5D587878787000F0F0FFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFF0000878787D5D5D587878787000E0F0FFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFF0000000F0F0F000000000F0F0FFFFFFFFFFFFFFFFFFF"
-};
-
-resource mini_icon array {
-	$"FFFFFFFFFFFFFFFF020002FFFFFFFFFF"
-	$"FFFFFFFFFFFFFF021B1C0800FFFFFFFF"
-	$"FFFFFFFFFFFFFF0215150900FFFFFFFF"
-	$"FFFFFFFFFFFF003F000000D500FFFFFF"
-	$"FFFFFFFFFFFF00873F3FD5D500FFFFFF"
-	$"FFFFFFFF020002878787D5D500FFFFFF"
-	$"FFFFFF021B1C08008787D5D500FFFFFF"
-	$"FFFFFF02151509008787D5D500FFFFFF"
-	$"FFFF003F000000D50087D5D500FFFFFF"
-	$"FFFF00873F3FD5D50087D5D500FFFFFF"
-	$"FFFF00878787D5D50087D5D500FFFFFF"
-	$"FFFF00878787D5D50087D5D5000E0EFF"
-	$"FFFF00878787D5D50087D5D5000E0EFF"
-	$"FFFF00878787D5D50087D5D5000EFFFF"
-	$"FFFF00878787D5000E87D5000EFFFFFF"
-	$"FFFFFF0E0000000F0000000FFFFFFFFF"
-};
-
-#endif // HAIKU_TARGET_PLATFORM_HAIKU
diff --git a/src/apps/pulse/Pulse.rdef b/src/apps/pulse/Pulse.rdef
index c46b0608e2..5b0285fc52 100644
--- a/src/apps/pulse/Pulse.rdef
+++ b/src/apps/pulse/Pulse.rdef
@@ -10,13 +10,11 @@ resource app_version {
 	internal = 0,
 
 	short_info = "Pulse",
-	long_info = "Pulse ©2005-2007 Haiku, Inc."
+	long_info = "Pulse ©2005-2009 Haiku, Inc."
 };
 
 resource app_flags B_SINGLE_LAUNCH;
 
-#ifdef HAIKU_TARGET_PLATFORM_HAIKU
-
 resource vector_icon {
 	$"6E6369660E03010000020002023980000000000000004000004BE00008908100"
 	$"010000FFFF01000000020016023CC7EE389BC0BA16573E39B04977C842ADC700"
@@ -43,60 +41,3 @@ resource vector_icon {
 	$"770615FF0A0C010B0A3FEAF70000000000003FEAF7C573B4C2770615FF"
 };
 
-#else // HAIKU_TARGET_PLATFORM_HAIKU
-
-resource large_icon array {
-	$"FFFFFFFFFFFFFF0000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFF001B1C0000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFF001B1C1B1C1C0000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFF001B1C1B1C1C1B1C1C0000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFF001B1C1B1C1C1B1C1C1B1C1B0000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFF001B1C1B1C1C1B1C1C1B1C1B1C1C1B0000FFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FF001B1C1B1C1C1B1C1C1B1C1B1C1C1B1C1C1B0000FFFFFFFFFFFFFFFFFFFFFF"
-	$"003F1B1C1B1C1C1B1C1C1B1C1B1C1C1B1C1C1B1C1B0000FFFFFFFFFFFFFFFFFF"
-	$"00173F3F1B1C1B1C1C1B1C1C1B1C1B1C1C1B1C1C1B1C3F00FFFFFFFFFFFFFFFF"
-	$"001717183F3F1B1C1B1C1C1B1C1C1B1C1B1C1C1B1C3F0E00FFFFFFFFFFFFFFFF"
-	$"00170F1718173F3F1B1C1B1C1C1B1C1C1B1C1B1C3F0E0F00FFFFFFFFFFFFFFFF"
-	$"00170F0F0F1717183F3F1B1C1B1C1C1B1C1C1B3F0E0F0F00FFFFFFFFFFFFFFFF"
-	$"00170F00000F0F1717183F3F1B1C1B1C1C1B3F0E0F0F0F00FFFFFFFFFFFFFFFF"
-	$"00170F000000000F0F1717183F3F1B1C1B3F0E0F0F0F0F00FFFFFFFFFFFFFFFF"
-	$"00170F0000000000000F0F1717183F1B3F0E0F0F0F0F0F00FFFFFFFFFFFFFFFF"
-	$"00170F00003700000000000F0F17173F0E0F0F0F0F0F0F00FFFFFFFF000000FF"
-	$"00170F000037000000000000003F173F0E0F0F0F0F0F0F00FFFF00000F0F0FFF"
-	$"00170F373600370000000000003F173F0E0F0F0F0F0F0F00FF000F0FFFFFFFFF"
-	$"00170F000000370036003700003F173F0E0F0F0F0F0F0F00FF000FFFFFFFFFFF"
-	$"00170F000000373637003700003F173F0E0F0F0F0F0F0F00FF000FFFFFFFFFFF"
-	$"00170F000000370036373700003F173F0E0F0F0F0F0F0F00FFFF000EFFFFFFFF"
-	$"00170F000000000037000036003F173F0E0F0F0F0F0F0F00FFFFFF000EFFFFFF"
-	$"00173F3F0000000037000000003F173F0E0F0F0F0F0F0F00FFFFFF000FFFFFFF"
-	$"001717183F3F000000000000003F173F0E0F0F0F0F0F0F000F0EFF000FFFFFFF"
-	$"FF00001717183F3F00000000003F173F0E0F0F0F0F0F0F000F0E000FFFFFFFFF"
-	$"FFFFFF00001717183F3F0000003F173F0E0F0F0F0F0F000F0F000FFFFFFFFFFF"
-	$"FFFFFFFFFF00001717183F3F003F173F0E0F0F0F0F000000000FFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFF00001717183F3F173F0E0F0F0F000F0F0F0FFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFF0000171718173F0E0F0F000F0F0FFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFF000017173F0E0F000F0F0FFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFF00003F0E000F0F0FFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFF00000E0F0FFFFFFFFFFFFFFFFFFFFFFFFF"
-};
-
-resource mini_icon array {
-	$"FFFFFF0000FFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFF001B1C0000FFFFFFFFFFFFFFFFFF"
-	$"FF001B1C1B1C1C0000FFFFFFFFFFFFFF"
-	$"003F1B1C1B1C1C1B1C0000FFFFFFFFFF"
-	$"00173F3F1B1C1B1C1C1B1C00FFFFFFFF"
-	$"000E18173F3F1B1C1B1C0F00FFFFFFFF"
-	$"000E000018173F3F1B0F0F00FFFFFFFF"
-	$"000E0000000018170F0F0F00FFFF0000"
-	$"000E3600370000180F0F0E00FF000E0E"
-	$"000E0036370000180F0F0E00FF000EFF"
-	$"000F0000363737180E0F0F00FF000EFF"
-	$"00170000370000170F0F0F00FF000FFF"
-	$"00001717000000180F0E0F0000000FFF"
-	$"FFFF0000171700180F0E0000000EFFFF"
-	$"FFFFFFFF000017170F000F0F0EFFFFFF"
-	$"FFFFFFFFFFFF0000000E0FFFFFFFFFFF"
-};
-
-#endif // HAIKU_TARGET_PLATFORM_HAIKU
diff --git a/src/apps/screenshot/Screenshot.rdef b/src/apps/screenshot/Screenshot.rdef
index 589310e20a..712e28d2a1 100644
--- a/src/apps/screenshot/Screenshot.rdef
+++ b/src/apps/screenshot/Screenshot.rdef
@@ -14,7 +14,7 @@ resource app_version {
 	internal = 0,
 
 	short_info = "Screenshot",
-	long_info  = "Screenshot ©2008 Haiku"
+	long_info  = "Screenshot ©2009 Haiku"
 };
 
 resource vector_icon {
@@ -48,3 +48,4 @@ resource vector_icon {
 	$"0B73BD11333F6C1B4A6724C968940A0D010D02B8307E3A7163BA7600B82C644A"
 	$"AAA84832F80A0D010E023EE2433C8C01BC90D03EDCDB4A6EE0C86667"
 };
+
diff --git a/src/apps/showimage/ShowImage.rdef b/src/apps/showimage/ShowImage.rdef
index 2a4b8a0f22..edba419f4a 100644
--- a/src/apps/showimage/ShowImage.rdef
+++ b/src/apps/showimage/ShowImage.rdef
@@ -1,6 +1,3 @@
-/*
- * ShowImage.rdef
- */
 
 resource app_signature "application/x-vnd.Haiku-ShowImage";
 
@@ -22,8 +19,6 @@ resource file_types message {
 	"types" = "image"
 };
 
-#ifdef HAIKU_TARGET_PLATFORM_HAIKU
-
 resource vector_icon {
 	$"6E6369660B0501040168053D0200160239B67D39594DBBAF083C0AC449D4F245"
 	$"BDCF00BDFF80020016023B818736DC54B73E603BF9B04A32BB47503500FFFFDA"
@@ -47,60 +42,3 @@ resource vector_icon {
 	$"4928244A93320A090108000A0A04090A0B0C100117810004"
 };
 
-#else // HAIKU_TARGET_PLATFORM_HAIKU
-
-resource large_icon array {
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF000000"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF000B1104"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF0411110400"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF000411110500FF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF0004113F0400FFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF000511040400FFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF0000041105040000FFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF0000041104050000FFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFF0000FFFFFFFFFF0200041104040000FFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFF0060600000FFFF0000041104040000FFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFF00606060606000000004110405000000FFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFF00603F603F603F110000110404000000FFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFF00603F603F603F6000111B0005000002FFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFF00603F3F3F3F3F3F0A111C111B00000000FFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFF00603F603F603F0000001B111111000B3F3F0000FFFFFFFFFFFF"
-	$"FFFFFFFFFF00603F3F3F3F3F002A2A30001111003F3F3F3F3F3F0000FFFFFFFF"
-	$"FFFFFFFF00603F3F3F2D2D3F002A2A2F2F00003F3F3F3F3F3F3F3F3F0000FFFF"
-	$"FFFFFF00603F3F3F2D2D3F3F002A2A2F30003F3F3F3F3F3F3F3F3F3F603F00FF"
-	$"FFFF00603F603F2D2D603F60002A2F302F003F603F603F603F603F603F00FFFF"
-	$"FF00603F603FA92D2D3F603F00302F0000878787878787878787878701AEAEAE"
-	$"00003F603F60A92D2D2D2D2D0000000AAEAEAEAEAEAEAEAEAEAEAE0100AEAE87"
-	$"FFAE0000603F602D2D2D2DA9878787878787878787878787878701AE8701AEFF"
-	$"FFFFAE0000006060606060606060606060601B60606060606000AE87870100AE"
-	$"FFFFFFAE00AE00006060606060606060606060601B60606000AE870000AEAEAE"
-	$"FFFFFFFFAE00AEAE00006087608760876087608760871B29AE0000AEAEFFFFFF"
-	$"FFFFFFFFFFAE0087AEAE000087878787878787878787010000AEAEFFFFFFFFFF"
-	$"FFFFFFFFFFFFAE008787AEAE0000878787878787870100AEAEFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFAE00608787AEAE0000AEAEAEAE00AEAEFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFAE0060608787AEAE0000AE00AEAEFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFAE00606060870000AE00AEAEFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFAE00600000AEAEAEAEAEFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFAE00AEAEFFFFFFAEFFFFFFFFFFFFFFFFFFFFFFFFFF"
-};
-
-resource mini_icon array {
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFF0000"
-	$"FFFFFFFFFFFFFFFFFFFFFFFF00040500"
-	$"FFFFFFFFFFFFFFFFFFFFFF00001100FF"
-	$"FFFFFFFFFFFF00FFFFFF0004110400FF"
-	$"FFFFFFFFFF003F00000000110400FFFF"
-	$"FFFFFFFF003F606000043F0000FFFFFF"
-	$"FFFFFF003F6060000011040000FFFFFF"
-	$"FFFF003F3F3F002B00000060600000FF"
-	$"FF003F3F2D2D002B2F003F3F60600000"
-	$"0060602D2D60002F30008787870100AE"
-	$"AE0000872D00000000AEAEAE00AE0000"
-	$"FFAE000000878787878787008700AEAE"
-	$"FFFFAE00AE0000AEAEAE000000AEFFFF"
-	$"FFFFFFAE0087AE00AE00AEAEFFFFFFFF"
-	$"FFFFFFFFAE00000000AEAEFFFFFFFFFF"
-	$"FFFFFFFFFFAE00AEFFAEFFFFFFFFFFFF"
-};
-
-#endif // HAIKU_TARGET_PLATFORM_HAIKU
diff --git a/src/apps/soundrecorder/SoundRecorder.rdef b/src/apps/soundrecorder/SoundRecorder.rdef
index 7e16623569..a1f7fdc0fc 100644
--- a/src/apps/soundrecorder/SoundRecorder.rdef
+++ b/src/apps/soundrecorder/SoundRecorder.rdef
@@ -8,7 +8,7 @@ resource app_version {
 	variety    = B_APPV_BETA,
 	internal   = 0,
 	short_info = "SoundRecorder",
-	long_info  = "SoundRecorder ©2005-2007 Haiku, Inc."
+	long_info  = "SoundRecorder ©2005-2009 Haiku, Inc."
 };
 
 resource app_flags B_SINGLE_LAUNCH;
@@ -24,8 +24,6 @@ resource file_types message {
 	"types" = "audio/riff"
 };
 
-#ifdef HAIKU_TARGET_PLATFORM_HAIKU
-
 resource vector_icon {
 	$"6E6369661203050000010500006C020006023D1A593A6DAABCEA4A3FB9974A96"
 	$"ACBF3B8E00FFE0A5FFFFCB6502000602388C08BAE9243FAA233D34E9C40F754A"
@@ -64,60 +62,3 @@ resource vector_icon {
 	$"04"
 };
 
-#else // HAIKU_TARGET_PLATFORM_HAIKU
-
-resource large_icon array {
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF000000FFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFF00FED8D80202FFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFF00FED88484D8D80202FFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFF00FED884D8D88484D8D80202FFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFF00FED8D8D88484D8D8AAAAD8D80202FFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFF00FED8D88484D8D8AAAAD8D8AA84D8D80202FFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFF00FED8D884D8D8AAAAD8D8AAAAD8D88484D8D802FFFF"
-	$"FFFFFFFFFFFFFFFFFF00FE07D8D8D88484D8D8AAAAD8D8AA84D8D884D829FFFF"
-	$"FFFFFFFFFFFFFFFF00FE070A0707D8D8D8AAAAD8D8AAAAD8D88484D8D804FFFF"
-	$"FFFFFFFFFFFFFF00FE070A0A0A0A0707D8D8D8AAAAD8D88484D8D8D88329FFFF"
-	$"FFFFFFFFFFFF00FE070A0A0A0A0A0A0A0707D8D8D88484D8D8D8D8838302FFFF"
-	$"FFFFFFFFFF00FE070A0A0A0F150A0A0A0A0A0707D8D8D884D8D883838302FFFF"
-	$"FFFFFFFF00FE070A0A0A0A0F0F0A0A0A0A0A0A0A0707D8D8D8838383830210FF"
-	$"FFFFFF00FED8D807070A0A0A0A0A0A0F150A0A0A0A07D8D88383838383021010"
-	$"FFFF00FED8FEFED8D807070A0A0A0A0F0F0A0A0A07D8D8838383838300101010"
-	$"FF00FED80910D8FEFED8D807070A0A0A0A0A0A07D8D8838383838300101010FF"
-	$"FF00FE091010099CD8FEFED8D807070A0A0A07D8D8838383838300101010FFFF"
-	$"00FE091010099C9C3010D8FEFED8D8070707D8D8838383838300101010FFFFFF"
-	$"00D80C0C099C9C3010100910D8FEFED8D8D8D8838383838300101010FFFFFFFF"
-	$"FF0083832C2C3010100910100910D8FED8D8838383838300101010FFFFFFFFFF"
-	$"FFFF333383830C0C09101009101009D8D8838383838300101010FFFFFFFFFFFF"
-	$"FFFFFFFF330083830C0C09101009D8D8D88383838300101010FFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFF003383830C0C0909D8D8D883838300101010FFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFF0000838309D8D8D883838300101010FFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFF00008383D8D8838300101010FFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFF280083838300101010FFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFF000000101010FFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-};
-
-resource mini_icon array {
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFF000000FFFFFFFFFFFF"
-	$"FFFFFFFFFFFF00FED8840000FFFFFFFF"
-	$"FFFFFFFFFF00FED8AAD8AA840000FFFF"
-	$"FFFFFFFF00FE0707D88484D8AAD800FF"
-	$"FFFFFF00FE070F090707D8AAD8D800FF"
-	$"FFFF00FE0709150F0F09070FD88300FF"
-	$"FF00FED807070909150F09D883830010"
-	$"00FE09FEFED807070909D88383001010"
-	$"000910099CFEFED807D88383001010FF"
-	$"0010099C9C0C09FED88383001010FFFF"
-	$"FF00092C0C090CD88383001010FFFFFF"
-	$"FFFF0000090CD88383001010FFFFFFFF"
-	$"FFFFFFFF00008383001010FFFFFFFFFF"
-	$"FFFFFFFFFFFF00001010FFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-};
-
-#endif // HAIKU_TARGET_PLATFORM_HAIKU
diff --git a/src/apps/stylededit/Jamfile b/src/apps/stylededit/Jamfile
index ec261d3669..e41c849b93 100644
--- a/src/apps/stylededit/Jamfile
+++ b/src/apps/stylededit/Jamfile
@@ -13,7 +13,7 @@ local styled_edit_rsrc =
 	[ FGristFiles StyledEdit.rsrc ]
 	;
 ResComp $(styled_edit_rsrc) :
-	[ FGristFiles StyledEdit.rdef StyledEdit.icons.rdef ]
+	[ FGristFiles StyledEdit.rdef ]
 	;
 
 local styled_edit_files = 
diff --git a/src/apps/stylededit/StyledEdit.icons.rdef b/src/apps/stylededit/StyledEdit.icons.rdef
deleted file mode 100644
index 92a2adfdd7..0000000000
--- a/src/apps/stylededit/StyledEdit.icons.rdef
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * StyledEdit.icons.rdef
- */
-
-resource(1, "BEOS:L:text") #'ICON' array {
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFF0000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFF003F3F0000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFF003F3F3F3FFE000000FFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFF003F3FFE3FFE3FFE3F0000FFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFF003F3F3F3F3F3F3F3F3F3FFE0000FFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFF003F3FFE3FFE3FFE3FFE3FFE3FFE3F0000FFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFF003F3F3F3F3F3F3F623F3F3F3F3F3F3F3FFE0000FFFFFFFFFFFF"
-	$"FFFFFFFFFF003F3FFE3FFE3FFEB0FE3FFE3FFE3FFE3FFE3FFE3F0000FFFFFFFF"
-	$"FFFFFFFF003F3FFE3FFE3FFEB0FE3F623FFE62FE3FFE3FFE3FFE3FFE0000FFFF"
-	$"FFFFFF003F3FFE3FFE3FFE89FE3F893FFEB0FE3FFE3FFE3FFE3FFE3FFEFE00FF"
-	$"FFFF003F3FFE3FFE3FFEB0FE3FB03FFEB0FE3F623FFE62FE3FFE3FFEFE00FFFF"
-	$"FF003FFEFEFEFEFEFEB0FEFEB0FEFE89FEFE89FEFEB0FEFEFEFEFEFE29B0B0B0"
-	$"0000FEFEFEFEFEFEFEFEFEB0FEFEB0FEFEB0FEFEB0FEFEFEFEFE1F0000B0B0FF"
-	$"FFB00000FEFEFEFEFEFEFEFEFEB0FEFEB0FEFEB0FEFEFEFEFEFE29626200B0FF"
-	$"FFFFB0000000FDFDFDFDFDFDFDFDFDB0FDFD89FDFDFDFDFDFD296262FC0000B0"
-	$"FFFFFFB000890000FDFDFDFDFDFDFDFDFDB0FDFDFDFDFDFD0062622900B0B0B0"
-	$"FFFFFFFFB00089890000FCFCFCFCFCFCFCFCFCFCFCFCFC00620000B0B0FFFFFF"
-	$"FFFFFFFFFFB0006289890000FBFBFBFBFBFBFBFBFBFB000000B0B0FFFFFFFFFF"
-	$"FFFFFFFFFFFFB000626289890000FAFAFAFAFAFAFA0000B0B0FFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFB000FC626289890000FAFAFAFA00B0B0FFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFB000FCFC626289890000FA00B0B0FFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFB000FCFCFCFC0000B000B0B0FFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFB000FC0000B0B0B0B0B0FFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFB000B0B0FFFFFFB0FFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFB0FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-};
-
-resource(1, "BEOS:M:text") #'MICN' array {
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFF00FFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFF003F0000FFFFFFFFFFFFFF"
-	$"FFFFFFFF003FFEFEFE0000FFFFFFFFFF"
-	$"FFFFFF003FFEFE62FEFEFE0000FFFFFF"
-	$"FFFF00FEFEFEB0626262FEFEFE0000FF"
-	$"FF00FEFEFEB0B089B0626289FEFE0000"
-	$"00FEFEFDFEFEB0B0B089B0FEFE0000B0"
-	$"B00000FDFDFDFDFDB0B0FDFD29890000"
-	$"FFB0000000FDFCFCFCFCFC008900B0B0"
-	$"FFFFB000890000FAFAFA000000B0FFFF"
-	$"FFFFFFB000628900FA00B0B0FFFFFFFF"
-	$"FFFFFFFFB000000000B0B0FFFFFFFFFF"
-	$"FFFFFFFFFFB000B0FFB0FFFFFFFFFFFF"
-};
diff --git a/src/apps/stylededit/StyledEdit.rdef b/src/apps/stylededit/StyledEdit.rdef
index cfb974aa2a..2a67733853 100644
--- a/src/apps/stylededit/StyledEdit.rdef
+++ b/src/apps/stylededit/StyledEdit.rdef
@@ -1,6 +1,3 @@
-/*
- * StyledEdit.rdef
- */
 
 resource app_signature "application/x-vnd.Haiku-StyledEdit";
 
@@ -13,7 +10,7 @@ resource app_version {
 	internal = 0,
 
 	short_info = "StyledEdit",
-	long_info = "StyledEdit ©2002-2007 Haiku, Inc."
+	long_info = "StyledEdit ©2002-2009 Haiku, Inc."
 };
 
 resource app_flags B_SINGLE_LAUNCH;
@@ -23,8 +20,6 @@ resource file_types message {
 	"types" = "text"
 };
 
-#ifdef HAIKU_TARGET_PLATFORM_HAIKU
-
 resource vector_icon {
 	$"6E6369660D05010200060338D2F73CD163BF82B23B84A94B88504910C900FFEF"
 	$"A5BDFFFCC0FFFFF890020106023E49240000000000003CAAAA4940004A8000FF"
@@ -60,60 +55,3 @@ resource vector_icon {
 	$"D4133ED41347F4A24A5889"
 };
 
-#else // HAIKU_TARGET_PLATFORM_HAIKU
-
-resource large_icon array {
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF000000FFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF000B3F5A00FF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF005A0B3F5A5A00"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF000B5A0B3F5A5A00"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF005C0B5A3F085A5A00"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF005CFD0A3FA3A3080900"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF005CFD113F08A3A3CA00FF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFF0000FFFFFFFFFFFF005CFD113FFA08090800FFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFF003F3F0000FFFFFF005CFD113FFA085C5C00FFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFF003F3F3F3FFE0000005CFD113FFA085C5C00FFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFF003F3FFE3FFE3FFE0A5CFD113FFA085C5C00FFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFF003F3F3F3F3F3F3F0A5CFD113FFA085C5C00FFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFF003F3FFE3FFE3FFE0A5CFD113FFA085C5C00FFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFF003F3F3F3F3F3F3F620AFD113FFA085C5C000000FFFFFFFFFFFF"
-	$"FFFFFFFFFF003F3FFE3FFE3FFEB00A0B0A3FFA085C5C003FFE3F0000FFFFFFFF"
-	$"FFFFFFFF003F3FFE3FFE3FFEB0FE0A3F0AFA085C5C003FFE3FFE3FFE0000FFFF"
-	$"FFFFFF003F3FFE3FFE3FFE89FE3F0A3F0A000000003FFE3FFE3FFE3FFEFE00FF"
-	$"FFFF003F3FFE3FFE3FFEB0FE3F0A3F5A5B5B5B003FFE62FE3FFE3FFEFE00FFFF"
-	$"FF003FFEFEFEFEFEFEB0FE3FB00A095B5B0000FEFEB0FEFEFEFEFEFE00B0B0FF"
-	$"0000FEFEFEFEFEFEFEFEFEB0FE0A090000B06262B08989898989890100B0B0B0"
-	$"FFB00000FEFEFEFEFEFEFEFE0A0000B000B0B000B0B0B0B0B0B000B0B000B0B0"
-	$"FFFFB0000000FDFDFDFDFDFD0000B000B0B000B0B0B0B0B0B000B0B0B00000B0"
-	$"FFFFFFB000890000FDFDFDFDFDFDFDFDFDB0FDFDFDFDFDFD0062622900B0B0FF"
-	$"FFFFFFFFB00089890000FCFCFCFCFCFCFCFCFCFCFCFCFC00620000B0B0FFFFFF"
-	$"FFFFFFFFFFB0006289890000FBFBFBFBFBFBFBFBFBFB000000B0B0FFFFFFFFFF"
-	$"FFFFFFFFFFFFB000626289890000FAFAFAFAFAFAFA0000B0B0FFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFB000FC626289890000FAFAFAFA00B0B0FFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFB000FCFC626289890000FA00B0B0FFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFB000FCFCFCFC0000B000B0B0FFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFB000FC0000B0B0B0B0B0FFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFB000B0B0FFFFFFB0FFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFB0FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-};
-
-resource mini_icon array {
-	$"FFFFFFFFFFFFFFFFFFFFFFFF000000FF"
-	$"FFFFFFFFFFFFFFFFFFFFFF000B3F5A00"
-	$"FFFFFFFFFFFFFFFFFFFF00095A0A5A01"
-	$"FFFFFFFFFFFF00FFFF005B09A3A30000"
-	$"FFFFFFFFFF003F00005BFDFA08A300FF"
-	$"FFFFFFFF003FFE0A0BFDFA5B5B00FFFF"
-	$"FFFFFF003FFEFE0A0BFA5B5B00FFFFFF"
-	$"FFFF00FEFEFE0A5B0B0B0A00FE0000FF"
-	$"FF00FEFEFEFE0A5B5B0000FEFEFE0000"
-	$"00FEFEFDFE0A290000898989890100B0"
-	$"B00000FDFD0000B0B0B0B0B000890000"
-	$"FFB0000000FDFCFCFCFCFC008900B0B0"
-	$"FFFFB000890000FAFAFA000000B0FFFF"
-	$"FFFFFFB000628900FA00B0B0FFFFFFFF"
-	$"FFFFFFFFB000000000B0B0FFFFFFFFFF"
-	$"FFFFFFFFFFB000B0FFB0FFFFFFFFFFFF"
-};
-
-#endif // HAIKU_TARGET_PLATFORM_HAIKU
diff --git a/src/apps/sudoku/Sudoku.rdef b/src/apps/sudoku/Sudoku.rdef
index 98a9b7baf1..aef064bbe7 100644
--- a/src/apps/sudoku/Sudoku.rdef
+++ b/src/apps/sudoku/Sudoku.rdef
@@ -10,13 +10,11 @@ resource app_version {
 	internal = 3,
 
 	short_info = "Sudoku",
-	long_info = "Sudoku ©2007 Haiku, Inc."
+	long_info = "Sudoku ©2009 Haiku, Inc."
 };
 
 resource app_flags B_MULTIPLE_LAUNCH;
 
-#ifdef HAIKU_TARGET_PLATFORM_HAIKU
-
 resource vector_icon {
 	$"6E636966050500020006023B2B47BB18653D0FA53D225148297046CA1900FFEC"
 	$"4BFFF0A506020006023B3049396B0ABA90833C646E4A101543299500FFFFFFFF"
@@ -41,5 +39,3 @@ resource vector_icon {
 	$"3F1885465E1E46C132"
 };
 
-#endif // HAIKU_TARGET_PLATFORM_HAIKU
-
diff --git a/src/apps/terminal/Jamfile b/src/apps/terminal/Jamfile
index d26e7cd532..fe3daa8c63 100644
--- a/src/apps/terminal/Jamfile
+++ b/src/apps/terminal/Jamfile
@@ -32,5 +32,5 @@ Application Terminal :
 	VTKeyTbl.c
 	VTPrsTbl.c
 	: be game tracker textencoding $(TARGET_LIBSUPC++)
-	: Terminal.rdef Terminal.icons.rdef
+	: Terminal.rdef
 ;
diff --git a/src/apps/terminal/Terminal.icons.rdef b/src/apps/terminal/Terminal.icons.rdef
deleted file mode 100644
index ee0abdfe39..0000000000
--- a/src/apps/terminal/Terminal.icons.rdef
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
-** Terminal.icons.rdef
-**
-*/
-
-resource(2, "BEOS:L:application/x-vnd.Be-pref") #'ICON' array {
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFF0000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFF00FAFA0000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFF00FAF8FAFA0000FFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFF00FAF8F8F8FAFA00FFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFF001B0FF8F8F8F800FFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFF001B0F0F0FF8F80000FFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFF001B0F3F3F0E0F1C190000FFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFF001B0F3F3F3F3F0E0F1A190000FFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFF00001B0F3F3F3F3F3F3F0E0F1A190000FFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFF003F001B0F3F3F3F3F3F3F3F3F0E0F1A00FFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFF003F3F001B0F3F3F3F3F3F3F3F3F3F171900FFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFF003F3F3F001B0F3F3F3F3F3F3F3F3F3F171900FFFFFFFFFF"
-	$"FFFFFFFFFFFFFF003F3FFE3F001B183F3F3F3F3F3F3F3F3F171900FFFFFFFFFF"
-	$"FFFFFFFFFFFF003F0000003F3F00001717183F3F3F3F3F3F171900FFFFFFFFFF"
-	$"FFFFFFFFFF003F00191A1900003F3F000017173F3F3F3F3F17190000FFFFFFFF"
-	$"FFFFFFFF003F00191A0E3F191A00003F3F000017173F3F3F171900FE0000FFFF"
-	$"FFFFFF003F00191A0E3F190F3F191A00003F3F0000171718171A003FFEFE00FF"
-	$"FFFF003F3F000E0F1A190F3F190F3F191A00003F3F000017171A00FEFE00FFFF"
-	$"FF003FFEFEFE00000E0F1A190F3F190F3F191A00003F3F00001900FE000A0B0A"
-	$"0000FEFEFEFEFEFE29000E0F1A190F3F190F191A000F3F003F000000000A0BFF"
-	$"FF0A0000FEFEFEFEFEFE00000E0F1A610F3F190F00000F003FFD006262000AFF"
-	$"FFFF0A000000FDFDFDFDFDFD00000E0F1A610F000F0F003FFD006262FC00000A"
-	$"FFFFFF0A00890000FDFDFDFDFDFD00000E0F290F0FFDFDFD00620F00000A0B0A"
-	$"FFFFFFFF0A0089890000FCFCFCFCFCFC00000E0FFCFCFC006200000A0BFFFFFF"
-	$"FFFFFFFFFF0A006289890100FBFBFBFBFBFBFBFBFBFB0000000A0BFFFFFFFFFF"
-	$"FFFFFFFFFFFF0A00626289890100FAFAFAFAFAFAFA00000A0BFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFF0A00FC626289890000FAFAFAFA000A0BFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFF0A00FCFC626289890000FA000A0BFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFF0A00FCFCFCFC00000A000B0AFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFF0A00FC00000A0B0A0B0BFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFF0A000B0AFFFFFF0AFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFF0AFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-};
-
-resource(2, "BEOS:M:application/x-vnd.Be-pref") #'MICN' array {
-	$"FFFFFFFFFF0000FFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFF00F80000FFFFFFFFFFFFFF"
-	$"FFFFFFFFFF00F8F800FFFFFFFFFFFFFF"
-	$"FFFFFFFFFF0017F8170000FFFFFFFFFF"
-	$"FFFFFFFFFF00173F3F17170000FFFFFF"
-	$"FFFFFFFF0000173F3F3F3F1700FFFFFF"
-	$"FFFFFF0000000017173F3F1700FFFFFF"
-	$"FFFF0000193F000000171718000000FF"
-	$"FF00000E0F1A3F3F00000017003F0000"
-	$"00FEFE00000E0F1A3F3F00000000000A"
-	$"0B0000FDFD00000E0F0F00FD00890000"
-	$"FF0A000000FDFA000000FA0089000A0B"
-	$"FFFF0A00890000FAFAFA0000000AFFFF"
-	$"FFFFFF0A00628900FA000A0BFFFFFFFF"
-	$"FFFFFFFF0A000000000B0AFFFFFFFFFF"
-	$"FFFFFFFFFF0A000BFF0AFFFFFFFFFFFF"
-};
-
diff --git a/src/apps/terminal/Terminal.rdef b/src/apps/terminal/Terminal.rdef
index 65ef3cb594..eeffefd070 100644
--- a/src/apps/terminal/Terminal.rdef
+++ b/src/apps/terminal/Terminal.rdef
@@ -1,6 +1,3 @@
-/*
- * Terminal.rdef
- */
 
 resource app_signature "application/x-vnd.Haiku-Terminal";
 
@@ -13,7 +10,7 @@ resource app_version {
 	internal = 1,
 
 	short_info = "Terminal",
-	long_info = "Terminal ©2002-2007 Haiku Inc."
+	long_info = "Terminal ©2002-2009 Haiku Inc."
 };
 
 resource app_flags B_MULTIPLE_LAUNCH;
@@ -22,8 +19,6 @@ resource file_types message {
 	"types" = "application/x-vnd.Be-pref"
 };
 
-#ifdef HAIKU_TARGET_PLATFORM_HAIKU
-
 resource vector_icon {
 	$"6E6369660D0500040064020016023BA4CA3BBF52BC04343BEBDB4B681C48B96C"
 	$"00EDFFA505FF0200160232FD6F3A991DBE4480369C0E4B47C24869BD0091FFB5"
@@ -51,61 +46,3 @@ resource vector_icon {
 	$"B30CB30C0A0C0110000A0B010F2032290A09010D2032BA450A09010D2036BB11"
 };
 
-#else // HAIKU_TARGET_PLATFORM_HAIKU
-
-resource large_icon array {
-	$"FFFFFFFFFFFFFFFFFFFFFF0000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFF00FAFA0000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFF00FAF8FAFA0000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFF00FAF8F8F8FAFA0000FFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFF00FAF8F8F8F8F8FAFA00FFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFF001BF8F8F8F8F8F8F800FFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFF001B0F0F0FF8F8F8F800FFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFF001B0F3F3F0E0FF8F80000FFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFF001B0F3F3F3F3F0E0F1C1C0000FFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFF001B0F3F3F3F3F3F3F0E0F1C1C0000FFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFF001B0F3F3F3F3F3F3F3F3F0E0F1C1C0000FFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFF001B0F3F3F3F3F3F3F3F3F3F3F0E0F1A190000FFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFF001B0F3F3F3F3F3F3F3F3F3F3F3F3F0E1A1900FFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFF001B0F3F3F3F3F3F3F3F3F3F3F3F3F3F171900FFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFF001B0F3F3F3F3F3F3F3F3F3F3F3F3F3F171900FFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFF001B0F3F3F3F3F3F3F3F3F3F3F3F3F3F171900FFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFF001B183F3F3F3F3F3F3F3F3F3F3F3F3F171900FFFFFF"
-	$"FFFFFFFFFF0000FFFFFF001B1C17183F3F3F3F3F3F3F3F3F3F3F171900FFFFFF"
-	$"FFFFFFFF00191A0000FFFF00001B1C17183F3F3F3F3F3F3F3F3F171900FFFFFF"
-	$"FFFFFF00191A191A190000FFFF0000191A17173F3F3F3F3F3F3F171900FFFFFF"
-	$"FFFF00191A190F3F191A190000FFFF0000191A17173F3F3F3F3F171900FFFFFF"
-	$"FF00191A0E3F191A0E3F191A190000FFFF0000191A17173F3F3F171900FFFFFF"
-	$"00191A191A190F3F191A0E3F191A190000FFFF0000191A17173F171900FFFFFF"
-	$"000E0F1A191A191A0F3F191A0E3F191A190000FFFF0000191A17171A00FFFFFF"
-	$"FF00000E0F1A191A191A0F3F191A0E3F191A190000FFFF0000191A1900FFFFFF"
-	$"FFFFFF00000E0F1A191A191A0F3F191A0E3F191A19000FFFFF00001900FFFFFF"
-	$"FFFFFFFFFF00000E0F1A191A191A0F3F191A191A0E000F0F0F000F0000FFFFFF"
-	$"FFFFFFFFFFFFFF00000E0F1A191A191A0F191A0F0E00000FFF000F0FFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFF00000E0F1A191A191A0F0F000E0F000EFF00000EFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFF00000E0F1A190F0F000F0FFF000EFFFFFF000EFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFF00000E0F0F000F0FFFFFFF000000000FFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFF0000000E0FFFFFFFFFFF0E0E0FFFFFFFFF"
-};
-
-resource mini_icon array {
-	$"FFFFFFFFFF0000FFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFF00F80000FFFFFFFFFFFFFF"
-	$"FFFFFFFFFF00F8F8F800FFFFFFFFFFFF"
-	$"FFFFFFFFFF00191A1900FFFFFFFFFFFF"
-	$"FFFFFFFFFF00193F191A0000FFFFFFFF"
-	$"FFFFFFFFFF00193F3F3F191A0000FFFF"
-	$"FFFFFFFFFF00193F3F3F3F3F191700FF"
-	$"FFFFFFFFFF00193F3F3F3F3F3F1700FF"
-	$"FFFF0000FF0017173F3F3F3F3F1700FF"
-	$"FF00191A0000191A17173F3F3F1700FF"
-	$"00191A191A1900001A1917183F1700FF"
-	$"000E0F1A191A191A0000191A171800FF"
-	$"FF00000E0F1A191A191A0000191A00FF"
-	$"FFFFFF00000E0F1A190F0F00000000FF"
-	$"FFFFFFFFFF00000E0F0F0000FF000EFF"
-	$"FFFFFFFFFFFFFF0000000EFF00000EFF"
-};
-
-#endif // HAIKU_TARGET_PLATFORM_HAIKU
-
diff --git a/src/apps/text_search/TextSearch.rdef b/src/apps/text_search/TextSearch.rdef
index 631998aab2..00153c8b7a 100644
--- a/src/apps/text_search/TextSearch.rdef
+++ b/src/apps/text_search/TextSearch.rdef
@@ -1,6 +1,3 @@
-/*
- * TextSearch.rdef
- */
 
 resource app_signature "application/x-vnd.Haiku.TextSearch";
 
@@ -45,3 +42,4 @@ resource vector_icon {
 	$"010B000A05010D1001178400040A08010D000A05010C1001178400040A07010C"
 	$"000A09010C023C00000000000000003C000048B00048F000"
 };
+
diff --git a/src/apps/tracker/Tracker.rdef b/src/apps/tracker/Tracker.rdef
index ec98020b39..49a7ab829c 100644
--- a/src/apps/tracker/Tracker.rdef
+++ b/src/apps/tracker/Tracker.rdef
@@ -9,7 +9,7 @@ resource app_version {
 	internal   = 0,
 	short_info = "Tracker",
 	long_info  = "Tracker 5.2.1 ©1991-2001 Be, Inc.,\n"
-		"©2006-2007 Haiku, Inc."
+		"©2006-2009 Haiku, Inc."
 };
 
 resource app_flags B_SINGLE_LAUNCH;
@@ -26,8 +26,6 @@ resource file_types message {
 	"types" = "application/octet-stream"
 };
 
-#ifdef HAIKU_TARGET_PLATFORM_HAIKU
-
 resource vector_icon {
 	$"6E636966120500040068020106023ECFFF0000000000003EFFFF486000474000"
 	$"00DDA771FEA97644020006033C0564379BD6B9B4043E12EF49C94948FD140087"
@@ -68,61 +66,3 @@ resource vector_icon {
 	$"040A0D0112000A0E0113000A0F0114000A100115000A11011600"
 };
 
-#else // HAIKU_TARGET_PLATFORM_HAIKU
-
-resource large_icon array {
-	$"FFFF000000FFFFFFFFFFFFFFFFFFFFFF0000000000000000000000FFFFFFFFFF"
-	$"FF00D9D9D900FFFFFFFFFFFFFFFF0000838383838383008383D9D900FFFFFFFF"
-	$"00D9D98383000000000000FFFF00838383838383838383010000D9D900FFFFFF"
-	$"00D9838383D9D9D9D9D9D90000AA00008383D9D9838383AAAA0183D900FFFFFF"
-	$"00D90083D9D9D983838383D9D900D9D901D9D9D9D9D983AAAA00AAD900FFFFFF"
-	$"00D900D90000D98383838383D9D9D9D900D9D9D9838383AAAAAA018300FFFFFF"
-	$"00D900D90083838383000083D90083D983008383838383AAAAAA01AA00FFFFFF"
-	$"0000D9D98383838383008383D9AA00D983008383838383AAAAAA01AA00FFFFFF"
-	$"FF0083AAAAAAAAD9D9838383D9AA00D983008383838383AAAAAA01AAD900FFFF"
-	$"FFAA00AAD983838383D9D9D9D90083D983008383838383AAAAAA01AA83D900FF"
-	$"FF00D9D98383D98383AAAAD98300D9D983008383830083AAAAAA0100AA83D900"
-	$"FF00D900D9D9AAAAAAAAAAD9AA00D9D983008383008383AAAAAA01FF00AAAA00"
-	$"00D9000000AAAAAAAAAAD9AAAA00D983AA0083AA008383AAAAAA00FFFF0000FF"
-	$"0000D900AAAA00000000D9AA0000AAAA008383AA008383AAAAAA00FFFFFFFFFF"
-	$"00FA00000000008383AAAA00AAAA0000838300AA00838383AAAAAA00FFFFFFFF"
-	$"00170FF8F8FA0000000000AAAAAAAAAA838300000083838383AAAA00FFFFFFFF"
-	$"00170F0F0FF81B000000AAAAAAAA00AA838301FFFF00000000AAAAAA00FFFFFF"
-	$"00170F3F3F0E0F3F3F3F0000AAAA00AA838300FFFFFFFFFFFF00AAAA00FFFFFF"
-	$"00170F3F3F3F3F0E0F0F3F1900AAAA00838300FFFFFFFFFFFFFF00AAAA00FFFF"
-	$"00170F3F3F3F3F3F3F3F0E180000000083AA00FFFFFFFFFFFF00D9AAAA000FFF"
-	$"00170F3F3F3F3F3F3F3F3F1700FFFF00838300FFFFFFFFFFFF00D9AAAA000F0E"
-	$"001C173F3F3F3F3F3F3F3F1700FFFF008383AA00FFFFFFFFFF000000000E0F0F"
-	$"001C17183F3F3F3F3F3F3F1700FFFF008383AA00FFFFFFFFFF0E0F0F0F0F0F0F"
-	$"00003F3F17173F3F3F3F3F1700FFFF008383AA00FFFFFFFFFFFFFFFFFFFFFFFF"
-	$"1BFF00003F3F17173F3F3F1700FFFF00838300FFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"1B1C00FF00003F3F17173F1700FFFF00838300FFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"1B0083AAAA0000003F3F171700FFFF00838300FFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"00AAAAAAAA000EFF00003F3F00FF0083838300FFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FF000000000E0F0F0F0F000000FF008383AA000F0F0E0F0F0F0F0FFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFF00FFFF0000000E0F0F0F0F0F0FFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-};
-
-resource mini_icon array {
-	$"FF0000FFFFFFFFFF000000000000FFFF"
-	$"00D900000000FF008383D900838300FF"
-	$"00D98383838300D900D983AA00AA00FF"
-	$"00D900830083AAD9008383AAAA0000FF"
-	$"00AAAAAA83830083008383AAAA0000FF"
-	$"FF00008383AA008300830083AA008300"
-	$"0000000000AA0000AAAA0083AA000000"
-	$"00F800000000AAAAD90000D9AA00FFFF"
-	$"00F8F8F817170000D9000000D9AA01FF"
-	$"00173F3F3F3F1700D900FFFF00AA00FF"
-	$"00173F3F3F3F1700D900FFFF00AA000E"
-	$"00183F3F3F3F17008300FFFF0000000E"
-	$"0000003F3F3F17008300FFFFFFFFFFFF"
-	$"FF008300003F17008300FFFFFFFFFFFF"
-	$"00000000FF000083AA000F0E0F0FFFFF"
-	$"FFFFFFFFFFFFFF00000E0F0F0FFFFFFF"
-};
-
-#endif // HAIKU_TARGET_PLATFORM_HAIKU
-
diff --git a/src/apps/tv/tv.rdef b/src/apps/tv/tv.rdef
index 6e272053f0..feeab420a2 100644
--- a/src/apps/tv/tv.rdef
+++ b/src/apps/tv/tv.rdef
@@ -1,6 +1,3 @@
-/*
- * Icon-O-Matic.rdef
- */
 
 resource app_signature "application/x-vnd.Haiku.TV";
 
@@ -16,7 +13,7 @@ resource app_version {
 	internal = 0,
 
 	short_info = "TV",
-	long_info = "TV ©2005-2007 Marcus Overhagen"
+	long_info = "TV ©2005-2009 Marcus Overhagen"
 };
 
 resource app_flags B_SINGLE_LAUNCH;
diff --git a/src/apps/webwatch/WebWatch.rdef b/src/apps/webwatch/WebWatch.rdef
index f4df071060..a469b7fad9 100644
--- a/src/apps/webwatch/WebWatch.rdef
+++ b/src/apps/webwatch/WebWatch.rdef
@@ -9,12 +9,9 @@ resource app_version {
 	internal   = 0,
 	short_info = "WebWatch",
 	long_info  = "WebWatch 1.5.0 ©1999-2003 Matthijs Hollemans.,\n"
-		"©2008 Haiku, Inc.\n"
+		"©2009 Haiku, Inc.\n"
 		"A port of Swatch Internet Time "
 };
 
 resource app_flags B_SINGLE_LAUNCH | B_BACKGROUND_APP;
 
-/*resource file_types message {
-};*/
-
diff --git a/src/apps/workspaces/Workspaces.rdef b/src/apps/workspaces/Workspaces.rdef
index ed90e31754..fde389bb31 100644
--- a/src/apps/workspaces/Workspaces.rdef
+++ b/src/apps/workspaces/Workspaces.rdef
@@ -10,13 +10,11 @@ resource app_version {
 	internal = 0,
 
 	short_info = "Workspaces",
-	long_info  = "Workspaces ©2002-2007 Haiku, Inc."
+	long_info  = "Workspaces ©2002-2009 Haiku, Inc."
 };
 
 resource app_flags B_SINGLE_LAUNCH;
 
-#ifdef HAIKU_TARGET_PLATFORM_HAIKU
-
 resource vector_icon {
 	$"6E6369660F050004006B020006023A498437D931BA09203C6B6D4B49E74A11B7"
 	$"01663300FF9B663203603307020006023393B0B84A2E3B59D6369E0646DFD84A"
@@ -48,60 +46,3 @@ resource vector_icon {
 	$"00"
 };
 
-#else // HAIKU_TARGET_PLATFORM_HAIKU
-
-resource large_icon {
-	$"FFFFFFFFFFFFFFFFFFFFFF0000FFFFFFFFFF0000FFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFF00D9D90000FFFF0037360000FFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFF00D9D9D9D9D9000035343736370000FFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFF00D9D9D9D9D9D9D9D9090935343737360000FFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFF00D9D93FD9D9D9D9D9D9D9D909093534373900FFFFFFFFFFFF"
-	$"FFFFFFFFFFFF00D9D93F3F3F3FD9D9D9D9D9D90B0B08093A3900FFFFFFFFFFFF"
-	$"FFFFFFFFFF00D9D93F3F3F3F3F3F3FD9D9D9D90B1500D90900FFFFFFFFFFFFFF"
-	$"FFFFFFFF00D9D93F3F3F3F3F3F3F3F3F3FD9000A3F0000D9D90000FFFFFFFFFF"
-	$"FFFFFF00D9D93F3F3F3F1B150000000083D9013F000B1500D93FAA00FFFFFFFF"
-	$"FFFF00D9D93F3F3F3F3F3F3F1B838383D9D900161515008383AAAA00FFFFFFFF"
-	$"FF0083D9D9D983833F3F3F3F3F83D9D9D9D9830000008383D1AAD100FFFFFFFF"
-	$"FF00838383D9D9D983833F3F83D9D9D9D9D9D983838383D1D1D1AA00FFFFFFFF"
-	$"FF00D183838383D9D9D98383D9D9D9D9D9D9D9D9D93FAAD1D1AAAA00FFFFFFFF"
-	$"FF00AAD1D183838383D9D9D9D9D9D9D9D9D9D9D93FAAAAD1D1AAAA00FFFFFFFF"
-	$"FF0083AAAAD1D183838383D9D9D9D9D9D9D9D93FAAAAD1AAD1AAAA00FFFFFFFF"
-	$"FF0083D183AAD1D1D183838383D9D9D9D9D93FAAAAD1AAAAAAAAAA00FFFFFFFF"
-	$"FF0083D9D183D1AAAAD1D183838383D9D93FAAAAD1AAAAAAAAAAAA00FFFFFFFF"
-	$"FF0083838383D183D1AAAAD1D18383833FAAAAD1AAAAAAAAAAAAAA00FFFFFFFF"
-	$"FF00AAAA8383D18383D1D1AAD1D1D18383AAD1AAAAAAAAAAAAAAAA01FFFFFFFF"
-	$"FF008383AAAAD1D1D1838383D1AAAAD1D1D1AAAAAAAAAAAAAAAAAA01FFFFFFFF"
-	$"FF0083838383D1D1D1D1D183D183D1AAD9AAAAAAAAAAAAAAAAAAAA000F0FFFFF"
-	$"FF0083D18383D1D1D1D1D1000083D9D1D9AAAAAAAAAAAAAAAAAAAA000F0F0FFF"
-	$"FF0083D9D183D1D1D1D1000F00838383D9AAAAAAAAAAAAAAAAAA000F0F0FFFFF"
-	$"FF0083838383D1D1D1000F0F00AAAA83D9AAAAAAAAAAAAAAAA000F0F0FFFFFFF"
-	$"FFFF00008383D1D1000F0F0E008383AAAAAAAAAAAAAAAAAA010F0F0EFFFFFFFF"
-	$"FFFFFFFF0000D1000E0F0F0F00838383D9AAAAAAAAAAAA000F0F0FFFFFFFFFFF"
-	$"FFFFFFFFFFFF000E0F0F0F0F0083D183D9AAAAAAAAAA000F0F0FFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFF0083D9D1D9AAAAAAAA000F0F0FFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFF00838383D9AAAAAA000F0F0FFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFF00008383D9AAAA000F0F0EFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFF0000D9AA000F0E0FFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF00000E0F0FFFFFFFFFFFFFFFFFFFFFFF"
-};
-
-resource mini_icon {
-	$"FFFFFFFFFF0000FFFF0000FFFFFFFFFF"
-	$"FFFFFFFF00D9D9000037360000FFFFFF"
-	$"FFFFFF00D9D9D9D9D909083600FFFFFF"
-	$"FFFF00D93F3F3FD9D90000000000FFFF"
-	$"FF00D93F3F15000083150B00AA00FFFF"
-	$"008383D9D93F83D9D90000D1D100FFFF"
-	$"00D1D18383D9D9D9D9D9AAD1D100FFFF"
-	$"0083D1D1D18383D9D9AAD1D1AA00FFFF"
-	$"008383D1D1D1D183AAD1D1AAAA00FFFF"
-	$"00AAAAD1D1D1D1D1D1D1AAAAAA00FFFF"
-	$"008383D1D1D1008383AAAAAAAA000F0F"
-	$"008383D1D100008383AAAAAAAA000FFF"
-	$"FF0000D1000E00AAAAAAAAAA000FFFFF"
-	$"FFFFFF000E0F008383AAAA010EFFFFFF"
-	$"FFFFFFFFFFFF008383AA000FFFFFFFFF"
-	$"FFFFFFFFFFFFFF0000000EFFFFFFFFFF"
-};
-
-#endif // HAIKU_TARGET_PLATFORM_HAIKU