diff --git a/data/artwork/icons/App_Tracker b/data/artwork/icons/App_Tracker
index 6342f832a9..b9cc213b97 100644
Binary files a/data/artwork/icons/App_Tracker and b/data/artwork/icons/App_Tracker differ
diff --git a/src/apps/login/Login.rdef b/src/apps/login/Login.rdef
index aafa83aea7..fde2778ab8 100644
--- a/src/apps/login/Login.rdef
+++ b/src/apps/login/Login.rdef
@@ -16,42 +16,51 @@ resource app_version {
 resource app_flags B_SINGLE_LAUNCH;
 
 resource vector_icon {
-	$"6E636966120500040068020106023ECFFF0000000000003EFFFF486000474000"
+	$"6E636966130500040068020106023ECFFF0000000000003EFFFF486000474000"
 	$"00DDA771FEA97644020006033C0564379BD6B9B4043E12EF49C94948FD140087"
 	$"5B2FFFC58A50C4A97644020006023AA0B4B6910F3840E83C4EA54A20CC3C5E02"
 	$"00F4C597FFDAA47003D7A26E03DAA470020006033AC3B134D937B81B9A3E0BAC"
 	$"4B13774865BC00C28D59FFB6783BDCA26C3803A4703E020106023B46923A3AF8"
 	$"BC79A03DA299463C564592D600FDD6ABFFC48B540399632D03F8CCA102000602"
-	$"38586D38586DB9279239279249CD5B46BF4E00D4975BFFA06F40020016023AA1"
+	$"38586D38586DB92792392792498D5B463F4E00D4975BFFA06F40020016023AA1"
 	$"AE3A9018BAE9A13AAE8E491D7E4A50B500EDFFA505FF020016023228D0398DC3"
-	$"BD46803591CA48EEC34A35750091FFB5020016023A05CA3C319CBEA5C93C305F"
+	$"BD46803591CA48EEC34A35750091FFB50200160239A9723BF8C7BE99853C6598"
 	$"4A55B949E8F800FFFFE9020006023375F8391697BA971434E7134759DA498BDF"
-	$"00FFEA00FFFFB83017060BEA4B08335A3D594260525E4B61595B604DCD01C7B3"
-	$"5E425248464C4C4354380604AE302628262D24B418B63A222E2C2C0A05B639BC"
-	$"B92B372B36263426350605BA03342E38284030BF44B77141343E3838323A3436"
-	$"300608EEEE342E38323630BCFBBA973E3840304134BF44B77138284230C027B7"
-	$"0443363F3A38343A36363206033E5A224A26542A4A264C274C27592C06033BC5"
-	$"64B639C564B6395A305A22C48AB5CB592CC48AB5CB06156F6BEBB8BC03343038"
-	$"2A3036303E303A304232445234582A583C583846404A56425E345E4A5E444248"
-	$"3E4E424C425042525448584E4C4E604E563E545434543854B9B2C564B639C736"
-	$"B7B45A305A224A26542AC165B4740609BEFB02483E4E3EC431BF54513D523452"
-	$"36522EC564B639452749263D29353340314031C17ABADA463A4638463C444206"
-	$"0ADBDA0E4031C17ABADA4031303D3F3541333F37433846404A56425E345E4A5E"
-	$"4442463A463C46380606B60B32445234582A583C58384635413743333F303F06"
-	$"0BCFB83C5234522E52364E3E513DC431BF54484E424C425042525448584E4C4E"
-	$"604E563E545434543854B9B2C564B639C736B7B4C564B6390605BB033430382A"
-	$"3430353445273DB6954926C564B6394A264A26C165B4740204BE31B7FBBE31B7"
-	$"FBBE6BB89E3C32BE6EB958BDDCBB0FBC2FBC93BD1EBBE6BC2FBC93352F363135"
-	$"2F02063426B796B443BC88B5E9BE31B7FB3BB6C6BE31B7FB352F352F3631BC2F"
-	$"BC93BC2FBC93BADFBD862C3CB92D3C263C2632B4C7BC9D282A0204292CB6CE2C"
-	$"B65D2C28B8C728B83A28B9532931B65D31B6CE312BB8C72BB9532BB83A020430"
-	$"30B9D030B8EF302E322EB9BB2EBA9C3034B8EF34B9D034323232BA9C32B9BB0A"
-	$"06224C385738452C402C3C22380A04223C224C385738450A063451264A244B36"
-	$"54364634470A06243E244B264A2641344736460A042642264A345134480A0422"
-	$"38223C2C402C3C190A010100000A0001071001178402040A0200000A03010900"
-	$"0A020108000A05010A000A07010B000A04010C000A060105000A070106000A00"
-	$"01011001178402040A0B0101000A00020D0E1001178402040A09010E000A0A01"
-	$"0D000A000104000A0C0103000A000102000A00020F10000A0001111001178400"
-	$"040A0D0112000A0E0113000A0F0114000A100115000A11011600"
+	$"00FFEA00FFFFB830020106023B46923A3AF8BC79A03DA299463C564592D600FD"
+	$"D6ABFFC48B5419060BEA4B08335A3D594260525E4B61595B604DCD01C7B35E42"
+	$"5248464C4C4354380604AE302628262D24B418B63A222E2C2C0A0629362C362C"
+	$"37293A263726360605BA03342E38284030BF44B77141343E3838323A34363006"
+	$"08EEEE342E38323630BCFBBA973E3840304134BF44B77138284230C027B70443"
+	$"363F3A38343A36363206033E5A224A26542A4A264C274C27592C06033BC564B6"
+	$"39C564B6395A305A22C48AB5CB592CC48AB5CB06156FABEBB8BC033430382A30"
+	$"36313F313B314332445234582A583C583846444B4356475F395F4F5F4943483E"
+	$"4E424C425042525448584E4C4E604E563E545434543854B9B2C564B639C736B7"
+	$"B45A305A224A26542AC165B4740609BEFB02483E4E3EC431BF54513D52345236"
+	$"522EC564B639452749263D293533403140314436463AC1C8BCA5473C473D060A"
+	$"EBEA0E4031C17ABADA40312E3C2D4132462F45BB3DC27F38483F4B3E56425E34"
+	$"5E4A5E433C463A463C46380606B60B32445234582A583C583846354237443340"
+	$"303F060BCFB83C5234522E52364E3E513DC431BF54484E424C42504252544858"
+	$"4E4C4E604E563E545434543854B9B2C564B639C736B7B4C564B6390605BB0334"
+	$"30382A3430353445273DB6954926C564B6394A264A26C165B4740204BE31B7FB"
+	$"BE31B7FBBE6BB89E3C32BE6EB958BDDCBB0FBC2FBC93BD1EBBE6BC2FBC93352F"
+	$"3631352F02063426B796B443BC88B5E9BE31B7FB3BB6C6BE31B7FB352F352F36"
+	$"31BC2FBC93BC2FBC93BADFBD862C3CB92D3C263C2632B4C7BC9D282A0204292E"
+	$"2A2E282E2730272F2731293228322A322B302B312B2F02043030B9D030B8EF30"
+	$"2E322EB9BB2EBA9C3034B8EF34B9D034323232BA9C32B9BB0A06224C39573945"
+	$"2C402C3C22380A04223C224C385738450A063451264A244B3654364634470A06"
+	$"243E244B264A2641344736460A042642264A345134480A042238223C2C402C3C"
+	$"0609FA2A033939363D334034403240323EBA64BF2C313D303D313C3339373B36"
+	$"BDA7BBB6BDEDBBD90404FB2C3C2CBF482C3A3138353835BBAB353A2C3CB8AD3C"
+	$"2B3C1B0A010100000A0001071001178402040A0200000A0301092025200A0201"
+	$"08000A05010A000A07010B000A04010C000A060105000A070106000A00010110"
+	$"01178402040A0B0101000A000111124013B10000000000004000004400004000"
+	$"0001178400040A0D01120240155500000000000040000043F5554000000A0E01"
+	$"130240155500000000000040000043F5554000000A0F01140240155500000000"
+	$"000040000043F5554000000A1101160240155500000000000040000043F55540"
+	$"00000A1001150240155500000000000040000043F5554000000A00020D0E1001"
+	$"178402040A09010E000A0001170240C000000000000000400000C60000C00000"
+	$"0A120118023E20903A9FB0BDF7B741B2E5491686C9131B0A0A010D0240000000"
+	$"0000000000402C66000000C02B2A0A000104000A0C0103000A000102023F3E5C"
+	$"3B12A8BB12A83F3E5C4567D643FA000A00020F1000"
 };
 
diff --git a/src/apps/tracker/Tracker.rdef b/src/apps/tracker/Tracker.rdef
index f29a044ecc..666a8f21d9 100644
--- a/src/apps/tracker/Tracker.rdef
+++ b/src/apps/tracker/Tracker.rdef
@@ -29,42 +29,51 @@ resource file_types message {
 };
 
 resource vector_icon {
-	$"6E636966120500040068020106023ECFFF0000000000003EFFFF486000474000"
+	$"6E636966130500040068020106023ECFFF0000000000003EFFFF486000474000"
 	$"00DDA771FEA97644020006033C0564379BD6B9B4043E12EF49C94948FD140087"
 	$"5B2FFFC58A50C4A97644020006023AA0B4B6910F3840E83C4EA54A20CC3C5E02"
 	$"00F4C597FFDAA47003D7A26E03DAA470020006033AC3B134D937B81B9A3E0BAC"
 	$"4B13774865BC00C28D59FFB6783BDCA26C3803A4703E020106023B46923A3AF8"
 	$"BC79A03DA299463C564592D600FDD6ABFFC48B540399632D03F8CCA102000602"
-	$"38586D38586DB9279239279249CD5B46BF4E00D4975BFFA06F40020016023AA1"
+	$"38586D38586DB92792392792498D5B463F4E00D4975BFFA06F40020016023AA1"
 	$"AE3A9018BAE9A13AAE8E491D7E4A50B500EDFFA505FF020016023228D0398DC3"
-	$"BD46803591CA48EEC34A35750091FFB5020016023A05CA3C319CBEA5C93C305F"
+	$"BD46803591CA48EEC34A35750091FFB50200160239A9723BF8C7BE99853C6598"
 	$"4A55B949E8F800FFFFE9020006023375F8391697BA971434E7134759DA498BDF"
-	$"00FFEA00FFFFB83017060BEA4B08335A3D594260525E4B61595B604DCD01C7B3"
-	$"5E425248464C4C4354380604AE302628262D24B418B63A222E2C2C0A05B639BC"
-	$"B92B372B36263426350605BA03342E38284030BF44B77141343E3838323A3436"
-	$"300608EEEE342E38323630BCFBBA973E3840304134BF44B77138284230C027B7"
-	$"0443363F3A38343A36363206033E5A224A26542A4A264C274C27592C06033BC5"
-	$"64B639C564B6395A305A22C48AB5CB592CC48AB5CB06156F6BEBB8BC03343038"
-	$"2A3036303E303A304232445234582A583C583846404A56425E345E4A5E444248"
-	$"3E4E424C425042525448584E4C4E604E563E545434543854B9B2C564B639C736"
-	$"B7B45A305A224A26542AC165B4740609BEFB02483E4E3EC431BF54513D523452"
-	$"36522EC564B639452749263D29353340314031C17ABADA463A4638463C444206"
-	$"0ADBDA0E4031C17ABADA4031303D3F3541333F37433846404A56425E345E4A5E"
-	$"4442463A463C46380606B60B32445234582A583C58384635413743333F303F06"
-	$"0BCFB83C5234522E52364E3E513DC431BF54484E424C425042525448584E4C4E"
-	$"604E563E545434543854B9B2C564B639C736B7B4C564B6390605BB033430382A"
-	$"3430353445273DB6954926C564B6394A264A26C165B4740204BE31B7FBBE31B7"
-	$"FBBE6BB89E3C32BE6EB958BDDCBB0FBC2FBC93BD1EBBE6BC2FBC93352F363135"
-	$"2F02063426B796B443BC88B5E9BE31B7FB3BB6C6BE31B7FB352F352F3631BC2F"
-	$"BC93BC2FBC93BADFBD862C3CB92D3C263C2632B4C7BC9D282A0204292CB6CE2C"
-	$"B65D2C28B8C728B83A28B9532931B65D31B6CE312BB8C72BB9532BB83A020430"
-	$"30B9D030B8EF302E322EB9BB2EBA9C3034B8EF34B9D034323232BA9C32B9BB0A"
-	$"06224C385738452C402C3C22380A04223C224C385738450A063451264A244B36"
-	$"54364634470A06243E244B264A2641344736460A042642264A345134480A0422"
-	$"38223C2C402C3C190A010100000A0001071001178402040A0200000A03010900"
-	$"0A020108000A05010A000A07010B000A04010C000A060105000A070106000A00"
-	$"01011001178402040A0B0101000A00020D0E1001178402040A09010E000A0A01"
-	$"0D000A000104000A0C0103000A000102000A00020F10000A0001111001178400"
-	$"040A0D0112000A0E0113000A0F0114000A100115000A11011600"
+	$"00FFEA00FFFFB830020106023B46923A3AF8BC79A03DA299463C564592D600FD"
+	$"D6ABFFC48B5419060BEA4B08335A3D594260525E4B61595B604DCD01C7B35E42"
+	$"5248464C4C4354380604AE302628262D24B418B63A222E2C2C0A0629362C362C"
+	$"37293A263726360605BA03342E38284030BF44B77141343E3838323A34363006"
+	$"08EEEE342E38323630BCFBBA973E3840304134BF44B77138284230C027B70443"
+	$"363F3A38343A36363206033E5A224A26542A4A264C274C27592C06033BC564B6"
+	$"39C564B6395A305A22C48AB5CB592CC48AB5CB06156FABEBB8BC033430382A30"
+	$"36313F313B314332445234582A583C583846444B4356475F395F4F5F4943483E"
+	$"4E424C425042525448584E4C4E604E563E545434543854B9B2C564B639C736B7"
+	$"B45A305A224A26542AC165B4740609BEFB02483E4E3EC431BF54513D52345236"
+	$"522EC564B639452749263D293533403140314436463AC1C8BCA5473C473D060A"
+	$"EBEA0E4031C17ABADA40312E3C2D4132462F45BB3DC27F38483F4B3E56425E34"
+	$"5E4A5E433C463A463C46380606B60B32445234582A583C583846354237443340"
+	$"303F060BCFB83C5234522E52364E3E513DC431BF54484E424C42504252544858"
+	$"4E4C4E604E563E545434543854B9B2C564B639C736B7B4C564B6390605BB0334"
+	$"30382A3430353445273DB6954926C564B6394A264A26C165B4740204BE31B7FB"
+	$"BE31B7FBBE6BB89E3C32BE6EB958BDDCBB0FBC2FBC93BD1EBBE6BC2FBC93352F"
+	$"3631352F02063426B796B443BC88B5E9BE31B7FB3BB6C6BE31B7FB352F352F36"
+	$"31BC2FBC93BC2FBC93BADFBD862C3CB92D3C263C2632B4C7BC9D282A0204292E"
+	$"2A2E282E2730272F2731293228322A322B302B312B2F02043030B9D030B8EF30"
+	$"2E322EB9BB2EBA9C3034B8EF34B9D034323232BA9C32B9BB0A06224C39573945"
+	$"2C402C3C22380A04223C224C385738450A063451264A244B3654364634470A06"
+	$"243E244B264A2641344736460A042642264A345134480A042238223C2C402C3C"
+	$"0609FA2A033939363D334034403240323EBA64BF2C313D303D313C3339373B36"
+	$"BDA7BBB6BDEDBBD90404FB2C3C2CBF482C3A3138353835BBAB353A2C3CB8AD3C"
+	$"2B3C1B0A010100000A0001071001178402040A0200000A0301092025200A0201"
+	$"08000A05010A000A07010B000A04010C000A060105000A070106000A00010110"
+	$"01178402040A0B0101000A000111124013B10000000000004000004400004000"
+	$"0001178400040A0D01120240155500000000000040000043F5554000000A0E01"
+	$"130240155500000000000040000043F5554000000A0F01140240155500000000"
+	$"000040000043F5554000000A1101160240155500000000000040000043F55540"
+	$"00000A1001150240155500000000000040000043F5554000000A00020D0E1001"
+	$"178402040A09010E000A0001170240C000000000000000400000C60000C00000"
+	$"0A120118023E20903A9FB0BDF7B741B2E5491686C9131B0A0A010D0240000000"
+	$"0000000000402C66000000C02B2A0A000104000A0C0103000A000102023F3E5C"
+	$"3B12A8BB12A83F3E5C4567D643FA000A00020F1000"
 };
 
diff --git a/src/preferences/tracker/TrackerPreferences.rdef b/src/preferences/tracker/TrackerPreferences.rdef
index e36ee08e22..aea60ce98e 100644
--- a/src/preferences/tracker/TrackerPreferences.rdef
+++ b/src/preferences/tracker/TrackerPreferences.rdef
@@ -21,42 +21,51 @@ resource app_version {
 resource app_flags B_SINGLE_LAUNCH | B_BACKGROUND_APP;
 
 resource vector_icon {
-	$"6E636966120500040068020106023ECFFF0000000000003EFFFF486000474000"
+	$"6E636966130500040068020106023ECFFF0000000000003EFFFF486000474000"
 	$"00DDA771FEA97644020006033C0564379BD6B9B4043E12EF49C94948FD140087"
 	$"5B2FFFC58A50C4A97644020006023AA0B4B6910F3840E83C4EA54A20CC3C5E02"
 	$"00F4C597FFDAA47003D7A26E03DAA470020006033AC3B134D937B81B9A3E0BAC"
 	$"4B13774865BC00C28D59FFB6783BDCA26C3803A4703E020106023B46923A3AF8"
 	$"BC79A03DA299463C564592D600FDD6ABFFC48B540399632D03F8CCA102000602"
-	$"38586D38586DB9279239279249CD5B46BF4E00D4975BFFA06F40020016023AA1"
+	$"38586D38586DB92792392792498D5B463F4E00D4975BFFA06F40020016023AA1"
 	$"AE3A9018BAE9A13AAE8E491D7E4A50B500EDFFA505FF020016023228D0398DC3"
-	$"BD46803591CA48EEC34A35750091FFB5020016023A05CA3C319CBEA5C93C305F"
+	$"BD46803591CA48EEC34A35750091FFB50200160239A9723BF8C7BE99853C6598"
 	$"4A55B949E8F800FFFFE9020006023375F8391697BA971434E7134759DA498BDF"
-	$"00FFEA00FFFFB83017060BEA4B08335A3D594260525E4B61595B604DCD01C7B3"
-	$"5E425248464C4C4354380604AE302628262D24B418B63A222E2C2C0A05B639BC"
-	$"B92B372B36263426350605BA03342E38284030BF44B77141343E3838323A3436"
-	$"300608EEEE342E38323630BCFBBA973E3840304134BF44B77138284230C027B7"
-	$"0443363F3A38343A36363206033E5A224A26542A4A264C274C27592C06033BC5"
-	$"64B639C564B6395A305A22C48AB5CB592CC48AB5CB06156F6BEBB8BC03343038"
-	$"2A3036303E303A304232445234582A583C583846404A56425E345E4A5E444248"
-	$"3E4E424C425042525448584E4C4E604E563E545434543854B9B2C564B639C736"
-	$"B7B45A305A224A26542AC165B4740609BEFB02483E4E3EC431BF54513D523452"
-	$"36522EC564B639452749263D29353340314031C17ABADA463A4638463C444206"
-	$"0ADBDA0E4031C17ABADA4031303D3F3541333F37433846404A56425E345E4A5E"
-	$"4442463A463C46380606B60B32445234582A583C58384635413743333F303F06"
-	$"0BCFB83C5234522E52364E3E513DC431BF54484E424C425042525448584E4C4E"
-	$"604E563E545434543854B9B2C564B639C736B7B4C564B6390605BB033430382A"
-	$"3430353445273DB6954926C564B6394A264A26C165B4740204BE31B7FBBE31B7"
-	$"FBBE6BB89E3C32BE6EB958BDDCBB0FBC2FBC93BD1EBBE6BC2FBC93352F363135"
-	$"2F02063426B796B443BC88B5E9BE31B7FB3BB6C6BE31B7FB352F352F3631BC2F"
-	$"BC93BC2FBC93BADFBD862C3CB92D3C263C2632B4C7BC9D282A0204292CB6CE2C"
-	$"B65D2C28B8C728B83A28B9532931B65D31B6CE312BB8C72BB9532BB83A020430"
-	$"30B9D030B8EF302E322EB9BB2EBA9C3034B8EF34B9D034323232BA9C32B9BB0A"
-	$"06224C385738452C402C3C22380A04223C224C385738450A063451264A244B36"
-	$"54364634470A06243E244B264A2641344736460A042642264A345134480A0422"
-	$"38223C2C402C3C190A010100000A0001071001178402040A0200000A03010900"
-	$"0A020108000A05010A000A07010B000A04010C000A060105000A070106000A00"
-	$"01011001178402040A0B0101000A00020D0E1001178402040A09010E000A0A01"
-	$"0D000A000104000A0C0103000A000102000A00020F10000A0001111001178400"
-	$"040A0D0112000A0E0113000A0F0114000A100115000A11011600"
+	$"00FFEA00FFFFB830020106023B46923A3AF8BC79A03DA299463C564592D600FD"
+	$"D6ABFFC48B5419060BEA4B08335A3D594260525E4B61595B604DCD01C7B35E42"
+	$"5248464C4C4354380604AE302628262D24B418B63A222E2C2C0A0629362C362C"
+	$"37293A263726360605BA03342E38284030BF44B77141343E3838323A34363006"
+	$"08EEEE342E38323630BCFBBA973E3840304134BF44B77138284230C027B70443"
+	$"363F3A38343A36363206033E5A224A26542A4A264C274C27592C06033BC564B6"
+	$"39C564B6395A305A22C48AB5CB592CC48AB5CB06156FABEBB8BC033430382A30"
+	$"36313F313B314332445234582A583C583846444B4356475F395F4F5F4943483E"
+	$"4E424C425042525448584E4C4E604E563E545434543854B9B2C564B639C736B7"
+	$"B45A305A224A26542AC165B4740609BEFB02483E4E3EC431BF54513D52345236"
+	$"522EC564B639452749263D293533403140314436463AC1C8BCA5473C473D060A"
+	$"EBEA0E4031C17ABADA40312E3C2D4132462F45BB3DC27F38483F4B3E56425E34"
+	$"5E4A5E433C463A463C46380606B60B32445234582A583C583846354237443340"
+	$"303F060BCFB83C5234522E52364E3E513DC431BF54484E424C42504252544858"
+	$"4E4C4E604E563E545434543854B9B2C564B639C736B7B4C564B6390605BB0334"
+	$"30382A3430353445273DB6954926C564B6394A264A26C165B4740204BE31B7FB"
+	$"BE31B7FBBE6BB89E3C32BE6EB958BDDCBB0FBC2FBC93BD1EBBE6BC2FBC93352F"
+	$"3631352F02063426B796B443BC88B5E9BE31B7FB3BB6C6BE31B7FB352F352F36"
+	$"31BC2FBC93BC2FBC93BADFBD862C3CB92D3C263C2632B4C7BC9D282A0204292E"
+	$"2A2E282E2730272F2731293228322A322B302B312B2F02043030B9D030B8EF30"
+	$"2E322EB9BB2EBA9C3034B8EF34B9D034323232BA9C32B9BB0A06224C39573945"
+	$"2C402C3C22380A04223C224C385738450A063451264A244B3654364634470A06"
+	$"243E244B264A2641344736460A042642264A345134480A042238223C2C402C3C"
+	$"0609FA2A033939363D334034403240323EBA64BF2C313D303D313C3339373B36"
+	$"BDA7BBB6BDEDBBD90404FB2C3C2CBF482C3A3138353835BBAB353A2C3CB8AD3C"
+	$"2B3C1B0A010100000A0001071001178402040A0200000A0301092025200A0201"
+	$"08000A05010A000A07010B000A04010C000A060105000A070106000A00010110"
+	$"01178402040A0B0101000A000111124013B10000000000004000004400004000"
+	$"0001178400040A0D01120240155500000000000040000043F5554000000A0E01"
+	$"130240155500000000000040000043F5554000000A0F01140240155500000000"
+	$"000040000043F5554000000A1101160240155500000000000040000043F55540"
+	$"00000A1001150240155500000000000040000043F5554000000A00020D0E1001"
+	$"178402040A09010E000A0001170240C000000000000000400000C60000C00000"
+	$"0A120118023E20903A9FB0BDF7B741B2E5491686C9131B0A0A010D0240000000"
+	$"0000000000402C66000000C02B2A0A000104000A0C0103000A000102023F3E5C"
+	$"3B12A8BB12A83F3E5C4567D643FA000A00020F1000"
 };