diff --git a/src/preferences/appearance/Appearance.rdef b/src/preferences/appearance/Appearance.rdef
index 928910a9df..a2b5e55a02 100644
--- a/src/preferences/appearance/Appearance.rdef
+++ b/src/preferences/appearance/Appearance.rdef
@@ -13,13 +13,11 @@ resource app_version {
 	internal = 0,
 
 	short_info = "Appearance",
-	long_info  = "Appearance ©2002-2007 Haiku"
+	long_info  = "Appearance ©2002-2009 Haiku"
 };
 
 resource app_flags B_SINGLE_LAUNCH;
 
-#ifdef HAIKU_TARGET_PLATFORM_HAIKU
-
 resource vector_icon {
 	$"6E636966050500020106023AB09C387275BA11FB3C46904852304A0DE300FFE7"
 	$"DCFFE29C7A020002043C233C3AF073BE44203F4BD14A79EB417FF50DF1F6FFCB"
@@ -39,62 +37,3 @@ resource vector_icon {
 	$"0A0B00"
 };
 
-#else // HAIKU_TARGET_PLATFORM_HAIKU
-
-resource large_icon
-{
-	$"FFFFFFFFFFFFFF000000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFF00F9F90000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFF00F9FBF9F90000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFF00F9FBFBF9F9F90000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFF001717F9F9F9F9F9F90000FFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFF003F3F1717F9F9F9F9F9F90000FFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFF003F1B3F3F1717F9F9F9FBF9F900FFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFF003F1B1C1B3F3F1717F9F9FBF900FFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFF003F00001B1C1B3F3F1717F9F900FFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFF003F1B1B00001B1B1B1B3F171700FFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFF003F1B1B1B1B1B00001B1C3F3F170000FFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFF003F1B1C1B00001C1C3F001C1B3F3F170000FFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFF003F1B1C007B7B000F1B1C00001B1C3F3F170000FFFFFFFFFF"
-	$"FFFFFFFFFFFFFF003F1B0000DA7B7B001C1C1C1C00001C1B3F3F1700FFFFFFFF"
-	$"FFFFFFFFFFFFFF003F1B002B2BDA7B001C001B1C1C1C1B00001C1700FFFFFFFF"
-	$"FFFFFFFFFFFFFF003F1B002B2F2F00001B00001B1B1B1B1B1B1B1700FFFFFFFF"
-	$"FFFFFFFFFFFFFF003F002B2CEB2F001B1C1C1C1C00001B1B1B1B1700FFFFFFFF"
-	$"FFFFFFFFFFFFFF003F002B2F2F001B1B00001C1B1C1C1B1C1C1B1700FFFFFFFF"
-	$"FFFFFFFFFFFFFF00002B2CEB2F001B1C000000001B1C1C1C1B1C1700FFFFFFFF"
-	$"FFFF000000FFFF00002B2F2F001B1C1B001C1B0000001B1C1C1C1700FFFFFFFF"
-	$"FF007B7B7B00FF002B2CEB2F001B1B1C001B1C1C1B001C1C1B1C1800FFFFFFFF"
-	$"007B7B7BDA00FF002B2F2F001B1C1B1C00001B1C1C001C1B1C1C1800FFFFFFFF"
-	$"002B2CDA7B7B002B2CEB2F001B1C1C1C1C1C00001B001C1B1C1B1700FFFFFFFF"
-	$"FF002B2CDA7B2B2CEB2F000017171C1C1B1C1C1C00001B1C1C1B1700FFFFFFFF"
-	$"FF002B2CDA7B2B2CEB2F00FF000017171A1B1C1C1B1B1C1B1C1B1800FFFFFFFF"
-	$"FFFF002B2C2B2B2F2F00FFFFFFFF000017171A1B1B1C1C1C1B1C1700FFFFFFFF"
-	$"FFFF002B2C2B2B2F2F00FFFFFFFFFFFF000017171C1C1C1C1B1B1800FFFFFFFF"
-	$"FFFFFF002B2CEB2F00FFFFFFFFFFFFFFFFFF000017171C1C1B1C1700FFFFFFFF"
-	$"FFFFFF002B2CEB2F00FFFFFFFFFFFFFFFFFFFFFF000017171C1C1700FFFFFFFF"
-	$"FFFFFFFF002B2F000E0F0F0F0F0F0F0F0E0FFFFFFFFF0000171718000F0EFFFF"
-	$"FFFFFFFF0000000E0F0F0F0F0F0F0F0E0F0FFFFFFFFFFFFF000017000F0F0F0E"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF00000E0F0F0F"
-};
-
-resource mini_icon
-{
-	$"FFFFFF000000FFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFF00E5F90000FFFFFFFFFFFFFFFF"
-	$"FFFFFF001B63F9F90000FFFFFFFFFFFF"
-	$"FFFFFF001D1D1B63F9F900FFFFFFFFFF"
-	$"FFFFFF00160D141D1A6300FFFFFFFFFF"
-	$"FFFFFF001D1B0D0E151D150000FFFFFF"
-	$"FFFFFF003F1B001C1B0E0D1D1500FFFF"
-	$"FFFFFF003F007B001B141B141400FFFF"
-	$"FFFFFF003F002F001B1B0E1B1B00FFFF"
-	$"FFFFFF00002F001B1C060D1B1B00FFFF"
-	$"FF00FF00002F001B1C1B0D1B1B00FFFF"
-	$"002B00002F0017171C0E061B1B00FFFF"
-	$"002B7B2CEB000000171B1B1B1B00FFFF"
-	$"FF002B2F00FFFFFF0000191C1B00FFFF"
-	$"FF002B2F00FFFFFFFFFF00001900FFFF"
-	$"FFFF00000E0F0F0F0FFFFFFF00000E0E"
-};
-
-#endif // HAIKU_TARGET_PLATFORM_HAIKU
diff --git a/src/preferences/backgrounds/Backgrounds.rdef b/src/preferences/backgrounds/Backgrounds.rdef
index 80c02d18bb..26f5be83fd 100644
--- a/src/preferences/backgrounds/Backgrounds.rdef
+++ b/src/preferences/backgrounds/Backgrounds.rdef
@@ -13,13 +13,11 @@ resource app_version {
 	internal = 0,
 
 	short_info = "Backgrounds",
-	long_info  = "Backgrounds ©2002-2006 Haiku"
+	long_info  = "Backgrounds ©2002-2009 Haiku"
 };
 
 resource app_flags B_SINGLE_LAUNCH;
 
-#ifdef HAIKU_TARGET_PLATFORM_HAIKU
-
 resource vector_icon {
 	$"6E6369660E05000400670200060336FFFF0000000000003AC000479E664A48A3"
 	$"00D3A966C784572AFFAB7A4A0200060236FFFF0000000000003AC000479E664A"
@@ -58,60 +56,3 @@ resource vector_icon {
 	$"000A0D0114000A00011500"
 };
 
-#else // HAIKU_TARGET_PLATFORM_HAIKU
-
-resource large_icon {
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFF0000FFFFFFFFFFFFFFFFFFFFFFFF0000000000FFFFFFFFFFFFFFFF"
-	$"FFFF000000F8F8000000FFFFFFFFFFFFFFFF001D1D1D1D1D00FFFFFFFFFFFFFF"
-	$"FF0000E5E5FBFBFBFBF800FF00FFFFFFFF001D1D1D001D1D1D00FFFFFFFFFFFF"
-	$"FFFF0000E5F8F8E53FFBFB00F800FFFFFF003F1D1D1D1D1D0A00FFFFFFFFFFFF"
-	$"FFFFFF00FBE5F9E5F8E5FBFBFBF800FFFF00163F3F3F3F160A00FFFFFFFFFFFF"
-	$"FFFFFF00FBFBF9FBE5F9E5E5F83F0000FF0016161616160A0D00FFFFFFFFFFFF"
-	$"FFFF003FF8F8FBFBFBF9E5E5F8F8F800FF00161616160A0F0D00FFFFFFFFFFFF"
-	$"FFFF00843F3FF8F8FBFBFBFBF8F80000FF00161616160A0F0D00FFFFFFFFFFFF"
-	$"FFFF008484843F3FF8F8FBF8FBF800FFFF001616160A0A0F0D00FFFFFFFFFFFF"
-	$"FFFF0084848484843F3FF8F8F8F800FFFF001616160A3F0A0D00FFFFFFFFFFFF"
-	$"FFFF00848484848484843F3FF8F8AA00FF001616160A3F1D0A00FFFFFFFFFFFF"
-	$"FFFF008484848484848484840000AA00FF001616160A3F1D0A00FFFFFFFFFFFF"
-	$"FFFF000084848484848484007B7B0000FF0016160A3F1D1D1D00FFFFFFFFFFFF"
-	$"FFFFFFFF0000848484848400DA7B7B00FF0016160A3F1D1D1D00FFFFFFFFFFFF"
-	$"FFFFFFFFFFFF00AA8484002B2CDA7B00FF0016160A3F1D1D1D1D00FFFFFFFFFF"
-	$"FFFFFFFFFFFFFF00AAAA002B2F2F0000FF0016160A3F1D1D1D0D0D00FFFFFFFF"
-	$"FFFFFFFFFFFFFF0084002B2CEB2F00FFFF0016160A3F1D1D0D0000FFFFFFFFFF"
-	$"FFFFFFFFFFFFFF0084002B2F2F00FFFFFF0016160A1D1D0D0D00FFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFF00002B2CEB2F00FFFFFF0016160A1D0D0F0D00FFFFFFFFFFFF"
-	$"FFFF000000FFFF00002B2F2F00FFFFFFFF00160A3F0D0F0F0D00FFFFFFFFFFFF"
-	$"FF007B7B7B00FF002B2CEB2F00FFFFFFFF00160A1D0D120F0D00FFFFFFFFFFFF"
-	$"007B7B7BDA00FF002B2F2F00FFFFFFFFFF00160A0D120F0F0D00FFFFFFFFFFFF"
-	$"002B2CDA7B7B002B2CEB2F000FFFFFFFFF00160A0D12120F0D00FFFFFFFFFFFF"
-	$"FF002B2CDA7B2B2CEB2F000F0F0F0FFF0F00160A12120F0F0D00FFFFFFFFFFFF"
-	$"FF002B2CDA7B2B2CEB2F000F0F0F0F0F0F00160A12120F0F0D000F0F0F0FFFFF"
-	$"FFFF002B2C2B2B2F2F00FFFF0F0F0F0F0F00160A12120F0D0D000F0F0F0F0FFF"
-	$"FFFF002B2C2B2B2F2F00FFFFFFFF0F0F0F0F000A120F0D0D000F0F0F0F0F0FFF"
-	$"FFFFFF002B2CEB2F00FFFFFFFFFFFF0F0F0F0F00120D00000F0F0F0F0F0F0FFF"
-	$"FFFFFF002B2CEB2F00FFFFFFFFFFFFFF0F0F0F0012000F0F0F0F0F0F0F0FFFFF"
-	$"FFFFFFFF002B2F000F0F0F0F0F0F0F0F0F0F0F00000F0F0F0F0F0F0F0FFFFFFF"
-	$"FFFFFFFF0000000F0F0F0F0F0F0F0F0F0F0FFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-};
-
-resource mini_icon {
-	$"FFFFFFFFFFFFFFFFFF00000000FFFFFF"
-	$"FF0000FFFFFFFFFF003F1D1D1D00FFFF"
-	$"003FF80000FFFFFF00163F3F1600FFFF"
-	$"00F8FBFBF80000FF001616160A00FFFF"
-	$"003FF8F8FBF800FF0016160A0A00FFFF"
-	$"00843F3FF8FB00FF0016160A1D00FFFF"
-	$"008484843FAA00FF00160A3F1D00FFFF"
-	$"FF00AA8484007B0000160A1D1D1D00FF"
-	$"FFFF00AA84002F0000160A1D1D00FFFF"
-	$"FFFF0084002F00FF00160A1D0D00FFFF"
-	$"FF000000002F00FF00160A0D0D00FFFF"
-	$"002B00002F00FF0F00160A120D00FFFF"
-	$"002B7B2CEB000F0F00160A120D00FFFF"
-	$"FF002B2F000F0F0F0F000A120D000FFF"
-	$"FF002B2F00FFFF0F0F0F000D000F0F0F"
-	$"FFFF00000E0F0F0F0F0F0F000F0F0FFF"
-};
-
-#endif // HAIKU_TARGET_PLATFORM_HAIKU
diff --git a/src/preferences/bluetooth/bluetooth-pref.rdef b/src/preferences/bluetooth/bluetooth-pref.rdef
index 8a7f0c333c..7650fbbfbc 100644
--- a/src/preferences/bluetooth/bluetooth-pref.rdef
+++ b/src/preferences/bluetooth/bluetooth-pref.rdef
@@ -1,6 +1,3 @@
-/*
- * bluetooth_pref.rdef
- */
 
 resource app_signature "application/x-vnd.haiku-BluetoothPrefs";
 
@@ -15,7 +12,7 @@ resource app_version {
 	internal = 0,
 
 	short_info = "bluetooth_pref",
-	long_info = "bluetooth_pref ©2007-2008 Haiku"
+	long_info = "bluetooth_pref ©2007-2009 Haiku"
 };
 
 resource vector_icon array {
@@ -55,3 +52,4 @@ resource vector_icon array {
 	$"03040506000A0503070809000A06010A000A07010B000A08010C000A09010D00"
 	$"0A0A010E000A0B010F000A0C011000"
 };
+
diff --git a/src/preferences/cpufrequency/cpufrequency.rdef b/src/preferences/cpufrequency/cpufrequency.rdef
index d4ae66d5da..317c4597cc 100644
--- a/src/preferences/cpufrequency/cpufrequency.rdef
+++ b/src/preferences/cpufrequency/cpufrequency.rdef
@@ -10,13 +10,11 @@ resource app_version {
 	internal = 0,
 
 	short_info = "CPUFrequency",
-	long_info = "CPUFrequency ©2008 Haiku, Inc."
+	long_info = "CPUFrequency ©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/preferences/datatranslations/DataTranslations.rdef b/src/preferences/datatranslations/DataTranslations.rdef
index ba93e976a3..9dca66f52e 100644
--- a/src/preferences/datatranslations/DataTranslations.rdef
+++ b/src/preferences/datatranslations/DataTranslations.rdef
@@ -13,13 +13,11 @@ resource app_version {
 	internal = 0,
 
 	short_info = "DataTranslations",
-	long_info  = "DataTranslations ©2002-2007 Haiku, Inc."
+	long_info  = "DataTranslations ©2002-2009 Haiku, Inc."
 };
 
 resource app_flags B_SINGLE_LAUNCH;
 
-#ifdef HAIKU_TARGET_PLATFORM_HAIKU
-
 resource vector_icon {
 	$"6E636966090500020006023AF8483564E4B643423BF5B54A331148676B00FC3D"
 	$"5DFDF92145020006023A80000000000000003DC0004A200047000000FFA5A5FF"
@@ -39,60 +37,3 @@ resource vector_icon {
 	$"010B000A0001001001178400040A040101000A060103000A05010200"
 };
 
-#else // HAIKU_TARGET_PLATFORM_HAIKU
-
-resource large_icon array {
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF00000000FFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF0000232323230000FFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF00232320202020232300FFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF002320ACACACAC202300FFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF002320ACAC3FACAC20232300FF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF002320AC3F3FACAC20232300FF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF002320ACACACACAC20232300FF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF002320ACACACAC2020232300FF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000020202020232300FFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFF003F7B7B7B7B7B7B7B7B0023232323232300FFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFF002B3F7B7B7B7B7B7B7B002323232300000F0FFF"
-	$"FFFFFFFFFFFF00FFFFFFFFFF002B2B007B7B7B7B7B7B00000000000F0F0F0F0F"
-	$"FFFFFFFFFF00F90000FFFFFFFF00007B7B7B7B3F7B7B000F0F0F00000F0F0FFF"
-	$"FFFFFFFF00F9F9F9F90000FFFF007B7B7B7B2F2B3F7B000F0F007B7B00FFFFFF"
-	$"FFFFFF00F9F9F9F9F9F9F900007B7B7B7B2F2F2B2B3F000F0F00DA7B7B00FFFF"
-	$"FFFF00F9F9F9F9F9F9F9F9F9F9007B7B2F2F2F002B2B290F002B2CDA7B00FFFF"
-	$"FF00F9F9F9F9F9F9F9F9F9F95D007B2F2F2F000F002B290F002B2F2F00FFFFFF"
-	$"00FAF9F9F9F9F9F9F9F9F95D5D002F2F2F000F0FFF0000002B2CEB2F00FFFFFF"
-	$"00FAFAFAF9F9F9F9F9F95D5D5D002F2F000F0FFFFFFFFF002B2F2F00FFFFFFFF"
-	$"00FAFAFAFAFAF9F9F95D5D5D5D0000000F0FFFFFFFFF002B2CEB2F00FFFFFFFF"
-	$"00FAFAFAFAFAFAFA5D5D5D5D5D00FFFF000000FFFFFF002B2F2F00FFFFFFFFFF"
-	$"00FAFAFAFAFAFAFA5D5D5D5D5D000F007B7B7B00FF002B2CEB2F00FFFFFFFFFF"
-	$"00FAFAFAFAFAFAFA5D5D5D5D5D00007B7B7BDA00FF002B2F2F00FFFFFFFFFFFF"
-	$"00FAFAFAFAFAFAFA5D5D5D5D5D00002B2CDA7B7B002B2CEB2F00FFFFFFFFFFFF"
-	$"00FAFAFAFAFAFAFA5D5D5D5D000E0E002B2CDA7B2B2CEB2F00FFFFFFFFFFFFFF"
-	$"0000FAFAFAFAFAFA5D5D5D000E0E0E002B2CDA7B2B2CEB2F00FFFFFFFFFFFFFF"
-	$"FFFF0000FAFAFAFA5D5D000E0E0EFFFF002B2C2B2B2F2F00FFFFFFFFFFFFFFFF"
-	$"FFFFFFFF0000FAFA5D000E0E0EFFFFFF002B2C2B2B2F2F00FFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFF0000000F0F0FFFFFFFFFFF002B2CEB2F00FFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF002B2CEB2F00FFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF002B2F000E0F0F0F0F0F0F0F0F0F"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF0000000E0F0F0F0F0F0F0F0F0F0F"
-};
-
-resource mini_icon array {
-	$"FFFFFFFFFFFFFFFFFFFFFF000000FFFF"
-	$"FFFFFFFFFFFFFFFFFFFF0023232300FF"
-	$"FFFFFFFFFFFFFFFFFF00233FAC202300"
-	$"FFFFFFFFFFFFFFFFFF0023ACAC202300"
-	$"FFFFFFFFFF0000000000022020202300"
-	$"FFFFFF00FF337B7B7B7B0023232300FF"
-	$"FFFF00F90000007B7B7B00000000FFFF"
-	$"FF00F9F9F9F9F77B2F7B000F007B00FF"
-	$"00F9F9F9F9F9982F0033290F002F00FF"
-	$"00FAFAF9F9989800000FFF002F00FFFF"
-	$"00FAFAFA9898980000FF00002F00FFFF"
-	$"00FAFAFA989898002B00002F00FFFFFF"
-	$"00FAFAFA989800002B7B2CEB00FFFFFF"
-	$"FF00D7FA98000E0E002B2F00FFFFFFFF"
-	$"FFFFFF00000E0EFF002B2F00FFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFF00000E0F0F0F0F"
-};
-
-#endif // HAIKU_TARGET_PLATFORM_HAIKU
diff --git a/src/preferences/devices/Devices.rdef b/src/preferences/devices/Devices.rdef
index 2331c49348..50e43999cd 100644
--- a/src/preferences/devices/Devices.rdef
+++ b/src/preferences/devices/Devices.rdef
@@ -14,15 +14,13 @@ resource app_version
 	internal = 0,
 
 	short_info = "Devices", 
-	long_info  = "Devices ©2002-2007 Haiku"
+	long_info  = "Devices ©2002-2009 Haiku"
 };
 
 resource app_flags B_SINGLE_LAUNCH;
 
 resource file_types message;
 
-#ifdef HAIKU_TARGET_PLATFORM_HAIKU
-
 resource vector_icon {
 	$"6E6369660705010200060239F8173B7914BB791439F8174A3FA149A2B701A3D4"
 	$"44FF70A804020016053BB7B3BCF33339625B3821E44A58094AD9AF000C5E79A5"
@@ -41,62 +39,3 @@ resource vector_icon {
 	$"01011001178410040A020102000A000103000A030104000A00010500"
 };
 
-#else // HAIKU_TARGET_PLATFORM_HAIKU
-
-resource large_icon
-{
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFF0000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFF00370000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFF003737370000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFF0037733737370000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFF0037FAFA373737370000FFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFF0037FA37FAFA373737370000FFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFF0037FA0037FA3700373737370000FFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFF0037FA0000FA370000FA373737370000FFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFF0037FA3700FA373700FA37FAFA37373700000808FFFFFFFF"
-	$"FFFFFFFFFFFFFFFF0037FA2137FA37FAFAFA37FA37FAFA3737081B1B08FFFFFF"
-	$"FFFFFFFFFFFFFFFF0037373721FA37FA37FA37FA3737FA37081B1B08FFFFFFFF"
-	$"FFFFFFFFFFFFFFFF0037FAFA000037FA37C437FA373721081B1B0800FFFFFFFF"
-	$"FFFFFFFFFFFFFFFF0037FA007B7B00FA37C4C4FAFA37370808081600FFFFFFFF"
-	$"FFFFFFFFFFFFFFFF0037FA00DA7B7B00FA37C43737FAFA0816161600FFFFFFFF"
-	$"FFFFFFFFFFFFFFFF0037002B2CDA7B0037FAFA3737373708160B1600FFFFFFFF"
-	$"FFFFFFFFFFFFFFFF0037002B2F2F0037373737FAFA733708160B1600FFFFFFFF"
-	$"FFFFFFFFFFFFFFFF00002B2CEB2F00FA3700373737FAFA0816161600FFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFF002B2F2F0037FAFA00003737373708160B1600FFFFFFFF"
-	$"FFFFFFFFFFFFFFFF002B2CEB2F0037FA373700FAFA373708160B1600FFFFFFFF"
-	$"FFFF000000FFFFFF002B2F2F00FA37FA373737FA37FAFA0816161600FFFFFFFF"
-	$"FF007B7B7B00FF002B2CEB2F000037FA37FA37FA3737370816161600FFFFFFFF"
-	$"007B7B7BDA00FF002B2F2F000F0F000037FA37FA37C4370816161600FFFFFFFF"
-	$"002B2CDA7B7B002B2CEB2F00FFFF0F0F000037FA0000370816161600FFFFFFFF"
-	$"FF002B2CDA7B2B2CEB2F00FFFFFFFFFF0F0F00000FFF000816161600FFFFFFFF"
-	$"FF002B2CDA7B2B2CEB2F00FFFFFFFFFFFFFF0F0F0FFFFF00161616000F0FFFFF"
-	$"FFFF002B2C2B2B2F2F00FFFFFFFFFFFFFFFFFFFFFFFFFF00161616000F0F0F0F"
-	$"FFFF002B2C2B2B2F2F00FFFFFFFFFFFFFFFFFFFFFFFFFF0F0016000F0F0F0FFF"
-	$"FFFFFF002B2CEB2F00FFFFFFFFFFFFFFFFFFFFFFFFFFFFFF0F000F0F0F0FFFFF"
-	$"FFFFFF002B2CEB2F00FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF0F0F0FFFFFFFFF"
-	$"FFFFFFFF002B2F000E0F0F0F0F0F0F0F0F0FFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFF0000000E0F0F0F0F0F0F0F0F0F0FFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-};
-
-resource mini_icon
-{
-	$"FFFFFF2929FFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFF299F2929FFFFFFFFFFFFFFFFFF"
-	$"FFFFFF2970379F0129FFFFFFFFFFFFFF"
-	$"FFFFFF29FAFA773AB72929FFFFFFFFFF"
-	$"FFFFFF29913E91DC779797290000FFFF"
-	$"FFFFFF29907F71FA6BFA7197071329FF"
-	$"FFFFFF29717000FACB6B3E081400FFFF"
-	$"FFFFFF296B007B00AAFA71051129FFFF"
-	$"FFFFFF294B002F007171FA061129FFFF"
-	$"FFFFFF29002F0071DF7770071200FFFF"
-	$"FF00FF00002F006B3AFAFA061229FFFF"
-	$"002B00002F0097F951FA97081601FFFF"
-	$"002B7B2CEB00290097FA06071600FFFF"
-	$"FF002B2F00FFFF0F2900000616000FFF"
-	$"FF002B2F00FFFFFFFFFF0F000D000F0F"
-	$"FFFF00000E0F0F0F0FFFFFFF000F0FFF"
-};
-
-#endif // HAIKU_TARGET_PLATFORM_HAIKU
diff --git a/src/preferences/dun/DUN.rdef b/src/preferences/dun/DUN.rdef
index 55f3ab8dbb..b9a4f5a527 100644
--- a/src/preferences/dun/DUN.rdef
+++ b/src/preferences/dun/DUN.rdef
@@ -1,8 +1,6 @@
 
 resource(1, "BEOS:FILE_TYPES") message;
 
-#ifdef HAIKU_TARGET_PLATFORM_HAIKU
-
 resource vector_icon {
 	$"6E63696609020016023877103BCE2CBBCE2C3877104964A94A5EC90065FF2302"
 	$"00160236204B3AEC69BBEF7B36DCB64A12D04A1BEF0093FF5A02001602BAD095"
@@ -18,66 +16,6 @@ resource vector_icon {
 	$"0A040105201E210A0401052025B4A40A040105202AB5970A040105202F29"
 };
 
-#else // HAIKU_TARGET_PLATFORM_HAIKU
-
-resource(101, "BEOS:L:STD_ICON") #'ICON' array
-{
-	$"FFFFFFFFFFFFFFFFFFFF0000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFF00BEBE0000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFF00BEBEBEBEBE0000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFF00BEBEBEBEBEBEBEBE00FFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFF00BEBEBEBEBEBEBEBE2500FFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFF00BEBEBEBEBEBEBEBE252500FFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFF001A1ABEBEBEBEBEBE25252500FFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFF00150F1A1ABEBEBE2525252500FFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFF00150F1B161A1A2525252525000000FFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFF0015251B16152525252525250000000000FFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFF00152524251525252525252500FFFF00000000FFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFF00150F252415252525252525000C0C0CFF00000000FFFFFFFFFFFF0F"
-	$"FFFFFFFF00150F1B1515252500002525000C0C0CFFFFFF000000FFFFFF0F0FFF"
-	$"FFFFFFFF0015041C151525007B7B00000C0C0CFFFFFFFFFF0000FFFF0809FFFF"
-	$"FFFFFFFF0015040405152500DA7B7B000C0CFFFFFF0000000000FF0000FFFFFF"
-	$"FFFFFFFF001504040515002B2CDA7B000CFFFFFF001A1A0000FF0000FFFFFFFF"
-	$"FFFFFFFFFF0000040415002B2F2F000CFFFFFF001A1A1A1A1A0000FFFFFFFFFF"
-	$"FFFFFFFFFFFFFF0000002B2CEB2F00FFFFFF001A1A1A1A1A1A1A1A00FFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFF002B2F2F00FFFFFF001A1A1A1A1A1A1A1A0F000C0CFFFF"
-	$"FFFFFFFFFFFFFFFF002B2CEB2F00FFFF003F1A1A1A1A1A1A1A0F0F000C0CFFFF"
-	$"FFFF000000FFFFFF002B2F2F00FFFFFF00973F3F1A1A1A1A0F0F000C0CFFFFFF"
-	$"FF007B7B7B00FF002B2CEB2F00FFFFFF001C1C973F3F1A0F0F000C0CFFFFFFFF"
-	$"007B7B7BDA00FF002B2F2F00FFFFFFFFFF00001C1C2A0F0F000C0CFFFFFFFFFF"
-	$"002B2CDA7B7B002B2CEB2F00FFFFFFFFFFFFFF00001C0F000C0CFFFFFFFFFFFF"
-	$"FF002B2CDA7B2B2CEB2F00FFFFFFFFFFFFFFFFFFFF00000C0CFFFFFFFFFFFFFF"
-	$"FF002B2CDA7B2B2CEB2F00FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFF002B2C2B2B2F2F00FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFF002B2C2B2B2F2F00FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFF002B2CEB2F00FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFF002B2CEB2F00FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFF002B2F000E0F0F0F0F0F0F0F0F0FFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFF0000000E0F0F0F0F0F0F0F0F0F0FFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-};
-
-resource(101, "BEOS:M:STD_ICON") #'MICN' array
-{
-	$"FFFFFFFFFF0000FFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFF00BEBE0000FFFFFFFFFFFFFF"
-	$"FFFFFF00BEBEBE2501FFFFFFFFFFFFFF"
-	$"FFFF000FBEBE252500FFFFFFFFFFFFFF"
-	$"FFFF000E1615252500FFFFFFFFFFFFFF"
-	$"FFFF000E251525250002020CFFFFFFFF"
-	$"FFFF000E16150025000C0C02020CFF0C"
-	$"FFFF000404007B000C0CFFFFFF02FF0C"
-	$"FFFFFF0000002F000CFFFF0001020C0C"
-	$"FFFFFFFF002F000CFFFF001A1A000CFF"
-	$"FF00FF00002F00FFFF001A1A1A1A000A"
-	$"002B00002F00FFFFFF00971A1A0F000B"
-	$"002B7B2CEB00FFFFFF00002A0F000BFF"
-	$"FF002B2F00FFFFFFFFFFFF00000CFFFF"
-	$"FF002B2F00FFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFF00000E0F0F0F0FFFFFFFFFFFFFFF"
-};
-
-#endif // HAIKU_TARGET_PLATFORM_HAIKU
-
 resource(1, "BEOS:APP_SIG") #'MIMS' "application/x-vnd.Haiku-DialUpNetworking";
 
 resource(1, "BEOS:APP_VERSION") #'APPV' array
@@ -107,3 +45,4 @@ resource(1, "BEOS:APP_VERSION") #'APPV' array
 };
 
 resource(1, "BEOS:APP_FLAGS") #'APPF' $"00000000";
+
diff --git a/src/preferences/filetypes/FileTypes.icons.rdef b/src/preferences/filetypes/FileTypes.icons.rdef
index 6933f5486d..aca931550a 100644
--- a/src/preferences/filetypes/FileTypes.icons.rdef
+++ b/src/preferences/filetypes/FileTypes.icons.rdef
@@ -1,8 +1,3 @@
-/*
- * FileTypes.icons.rdef
- */
-
-#ifdef HAIKU_TARGET_PLATFORM_HAIKU
 
 resource(0, "BEOS:application/x-be-resource") #'VICN' array {
 	$"6E63696607050102000603399E0F3D9C0ABF82B23B84A94B88504870C900A5B1"
@@ -29,114 +24,3 @@ resource(1, "BEOS:application/octet-stream") #'VICN' array {
 	$"8400040A020101000A0101001001178400040A00010000"
 };
 
-#else // HAIKU_TARGET_PLATFORM_HAIKU
-
-resource(0, "BEOS:L:application/x-be-resource") #'ICON' array {
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF02020008FFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF041B17110802FFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF041B3F3F1B150800FFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFF00FFFFFFFFFFFF021B3F3F1B150A00FFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFF003F00FFFFFFFFFF04151B1B17110800FFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFF003FFD00FFFFFFFFFF02081515150A0800FFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFF003FFDFDFD00FFFFFF00F9000A0A080A00FFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFF003FFDFDFDFD00FFFF003FF97D000000007D0000FFFFFFFFFFFFFF"
-	$"FFFFFFFF003FFDFDFDFDFDFD00FF00F93F3F7D7D7D7D7D7DF900FFFFFFFFFFFF"
-	$"FFFFFF003FFDFDFDFD62FDFD00FF00F9F9F93F3FF9F9F9F97D00FFFFFFFFFFFF"
-	$"FFFF003FFEFDFDFD62FDFDFDFA0000F9F9F9F9F93F3FF97D7D00FFFFFFFFFFFF"
-	$"FF003FFEFEFDFD89FDFDFDFDFA0000F9F9F9F9F9F9F97D7D7D00FFFFFFFFFFFF"
-	$"003FFEFEFEFDB0FD62FD62FDFAFA00F9F9F9F9F9F9F97D7D7D00FFFFFFFFFFFF"
-	$"FF003FFEFEB0FD89FD62FD62FAFA00F9F9F9F9F9F9F97D7D7D00FFFFFFFFFFFF"
-	$"FF003FFEB0FDB0FDB0FD62FAFAFAFA00F9F90000F9F97D7D7D00FFFFFFFFFFFF"
-	$"FFFF003FFEB0FDB0FDB0FDFAFA62FA000000606000007D7D7D00FFFFFFFFFFFF"
-	$"FFFF003FFEFDFDFD89FD62FD62FAFAFA00606060606000007D00FFFFFFFFFFFF"
-	$"FFFFFF003FFDFDB0FD89FD62FAFAFA0060606060606060600000FFFFFFFFFFFF"
-	$"FFFFFF003FFDFDFDB0FD89FAFAFA00606060606060606060606000FFFFFFFFFF"
-	$"FFFFFFFF003FFDB0FDB0FDFDFA006060606060606060606060D5000EFFFFFFFF"
-	$"FFFFFFFF003FFDFDB0FDFDFD003F60606060606060606060D5D5000EFFFFFFFF"
-	$"FFFFFFFFFF003FFDFDFDFDFD00AC3F3F60606060606060D5D5D5000E0E0EFFFF"
-	$"FFFFFFFFFF003FFDFDFDFDFD00ACACAC3F3F60606060D5D5D5D5000E0E0E0E0E"
-	$"FFFFFFFFFFFF003FFDFDFD0000ACACACACAC3F3F60D5D5D5D5D5000E0E0E0E0E"
-	$"FFFFFFFFFFFF003FFDFD000E00ACACACACACACACD5D5D5D5D5D5000E0E0E0EFF"
-	$"FFFFFFFFFFFFFF00FD000E0E00ACACACACACACACD5D5D5D5D5D5000E0E0EFFFF"
-	$"FFFFFFFFFFFFFFFF000E0E0E00ACACACACACACACD5D5D5D5D5000E0E0EFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFF00ACACACACACACACD5D5D5D5000E0E0EFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFF0000ACACACACACD5D5D5000E0E0EFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFF0000ACACACD5D5000E0E0EFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF0000ACD5000E0E0EFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF00000E0E0EFFFFFFFFFFFFFFFF"
-};
-
-resource(1, "BEOS:L:application/octet-stream") #'ICON' array {
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFF0000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFF0060600000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFF0060606060600000FFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFF00603F603F603F603F0000FFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFF00603F603F603F603F603F600000FFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFF00603F3F3F3F3F3F3F3F3F3F3F3F3F0000FFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFF00603F603F603F603F603F603F603F603F3F0000FFFFFFFFFFFF"
-	$"FFFFFFFFFF00603F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F0000FFFFFFFF"
-	$"FFFFFFFF00603F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F0000FFFF"
-	$"FFFFFF00603F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F603F00FF"
-	$"FFFF00603F603F603F603F603F603F603F603F603F603F603F603F603F00FFFF"
-	$"FF00603F603F603F603F603F603F603F603F603F603F603F603F603F00AEAEAE"
-	$"00003F603F603F603F603F603F603F603F603F603F603F603F603F0000AEAEFF"
-	$"FFAE0000603F603F603F603F603F603F603F603F603F603F603F00AE8700AEFF"
-	$"FFFFAE0000006060606060606060606060601B60606060606000AE87870100AE"
-	$"FFFFFFAE00AE00006060606060606060606060601B60606000AE870000AEAEAE"
-	$"FFFFFFFFAE00AEAE00006087608760876087608760871B29AE0000AEAEFFFFFF"
-	$"FFFFFFFFFFAE0087AEAE000087878787878787878787010000AEAEFFFFFFFFFF"
-	$"FFFFFFFFFFFFAE008787AEAE0000878787878787870100AEAEFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFAE00608787AEAE0000AEAEAEAE00AEAEFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFAE0060608787AEAE0000AE00AEAEFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFAE00606060870000AE00AEAEFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFAE00600000AEAEAEAEAEFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFAE00AEAEFFFFFFAEFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFAEFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-};
-
-resource(0, "BEOS:M:application/x-be-resource") #'MICN' array {
-	$"FFFFFFFFFFFFFFFF020200FFFFFFFFFF"
-	$"FFFFFFFFFFFFFF04151E1500FFFFFFFF"
-	$"FFFFFFFFFFFFFF021D1E1C00FFFFFFFF"
-	$"FFFFFFFF00FFFF00151B1600FFFFFFFF"
-	$"FFFFFF003F0000FA0000000000FFFFFF"
-	$"FFFF003FFD0000F9F9FAFAFAFA00FFFF"
-	$"FF003FFEFDFD00F9F9F9F97D7D00FFFF"
-	$"003F62FE89FD00F9F9F900007D00FFFF"
-	$"FF003FB0FD89FA00F90060600000FFFF"
-	$"FF003FFEB0FD620000606060606000FF"
-	$"FFFF003FFD89FA003F3F606060D500FF"
-	$"FFFF003FFDFDFA00ACAC3F3FD5D5000E"
-	$"FFFFFF003FFD0000ACACACACD5D5000E"
-	$"FFFFFF003F000E00ACACACACD5D5000E"
-	$"FFFFFFFF000E0E0E0000ACACD5000E0E"
-	$"FFFFFFFFFFFFFFFFFFFF0000000E0EFF"
-};
-
-resource(1, "BEOS:M:application/octet-stream") #'MICN' array {
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFF00FFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFF003F0000FFFFFFFFFFFFFF"
-	$"FFFFFFFF003F6060600000FFFFFFFFFF"
-	$"FFFFFF003F6060606060600000FFFFFF"
-	$"FFFF003F3F3F3F3F3F3F3F60600000FF"
-	$"FF003F603F603F603F603F3F60600000"
-	$"00606060606060606060601B600000AE"
-	$"AE000087878787878787878701870000"
-	$"FFAE000000878787878787008700AEAE"
-	$"FFFFAE00AE0000AEAEAE000000AEFFFF"
-	$"FFFFFFAE0087AE00AE00AEAEFFFFFFFF"
-	$"FFFFFFFFAE00000000AEAEFFFFFFFFFF"
-	$"FFFFFFFFFFAE00AEFFAEFFFFFFFFFFFF"
-};
-
-#endif // HAIKU_TARGET_PLATFORM_HAIKU
diff --git a/src/preferences/filetypes/FileTypes.rdef b/src/preferences/filetypes/FileTypes.rdef
index 57ec0ae34b..6d753616eb 100644
--- a/src/preferences/filetypes/FileTypes.rdef
+++ b/src/preferences/filetypes/FileTypes.rdef
@@ -1,6 +1,3 @@
-/*
- * FileTypes.rdef
- */
 
 resource app_signature "application/x-vnd.Haiku-FileTypes";
 
@@ -23,12 +20,9 @@ resource app_version {
 	internal = 1,
 
 	short_info = "FileTypes",
-	long_info = "FileTypes ©2006-2007 Haiku Inc."
+	long_info = "FileTypes ©2006-2009 Haiku Inc."
 };
 
-
-#ifdef HAIKU_TARGET_PLATFORM_HAIKU
-
 resource vector_icon {
 	$"6E6369660C0500040169020006023CADF43D104EBF02CA3EA2224BF02046648D"
 	$"00FFDB97FFFCAF29020006023A6496BA3F153EBCDD3EEA91492CB5C09D5100FF"
@@ -65,95 +59,3 @@ resource(200, "icon heap") #'VICN' array {
 	$"01011001178400040A02010100"
 };
 
-#else // HAIKU_TARGET_PLATFORM_HAIKU
-
-resource large_icon array {
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF02020000FFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF041B17110802FFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF041B3F3F1B150800FFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFF00FFFFFFFFFFFF021B3F3F1B150A00FFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFF003F00FFFFFFFFFF04151B1B17110800FFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFF003FFD00FFFFFFFFFF02081515150A0800FFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFF003FFDFDFD00FFFFFF00F9000A0A080A00FFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFF003FFDFDFDFD00FFFF003FF97D000000007D0000FFFFFFFFFFFFFF"
-	$"FFFFFFFF003FFDFDFDFDFDFD00FF00F93F3F7D7D7D7D7D7DF900FFFFFFFFFFFF"
-	$"FFFFFF003FFDFDFDFD62FDFD00FF00F9F9F93F3FF9F9F9F97D00FFFFFFFFFFFF"
-	$"FFFF003FFEFDFDFD62FDFDFDFA0000F9F9F9F9F93F3FF97D7D00FFFFFFFFFFFF"
-	$"FF003FFEFEFDFD89FDFDFDFDFA0000F9F9F9F9F9F9F97D7D7D00FFFFFFFFFFFF"
-	$"003FFEFEFEFDB0FD62FD62FD000000F9F9F9F9F9F9F97D7D7D00FFFFFFFFFFFF"
-	$"FF003FFEFEB0FD89FD62FD007B7B00F9F9F9F9F9F9F97D7D7D00FFFFFFFFFFFF"
-	$"FF003FFEB0FDB0FDB0FD6200DA7B7B00F9F90000F9F97D7D7D00FFFFFFFFFFFF"
-	$"FFFF003FFEB0FDB0FDB0002B2CDA7B000000606000007D7D7D00FFFFFFFFFFFF"
-	$"FFFF003FFEFDFDFD89FD002B2F2F00FA00606060606000007D00FFFFFFFFFFFF"
-	$"FFFFFF003FFDFDB0FD002B2CEB2F000060606060606060600000FFFFFFFFFFFF"
-	$"FFFFFF003FFDFDFDB0002B2F2F0000606060606060606060606000FFFFFFFFFF"
-	$"FFFFFFFF003FFDB0002B2CEB2F006060606060606060606060D5000EFFFFFFFF"
-	$"FFFF0000003FFDFD002B2F2F003F60606060606060606060D5D5000EFFFFFFFF"
-	$"FF007B7B7B003F002B2CEB2F00AC3F3F60606060606060D5D5D5000E0E0EFFFF"
-	$"007B7B7BDA003F002B2F2F0000ACACAC3F3F60606060D5D5D5D5000E0E0E0E0E"
-	$"002B2CDA7B7B002B2CEB2F0000ACACACACAC3F3F60D5D5D5D5D5000E0E0E0E0E"
-	$"FF002B2CDA7B2B2CEB2F000E00ACACACACACACACD5D5D5D5D5D5000E0E0E0EFF"
-	$"FF002B2CDA7B2B2CEB2F000E00ACACACACACACACD5D5D5D5D5D5000E0E0EFFFF"
-	$"FFFF002B2C2B2B2F2F000E0E00ACACACACACACACD5D5D5D5D5000E0E0EFFFFFF"
-	$"FFFF002B2C2B2B2F2F00FFFF00ACACACACACACACD5D5D5D5000E0E0EFFFFFFFF"
-	$"FFFFFF002B2CEB2F00FFFFFFFF0000ACACACACACD5D5D5000E0E0EFFFFFFFFFF"
-	$"FFFFFF002B2CEB2F00FFFFFFFFFFFF0000ACACACD5D5000E0E0EFFFFFFFFFFFF"
-	$"FFFFFFFF002B2F000E0F0F0F0F0F0F0F0F0000ACD5000E0E0EFFFFFFFFFFFFFF"
-	$"FFFFFFFF0000000E0F0F0F0F0F0F0F0F0F0F0F00000E0E0EFFFFFFFFFFFFFFFF"
-};
-
-resource mini_icon array {
-	$"FFFFFFFFFFFFFFFF020200FFFFFFFFFF"
-	$"FFFFFFFFFFFFFF04151E1500FFFFFFFF"
-	$"FFFFFFFFFFFFFF021D1E1C00FFFFFFFF"
-	$"FFFFFFFF00FFFF00151B1600FFFFFFFF"
-	$"FFFFFF003F0000FA0000000000FFFFFF"
-	$"FFFF003FFD0000F9F9FAFAFAFA00FFFF"
-	$"FF003FFEFDFD00F9F9F9F97D7D00FFFF"
-	$"003F62FE89007B00F9F900007D00FFFF"
-	$"FF003FB0FD002F00F90060600000FFFF"
-	$"FF003FFE002F000000606060606000FF"
-	$"FF000000002F00003F3F606060D500FF"
-	$"002B00002F00FA00ACAC3F3FD5D500FF"
-	$"002B7B2CEB000000ACACACACD5D5000E"
-	$"FF002B2F00000E00ACACACACD5D5000E"
-	$"FF002B2F000E0E0F0000ACACD5000E0E"
-	$"FFFF00000E0F0F0F0F0F0000000E0EFF"
-};
-
-resource(200, "icon heap") #'ICON' array {
-	$"FFFFFFFFFFFFFFFFFFFFFFFF0000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFF0060600000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFF0060606060600000FFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFF00603F603F603F603F0000FFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFF00603F603F603F603F603F600000FFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFF00603F3F3F3F3F3F3F3F3F3F3F3F3F0000FFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFF00603F603F603F603F603F603F603F603F3F0000FFFFFFFFFFFF"
-	$"FFFFFFFFFF00603F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F0000FFFFFFFF"
-	$"FFFFFFFF00603F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F0000FFFF"
-	$"FFFFFF00603F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F603F00FF"
-	$"FFFF00603F603F603F603F603F603F603F603F603F603F603F603F603F00FFFF"
-	$"FF00603F603F603F603F603F603F603F603F603F603F603F603F603F00FFFFFF"
-	$"00003F603F603F603F603F603F603F603F603F603F603F603F603F000000FFFF"
-	$"FF000000603F603F603F603F603F603F603F603F603F603F603F00AE878700FF"
-	$"FF00870000006060606060606060606060606060606060606000AE87870100FF"
-	$"FF00008700AE00006060606060606060606060606060606000AE8700008700FF"
-	$"FF0087008700AEAE00006087608760876087608760876029AE000087870000FF"
-	$"FF00008700870087AEAE000087878787878787878787010000878700008700FF"
-	$"FF008700870087008787AEAE00008787878787878701008787000087870100FF"
-	$"FFAE00870087008700608787AEAE0000AEAEAEAE0087870000878700008700AE"
-	$"FFFFAE0087008700600060608787AEAE0000AE008700008787000087870100AE"
-	$"FFFFFFAE00870060006000606060870000870000008787000087870000AEAEFF"
-	$"FFFFFFFFAE00600060006000600000878700008787000087870000AEAEFFFFFF"
-	$"FFFFFFFFFFAE00600060006000606000008787000087870000AEAEFFFFFFFFFF"
-	$"FFFFFFFFFFFFAE00600060006000006087000087870000AEAEFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFAE00600060006060000087870000AEAEFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFAE00600060000060600000AEAEFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFAE00600060600000AEAEFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFAE00600000AEAEFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFAE00AEAEFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFAEFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-};
-
-#endif // HAIKU_TARGET_PLATFORM_HAIKU
diff --git a/src/preferences/fonts/Fonts.rdef b/src/preferences/fonts/Fonts.rdef
index fa0e41f741..0da19408ca 100644
--- a/src/preferences/fonts/Fonts.rdef
+++ b/src/preferences/fonts/Fonts.rdef
@@ -13,13 +13,11 @@ resource app_version {
 	internal = 0,
 
 	short_info = "Fonts",
-	long_info  = "Fonts ©2002-2006 Haiku"
+	long_info  = "Fonts ©2002-2009 Haiku"
 };
 
 resource app_flags B_SINGLE_LAUNCH;
 
-#ifdef HAIKU_TARGET_PLATFORM_HAIKU
-
 resource vector_icon {
 	$"6E63696608050004005F020006023D5F39368F62B905F93FFB6B4ACB36BEDE32"
 	$"00032288FF1944E7020006023AAFCC3BFAA8BF50A93E3D044B460F48AEEC0002"
@@ -36,60 +34,3 @@ resource vector_icon {
 	$"000A070108000A04020405000A05010A00"
 };
 
-#else // HAIKU_TARGET_PLATFORM_HAIKU
-
-resource large_icon {
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF0000FFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFF008C8C0000FFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFF008C8C8C8C8C0000FFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFF008C8C8C8C8C8C8C6600FFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFF008C8C8C8C8C8C8C662101FFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFF008C8C8C8C8C8C8C6621212000FFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFF0066668C8C8C8C8C662121202101FFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFF00B2B266668C8C66212120212129FFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFF00B2B2B2B2B2666621212021212000FFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFF00B2B2B2B2B2B28C2121202121202100FFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFF00B2B2B2B2B2B2B28C21212021212000FFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFF00B2B2B2B20000B2B28C21212021212000FFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFF00B2B2B2000000B2B28C21212021212000FFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFF00B2B2B2007B7B00B2B28C2121202121202100FFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFF00B2B2B200DA7B7B00B2B28C21212021212000FFFFFFFFFFFF"
-	$"FFFFFFFFFFFF00B2B2B2002B2CDA7B00B2B28C21212021212000FFFFFFFFFFFF"
-	$"FFFFFFFFFFFF00B2B2B2002B2F2F0000B2B28C21212021212000FFFFFFFFFFFF"
-	$"FFFFFFFFFF00B2B2B2002B2CEB2F0000B2B28C2121202121202100FFFFFFFFFF"
-	$"FFFFFFFFFF00B2B2B2002B2F2F00B200B2B2B28C21212021212000FFFFFFFFFF"
-	$"FFFFFFFFFF00B2B2002B2CEB2F00B2B2B2B2B28C21212021212000FFFFFFFFFF"
-	$"FFFF000000B2B2B2002B2F2F00B2B2B2B2B2B28C21212021212000FFFFFFFFFF"
-	$"FF007B7B7B00B2002B2CEB2F000000B2B2B2B28C2121202121202100FFFFFFFF"
-	$"007B7B7BDA00B2002B2F2F00000F0E0000B2B2B28C21212021212001FFFFFFFF"
-	$"002B2CDA7B7B002B2CEB2F000F0E0F0F00B2B2B28C21212021212000FFFFFFFF"
-	$"FF002B2CDA7B2B2CEB2F000F0E0F0F0F00B2B2B28C21212021212021000FFFFF"
-	$"FF002B2CDA7B2B2CEB2F000F0E0F0F0F0F00B2B28C21212021212021000F0FFF"
-	$"FFFF002B2C2B2B2F2F00FFFFFFFFFFFFFF00B2B2B28C212120212120000E0F0F"
-	$"FFFF002B2C2B2B2F2F00FFFFFFFFFFFFFF00B2B2B28C2121202121290E0F0F0F"
-	$"FFFFFF002B2CEB2F00FFFFFFFFFFFFFFFF00B2B2B28C21212021000F0E0F0FFF"
-	$"FFFFFF002B2CEB2F00FFFFFFFFFFFFFFFFFF00B2B2B28C2121290E0F0F0FFFFF"
-	$"FFFFFFFF002B2F000E0F0F0F0F0F0F0F0E0F0F0000B28C21000F0F0F0FFFFFFF"
-	$"FFFFFFFF0000000E0F0F0F0F0F0F0F0E0F0F0F0F0F0000000F0F0E0FFFFFFFFF"
-};
-
-resource mini_icon {
-	$"FFFFFFFFFFFF0000FFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFF008C8C0000FFFFFFFFFFFF"
-	$"FFFFFFFF00668C8C6600FFFFFFFFFFFF"
-	$"FFFFFF00B2B26666212129FFFFFFFFFF"
-	$"FFFFFF00B2B2B28C212129FFFFFFFFFF"
-	$"FFFF00B2B200B28C212129FFFFFFFFFF"
-	$"FFFF00B2B200008C212129FFFFFFFFFF"
-	$"FF00B2B200007B008C212129FFFFFFFF"
-	$"FF00B2B200002F008C212101FFFFFFFF"
-	$"FF00B200002F00B28C212101FFFFFFFF"
-	$"0000B200002F00B28C212101FFFFFFFF"
-	$"007B00002F0000B2B28C212101FFFFFF"
-	$"002B7B2CEB000000B28C2121290E0FFF"
-	$"FF002B2F00FFFF00B28C2121290E0F0F"
-	$"FF002B2F00FFFF00B28C21000F0E0FFF"
-	$"FFFF00000E0F0F0F0000000E0F0FFFFF"
-};
-
-#endif // HAIKU_TARGET_PLATFORM_HAIKU
diff --git a/src/preferences/joysticks/Joysticks.rdef b/src/preferences/joysticks/Joysticks.rdef
index f52720dcf8..1c19563ca1 100644
--- a/src/preferences/joysticks/Joysticks.rdef
+++ b/src/preferences/joysticks/Joysticks.rdef
@@ -13,13 +13,11 @@ resource app_version {
 	internal = 0,
 
 	short_info = "Joysticks",
-    long_info  = "Joysticks ©2007 Haiku"
+    long_info  = "Joysticks ©2009 Haiku"
 };
 
 resource app_flags B_SINGLE_LAUNCH;
 
-#ifdef HAIKU_TARGET_PLATFORM_HAIKU
-
 resource vector_icon {
 	$"6E6369660D010100007B0301000002001602B6D0E43AA952BC6AB8B88EA74B51"
 	$"7F4B2BA80099FE6C020016023A72333A634ABACB4D3ADCBF48F5514AA84A00CC"
@@ -48,60 +46,3 @@ resource vector_icon {
 	$"0A0B0108201E220A0C0107023C66660000000000003B33334A60004A1333"
 };
 
-#else // HAIKU_TARGET_PLATFORM_HAIKU
-
-resource large_icon {
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFF00000000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFF001012FFFFFF000D0D0D0D00FFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFF00000D0DFFFFFFFF00090D0D0000FFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFF000D0D001012FFFFFF000D09060600FFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFF000D0000FFFFFFFFFFFF000D0A090600FFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FF000D00FFFFFFFFFFFFFFFF000D0A090600FFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FF000D00FFFFFFFFFFFFFFFF000D0A090600FFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"001000FFFFFFFFFFFFFFFF00000D0A090600FFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"001000FFFFFFFFFFFFFF000D000D0A09060000FFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"00100000FFFFFFFFFF000D0D000D0A0906000D0000FFFFFFFFFFFFFFFFFFFFFF"
-	$"FF0010100000FFFF000D0D0D000D0A0906000D0D0D0000FFFFFFFFFFFFFFFFFF"
-	$"FFFF00000D0D00000DA50D0D000D0A0906000D7DA50D0D0000FFFFFFFFFFFFFF"
-	$"FFFFFFFF000D000DA57DA50000000A09060000090D0D0D0D0D0000FFFFFFFFFF"
-	$"FFFFFFFF00000D0D0D0D00007B7B000906000000090D0D0D0D0D0D0000FFFFFF"
-	$"FFFFFFFF000D0D0D0D000A00DA7B7B000600000000090D0D0D0D0D0D0D00FFFF"
-	$"FFFFFF000D0D0D0D0D00002B2BDA7B000000000600097DA50D0D0D0D0D00FFFF"
-	$"FFFF00A57DA50D7DA500002B2F2F00000009000600090D0D0D0D0D0D0600FFFF"
-	$"FF000D7D7D7DAA0D0D002B2CEB2F00090900000900090D0D0D0D0D060600FFFF"
-	$"00100D5B7DA50D0D0D002B2F2F00000000090900090D0D0D0D0D060606001111"
-	$"000A10100D0D0D0D002B2CEB2F000A0A090000090D7D0D0D0D06060600111111"
-	$"000A000000100D0D002B2F2F0000000000090D0D0D0D0D0D0606060600111111"
-	$"00007B7B7B0010002B2CEB2F000D0D0D7DA50D0D0D0D0D060606060600111111"
-	$"007B7B7BDA000A002B2F2F000D0D0D0D0D0D0D0D0D0D060606060600111111FF"
-	$"002B2CDA7B7B002B2CEB2F000D0D0D0D0D0D0D0D0D060606060600111111FFFF"
-	$"FF002B2CDA7B2B2CEB2F000A10100D0D0D0D0D0D060606060600111111FFFFFF"
-	$"FF002B2CDA7B2B2CEB2F000A0A0A10100D0D0D060606060600111111FFFFFFFF"
-	$"FFFF002B2C2B2B2F2F000A0A0A0A0A0A1010060606060600111111FFFFFFFFFF"
-	$"FFFF002B2C2B2B2F2F000A0A0A0A0A0A0A060606060600111111FFFFFFFFFFFF"
-	$"FFFFFF002B2CEB2F0000000A0A0A0A0A0A0606060600111111FFFFFFFFFFFFFF"
-	$"FFFFFF002B2CEB2F00FFFF00000A0A0A0A06060600111111FFFFFFFFFFFFFFFF"
-	$"FFFFFFFF002B2F00111111111100000A0A060000111111FFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFF000000111111111111111100000011111111FFFFFFFFFFFFFFFFFFFF"
-};
-
-resource mini_icon {
-	$"FFFFFFFFFFFFFF00FFFFFFFFFFFFFFFF"
-	$"FFFF010BFFFF000C00FFFFFFFFFFFFFF"
-	$"FF0505FFFFFF000903FFFFFFFFFFFFFF"
-	$"FF05FFFFFFFF000903FFFFFFFFFFFFFF"
-	$"FF05FFFFFF0400090407FFFFFFFFFFFF"
-	$"FF060606040D000904890707FFFFFFFF"
-	$"FFFF0704AAD7000904000D0D0707FFFF"
-	$"FFFF040D0D007B000001027D0D0D05FF"
-	$"FF047DAA0E002F000702010D0D0605FF"
-	$"0410100C002F00090702AA0D06050F0F"
-	$"04000710002F000D7D0D0D0606050F0F"
-	$"002B00002F00100D0D0D0606050F10FF"
-	$"002B7B2CEB000910100606050F0FFFFF"
-	$"FF002B2F00000A0A0806050F0FFFFFFF"
-	$"FF002B2F00FF000005050F0FFFFFFFFF"
-	$"FFFF00000E0F0F0F0FFFFFFFFFFFFFFF"
-};
-
-#endif // HAIKU_TARGET_PLATFORM_HAIKU
diff --git a/src/preferences/keyboard/Keyboard.rdef b/src/preferences/keyboard/Keyboard.rdef
index 13fb74f137..0a2634e2b0 100644
--- a/src/preferences/keyboard/Keyboard.rdef
+++ b/src/preferences/keyboard/Keyboard.rdef
@@ -33,3 +33,4 @@ resource vector_icon {
 	$"0106000A03030908071001178322040A000107000A010108000A020109000A03"
 	$"0105100117810004"
 };
+
diff --git a/src/preferences/keymap/Keymap.rdef b/src/preferences/keymap/Keymap.rdef
index de968802fe..9a80273573 100644
--- a/src/preferences/keymap/Keymap.rdef
+++ b/src/preferences/keymap/Keymap.rdef
@@ -13,7 +13,7 @@ resource app_version {
 	internal = 0,
 
 	short_info = "Keymap",
-	long_info  = "Keymap ©2004-2006 Haiku"
+	long_info  = "Keymap ©2004-2009 Haiku"
 };
 
 resource app_flags B_SINGLE_LAUNCH;
@@ -22,8 +22,6 @@ resource file_types message {
 	"types" = "application/x-vnd.Be-kmap"
 };
 
-#ifdef HAIKU_TARGET_PLATFORM_HAIKU
-
 resource vector_icon {
 	$"6E63696605020016023910813A2974BB43733A501C4B20D94AA7F400E9FFB902"
 	$"001602B82588B66C3639EE80BB7BCD4B41FC4B6A3B0066FF9002011603BC39E2"
@@ -47,114 +45,3 @@ resource vector_icon {
 	$"812204"
 };
 
-#else // HAIKU_TARGET_PLATFORM_HAIKU
-
-resource large_icon {
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF00FFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF003F0000FFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFF003F173F170000FFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFF003F170B0A3F3F170000FFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFF003F170B3F170B0A3F3F170000FFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFF003F170B3F0A180A3F0A0B3F3F170000FFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFF003F170B3F17170B3F0A180A0B0A3F17170000FFFF"
-	$"FFFFFFFFFFFFFFFFFFFF003F170B3F0A180A3F17170B3F17170B3F17170B00FF"
-	$"FFFFFFFFFFFFFFFFFF003F170B3F17170B3F0A180A3F17170B3F17170B0B000E"
-	$"FFFFFFFFFFFFFFFF003F170B3F0A180A3F17170B3F0A180A3F17170B0B0A000F"
-	$"FFFFFFFFFFFFFF003F170B3F17170B3F0A180A3F17170B3F17170B0B0A000F0F"
-	$"FFFFFFFFFFFF003F170B3F0A180A3F17170B3F17170B3F17170B0B0A000F0F0F"
-	$"FFFFFFFFFF003F170B3F17170B3F0A180A3F17170B3F17170B0B0A000E0E0FFF"
-	$"FFFFFFFF003F170B3F0A180A3F17170B3F17170B3F17170B0B0A000E0E0EFFFF"
-	$"FFFFFF003F170B3F17170B3F0A180A3F17170B3F17170B0B0A000F0E0EFFFFFF"
-	$"FFFF003F170B3F0A180A3F17170B3F17170B3F17170B0B0A000F0E0EFFFFFFFF"
-	$"FF003F170B3F17170B3F0A180A3F17170B3F17170B0B0A000F0E0EFFFFFFFFFF"
-	$"003F170B0A18170B3F17170B3F0A180A3F17170B0B0A000F0F0FFFFFFFFFFFFF"
-	$"003F3F17170B0B3F0A180A3F17170B3F17170B0B0A000F0F0FFFFFFFFFFFFFFF"
-	$"0011113F3F17170B0B0A3F17170B3F17170B0B0A000F0F0FFFFFFFFFFFFFFFFF"
-	$"00111111113F3F17170B0B3F0A3F17170B0B0A000E0E0FFFFFFFFFFFFFFFFFFF"
-	$"001111111111113F3F17170B3F17170B0B0A000F0F0FFFFFFFFFFFFFFFFFFFFF"
-	$"FF00001111111111113F3F1717180A0B0A000F0F0FFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFF00001111111111113F170B0A0B000F0F0FFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFF000011111111110A0B0A000F0F0FFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFF00001111110A0B000F0F0FFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFF0000110A000F0F0FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFF00000E0F0FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-};
-
-resource mini_icon {
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFF0000FFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFF0017170000FFFFFFFF"
-	$"FFFFFFFFFFFF00170B1717180000FFFF"
-	$"FFFFFFFFFF00170B170B170B17170000"
-	$"FFFFFFFF00170B170B170B17170A0B00"
-	$"FFFFFF00170B170B170B17170A0A000F"
-	$"FFFF00170B170B170B17170B0A000F0F"
-	$"FF00170B170B170B17170B0A000F0FFF"
-	$"001717180A180A18170A0B000F0FFFFF"
-	$"00111117170B17170A0A000F0FFFFFFF"
-	$"001111111117170A0A000F0FFFFFFFFF"
-	$"FF00001111110A0B000F0FFFFFFFFFFF"
-	$"FFFFFF0000110A000F0FFFFFFFFFFFFF"
-	$"FFFFFFFFFF00000F0FFFFFFFFFFFFFFF"
-};
-
-#endif // HAIKU_TARGET_PLATFORM_HAIKU
-
-resource(0, "BEOS:L:application/x-vnd.be-kmap") #'ICON' array {
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF00FFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF003F0000FFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF003F1717170000FFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF003F170A0A17173F0000FFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF003F170A3F170A0A173F3F0000FFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFF0000FF003F170A0A170A3F170A0A173F170000FF"
-	$"FFFFFFFFFFFFFFFFFFFFFF006060003F170A3F170A3F170A3F170A3F17170A00"
-	$"FFFFFFFFFFFFFFFFFFFF006060003F170A3F170A0A170A3F170A3F17170A0A00"
-	$"FFFFFFFFFFFFFFFFFF00603F003F170A0A170A3F170A0A170A3F17170A0A00AE"
-	$"FFFFFFFFFFFFFFFF00603F003F170A3F170A0A170A3F170A3F17170A0A00AEAE"
-	$"FFFFFFFFFFFFFF00603F003F170A0A170A3F170A3F170A3F17170A0A00AEAEFF"
-	$"FFFFFFFFFFFF00603F003F170A3F170A0A170A3F170A3F17170A0A00AEAEFFFF"
-	$"FFFFFFFFFF00603F003F170A0A170A3F170A3F170A3F17170A0A0000AEFFFFFF"
-	$"FFFFFFFF00603F003F170A3F170A0A170A0A170A3F17170A0A00AE870000FFFF"
-	$"FFFFFF00603F003F1717170A0A3F170A3F170A3F17170A0A00AE8760606000FF"
-	$"FFFF00603F60003F3F171717170A0A3F170A3F17170A0A00AE8760606000FFFF"
-	$"FF00603F603F0011113F3F171717170A0A3F17170A0A00AE8760606000AEAEAE"
-	$"00003F603F6000111111113F3F1717173F17170A0A00AE876060600000AEAEFF"
-	$"FFAE0000603F600000111111113F3F1717170A0A00AE8760606000AE8700AEFF"
-	$"FFFFAE0000006060600000111111113F170A0A00AE8760606000AE87870000AE"
-	$"FFFFFFAE00AE000060606000001111110A0A00AE8760606000AE870000AEAEAE"
-	$"FFFFFFFFAE00AEAE00006087600000110A00AE8760876000AE0000AEAEFFFFFF"
-	$"FFFFFFFFFFAE0087AEAE00008787870000AE87608787000000AEAEFFFFFFFFFF"
-	$"FFFFFFFFFFFFAE008787AEAE0000878787878787870000AEAEFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFAE00608787AEAE0000AEAEAEAE00AEAEFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFAE0060608787AEAE0000AE00AEAEFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFAE00606060870000AE00AEAEFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFAE00600000AEAEAEAEAEFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFAE00AEAEFFFFFFAEFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFAEFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-};
-
-resource(0, "BEOS:M:application/x-vnd.be-kmap") #'MICN' array {
-	$"FFFFFFFFFFFFFFFFFFFF00FFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFF003F0000FFFFFF"
-	$"FFFFFFFFFFFFFFFF003F1717170000FF"
-	$"FFFFFFFFFFFF00003F17171717170A00"
-	$"FFFFFFFFFF00003F17171717170A0A00"
-	$"FFFFFFFF00003F17171717170A0A00FF"
-	$"FFFFFF00003F17171717170A0A00FFFF"
-	$"FFFF00003F17171717170A0A000000FF"
-	$"FF006000113F3F17170A0A0060600000"
-	$"006060600011113F0A0A0060600000AE"
-	$"AE000060600000110A00606000000000"
-	$"FFAE00000087870000878700000000AE"
-	$"FFFFAE00AE0000878787000000AEFFFF"
-	$"FFFFFFAE0087AE00000000AEFFFFFFFF"
-	$"FFFFFFFFAE0000000000AEFFFFFFFFFF"
-	$"FFFFFFFFFFAE00AEFFAEFFFFFFFFFFFF"
-};
diff --git a/src/preferences/locale/Locale.rdef b/src/preferences/locale/Locale.rdef
index 92d4f22b20..b0b990febf 100644
--- a/src/preferences/locale/Locale.rdef
+++ b/src/preferences/locale/Locale.rdef
@@ -1,8 +1,4 @@
 
-resource file_types message;
-
-#ifdef HAIKU_TARGET_PLATFORM_HAIKU
-
 resource vector_icon {
 	$"6E636966040501020106033D0AFE000000000000BD0AFE48F10748A0780032B4"
 	$"FF910066FFFF0034CC020106033D0AFE000000000000BD0AFE48F10748207854"
@@ -124,64 +120,6 @@ resource vector_icon {
 	$"030A0304050607080A0B020902412E2C000000000000412FC3C85CD737400D"
 };
 
-#else // HAIKU_TARGET_PLATFORM_HAIKU
-
-resource large_icon array {
-	$"FFFFFFFFFFFFFFFFFFFFFFD5DDDE28000002DED57FFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFDD0000DE7F3E5F3E7EDCDE0000DDFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFDD00023E7436363E7E7E3E363E3E7E0200DDFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFDE003E3E5F5F3E5F7E3E7E363E3636363E7E00DEFFFFFFFFFFFF"
-	$"FFFFFFFFB528DE36345F5E5EBE5F7E3674363636363638383EDE28B5FFFFFFFF"
-	$"FFFFFFFFDEDE34745F5E5E5E5E5E3E7434363436367F3E36383EDE28FFFFFFFF"
-	$"FFFFFF28DD743E5F5E5E5E5E5E5F75343E7E3E343E363E3638363EDE28FFFFFF"
-	$"FFFFDD003E5F5E5E5E5E5E5E5E5F747436363E7E7E7E3E383638383E02DDFFFF"
-	$"FFFF005F745E5E5E5E5E5E5E5E5F5534343436363E363E36383E38387F00FFFF"
-	$"FFD528365E5E5EB25E925E92744E5634343634363636383E363E7F9E3E02DDFF"
-	$"FFDF5F3E5E5EB25E925E5E5F6E565634343436363636363E7F383EDD9E7E00FF"
-	$"B5005F5E5EB25E5E925E925F5457343436363436363636387F3E387FDD9E00B5"
-	$"DDDF5F5F925E92B25E925E5F3434343434363636363638363E7FDDBFDC7F28DD"
-	$"067E36745F92925E925E9273363634363634363636383638363E7FDCBF9EDD06"
-	$"DE5F3636745E92929292925E737474743E3E36363636383838367FDCBF247F28"
-	$"283E363836945E9272927292925E5F925E5F3E3636383836383E7FBFBFDCDC00"
-	$"005F38363636745F927292925E92925E925F3E363836383836DDBFBFBFDCDC00"
-	$"DE3E38363836387473927292925E925E5E5E3E38363836383EDC5FBFBFDCDDDE"
-	$"DD7F3E383638363E93725E92925E925E925E5F3E383838383EDCDCBFBFDE7FDE"
-	$"D5283E3638363E73925E92925E925E925E5E5F3E383638383EDD7FDCBF7F28D5"
-	$"B5005F3E3838365F92925E925E925E5E5E5E7E38363938387F7F7FBFDCDC00FF"
-	$"FF287E7E38363E5F925E925EB25EB25E5E5E5F7E3838383EDCDDDCBFBF2602FF"
-	$"FFDD027E38383E935EB25E925E5E5E5E5E5E5E7F38383EDCBFBFBFBFBF00DDFF"
-	$"FFFF007E3E387E5EB25E5E5EB25E5E5E5E5E5E7E3E3EDCBFBF5FBFBFDD00FFFF"
-	$"FFFFD5005F3E3E5E5EB25E5E5E5E5E5E5E5E5EBFDCBF5FBE5FBFBFDC00D4FFFF"
-	$"FFFFFFDEDD7F7E5F5E5E5E5E5E5E5E5E5E5EBE5E5F5EBF5FBEBFBF28DEFFFFFF"
-	$"FFFFFFFF28DE5F7E5E5E5E5E5E5E5E5E5E5F5EBF5EBFBEBFBFBF2828FFFFFFFF"
-	$"FFFFFFFFFF28DE7E5F5F5E5E5E5E5E5E5EBE5F5EBFBE5FBFDC28DFFFFFFFFFFF"
-	$"FFFFFFFFFFFFDE00DC7EDC5F5E5EBF5FBF5FBFDCDCDCBFDD00DEFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFD50000DC5FDDDDDC7F9E9E9E7F9EDC0028D5FFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFDD0200DEDD7E7E7E7EDD280000D5FFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFB5D5DEDE000028D5DEFFFFFFFFFFFFFFFFFFFFFFFF"
-};
-
-resource mini_icon array {
-	$"B4B4B4B4DD007F5F7EDE00B4B4B4B4B4"
-	$"B4B4B4003E5F5F3E3636367EDEB4B4B4"
-	$"B4B4DE745E5E5E7436367F363E28B4B4"
-	$"B4005F5E5E5E5F74367E7E38383EDDB4"
-	$"D5365EB292924E343636363E3E9E02B4"
-	$"005EB25E5E5F5734363636383E7F9EB5"
-	$"7E74925E5E733636343638383EDC9E06"
-	$"3E38949292925E925F3638363EBFDC00"
-	$"3E36367492925E5E5E383838DCBFDCDE"
-	$"283636735E9292925E3E3638DDDC7FD5"
-	$"287E365F5E5E5E5E5E7E383EDDBF26B4"
-	$"B47E385E5E5E5E5E5E7E3EBF5FBF00B4"
-	$"B4DE7F5F5E5E5E5E5E5E5E5FBF28B4B4"
-	$"B4B4287E5F5E5E5EBE5EBEBF28B4B4B4"
-	$"B4B4B4D5005FDD7F9E7FDC28B4B4B4B4"
-	$"B4B4B4B4B4B5DE0028DEB4B4B4B4B4B4"
-};
-
-#endif // HAIKU_TARGET_PLATFORM_HAIKU
-
 resource app_signature "application/x-vnd.Haiku-Locale";
 
 resource app_version {
@@ -197,3 +135,4 @@ resource app_version {
 };
 
 resource app_flags B_SINGLE_LAUNCH;
+
diff --git a/src/preferences/mail/e-mail.rdef b/src/preferences/mail/e-mail.rdef
index bcc48554b7..f182e1b43a 100644
--- a/src/preferences/mail/e-mail.rdef
+++ b/src/preferences/mail/e-mail.rdef
@@ -15,11 +15,9 @@ resource app_version {
 	internal = 3,
 
 	short_info = "E-mail",
-	long_info = "E-mail ©2005-2008 Haiku"
+	long_info = "E-mail ©2005-2009 Haiku"
 };
 
-#ifdef HAIKU_TARGET_PLATFORM_HAIKU
-
 resource vector_icon {
 	$"6E63696619050004006A020006063C55F93D5C9ABF48EE3E484E4B6A43C35976"
 	$"495F849385EAF7FFA2A5B7C2C2A0BCCCDC748994FF829AB2020006033B9EE13B"
@@ -64,63 +62,3 @@ resource vector_icon {
 	$"0114000A150115000A160116000A170117000A18011800"
 };
 
-#else // HAIKU_TARGET_PLATFORM_HAIKU
-
-resource large_icon {
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFF0000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFF003FFD0000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFF003F0000FDFD0000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFF003F3FFDFD0000FDFD0000FFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFF003F3FFDFDFDFDFDFDFDFDFD0000FFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFF003F3FFDFDFDFDFDFDFDFDFDFDFDFD0000FFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFF003F3FFDFDFDFDFDFDFDFDFDFDFDFDFDFDFD0000FFFFFFFFFFFFFFFF"
-	$"FFFFFF003F3FFDFDFDFDFDFD0000FDFDFDFDFDFDFDFDFDFD0000FFFFFFFFFFFF"
-	$"FFFF00FDFDFDFDFDFDFDFDFD00000000FDFDFDFDFDFDFDFDFDFD0000FFFFFFFF"
-	$"FFFFFF0000FDFDFDFDFDFD007B7B00FD0000FDFDFDFDFDFDD898D8FD0000FFFF"
-	$"FFFF0F0F0F0000FDFDFDFD00DA7B7B00FDFDFDFDFDFDFDFD2D2D2DFDFD00000F"
-	$"FFFFFFFF0F0F0F0000FD002B2CDA7B0000FDFDFDFDFDFDFDD82DD8FDF8000F0F"
-	$"FFFFFFFFFFFF0F0F0F00002B2F2F00FDFDFDFDFDFDFDFDFDFDFDFDF8000F0FFF"
-	$"FFFFFFFFFFFFFFFF0F002B2CEB2F00FDFDFDFDFDFDFDFDFDFDFDF8000F0FFFFF"
-	$"FFFFFFFFFFFFFFFFFF002B2F2F0000FDFDFDFDFDFDFDFDFDFDF8000F0FFFFFFF"
-	$"FFFFFFFFFFFFFFFF002B2CEB2F000F0000FDFDFDFDFDFDFDF8000F0FFFFFFFFF"
-	$"FFFF000000FFFFFF002B2F2F00FF0F0F0F0000FDFDFDFDF8000F0FFFFFFFFFFF"
-	$"FF007B7B7B00FF002B2CEB2F00FFFFFF0F0F0F0000F8F8000F0FFFFFFFFFFFFF"
-	$"007B7B7BDA00FF002B2F2F00FFFFFFFFFFFF0F0F0F00000F0FFFFFFFFFFFFFFF"
-	$"002B2CDA7B7B002B2CEB2F00FFFFFFFFFFFFFFFF0F0F0F0FFFFFFFFFFFFFFFFF"
-	$"FF002B2CDA7B2B2CEB2F00FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FF002B2CDA7B2B2CEB2F00FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFF002B2C2B2B2F2F00FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFF002B2C2B2B2F2F00FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFF002B2CEB2F00FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFF002B2CEB2F00FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFF002B2F000E0F0F0F0F0F0F0F0F0FFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFF0000000E0F0F0F0F0F0F0F0F0F0FFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-};
-
-resource mini_icon {
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFF00FFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFF003F0000FFFFFFFFFFFFFFFF"
-	$"FFFFFF003F0011FD0000FFFFFFFFFFFF"
-	$"FFFF003FFDFDFDFDFDFD0000FFFFFFFF"
-	$"FF003FFDFDFD0000FDFDFDFD0000FFFF"
-	$"FFFF0000FD007B000000FD982DFD0000"
-	$"FFFF0F0F00002F00FDFDFDFDD8F8000F"
-	$"FFFFFFFF002F0000FDFDFDFDF8000FFF"
-	$"FF00FF00002F000F0000FDF8000FFFFF"
-	$"002B00002F00FFFF0F0F00000FFFFFFF"
-	$"002B7B2CEB00FFFFFFFF0F0FFFFFFFFF"
-	$"FF002B2F00FFFFFFFFFFFFFFFFFFFFFF"
-	$"FF002B2F00FFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFF00000F0F0F0F0FFFFFFFFFFFFFFF"
-};
-
-#endif // HAIKU_TARGET_PLATFORM_HAIKU
-
-
-resource(1, "BEOS:FILE_TYPES") message;
diff --git a/src/preferences/media/media.rdef b/src/preferences/media/media.rdef
index 42f535420d..779d56d95d 100644
--- a/src/preferences/media/media.rdef
+++ b/src/preferences/media/media.rdef
@@ -13,15 +13,13 @@ resource app_version {
 	internal = 0,
 
 	short_info = "Media", 
-	long_info  = "Media ©2003-2006 Haiku"
+	long_info  = "Media ©2003-2009 Haiku"
 };
 
 resource app_flags B_SINGLE_LAUNCH;
 
 resource file_types message;
 
-#ifdef HAIKU_TARGET_PLATFORM_HAIKU
-
 resource vector_icon {
 	$"6E6369660A0500040063020006023A9CFB3B0744BD682D3CF09A498CD74A42F0"
 	$"00798291FF5B697D0200060239D8C838576FBB1EA33C90064B3B284A08CD0024"
@@ -43,61 +41,3 @@ resource vector_icon {
 	$"040A07010920372A0A08010A20372A0A09010B20372A"
 };
 
-#else // HAIKU_TARGET_PLATFORM_HAIKU
-
-resource large_icon {
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF00FFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF00FFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF00FFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF00FFFFFFFFFFFF00FFFFFFFFFFFFFF"
-	$"FFFFFF000000FFFFFFFF0000FF000000FF00FFFFFFFFFF00FFFFFFFFFFFFFFFF"
-	$"FFFF003F1C1C0000FF001C1C000B1B1C0000FFFFFFFF00FFFFFFFFFFFFFFFFFF"
-	$"FF003F1C1C1C1C00001C1C1C1C1C0B0B1C000000FF00FFFFFFFFFFFFFFFFFFFF"
-	$"003F3F1C1C1C1C003F1C1C1C1C1C1C1C0B0019190000FFFFFFFFFFFFFFFFFFFF"
-	$"0017183F3F1C1C00153F3F1C1C1C1C1C1C000B000F00FFFFFFFFFFFFFFFFFFFF"
-	$"00171718173F3F001515153F3F1C1C1C1C00001A000000FFFFFFFFFFFFFFFFFF"
-	$"0011000000171100150A0A15163F3F1C1C061111111100FFFFFFFFFFFFFFFFFF"
-	$"0000080900111100150A860A0A15153F3F1C1C1C110F00FFFFFFFFFFFFFFFFFF"
-	$"0000080F0B081100150A8686860A0A15153F3F11000000FFFFFFFFFFFFFFFFFF"
-	$"0011000A0F091100150A86606086860A0A1C15007B7B00FFFFFFFFFFFFFFFFFF"
-	$"0017110809111100150A8660608686ADAD3F1500DA7B7B000000FFFFFFFFFFFF"
-	$"0017171717171100150A8660608686ADAD3F002B2CDA7B001C1C0000FFFFFFFF"
-	$"000017172D181100150A8660608686ADAD3F002B2F2F001C1C1C1C1C0000FFFF"
-	$"FFFF000017171100150A8660608686ADAD002B2CEB2F001C1C1C1C1C1C1100FF"
-	$"FFFFFFFF00001100153F3F60608686ADAD002B2F2F00183F3F1C1C1C110F00FF"
-	$"FFFFFFFFFFFF00001515153F3F8686AD002B2CEB2F001718173F3F110F0F00FF"
-	$"FFFFFFFFFFFFFF1103030000003F3FAD002B2F2F001100000017110F0F0F00FF"
-	$"FFFFFFFFFFFFFFFF11007B7B7B0015002B2CEB2F000008090011110F0F0F00FF"
-	$"FFFFFFFFFFFFFFFF007B7B7BDA0015002B2F2F000000080F0B08110F0F0F00FF"
-	$"FFFFFFFFFFFFFFFF002B2CDA7B7B002B2CEB2F000011000A0F09110F0F0F00FF"
-	$"FFFFFFFFFFFFFFFFFF002B2CDA7B2B2CEB2F000F001711080911110F0F0F00FF"
-	$"FFFFFFFFFFFFFFFFFF002B2CDA7B2B2CEB2F0005001717171717110F0F0F000F"
-	$"FFFFFFFFFFFFFFFFFFFF002B2C2B2B2F2F001111000017172D18110F0F000F0F"
-	$"FFFFFFFFFFFFFFFFFFFF002B2C2B2B2F2F00FFFFFFFF00001717110F000F0FFF"
-	$"FFFFFFFFFFFFFFFFFFFFFF002B2CEB2F00FFFFFFFFFFFFFF000011000F0FFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFF002B2CEB2F00FFFFFFFFFFFFFFFFFF000F0FFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFF002B2F000E0F0F0F0F0F0F0F0F0FFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFF00000E0F0F0F0F0F0F0F0F0F0FFFFFFFFFFFFF"
-};
-
-resource mini_icon {
-	$"FFFFFFFFFFFFFFFFFF00FFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFF00FFFFFFFFFFFF"
-	$"FFFFFFFFFF0000FFFF00FFFF00FFFFFF"
-	$"FFFFFF04041E1E000000FF00FFFFFFFF"
-	$"FF0404043F3F1E1E1E0006FFFFFFFFFF"
-	$"043F3F0519193F3F1E001E01FFFFFFFF"
-	$"040E1A05190A0A193F3F1600FFFFFFFF"
-	$"04041A05190A600A0A19007B00FFFFFF"
-	$"041A1A05190A6086AD19002F0004FFFF"
-	$"04041A0519D38686AD002F001B1B04FF"
-	$"FFFF04001919003F86002F003F0F04FF"
-	$"FFFFFFFF02002B00002F001A040F04FF"
-	$"FFFFFFFFFF002B7B2CEB001A0E0F04FF"
-	$"FFFFFFFFFFFF002B2F00041B1A0F040F"
-	$"FFFFFFFFFFFF002B2F00FF0404040F0F"
-	$"FFFFFFFFFFFFFF00000E0F0F0F0FFFFF"
-};
-
-#endif // HAIKU_TARGET_PLATFORM_HAIKU
-
diff --git a/src/preferences/mouse/Mouse.rdef b/src/preferences/mouse/Mouse.rdef
index ebcbd15f23..7239ead3a3 100644
--- a/src/preferences/mouse/Mouse.rdef
+++ b/src/preferences/mouse/Mouse.rdef
@@ -35,3 +35,4 @@ resource vector_icon {
 	$"01031001178422040A020101000A030102000A0001041001178100040A060104"
 	$"123FE3AA0000000000003FDFFC41DB9540107701178100040A04010300"
 };
+
diff --git a/src/preferences/network/Network.rdef b/src/preferences/network/Network.rdef
index aa3093da6d..6175bdf9af 100644
--- a/src/preferences/network/Network.rdef
+++ b/src/preferences/network/Network.rdef
@@ -12,7 +12,7 @@ resource app_version {
 	internal = 0,
 
 	short_info = "Network",
-	long_info = "Network ©2007-2008 Haiku"
+	long_info = "Network ©2007-2009 Haiku"
 };
 
 resource vector_icon {
diff --git a/src/preferences/network_old/Network.rdef b/src/preferences/network_old/Network.rdef
index e09488d77f..0f80a3843c 100644
--- a/src/preferences/network_old/Network.rdef
+++ b/src/preferences/network_old/Network.rdef
@@ -1,62 +1,4 @@
 
-resource(1, "BEOS:FILE_TYPES") message;
-
-resource(101, "BEOS:L:STD_ICON") #'ICON' array
-{
-	$"FFFFFFFFFFFFFFFFFFFFFFFF0000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFF00BEBE0000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFF00BEBEBEBEBE0000FFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFF00BEBEBEBEBEBEBEBE00FFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFF00BEBEBEBEBEBEBEBE2600FFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFF00BEBEBEBEBEBEBEBE262500FFFFFFFFFFFFFFFFFFFFFF0E1C"
-	$"FFFFFFFFFFFF001B1BBEBEBEBEBEBE26252500FFFFFFFFFFFFFFFFFFFF0E1C0F"
-	$"FFFFFFFFFFFF00150F1B1BBEBEBE2625252600FFFFFFFFFFFFFFFFFF080F0FFF"
-	$"FFFFFFFFFFFF00150F1B161B1B2625252625000000FFFFFFFFFFFF000809FFFF"
-	$"FFFFFFFFFFFF0015251B16152526252526250000000000FFFFFF000800FFFFFF"
-	$"FFFFFFFFFFFF00152524251500002625252600FFFF00000000000000FFFFFFFF"
-	$"FFFFFFFFFFFF00150F2524007B7B00262525000A0BFFFF00000000FFFFFFFFFF"
-	$"FFFFFFFFFFFF00150F1B1600DA7B7B002526000A0BFFFFFFFF00000000FFFFFF"
-	$"FFFFFFFFFFFF0015041C002B2CDA7B0025000A0BFFFF0000FFFFFF00000000FF"
-	$"FFFFFFFFFFFF00150404002B2F2F0025000B0BFFFF00BEBE0000FFFFFF000000"
-	$"FFFFFFFFFFFF001504002B2B2F2F00000B0AFFFF00BEBEBEBEBE0000FFFF0000"
-	$"FFFFFFFFFFFFFF001B002B2F2F00000B0BFFFF00BEBEBEBEBEBEBEBE00000000"
-	$"FFFFFFFFFFFFFFFF002B2CEB2F000A0BFFFF00BEBEBEBEBEBEBEBE26000000FF"
-	$"FFFF000000FFFFFF002B2F2F000A0BFFFF00BEBEBEBEBEBEBEBE26250000FFFF"
-	$"FF007B7B7B00FF002B2CEB2F00FFFFFF001B1BBEBEBEBEBEBE26252500FFFFFF"
-	$"007B7B7BDA00FF002B2F2F00FFFFFFFF00150F1B1BBEBEBE2625252600FFFFFF"
-	$"002B2CDA7B7B002B2CEB2F00FFFFFFFF00150F1B161B1B262525262500FFFFFF"
-	$"FF002B2CDA7B2B2CEB2F00FFFFFFFFFF0015251B161525262525262500FFFFFF"
-	$"FF002B2CDA7B2B2CEB2F00FFFFFFFFFF001525242515262525262526000BFFFF"
-	$"FFFF002B2C2B2B2F2F00FFFFFFFFFFFF00150F252415262526252625000B0A0B"
-	$"FFFF002B2C2B2B2F2F00FFFFFFFFFFFF00150F1B1615252625262526000A0BFF"
-	$"FFFFFF002B2CEB2F00FFFFFFFFFFFFFF0015041C15152526252625000B0AFFFF"
-	$"FFFFFF002B2CEB2F00FFFFFFFFFFFFFF00150404051525262526000A0BFFFFFF"
-	$"FFFFFFFF002B2F001111111111111111001504040515252625000A0BFFFFFFFF"
-	$"FFFFFFFF0000001111111111111111111100000404152526000B0BFFFFFFFFFF"
-	$"FFFFFFFFFF111111111111111111111111111100001525000A0BFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF00000A0BFFFFFFFFFFFFFF"
-};
-
-resource(101, "BEOS:M:STD_ICON") #'MICN' array
-{
-	$"FFFFFFFFFF000000FFFFFFFFFFFFFFFF"
-	$"FFFFFFFF0000BEBE0000FFFFFFFFFFFF"
-	$"FFFFFF0000BEBEBE2600FFFFFFFFFF0E"
-	$"FFFFFF000E1615252600FFFFFFFF080F"
-	$"FFFFFF000E160F2625000000FF0000FF"
-	$"FFFFFF000E000000250000000000FFFF"
-	$"FFFFFF000E007B0000000B0000000000"
-	$"FFFFFF000E002F00000B00BEBE000000"
-	$"FFFFFF00002F00000A00BEBEBE260100"
-	$"00000000002F000B000FBEBE262500FF"
-	$"002B7B002F00FFFF000E1615252600FF"
-	$"002B7B2CEB00FFFF000E25162526000A"
-	$"FF002B2F00FFFFFF000E16152526000B"
-	$"FF002B2F00FFFFFF0004041525000BFF"
-	$"FFFF00000E0F0F1111000015000BFFFF"
-	$"FFFF111111111111111111000AFFFFFF"
-};
-
 resource(1, "BEOS:APP_SIG") #'MIMS' "application/x-vnd.Haiku-Network";
 
 resource(1, "BEOS:APP_VERSION") #'APPV' array
@@ -86,3 +28,4 @@ resource(1, "BEOS:APP_VERSION") #'APPV' array
 };
 
 resource(1, "BEOS:APP_FLAGS") #'APPF' $"00000000";
+
diff --git a/src/preferences/print/Printers.rdef b/src/preferences/print/Printers.rdef
index 30eb079508..879c9f5b89 100644
--- a/src/preferences/print/Printers.rdef
+++ b/src/preferences/print/Printers.rdef
@@ -15,11 +15,9 @@ resource app_version {
 	internal = 0,
 
 	short_info = "Printers",
-	long_info = "Printers ©2001-2007 Haiku"
+	long_info = "Printers ©2001-2009 Haiku"
 };
 
-#ifdef HAIKU_TARGET_PLATFORM_HAIKU
-
 resource vector_icon {
 	$"6E6369660B050002001602B76E71BBF8593D1210B8A7674742A04ABEFB00AEFF"
 	$"E1053802001603373333B9333339333337333348E54F4B555400FFBFE5FF9B02"
@@ -42,66 +40,6 @@ resource vector_icon {
 	$"0A010A00"
 };
 
-#else // HAIKU_TARGET_PLATFORM_HAIKU
-
-resource(101, "BEOS:L:STD_ICON") #'ICON' array {
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFF0000FFFF0404FFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFF003F3F00043F3F0404FFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFF003F1717113F3FFE3F3F0404FFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFF003F1717113FFEFEFEFEFE3F3F0404FFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFF003F1717113FFDFEFEFEFEFEFEFE3F3F0404FFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFF003F1717113FFDFDFDFDFEFEFEFEFEFEFEFEFE04FFFFFFFF"
-	$"FFFFFFFFFFFFFF003F1717113F62FDFDFDFDFDFDFEFEFEFEFEFEFE04FFFFFFFF"
-	$"FFFFFFFFFFFF003F1717113F626262FDFDFDFDFDFDFDFEFEFEFE0000FFFFFFFF"
-	$"FFFFFFFFFF003F1717113F626262626262FDFDFDFDFDFDFDFE0B11170000FFFF"
-	$"FFFFFFFF003F1717113F898962626262626262FDFDFDFDFD0B1117171700FFFF"
-	$"FFFFFF003F17171711118989898962626262626262FDFD0B111717170B00FFFF"
-	$"FFFF003F17173F1717171111898989896262626262620B111717170B0B00FFFF"
-	$"FF003F171717113F3F1717170000898989896262623F171717170B0B0B00FFFF"
-	$"003F171717171711113F3F007B7B0011898989893F171717170B0B0B0B000BFF"
-	$"003F3F171717171717111100DA7B7B001111893F171717170B0B0B0B0B000B0B"
-	$"0011113F3F1717171717002B2BDA7B00171711171717170B0B0B0B0B0B000B0B"
-	$"00111111113F3F171717002B2F2F003F3F17171717170B0B0B0B0B0B0B000B0B"
-	$"001111111111113F3F002B2CEB2F0011113F1717170B0B0B0B0B0B0B000B0B0B"
-	$"001111111111111111002B2F2F001717171117170B0B0B0B0B0B0B000B0B0BFF"
-	$"001111113F111111002B2CEB2F0017171717170B0B0B0B0B0B0B000B0B0BFFFF"
-	$"00110000001C1C11002B2F2F003F3F1717170B0B0B0B0B0B0B000B0B0BFFFFFF"
-	$"00007B7B7B001C002B2CEB2F0011113F170B0B0B0B0B0B0B000B0B0BFFFFFFFF"
-	$"007B7B7BDA001C002B2F2F00111111110B0B0B0B0B0B0B000B0B0BFFFFFFFFFF"
-	$"002B2CDA7B7B002B2CEB2F001C1111110B0B0B0B0B0B000B0B0BFFFFFFFFFFFF"
-	$"FF002B2CDA7B2B2CEB2F001C1C0511110B0B0B0B0B000B0B0BFFFFFFFFFFFFFF"
-	$"FF002B2CDA7B2B2CEB2F003F050511110B0B0B0B000B0B0BFFFFFFFFFFFFFFFF"
-	$"FFFF002B2C2B2B2F2F001105050511110B0B0B000B0B0BFFFFFFFFFFFFFFFFFF"
-	$"FFFF002B2C2B2B2F2F001105001111110B0B000B0B0BFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFF002B2CEB2F000B00000B0000110B000B0B0BFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFF002B2CEB2F000B0B0B0B0B0B00000B0B0BFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFF002B2F000F0F0F0F0F0F0F0F0F0FFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFF0000000F0F0F0F0F0F0F0F0F0F0FFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-};
-
-resource(101, "BEOS:M:STD_ICON") #'MICN' array {
-	$"FFFFFFFFFFFF0000000000FFFFFFFFFF"
-	$"FFFFFFFFFF003F1711FE110000FFFFFF"
-	$"FFFFFFFF003F1711FEFEFEFE1100FFFF"
-	$"FFFFFF003F1711FDFDFDFEFEFE1000FF"
-	$"FFFF003F1711626262FDFDFD101700FF"
-	$"FF003F171189896262626210171700FF"
-	$"003F17171711008989621017170B00FF"
-	$"003F3F1717007B00111017170B0B000B"
-	$"0011113F3F002F001717170B0B0B000B"
-	$"00111111002F001717170B0B0B000B0B"
-	$"00003F17002F003F170B0B0B000B0BFF"
-	$"002B00002F0011110B0B0B000B0BFFFF"
-	$"002B7B2CEB001C110B0B000B0BFFFFFF"
-	$"FF002B2F001103110B000B0BFFFFFFFF"
-	$"FF002B2F00000606040B0BFFFFFFFFFF"
-	$"FFFF00000E0F0F0F0FFFFFFFFFFFFFFF"
-};
-
-#endif // HAIKU_TARGET_PLATFORM_HAIKU
-
-resource(1, "BEOS:FILE_TYPES") message;
-
 resource(102, "check_mark_icon") #'BBMP' archive BBitmap {
 	"_frame" = rect { 0.00000, 0.00000, 15.0000, 19.0000 },
 	"_cspace" = 8200,
@@ -3623,3 +3561,4 @@ resource(2, "network_icon") #'bits' array
 	$"80FF808080FF808080FF808080FF808080FF808080FF808080FF808080FF8080"
 	$"80FF808080FF808080FF808080FF808080FF808080FF"
 };
+
diff --git a/src/preferences/screen/Screen.rdef b/src/preferences/screen/Screen.rdef
index 62951cd029..566bf66b1b 100644
--- a/src/preferences/screen/Screen.rdef
+++ b/src/preferences/screen/Screen.rdef
@@ -15,11 +15,9 @@ resource app_version {
 	internal = 0,
 
 	short_info = "Screen",
-	long_info  = "Screen ©2001-2006 Haiku"
+	long_info  = "Screen ©2001-2009 Haiku"
 };
 
-#ifdef HAIKU_TARGET_PLATFORM_HAIKU
-
 resource vector_icon {
 	$"6E6369660B03010000020016023CC7EE389BC0BA16573E39B04977C842ADC700"
 	$"FFFFD3020006023C529D3753A2B8966F3D9D084B6044496AAF00474747FFA5A0"
@@ -37,60 +35,3 @@ resource vector_icon {
 	$"0304000A070107000A080105000A090106000A0A010B1815FF0117822004"
 };
 
-#else // HAIKU_TARGET_PLATFORM_HAIKU
-
-resource large_icon {
-	$"FFFFFFFFFFFF00FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFF001B0000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFF003F1B1C1B0000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFF0015153F1B1C1B0000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFF00150A16153F3F1B1C0000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFF00150A0B0B15153F1B1C1B0000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFF00150A0B000B0A16153F1B1C1B0000FFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFF00150A0B0000000B0A16153F3F1B1C0000FFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFF00150A0B00000000000B0A16153F3F1B1C0000FFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFF00150A0B000000000000000B0A16153F3F1B1C0000FFFFFFFFFFFFFF"
-	$"FFFFFFFF00150A0B0000000000000000000A0B15153F3F1B1C00FFFFFFFFFFFF"
-	$"FFFFFFFF00150A0B00000000000000000000000A0B15163F3F3F00FFFFFFFFFF"
-	$"FFFFFFFF00150A0B000000000000000000000000000B0B15150F00FFFFFFFFFF"
-	$"FFFFFFFF00150A0B000000007B7B00000000000000001B16150F00FFFFFFFFFF"
-	$"FFFFFFFF00150A0B00000000DA7B7B000000000000001B16150F00FFFFFFFFFF"
-	$"FFFFFFFF00150A0B0000002B2BDA7B000000000000001C15150F00FFFFFFFFFF"
-	$"FFFFFFFF00150A0B0000002B2F2F00000000000000001C15150F00FFFFFFFFFF"
-	$"FFFFFFFF00150A0B00002B2CEB2F00000000000000001C16150F00FFFFFFFFFF"
-	$"FFFFFFFF00150B0A00002B2F2F0000000000000000001C16150F00FFFFFFFFFF"
-	$"FFFFFFFF00150A0B002B2CEB2F0000000000000000001C16150F00FFFFFFFFFF"
-	$"FFFF000000150A1B002B2F2F000000000000000000001C15160F00FFFFFFFFFF"
-	$"FF007B7B7B0015002B2CEB2F000000000000000000001C16140F00FFFFFFFFFF"
-	$"007B7B7BDA0000002B2F2F001B0000000000000000001C15150F00FFFFFFFFFF"
-	$"002B2CDA7B7B002B2CEB2F001B1B1B000000000000001C15160F00FFFFFFFFFF"
-	$"FF002B2CDA7B2B2CEB2F0015151B1B1B1B00000000001C15150F00FFFFFFFFFF"
-	$"FF002B2CDA7B2B2CEB2F00000015151B1B1C1C0000001C15150F00FFFFFFFFFF"
-	$"FFFF002B2C2B2B2F2F00FFFFFF000015151C1B1C1C001B15160F00FFFFFFFFFF"
-	$"FFFF002B2C2B2B2F2F00FFFFFFFFFF000015151C1B1C1C15150F00FFFFFFFFFF"
-	$"FFFFFF002B2CEB2F00FFFFFFFFFFFFFFFF000015151C1B16150F00FFFFFFFFFF"
-	$"FFFFFF002B2CEB2F00FFFFFFFFFFFFFFFFFFFF0000151515160E00FFFFFFFFFF"
-	$"FFFFFFFF002B2F000E0F0F0F0F0F0F0F0E0FFFFFFF000015150F00FFFFFFFFFF"
-	$"FFFFFFFF0000000E0F0F0F0F0F0F0F0E0F0FFFFFFFFFFF000000FFFFFFFFFFFF"
-};
-
-resource mini_icon {
-	$"FFFFFF0000FFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFF001B1B0000FFFFFFFFFFFFFFFFFF"
-	$"FFFF000F151B1C0000FFFFFFFFFFFFFF"
-	$"FFFF000F000F151B1B0000FFFFFFFFFF"
-	$"FFFF000F0000000F151B1C0000FFFFFF"
-	$"FFFF000E00000000000F151B1C00FFFF"
-	$"FFFF000F000000000000000F1500FFFF"
-	$"FFFF000F00007B000000001B1500FFFF"
-	$"FFFF000F002B2F000000001C1500FFFF"
-	$"FFFF000F002F00000000001C1500FFFF"
-	$"FF0000002B2F00000000001C1500FFFF"
-	$"002B002B2F0000000000001C1400FFFF"
-	$"002B7B2CEB001C1C0000001C1600FFFF"
-	$"FF002B2F000015151C1C001C1500FFFF"
-	$"FFFF2B2F00FF000015151B1C1500FFFF"
-	$"FFFF00000E0F0F0F000000000000FFFF"
-};
-
-#endif // HAIKU_TARGET_PLATFORM_HAIKU
diff --git a/src/preferences/screensaver/ScreenSaver.rdef b/src/preferences/screensaver/ScreenSaver.rdef
index c99ad478bb..ce724374b2 100644
--- a/src/preferences/screensaver/ScreenSaver.rdef
+++ b/src/preferences/screensaver/ScreenSaver.rdef
@@ -3,8 +3,6 @@ resource app_signature "application/x-vnd.Haiku-ScreenSaver";
 
 resource app_flags B_SINGLE_LAUNCH;
 
-resource(1, "BEOS:FILE_TYPES") message;
-
 resource app_version {
 	major  = 1,
 	middle = 0,
@@ -17,11 +15,9 @@ resource app_version {
 	internal = 0,
 
 	short_info = "ScreenSaver",
-	long_info = "ScreenSaver ©2004-2006 Haiku"
+	long_info = "ScreenSaver ©2004-2009 Haiku"
 };
 
-#ifdef HAIKU_TARGET_PLATFORM_HAIKU
-
 resource vector_icon {
 	$"6E6369660C03010000020016023C529D3753A2B8966F3D9D084BA044496AAF00"
 	$"2BFF95020006023C529D3753A2B8966F3D9D084BA044496AAF00474747FFA5A0"
@@ -52,61 +48,3 @@ resource vector_icon {
 	$"030F0E0D000A000212101815FF01178220040A0001111800150117842004"
 };
 
-#else // HAIKU_TARGET_PLATFORM_HAIKU
-
-resource large_icon {
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF000000FFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFF00000000000000000000FFFFFFFFFFFFFFFF00FFFFFFFFFFFF"
-	$"FFFFFFFF0000001B3F3F3F3F3F3F3F3F3F0000FFFFFFFFFF00FFFF000000FFFF"
-	$"FFFFFF001B3F1B3F3F1B3F1C1B161919193F3F0000FFFF000000FFFFFF00FFFF"
-	$"FFFF003F3F1B1C1B3F3F3F3F1C1B1C161619193F1C0000FFFFFFFFFF00FFFFFF"
-	$"FFFF003F153F3F1B3F1B1C1C3F3F1C161616161919193F00FFFFFF000000FFFF"
-	$"FFFF003F3F3F3F3F3F1B1C3F1C1C3F3F1C1B1C161619193F00FFFFFFFFFFFFFF"
-	$"FFFF003F3F3F3F3F3F3F3F3F1C1B1C1C3F3F3F1B1C16163F3F00FFFFFFFFFFFF"
-	$"FF003F3F3F3F153F3F3F3F3F3F1B1C3F1C1C3F3F3F16163F3F3F00FFFFFFFFFF"
-	$"FF003F3F3F3F1515153F3F3F3F3F3F3F1C3F1C1C1B1C3F3F3F3F3F00FFFFFFFF"
-	$"FF003F3F3F1517171715153F3F3F3F3F3F3F3F3F1C1C3F1C3F3F3F00FFFFFFFF"
-	$"FF003F3F3F15171717171715153F3F3F3F3F3F3F3F3F1C3F3F3F3F3F00FFFFFF"
-	$"FF003F3F3F1517173F3F1717171500003F3F3F3F3F3F3F3F3F0E3F3F00FFFFFF"
-	$"003F3F3F3F15173F3F3F3F3F3F007B7B003F3F3F3F3F3F3F0E0F3F3F00FFFFFF"
-	$"003F3F3F3F17173F3F3F3F3F3F00DA7B7B00153F3F3F3F3F0F0E3F3F00FFFFFF"
-	$"003F0000000000003F3F3F3F002B2CDA7B003F3F3F3F113F3F0F0E3F3F00FFFF"
-	$"000000150A0A1C000000003F002B2F2F003F3F113F3F113F3F0F0F3F3F00FFFF"
-	$"FFFF00150A0A1C00000000002B2CEB2F003F3F113F3F113F3F3F3F3F3F0000FF"
-	$"FFFF00150A0A1C00000000002B2F2F003F3F3F113F3F113F3F3F3F00000000FF"
-	$"FFFF00150A0B1C000000002B2CEB2F00003F113F3F3F113F3F3F0000FFFFFFFF"
-	$"FFFF00150000001B1C00002B2F2F00000000123F3F3F113F3F000000FFFFFFFF"
-	$"FFFF00007B7B7B001B002B2CEB2F00000000123F3F3F113F3F000F00FFFFFFFF"
-	$"FFFF007B7B7BDA0015002B2F2F000000000000003F3F3F11000F0F001111FFFF"
-	$"FFFF002B2CDA7B7B002B2CEB2F001B000000000000003F3F000F0F00111111FF"
-	$"FFFFFF002B2CDA7B2B2CEB2F001B1C1C1B0000001B1500000F0F0F0011111111"
-	$"FFFFFF002B2CDA7B2B2CEB2F0015151C1B1C1C001B16150F0F0E0F0011111111"
-	$"FFFFFFFF002B2C2B2B2F2F0000151615151C1B1C1C15150F0F0F0F0011111111"
-	$"FFFFFFFF002B2C2B2B2F2F00FF0000151615151C1B16150F0F0F0E00111111FF"
-	$"FFFFFFFFFF002B2CEB2F00FFFFFFFF00001515151615150F0F0F00111111FFFF"
-	$"FFFFFFFFFF002B2CEB2F00FFFFFFFFFFFF0000151515160E0F00111111FFFFFF"
-	$"FFFFFFFFFFFF002B2F000F0F0F0F0F0F0FFFFF000016150F00111111FFFFFFFF"
-	$"FFFFFFFFFFFF0000000F0F0F0F0F0F0F0F0FFFFFFF000000111111FFFFFFFFFF"
-};
-
-resource mini_icon {
-	$"FFFFFFFF0404040404FFFFFF00FFFFFF"
-	$"FFFF00003F3F3F3F3F00FFFF00FF00FF"
-	$"FF003F1C3F3F1C1C16190A00FFFF00FF"
-	$"FF003F3F3F1C1C3F1C1C161900FFFFFF"
-	$"FF043F153F3F3F1C1C3F3F163F00FFFF"
-	$"043F3F1717153F3F3F3F1C3F3F0AFFFF"
-	$"043F3F173F1717153F3F3F3F3F3F00FF"
-	$"003F3F173F3F00003F153F3F0F3F00FF"
-	$"00000A0A0000007B003F3F113F0F04FF"
-	$"FF000A1C0000002F003F3F113F3F00FF"
-	$"FF00000000002F0000123F113F00FFFF"
-	$"FF002B00002F000000003F3F000611FF"
-	$"FF002B7B2CEB001C1B000A000F061111"
-	$"FFFF002B2F000016151B1C150F061111"
-	$"FFFF002B2F00FF06001516150F0011FF"
-	$"FFFFFF00000F0F0FFF0600060011FFFF"
-};
-
-#endif // HAIKU_TARGET_PLATFORM_HAIKU
-
diff --git a/src/preferences/sounds/Sounds.rdef b/src/preferences/sounds/Sounds.rdef
index 665b31a20e..c10e2d236c 100644
--- a/src/preferences/sounds/Sounds.rdef
+++ b/src/preferences/sounds/Sounds.rdef
@@ -15,13 +15,9 @@ resource app_version {
 	internal = 0,
 
 	short_info = "Sounds",
-	long_info  = "Sounds ©2003-2007 Haiku"
+	long_info  = "Sounds ©2003-2009 Haiku"
 };
 
-resource file_types message;
-
-#ifdef HAIKU_TARGET_PLATFORM_HAIKU
-
 resource vector_icon {
 	$"6E636966080500020106023880000000000000003CE00049400045000000F7C0"
 	$"7FFFA76B240201060237000000000000000036FFFF49400049E00000C7873BFF"
@@ -46,62 +42,3 @@ resource vector_icon {
 	$"06000A000309080700"
 };
 
-#else // HAIKU_TARGET_PLATFORM_HAIKU
-
-resource large_icon
-{
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF0000FFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF0000FFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF00000000FFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF000000000000FFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF0000000000000000FFFF0000FF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000FF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000FF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000FF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF0000FFFF0000000000000000FF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF0000FFFFFFFF000000000000FF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF0000FFFFFFFFFFFF00000000FF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF0000FFFFFFFFFFFFFFFF0000FF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFF0000FFFFFFFFFF0000FFFFFFFFFFFFFFFF0000FF"
-	$"FFFFFFFFFFFFFFFFFFFFFF007B7B00FFFFFFFF0000FFFFFFFFFFFFFFFF0000FF"
-	$"FFFFFFFFFFFFFFFFFFFFFF00DA7B7B0000FFFF0000FFFFFFFFFFFFFFFF0000FF"
-	$"FFFFFFFFFFFFFFFFFFFF002B2CDA7B000A00000000FFFFFFFFFFFFFFFF0000FF"
-	$"FFFFFFFFFFFFFFFFFFFF002B2F2F000F0A0A0A0000FFFFFFFFFFFFFFFF0000FF"
-	$"FFFFFFFFFFFFFFFFFF002B2CEB2F00100F0A0A0000FFFFFFFFFFFFFFFF0000FF"
-	$"FFFFFFFFFFFFFFFFFF002B2F2F0019100F0A0A0A00FFFFFFFFFFFFFFFF0000FF"
-	$"FFFFFFFFFFFFFFFF002B2CEB2F0010100F0A0A0A00FFFFFFFFFFFFFFFF0000FF"
-	$"FFFF000000FFFFFF002B2F2F0010100F0A0A0A0000FFFF00000000FFFF0000FF"
-	$"FF007B7B7B00FF002B2CEB2F000F0F0A0A0A0A000F00000A0A0A0A00000000FF"
-	$"007B7B7BDA00FF002B2F2F00000A0A0A0A00000F000A0A0F0F0F0A0A0A0000FF"
-	$"002B2CDA7B7B002B2CEB2F00FF000000000F0F0F000A101019100F0A0A0000FF"
-	$"FF002B2CDA7B2B2CEB2F00FFFFFFFF0F0F0F0F000A0F103F19100F0A0A0A00FF"
-	$"FF002B2CDA7B2B2CEB2F00FFFFFFFFFFFFFFFF000A0F101910100F0A0A0A00FF"
-	$"FFFF002B2C2B2B2F2F00FFFFFFFFFFFFFFFFFFFF000F0F10100F0A0A0A0000FF"
-	$"FFFF002B2C2B2B2F2F00FFFFFFFFFFFFFFFFFFFF000A0F0F0F0A0A0A0A000FFF"
-	$"FFFFFF002B2CEB2F00FFFFFFFFFFFFFFFFFFFFFFFF00000A0A0A0A00000F0F0F"
-	$"FFFFFF002B2CEB2F00FFFFFFFFFFFFFFFFFFFFFFFFFFFF000000000F0F0F0F0F"
-	$"FFFFFFFF002B2F000E0F0F0F0F0F0F0F0F0FFFFFFFFFFFFFFF0F0F0F0F0F0FFF"
-	$"FFFFFFFF0000000E0F0F0F0F0F0F0F0F0F0FFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-};
-
-resource mini_icon
-{
-	$"FFFFFFFFFFFFFFFFFF00FFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFF000000FFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFF000000000000FF"
-	$"FFFFFFFFFFFFFFFFFF000000000000FF"
-	$"FFFFFFFFFFFFFFFFFF00FFFF000000FF"
-	$"FFFFFFFFFFFFFFFFFF00FFFFFFFF00FF"
-	$"FFFFFFFFFFFF00FFFF00FFFFFFFF00FF"
-	$"FFFFFFFFFF007B00FF00FFFFFFFF00FF"
-	$"FFFFFFFFFF002F000000FFFFFFFF00FF"
-	$"FFFFFFFF002F000F0A00FFFFFFFF00FF"
-	$"FF00FF00002F000A0A000F00000000FF"
-	$"002B00002F000000000F003F0F0A00FF"
-	$"002B7B2CEB00FF0F0F0F000E0A0A00FF"
-	$"FF002B2F00FFFFFFFFFFFF0000000F0F"
-	$"FF002B2F00FFFFFFFFFFFFFF0F0F0FFF"
-	$"FFFF00000E0F0F0F0FFFFFFFFFFFFFFF"
-};
-
-#endif // HAIKU_TARGET_PLATFORM_HAIKU
diff --git a/src/preferences/time/Time.rdef b/src/preferences/time/Time.rdef
index abd2dd8ae8..5114e7fc96 100644
--- a/src/preferences/time/Time.rdef
+++ b/src/preferences/time/Time.rdef
@@ -15,11 +15,9 @@ resource app_version {
 	internal = 0,
 
 	short_info = "Time",
-	long_info  = "Time ©2002-2006 Haiku"
+	long_info  = "Time ©2002-2009 Haiku"
 };
 
-#ifdef HAIKU_TARGET_PLATFORM_HAIKU
-
 resource vector_icon {
 	$"6E636966080500040071020006043D88273D8827BED4133ED4134B1000C6104F"
 	$"4104A3A585B3FEFFE1026667FF037072020006033B9EE13B9EE1BB9EE13B9EE1"
@@ -51,60 +49,3 @@ resource vector_icon {
 	$"0D0C0B0A09123EFE743DD3DA3559283F4C7FBECFC1C690AD0117832204"
 };
 
-#else // HAIKU_TARGET_PLATFORM_HAIKU
-
-resource large_icon {
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFF0000000000FFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFF00006D474747470000FFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFF006D6D47474747473F470000FFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFF006D6D47474747473F4747474700FFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFF003F3F3F3F3F47473F47474747476D00FFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFF003F94949494943F3F47474747476D6D6D00FFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFF009494940000009494943F3F47476D6D6D6D00FFFFFFFFFF"
-	$"FFFFFFFFFFFFFF009494000086868600009494943F6D6D6D6D949400FFFFFFFF"
-	$"FFFFFFFFFFFF0094940086863F3F868686000094943F6D6D94949400FFFFFFFF"
-	$"FFFFFFFFFFFF009400863F3F3F3F00868686860094943F9494947F00FFFFFFFF"
-	$"FFFFFFFFFF00949400863F3F3F6060606086868600943F94947F7F7F00FFFFFF"
-	$"FFFFFFFFFF009400863F3F3F60600060606086860094946D7F7F7F7F00FFFFFF"
-	$"FFFFFFFFFF009400863F3F6000000060603F60868600946D7F7F7F7F00FFFFFF"
-	$"FFFFFFFFFF00940086003F007B7B00603F3F3F86860094947F7F7F7F00FFFFFF"
-	$"FFFFFFFFFF009400863F3F00DA7B7B00603F6060868600947F7F7F7F00FFFFFF"
-	$"FFFFFFFFFF009400863F002B2CDA7B0060606060868600947F7F7F7F00FFFFFF"
-	$"FFFFFFFFFF009400863F002B2F2F000060606060868600947F7F7F7F00FFFFFF"
-	$"FFFFFFFFFF00949400002B2CEB2F006000006060868600947F7F7F7F01FFFFFF"
-	$"FFFFFFFFFF00949400002B2F2F00606060600000868601947F7F7F7F00FFFFFF"
-	$"FFFFFFFFFF009494002B2CEB2F00606060606086860194947F7F7F7F00FFFFFF"
-	$"FFFF000000009494002B2F2F0060006060608686860194947F7F7F7F00FFFFFF"
-	$"FF007B7B7B0094002B2CEB2F0086606060868686019494947F7F7F7F00FFFFFF"
-	$"007B7B7BDA0094002B2F2F000000868686860000949494947F7F7F7F01FFFFFF"
-	$"002B2CDA7B7B002B2CEB2F009494000000009494949494947F7F7F7F01FFFFFF"
-	$"FF002B2CDA7B2B2CEB2F00949494949494949494949494947F7F7F7F010FFFFF"
-	$"FF002B2CDA7B2B2CEB2F00949494949494949494949494947F7F7F7F010F0F0F"
-	$"FFFF002B2C2B2B2F2F00FF000094949494949494949494947F7F7F7F010E0F0F"
-	$"FFFF002B2C2B2B2F2F00FFFFFF00009494949494949494947F7F7F010E0F0FFF"
-	$"FFFFFF002B2CEB2F00FFFFFFFFFFFF0000949494949494947F7F000F0F0FFFFF"
-	$"FFFFFF002B2CEB2F00FFFFFFFFFFFFFFFF000094949494947F000F0F0FFFFFFF"
-	$"FFFFFFFF002B2F000E0F0F0F0F0F0F0F0E0FFF0000949494000F0F0FFFFFFFFF"
-	$"FFFFFFFF0000000E0F0F0F0F0F0F0F0E0F0FFFFFFF0000000F0F0FFFFFFFFFFF"
-};
-
-resource mini_icon {
-	$"FFFFFFFFFF0000000000FFFFFFFFFFFF"
-	$"FFFFFFFF006D6D4747470000FFFFFFFF"
-	$"FFFFFF006D94943F3F476D9400FFFFFF"
-	$"FFFF009494000000943F949400FFFFFF"
-	$"FFFF0094003F868600946D947F00FFFF"
-	$"FF0094003F6000868600947F7F00FFFF"
-	$"FF009400606000608600947F7F00FFFF"
-	$"FF00940060007B006086007F7F00FFFF"
-	$"FF00940060002F006086007F7F00FFFF"
-	$"FF009400002F00600086007F7F00FFFF"
-	$"FF009494002F00868600947F7F00FFFF"
-	$"002B00002F0000000094947F7F00FFFF"
-	$"002B7B2CEB0094949494947F7F000F0F"
-	$"FF002B2F000094949494947F00000F0F"
-	$"FF002B2F00FF000000949400000F0FFF"
-	$"FFFF00000E0F0F0F0F0000000F0FFFFF"
-};
-
-#endif // HAIKU_TARGET_PLATFORM_HAIKU
diff --git a/src/preferences/touchpad/Touchpad.rdef b/src/preferences/touchpad/Touchpad.rdef
index 715a20fb64..09ae9469dc 100644
--- a/src/preferences/touchpad/Touchpad.rdef
+++ b/src/preferences/touchpad/Touchpad.rdef
@@ -15,11 +15,9 @@ resource app_version {
 	internal = 0,
 
 	short_info = "Touchpad",
-	long_info  = "Touchpad ©2002-2008 Haiku"
+	long_info  = "Touchpad ©2002-2009 Haiku"
 };
 
-#ifdef HAIKU_TARGET_PLATFORM_HAIKU
-
 resource vector_icon {
 	$"6E636966080301000002000202AC6DA33A810CBCBF0CAEA9C248C4E546BB2A00"
 	$"01000000FF010000FF020016023D2328BA287D3B40A23E5D334837CE48FA2500"
@@ -38,64 +36,6 @@ resource vector_icon {
 	$"123FE3AA0000000000003FDFFC41DB9540107701178100040A04010300"
 };
 
-#else // HAIKU_TARGET_PLATFORM_HAIKU
-
-resource large_icon {
-	$"FFFFFFFFFFFF000000000000000000000EFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFF00000E0F0F0F0F0F0F0F0E0FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFF00000E0FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FF000E0FFFFFFFFFFFFF00000000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FF000EFFFFFFFFFFFF00111717180000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FF00000E0FFFFFFF00111717181717180000FFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFF00000E0F00111817171817180A3F170000FFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFF0000111717181717180A3F171718170000FFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFF00111717181717180A3F171718171718170000FFFFFFFFFFFFFFFF"
-	$"FFFFFFFF00111717181717180A3F171718171718171817170000FFFFFFFFFFFF"
-	$"FFFFFF00111717181717180A3F17171817171817183F171718170000FFFFFFFF"
-	$"FFFF003F1717181717180A3F1717181717181718171C3F171718110A00FFFFFF"
-	$"FFFF003F3F171718170B3F171700001817171817183F171718110A0B00FFFFFF"
-	$"FFFF0011113F3F170B3F1717005B5B001817171817181717110B0B0000FFFFFF"
-	$"FFFF00111111113F0A18171700DA5B5B00171817171817110B0A000B000FFFFF"
-	$"FFFF000A0B1111110A3F3F002B2CDA5B001717181718110A0B000A0B000FFFFF"
-	$"FFFF0011110A0B110A1111002B2FEB001817181717110B0B000A0B000F0FFFFF"
-	$"FFFF00111111110A0B11002B2B2F2F0017181717110B0B000A0B000F0F0EFFFF"
-	$"FFFFFF00001111111100002B2F2F003F3F1717110B0B000A0B000F0F0EFFFFFF"
-	$"FFFFFFFFFF00001111002B2CEB2F0011113F110A0B000A0B000F0F0FFFFFFFFF"
-	$"FFFFFF000000FF0000002B2F2F000A1111110B0B000A0B000F0F0EFFFFFFFFFF"
-	$"FFFF005B5B5B00FF002B2CEB2F00110A0B110A000B0B000F0E0FFFFFFFFFFFFF"
-	$"FF005B5B5BDA00FF002B2F2F00111111110A000B0B000E0F0FFFFFFFFFFFFFFF"
-	$"FF002B2CDA5B5B002B2CEB2F0000001111110B0A000F0F0FFFFFFFFFFFFFFFFF"
-	$"FFFF002B2CDA5B2B2CEB2F00FFFFFF0000110A000F0F0FFFFFFFFFFFFFFFFFFF"
-	$"FFFF002B2BDA5B2C2B2FEB00FFFFFFFFFF00000E0F0FFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFF002B2C2B2B2F2F00FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFF002B2C2B2B2F2F00FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFF002B2CEB2F00FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFF002B2CEB2F00FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFF002B2F000E0F0F0F0F0F0F0F0F0FFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFF0000000E0F0F0F0F0F0F0F0F0F0FFFFFFFFFFFFFFFFFFFFFFFFFFF"
-};
-
-resource mini_icon {
-	$"FF00000000000E0F0FFFFFFFFFFFFFFF"
-	$"000F0F0F000000FFFFFFFFFFFFFFFFFF"
-	$"000FFF001717180000FFFFFFFFFFFFFF"
-	$"FF0000171718170B3F0000FFFFFFFFFF"
-	$"FF00171718170B3F1717180000FFFFFF"
-	$"003F3F17170B3F17171817171800FFFF"
-	$"000A113F0A3F001717181717110B00FF"
-	$"00110A0B11005B00171817110B0A00FF"
-	$"000011110A002F003F17110B0A000FFF"
-	$"FFFF0000002F000A11110B0A000FFFFF"
-	$"FF00FFFF002F00110A0B0A000FFFFFFF"
-	$"002B00002F0000000A0B000FFFFFFFFF"
-	$"002B5B2CEB00FFFF00000EFFFFFFFFFF"
-	$"FF002B2F00FFFFFFFFFFFFFFFFFFFFFF"
-	$"FF002B2F00FFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFF00000E0F0F0F0FFFFFFFFFFFFFFF"
-};
-
-#endif // HAIKU_TARGET_PLATFORM_HAIKU
-
 resource(601, "double_click_bmap") #'bits' array {
 	$"424D06070000000000003A000000280000000E0000001E000000010018000000"
 	$"0000CC060000130B0000130B00000000000000000000FFFFFFFFD8D8D8000000"
@@ -302,3 +242,4 @@ resource(603, "acceleration_bmap") #'bits' array {
 	$"8C420000984100008C4200000842430000FF00008C4200000C4200008C420000"
 	$"484200"
 };
+
diff --git a/src/preferences/tracker/TrackerPreferences.rdef b/src/preferences/tracker/TrackerPreferences.rdef
index c7dab6f29b..2f1c15e747 100644
--- a/src/preferences/tracker/TrackerPreferences.rdef
+++ b/src/preferences/tracker/TrackerPreferences.rdef
@@ -18,8 +18,6 @@ resource app_version {
 
 resource app_flags B_SINGLE_LAUNCH;
 
-#ifdef HAIKU_TARGET_PLATFORM_HAIKU
-
 resource vector_icon {
 	$"6E636966120500040068020106023ECFFF0000000000003EFFFF486000474000"
 	$"00DDA771FEA97644020006033C0564379BD6B9B4043E12EF49C94948FD140087"
@@ -60,61 +58,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/preferences/virtualmemory/VirtualMemory.rdef b/src/preferences/virtualmemory/VirtualMemory.rdef
index ea8288ba25..ac057f02de 100644
--- a/src/preferences/virtualmemory/VirtualMemory.rdef
+++ b/src/preferences/virtualmemory/VirtualMemory.rdef
@@ -13,13 +13,11 @@ resource app_version {
 	internal = 0,
 
 	short_info = "VirtualMemory",
-	long_info  = "VirtualMemory ©2005-2007 Haiku"
+	long_info  = "VirtualMemory ©2005-2009 Haiku"
 };
 
 resource app_flags B_SINGLE_LAUNCH;
 
-#ifdef HAIKU_TARGET_PLATFORM_HAIKU
-
 resource vector_icon {
 	$"6E6369660603010000010100006A0533020006023A5D2C39F8B1B9DBF13A4C0F"
 	$"48AEEA4A809100747474FF3E3D3D020016023C40A33251B1B294FA3C81FE4956"
@@ -40,61 +38,3 @@ resource vector_icon {
 	$"178422040A050103023FC7130000000000003F9C00411D99451350"
 };
 
-#else // HAIKU_TARGET_PLATFORM_HAIKU
-
-resource large_icon {
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF00FFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF00FF00150000FFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFF003F00153F15150000FFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFF0000153F15151516150000FFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFF00FF00153F15151516151515160000FFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFF003F00153F15151516151515161515150000FFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFF0000153F1515151615151516151515163F0E00FF"
-	$"FFFFFFFFFFFFFFFFFFFF00FF00153F15151516151515161515151600000000FF"
-	$"FFFFFFFFFFFFFFFFFF003F00153F1515151615151516151515163F003F3F00FF"
-	$"FFFFFFFFFFFFFFFFFF0000153F1515151615151516151515163F0000003F00FF"
-	$"FFFFFFFFFFFFFF00FF00153F15151516151515161515151600000000001500FF"
-	$"FFFFFFFFFFFF003F00153F1515151615151516151515163F003F3F00001500FF"
-	$"FFFFFFFFFFFF0000153F1515000015161515151615153F0000003F000015000F"
-	$"FFFFFFFFFFFF00153F1515007B7B00151615151516000000000015000015000F"
-	$"FFFFFFFFFF00153F15151500DA7B7B00161515153F003F3F000015000015000F"
-	$"FFFFFFFFFF003F3F1515002B2BDA7B001516153F0000003F000015000F000FFF"
-	$"FFFFFFFFFF0015153F3F002B2F2F00151515000000000016000015000FFFFFFF"
-	$"FFFFFFFFFF00001515002B2B2F2F0015163F003F3F000015000015000FFFFFFF"
-	$"FFFFFFFFFF00150000002B2F2F0015153F0000003F000015000F000F0EFFFFFF"
-	$"FFFFFFFFFF000015002B2B2F2F003F3F0E0F000016000015000FFFFFFFFFFFFF"
-	$"FFFF000000FFFF00002B2F2F001515150F00160015000015000FFFFFFFFFFFFF"
-	$"FF007B7B7B00FF002B2CEB2F0000001500150F0015000F000F0FFFFFFFFFFFFF"
-	$"007B7B7BDA00FF002B2F2F0000151500150F000016000EFFFFFFFFFFFFFFFFFF"
-	$"002B2CDA7B7B002B2CEB2F00FF0000150F000F0015000FFFFFFFFFFFFFFFFFFF"
-	$"FF002B2CDA7B2B2CEB2F00FFFFFFFF00000E0F0F000F0FFFFFFFFFFFFFFFFFFF"
-	$"FF002B2CDA7B2B2CEB2F00FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFF002B2C2B2B2F2F00FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFF002B2C2B2B2F2F00FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFF002B2CEB2F00FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFF002B2CEB2F00FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFF002B2F000E0F0F0F0F0F0F0F0F0FFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFF0000000E0F0F0F0F0F0F0F0F0F0FFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-};
-
-resource mini_icon {
-	$"FFFFFFFFFFFFFF00000000FFFFFFFFFF"
-	$"FFFFFFFFFFFFFF00003F150000FFFFFF"
-	$"FFFFFFFFFF0000003F151515160000FF"
-	$"FFFFFFFFFF00003F1515151615151500"
-	$"FFFFFF0000003F151515161515000000"
-	$"FFFFFF00003F1515151615153F150000"
-	$"FFFFFF003F15001515161500000800FF"
-	$"FFFF003F15007B0015153F15000000FF"
-	$"FFFF003F3F002F001500000800FF00FF"
-	$"FFFF000E002F00163F15000000FFFFFF"
-	$"FF00FF00002F003F0E0900FF00FFFFFF"
-	$"002B00002F00000E090000FFFFFFFFFF"
-	$"002B7B2CEB00FF0000FF00FFFFFFFFFF"
-	$"FF002B2F00FFFFFFFFFFFFFFFFFFFFFF"
-	$"FF002B2F00FFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFF00000E0F0F0F0FFFFFFFFFFFFFFF"
-};
-
-#endif // HAIKU_TARGET_PLATFORM_HAIKU
-