diff --git a/data/artwork/icons/App_Chart b/data/artwork/icons/App_Chart
new file mode 100644
index 0000000000..164395d887
Binary files /dev/null and b/data/artwork/icons/App_Chart differ
diff --git a/src/tests/kits/game/chart/Chart.rdef b/src/tests/kits/game/chart/Chart.rdef
index 120e974873..90f7ac6254 100644
--- a/src/tests/kits/game/chart/Chart.rdef
+++ b/src/tests/kits/game/chart/Chart.rdef
@@ -1,83 +1,80 @@
 
-resource(101, "BEOS:L:STD_ICON") #'ICON' array {
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFF000000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFF00002727200000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFF002727272727202000FF0000000000000000FFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFF00272727272720206000F99898F9BD9898980000FFFFFFFFFFFFFFFF"
-	$"FFFFFF0027272727272720206000BDBD98989898BDBDBDBD0000FFFFFFFFFFFF"
-	$"FFFFFF0027272727272020206000F9F9F9F998F9F9F9F9BDBDBD00FFFFFFFFFF"
-	$"FFFFFF0027272727272020606000F9FAFAF9FAFAFAF9F9F9F9BDBD00FFFFFFFF"
-	$"FFFFFFFF002727272020606000FAFAFAFAF9FAF900000000F9F998BD00FFFFFF"
-	$"FFFFFFFF002020202060602000FAFAFAFAF9FA002A2A2F2F00F99898F900FFFF"
-	$"FFFFFFFFFF00002020200000F9FAFAFAF9F9F9001E2A2F2F00F9F9989800FFFF"
-	$"FFFFFFFFFF0098000000FAFAF9F9F9F9F9FAF9001E2A2A2F00F9FAF998F900FF"
-	$"FFFFFFFFFF0098F9F9FAFAFAFAFAFAFAFAF9FA007B1E2A2F00FAFAF9989800FF"
-	$"FFFFFFFF009898F9F9F9F9F9F9F9F9F9F9FAF9F900000000F9FAFAFAF9989800"
-	$"FFFFFFFF00BDF9F9FAFAFAF9F9FAF9F9FAFAFAF9FAF9F9FAF9F9F9FAF9F9BD00"
-	$"FFFFFFFF00BDBDBDFAFAFAFAF9FAF9FAFAFAFAF9FAFAF9FAFAFAF9F9FAF99800"
-	$"FFFFFFFF00BDBDBDFAFAFAFAF9FAF9F9FAFAFAF9FAFAF9FAFAFAF9F9F9F99800"
-	$"FFFFFFFF00BD98F9FAFAFAFAF9FAF9FAF9F9F9F9F9F9F9FAFAFAF9FAF9F99800"
-	$"FFFFFFFF0098BDF9FAF9FAFAF9FAF9F9F9FAFAFAFAF9F9FAFAFAF9FAF9989800"
-	$"FFFFFFFF0098BDF9F9F9F9F9F9FAFAF9FAFAFAFAFAF9F9F9FAF9F9F9F998BD00"
-	$"FFFFFFFF0098BDF9F9FAFAFAF9F9F9F9F9F9FAFAFAF9F9F9F9F9F9F9FA98BD00"
-	$"FFFFFFFFFF00BDBDF9F9FAFAFAF9F9FAFAF9F9F9F9F9FAFAFAF9FAFABD9800FF"
-	$"FFFFFFFFFF00F9BDF9F9FAFAFAF9FAFAFAFAF9F9F9F9FAFAFAF9F9FABDBD00FF"
-	$"FFFFFFFFFFFF00BDF9F9F9FAFAF9F9FAFAF9F9FAFAF9F9FAF9F9F998BD00FFFF"
-	$"FFFFFFFFFFFF00BD98F9F9F9FAFAF9F9FAF9FAFAFAFAF9F9F9FAF9989800FFFF"
-	$"FFFFFFFFFFFFFF00BDF9F9F9F9FAFAF9F9F9FAFAFAFAF9FAFAF9989800FFFFFF"
-	$"FFFFFFFFFFFFFFFF009898F9F9F9F9F9F9F9F9FAFAF9F9F9F9989800FFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFF009898BDBDF9F9F9F9F9F9F9F9BD98989800FFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFF000098989898F9F9F9F9F998BDF90000FFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFF0000BD98BDBDBD9898980000FFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFF0000000000000000FFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
+resource app_signature "application/x-vnd.Be.ChartDemo";
+
+resource app_flags B_MULTIPLE_LAUNCH;
+
+resource app_version {
+	major  = 1,
+	middle = 1,
+	minor  = 0,
+
+	variety = B_APPV_FINAL,
+	internal = 1,
+
+	short_info = "Chart",
+	long_info = "Chart ©2008 Haiku"
 };
 
-resource(101, "BEOS:M:STD_ICON") #'MICN' array {
-	$"FFFF00000000FFFFFFFFFFFFFFFFFFFF"
-	$"FF00272727200000000000FFFFFFFFFF"
-	$"FF002727272000BD9898BD0000FFFFFF"
-	$"FF002727206000FAF9F9F9F9BD00FFFF"
-	$"FF002020602000FAF9000000F99800FF"
-	$"FFFF00000000F9F9F9002A00F9F900FF"
-	$"FF0098F9F9F9F9F9F9000000F9FA9800"
-	$"FF00BDBDFAFAFAFAFAF9F9F9FAF9F900"
-	$"FF00BDF9FAFAFAFAF9F9F9FAFAFAF900"
-	$"FF0098F9F9F9FAF9FAFAF9F9F9F99800"
-	$"FFFF00BDF9FAF9FAF9F9F9FAF9FA00FF"
-	$"FFFF00BDF9FAF9FAF9FAF9FAF99800FF"
-	$"FFFFFF00F9F9FAF9F9FAFAFAF900FFFF"
-	$"FFFFFFFF0000BDF9F9F9F90000FFFFFF"
-	$"FFFFFFFFFFFF0000000000FFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
+
+#ifdef HAIKU_TARGET_PLATFORM_HAIKU
+
+resource vector_icon {
+	$"6E636966050500020106033D398C0000000000003D398C4A3B884A3BC800FFCB"
+	$"00CCFFCB00FFE6860003FFFF00020106043B3186000000000000BB318646F198"
+	$"46FB8B0000005066000050B20000FFFFCCCCFF02010604391288000000000000"
+	$"B912884AF4614882F30080000066800000A5FF0000FFFFFFFF150204442AC710"
+	$"2ABB9F2A2A442ABB9F2AC710445EBB9F5EC7105E5E445EC7105EBB9F020BBD5B"
+	$"BC8ABD40BC22BD5BBC8ABD1DBD2BBD1DBD2BBD5DBD5EBDDEBDC3BD9EBD91BEA9"
+	$"BDC3BFB0BD41BF01BD94C037BCB9C034BACCC092BB83C023BAC3C001BAAEC011"
+	$"BAB8C001BAAEBF23BAAEBF23BAAEBEF9BAE4BEA8BB51BED1BB1ABDF5BB51BCB8"
+	$"BB78BD57BB1EBCB8BB78BCEBBB78BCEBBB78BCD3BB89BCA5BBABBCBDBB9BBCA5"
+	$"BC420209BAC8BD6EBA45BD4DBC78BD4EBFD9BD0A3CBD2BBFE5BD06C001BD01BF"
+	$"F3BD03C004BCF3C00ABCD8C007BCE6BF84BC34BD67BC7DBE1BBCA7BBF1BC24B9"
+	$"C3BAD2BB70BAD2B96B34B93FBB75B93FBB11B934BB63B920BB42B92BBB52B8E4"
+	$"BBB7B97BBC5DB946BC0EB9C3BCCA020CC289BA5AC23EBA6BC289BA5AC303BAAB"
+	$"C303BAABC30FBAB2C32ABABFC31EBAB8C33EBABBC368BAB5C354BAB8C36BBA9A"
+	$"C371BA63C36FBA7FC32DBA1FC2A6B998C2EBB9DDC2EAB97DC370B947C32CB962"
+	$"C373B913C33EB8C5C374B8DFC2C1B8C1C1C8B8BAC244B8BEC1D0B8BEC1DCB8C5"
+	$"C1D6B8C1C149B8EEC13BB9D6C13BB94BC15FBA12C1AABA8DC186BA50C1F4BA7B"
+	$"0205BDE8BE26BE5CBEEFBDE8BE26BD6EBE26BD6EBE26BCC8BF3CBD6EC2D038C2"
+	$"7FBE4EC321BEC8C2A6BE8BC321BF03C22DBE39C13BBE5BC1D1BDF8C0140205C4"
+	$"77C029C44DC04FC47EBF4EC353BE10C3EDBEA7C298BE10C2D9C033C24BBFBDC2"
+	$"D9C033C2D0C034C2D0C034C325C079C3F5C099C388C099C421C0730204BB38BE"
+	$"26BCB8BE62B9B8BDE8B887BEB3B8C5BE26B7DAC049B990C1F1B901C1A0BA1DC2"
+	$"41BBDBC241BAABC241BD0AC2410205C621C2BCC516C1C2C64BC2B5C69BC2A7C6"
+	$"72C2ADC7D7C21DC78DBF03C7FDC094C71FBEC1C636BE39C689BE9AC64ABE18C4"
+	$"F1BE9EC4DDBE8BC4E4C0C30208BF88C112BF2CC112C02DC067C1C8C03EC132C0"
+	$"DFC1C8BFD2C22DBF0DC22DBF8DC1D0BE58C0DFBD46C16BBDCAC02FBD46BF1ABE"
+	$"D1BF66BE63BF49BF28BFA6BFD9BF76BF80BF5FC00FBF18C0A3BF18C03FBF1EC0"
+	$"A0BF2CC099BF26C09DBF11C0F70205C39AC348C2D5C499C3DFC2C8C39AC1624A"
+	$"C1E9C308C104C0FDC0FDC1F5C0F9C091C162BFBAC22D41C1C840C29FBFF6C2E4"
+	$"BFCFC2A3C0C9C31D0206BD98C5A8BDF9C651BD90C54ABD83C48CBD8AC4ECBD47"
+	$"C372BB10C292BC7647BAB3C2BDBA45C30BBA78C2B5B9E2C464BDABC7B7BCE0C6"
+	$"F9BDFDC7A8BE9EC78DBE4EC79CBF04C68B0206C71FC60DC733C615C69EC60DC5"
+	$"9052C632C6E6C55EC704C542C75BC542C71CC575C781C5DAC7CBC5A8C7A5C6E0"
+	$"C7CBC78EC690C6F6C730C77EC66CC75BC621C76CC647C747C61B0206C8FBC1F1"
+	$"C86AC1EBC916C1D0C94CC18BC931C1ADC93DC141C922C0ADC931C0F7C90EC0A6"
+	$"C8E6C099C8FBC0A0C8CCC092C896C085C8B142C853C0C0C830C150C814C0EDC8"
+	$"48C1CD0207C8DBC3ADC92FC35AC879C37FC78DC39AC7EFC363C792C3A7C799C3"
+	$"C2C795C3B5C78DC3D4C77AC3F4C784C3E4C77AC471C862C539C82CC4C9C88AC5"
+	$"3BC8DBC542C8B4C53FC951C50AC9BAC2F7C9BAC2F7C923C2F70203C112C48CC1"
+	$"4FC5A8C0CCC345BE10C4CABDD9C2D2BE26C580BFCFC6B0BF03C6D7C09951020C"
+	$"C9A6BF03C9A6BF03C87EBE70C84E36C8DFBCE5C833BBAAC7FEBB75C818BB90C7"
+	$"BABB7553BBBBC772BB7753BC14C6F5BC68C72FBC31C6F2BC765238C6EFBC83C6"
+	$"9EBC64C636BC9BC672BC5BC636BC9BC636BCEBC636BCEBC678BD6CC7EABDFDC7"
+	$"56BDFDC807BE1CC941BFB1C92BBF89C96ABFB3C9BABFBAC993BFB6C9CCBFA3C9"
+	$"EDBF73C9DDBF8BC9EDBF730204C2A6C507C3A2C518C1F6C56CC112C65EC192C5"
+	$"CFC108C761C2F7C86CC20DC8C6C3A2C853C478C728C43CC7AFC4C9C615020652"
+	$"C427C6E2C52EC6D2C3F8C69BC39AC6B7C3CAC615C38CC507C371C58DC37FC4BA"
+	$"C39EC465C3EBC491C39DC45DC421C450C48CC456C456C46DC54EC5A8C5F8C509"
+	$"C5B9C645C5880208C309BCD8C27ABDBEC310BCAEC321BC5DC319BC86C317BC53"
+	$"C302BC40C30CBC4AC294BBC1C108BB9DC1A3BB9DC111BBA5C126BBB2C11DBBAA"
+	$"C108BBA5C0CCBB89C0EABB96C0B7BB93C08DBBA8C0A3BB9DC08BBBBCC085BBE5"
+	$"C088BBD0C0D4BC7D02042F26BAF426B6FF26262F26B6FF26BAF42F38B6FF38BA"
+	$"F438382F38BAF438B6FF02044E32C63532C472324A364ABAE24ABCA54E3AC472"
+	$"3AC6353A523652BCA552BAE2060A0001001001178400040A010100000A021201"
+	$"02030405060708090A0B0C0D0E0F1011122020210A000213141001178400040A"
+	$"030113000A04011400"
 };
 
-resource(1, "BEOS:APP_SIG") #'MIMS' "application/x-vnd.Be.ChartDemo";
-
-resource(1, "BEOS:APP_VERSION") #'APPV' array {
-	$"0000000000000000000000000000000000000000000000000000000000000000"
-	$"0000000000000000000000000000000000000000000000000000000000000000"
-	$"0000000000000000000000000000000000000000000000000000000000000000"
-	$"0000000000000000000000000000000000000000000000000000000000000000"
-	$"0000000000000000000000000000000000000000000000000000000000000000"
-	$"0000000000000000000000000000000000000000000000000000000000000000"
-	$"0000000000000000000000000000000000000000000000000000000000000000"
-	$"0000000000000000000000000000000000000000000000000000000000000000"
-	$"0000000000000000000000000000000000000000000000000000000000000000"
-	$"0000000000000000000000000000000000000000000000000000000000000000"
-	$"0000000000000000000000000000000000000000000000000000000000000000"
-	$"0000000000000000000000000000000000000000000000000000000000000000"
-	$"0000000000000000000000000000000000000000000000000000000000000000"
-	$"0000000000000000000000000000000000000000000000000000000000000000"
-	$"0000000000000000000000000000000000000000000000000000000000000000"
-	$"0000000000000000000000000000000000000000000000000000000000000000"
-	$"0000000000000000000000000000000000000000000000000000000000000000"
-	$"0000000000000000000000000000000000000000000000000000000000000000"
-	$"0000000000000000000000000000000000000000000000000000000000000000"
-	$"0000000000000000000000000000000000000000000000000000000000000000"
-	$"0000000000000000000000000000000000000000000000000000000000000000"
-	$"0000000000000000"
-};
-
-resource(1, "BEOS:APP_FLAGS") #'APPF' $"00000000";
+#endif // HAIKU_TARGET_PLATFORM_HAIKU